diff --git a/.bazelrc.common b/.bazelrc.common
index c401a90507982..0ad0c95fdcbbd 100644
--- a/.bazelrc.common
+++ b/.bazelrc.common
@@ -13,10 +13,10 @@ test --experimental_guard_against_concurrent_changes
 query --experimental_guard_against_concurrent_changes
 
 ## Cache action outputs on disk so they persist across output_base and bazel shutdown (eg. changing branches)
-common --disk_cache=~/.bazel-cache/disk-cache
+build --disk_cache=~/.bazel-cache/disk-cache
 
 ## Bazel repo cache settings
-common --repository_cache=~/.bazel-cache/repository-cache
+build --repository_cache=~/.bazel-cache/repository-cache
 
 # Bazel will create symlinks from the workspace directory to output artifacts.
 # Build results will be placed in a directory called "bazel-bin"
diff --git a/.buildkite/pipelines/hourly.yml b/.buildkite/pipelines/hourly.yml
index 81875dee70f18..b03a46b5b5c66 100644
--- a/.buildkite/pipelines/hourly.yml
+++ b/.buildkite/pipelines/hourly.yml
@@ -119,14 +119,6 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: .buildkite/scripts/steps/test/jest.sh
-    label: 'Jest Tests'
-    parallelism: 6
-    agents:
-      queue: n2-4
-    timeout_in_minutes: 90
-    key: jest
-
   - command: .buildkite/scripts/steps/test/jest_integration.sh
     label: 'Jest Integration Tests'
     agents:
@@ -141,6 +133,13 @@ steps:
     timeout_in_minutes: 120
     key: api-integration
 
+  - command: .buildkite/scripts/steps/test/jest.sh
+    label: 'Jest Tests'
+    agents:
+      queue: c2-16
+    timeout_in_minutes: 120
+    key: jest
+
   - command: .buildkite/scripts/steps/lint.sh
     label: 'Linting'
     agents:
diff --git a/.buildkite/pipelines/pull_request/base.yml b/.buildkite/pipelines/pull_request/base.yml
index a3a1881c856c5..1013a841dfd27 100644
--- a/.buildkite/pipelines/pull_request/base.yml
+++ b/.buildkite/pipelines/pull_request/base.yml
@@ -117,14 +117,6 @@ steps:
         - exit_status: '*'
           limit: 1
 
-  - command: .buildkite/scripts/steps/test/jest.sh
-    label: 'Jest Tests'
-    parallelism: 6
-    agents:
-      queue: n2-4
-    timeout_in_minutes: 90
-    key: jest
-
   - command: .buildkite/scripts/steps/test/jest_integration.sh
     label: 'Jest Integration Tests'
     agents:
@@ -139,6 +131,13 @@ steps:
     timeout_in_minutes: 120
     key: api-integration
 
+  - command: .buildkite/scripts/steps/test/jest.sh
+    label: 'Jest Tests'
+    agents:
+      queue: c2-16
+    timeout_in_minutes: 120
+    key: jest
+
   - command: .buildkite/scripts/steps/lint.sh
     label: 'Linting'
     agents:
diff --git a/.buildkite/scripts/steps/test/jest.sh b/.buildkite/scripts/steps/test/jest.sh
index d2d1ed10043d6..2c4e3fe21902d 100755
--- a/.buildkite/scripts/steps/test/jest.sh
+++ b/.buildkite/scripts/steps/test/jest.sh
@@ -9,5 +9,5 @@ is_test_execution_step
 .buildkite/scripts/bootstrap.sh
 
 echo '--- Jest'
-checks-reporter-with-killswitch "Jest Unit Tests $((BUILDKITE_PARALLEL_JOB+1))" \
-  .buildkite/scripts/steps/test/jest_parallel.sh
+checks-reporter-with-killswitch "Jest Unit Tests" \
+  node scripts/jest --ci --verbose --maxWorkers=10
diff --git a/.buildkite/scripts/steps/test/jest_parallel.sh b/.buildkite/scripts/steps/test/jest_parallel.sh
deleted file mode 100755
index d3ee75b7add4a..0000000000000
--- a/.buildkite/scripts/steps/test/jest_parallel.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-set -uo pipefail
-
-JOB=$BUILDKITE_PARALLEL_JOB
-JOB_COUNT=$BUILDKITE_PARALLEL_JOB_COUNT
-
-# a jest failure will result in the script returning an exit
-# code of 10
-
-i=0
-exitCode=0
-
-find src x-pack packages -name jest.config.js -not -path "*/__fixtures__/*" | sort | while read config; do
-  if [ "$(($i % $JOB_COUNT))" -eq $JOB ]; then
-    echo "--- $ node scripts/jest --config $config"
-    node --max-old-space-size=5632 ./node_modules/.bin/jest --config=$config --runInBand --coverage=false
-
-    if [ $? -ne 0 ]; then
-      exitCode=10
-      echo "^^^ +++"
-    fi
-  fi
-
-  ((i=i+1))
-done
-
-exit $exitCode
\ No newline at end of file
diff --git a/.ci/Dockerfile b/.ci/Dockerfile
index 29ed08c84b23e..8e0d2d4351965 100644
--- a/.ci/Dockerfile
+++ b/.ci/Dockerfile
@@ -1,7 +1,7 @@
 # NOTE: This Dockerfile is ONLY used to run certain tasks in CI. It is not used to run Kibana or as a distributable.
 # If you're looking for the Kibana Docker image distributable, please see: src/dev/build/tasks/os_packages/docker_generator/templates/dockerfile.template.ts
 
-ARG NODE_VERSION=16.11.1
+ARG NODE_VERSION=16.13.0
 
 FROM node:${NODE_VERSION} AS base
 
diff --git a/.node-version b/.node-version
index 141e9a2a2cef0..58a4133d910f4 100644
--- a/.node-version
+++ b/.node-version
@@ -1 +1 @@
-16.11.1
+16.13.0
diff --git a/.nvmrc b/.nvmrc
index 141e9a2a2cef0..5b0ad74a81023 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-16.11.1
+16.13.0
\ No newline at end of file
diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel
index d3c44eab2a526..08c5bfa551437 100644
--- a/WORKSPACE.bazel
+++ b/WORKSPACE.bazel
@@ -27,14 +27,14 @@ check_rules_nodejs_version(minimum_version_string = "3.8.0")
 # we can update that rule.
 node_repositories(
   node_repositories = {
-    "16.11.1-darwin_amd64": ("node-v16.11.1-darwin-x64.tar.gz", "node-v16.11.1-darwin-x64", "ba54b8ed504bd934d03eb860fefe991419b4209824280d4274f6a911588b5e45"),
-    "16.11.1-darwin_arm64": ("node-v16.11.1-darwin-arm64.tar.gz", "node-v16.11.1-darwin-arm64", "5e772e478390fab3001b7148a923e4f22fca50170000f18b28475337d3a97248"),
-    "16.11.1-linux_arm64": ("node-v16.11.1-linux-arm64.tar.xz", "node-v16.11.1-linux-arm64", "083fc51f0ea26de9041aaf9821874651a9fd3b20d1cf57071ce6b523a0436f17"),
-    "16.11.1-linux_s390x": ("node-v16.11.1-linux-s390x.tar.xz", "node-v16.11.1-linux-s390x", "855b5c83c2ccb05273d50bb04376335c68d47df57f3187cdebe1f22b972d2825"),
-    "16.11.1-linux_amd64": ("node-v16.11.1-linux-x64.tar.xz", "node-v16.11.1-linux-x64", "493bcc9b660eff983a6de65a0f032eb2717f57207edf74c745bcb86e360310b3"),
-    "16.11.1-windows_amd64": ("node-v16.11.1-win-x64.zip", "node-v16.11.1-win-x64", "4d3c179b82d42e66e321c3948a4e332ed78592917a69d38b86e3a242d7e62fb7"),
+    "16.13.0-darwin_amd64": ("node-v16.13.0-darwin-x64.tar.gz", "node-v16.13.0-darwin-x64", "37e09a8cf2352f340d1204c6154058d81362fef4ec488b0197b2ce36b3f0367a"),
+    "16.13.0-darwin_arm64": ("node-v16.13.0-darwin-arm64.tar.gz", "node-v16.13.0-darwin-arm64", "46d83fc0bd971db5050ef1b15afc44a6665dee40bd6c1cbaec23e1b40fa49e6d"),
+    "16.13.0-linux_arm64": ("node-v16.13.0-linux-arm64.tar.xz", "node-v16.13.0-linux-arm64", "93a0d03f9f802353cb7052bc97a02cd9642b49fa985671cdc16c99936c86d7d2"),
+    "16.13.0-linux_s390x": ("node-v16.13.0-linux-s390x.tar.xz", "node-v16.13.0-linux-s390x", "49e972bf3e969d621157df4c8f2fa18ff748c167d5ebd0efc87e1b9f0c6541cc"),
+    "16.13.0-linux_amd64": ("node-v16.13.0-linux-x64.tar.xz", "node-v16.13.0-linux-x64", "a876ce787133149abd1696afa54b0b5bc5ce3d5ae359081d407ff776e39b7ba8"),
+    "16.13.0-windows_amd64": ("node-v16.13.0-win-x64.zip", "node-v16.13.0-win-x64", "5a39ec5d4786c2814a6c04488bebac6423c2aaa12832b24f0882456f2e4674e1"),
   },
-  node_version = "16.11.1",
+  node_version = "16.13.0",
   node_urls = [
     "https://nodejs.org/dist/v{version}/{filename}",
   ],
diff --git a/api_docs/fleet.json b/api_docs/fleet.json
index b951a5feea633..06c6bf2dbae32 100644
--- a/api_docs/fleet.json
+++ b/api_docs/fleet.json
@@ -19696,16 +19696,6 @@
             "path": "x-pack/plugins/fleet/common/constants/routes.ts",
             "deprecated": false
           },
-          {
-            "parentPluginId": "fleet",
-            "id": "def-common.AGENT_API_ROUTES.ENROLL_PATTERN",
-            "type": "string",
-            "tags": [],
-            "label": "ENROLL_PATTERN",
-            "description": [],
-            "path": "x-pack/plugins/fleet/common/constants/routes.ts",
-            "deprecated": false
-          },
           {
             "parentPluginId": "fleet",
             "id": "def-common.AGENT_API_ROUTES.UNENROLL_PATTERN",
@@ -21889,4 +21879,4 @@
       }
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/docs/concepts/index-patterns.asciidoc b/docs/concepts/data-views.asciidoc
similarity index 55%
rename from docs/concepts/index-patterns.asciidoc
rename to docs/concepts/data-views.asciidoc
index b8a10572fd8eb..7eb95405db6bc 100644
--- a/docs/concepts/index-patterns.asciidoc
+++ b/docs/concepts/data-views.asciidoc
@@ -1,45 +1,45 @@
-[[index-patterns]]
-=== Create an index pattern
+[[data-views]]
+=== Create a data view
 
-{kib} requires an index pattern to access the {es} data that you want to explore.
-An index pattern selects the data to use and allows you to define properties of the fields.
+{kib} requires a data view to access the {es} data that you want to explore. 
+A data view selects the data to use and allows you to define properties of the fields.
 
-An index pattern can point to one or more indices, {ref}/data-streams.html[data stream], or {ref}/alias.html[index aliases].
-For example, an index pattern can point to your log data from yesterday,
+A data view can point to one or more indices, {ref}/data-streams.html[data stream], or {ref}/alias.html[index aliases].
+For example, a data view can point to your log data from yesterday,
 or all indices that contain your data.
 
 [float]
-[[index-patterns-read-only-access]]
+[[data-views-read-only-access]]
 === Required permissions
 
-* Access to *Index Patterns* requires the <<xpack-kibana-role-management, {kib} privilege>>
-`Index Pattern Management`.
+* Access to *Data Views* requires the <<xpack-kibana-role-management, {kib} privilege>>
+`Data View Management`.
 
-* To create an index pattern, you must have the <<xpack-kibana-role-management,{es} privilege>>
+* To create a data view, you must have the <<xpack-kibana-role-management,{es} privilege>>
 `view_index_metadata`.
 
 * If a read-only indicator appears in {kib}, you have insufficient privileges
-to create or save index patterns. The buttons to create new index patterns or
-save existing index patterns are not visible. For more information,
+to create or save data views. The buttons to create new data views or
+save existing data views are not visible. For more information,
 refer to <<xpack-security-authorization,Granting access to {kib}>>.
 
 [float]
 [[settings-create-pattern]]
-=== Create an index pattern
+=== Create a data view
 
 If you collected data using one of the {kib} <<connect-to-elasticsearch,ingest options>>,
 uploaded a file, or added sample data,
-you get an index pattern for free, and can start exploring your data.
-If you loaded your own data, follow these steps to create an index pattern.
+you get a data view for free, and can start exploring your data.
+If you loaded your own data, follow these steps to create a data view.
 
-. Open the main menu, then click to *Stack Management > Index Patterns*.
+. Open the main menu, then click to *Stack Management > Data Views*.
+
+. Click *Create data view*.
 
-. Click *Create index pattern*.
-+
 [role="screenshot"]
-image:management/index-patterns/images/create-index-pattern.png["Create index pattern"]
+image:management/index-patterns/images/create-index-pattern.png["Create data view"]
 
-. Start typing in the *Index pattern* field, and {kib} looks for the names of
+. Start typing in the *name* field, and {kib} looks for the names of
 indices, data streams, and aliases that match your input.
 +
 ** To match multiple sources, use a wildcard (*). For example, `filebeat-*` matches
@@ -61,21 +61,21 @@ global time filters on your dashboards. This is useful if
 you have multiple time fields and want to create dashboards that combine visualizations
 based on different timestamps.
 
-. Click *Create index pattern*.
+. Click *Create data view*.
 +
 [[reload-fields]] {kib} is now configured to use your {es} data. When a new field is added to an index,
-the index pattern field list is updated
-the next time the index pattern is loaded, for example, when you load the page or
+the data view field list is updated
+the next time the data view is loaded, for example, when you load the page or
 move between {kib} apps.
 
-. Select this index pattern when you search and visualize your data.
+. Select this data view when you search and visualize your data.
 
 [float]
-[[rollup-index-pattern]]
-==== Create an index pattern for rolled up data
+[[rollup-data-view]]
+==== Create a data view for rolled up data
 
-An index pattern can match one rollup index.  For a combination rollup
-index pattern with both raw and rolled up data, use the standard notation:
+A data view can match one rollup index.  For a combination rollup
+data view with both raw and rolled up data, use the standard notation:
 
 ```ts
 rollup_logstash,kibana_sample_data_logs
@@ -84,7 +84,7 @@ For an example, refer to <<rollup-data-tutorial,Create and visualize rolled up d
 
 [float]
 [[management-cross-cluster-search]]
-==== Create an index pattern that searches across clusters
+==== Create a data view that searches across clusters
 
 If your {es} clusters are configured for {ref}/modules-cross-cluster-search.html[{ccs}],
 you can create an index pattern to search across the clusters of your choosing. Use the
@@ -129,20 +129,20 @@ To exclude a cluster having a name starting with `cluster_`:
 `cluster_*:logstash-*,cluster_one:-*`
 ```
 
-Once you configure an index pattern to use the {ccs} syntax, all searches and
-aggregations using that index pattern in {kib} take advantage of {ccs}.
+Once you configure a data view to use the {ccs} syntax, all searches and
+aggregations using that data view in {kib} take advantage of {ccs}.
 
 [float]
-[[delete-index-pattern]]
-=== Delete index patterns
+[[delete-data-view]]
+=== Delete data views
 
-When you delete an index pattern, you cannot recover the associated field formatters, runtime fields, source filters,
-and field popularity data. Deleting an index pattern does not remove any indices or data documents from {es}.
+When you delete a data view, you cannot recover the associated field formatters, runtime fields, source filters,
+and field popularity data. Deleting a data view does not remove any indices or data documents from {es}.
 
-WARNING: Deleting an index pattern breaks all visualizations, saved searches, and other saved objects that reference the index pattern.
+WARNING: Deleting a data view breaks all visualizations, saved searches, and other saved objects that reference the data view.
 
-. Open the main menu, then click *Stack Management > Index Patterns*.
+. Open the main menu, then click *Stack Management > Data Views*.
 
-. Click the index pattern to delete.
+. Click the data view to delete.
 
-. Delete (image:management/index-patterns/images/delete.png[Delete icon]) the index pattern.
+. Delete (image:management/index-patterns/images/delete.png[Delete icon]) the data view.
diff --git a/docs/concepts/index.asciidoc b/docs/concepts/index.asciidoc
index 20d7103f021cd..eac26beee1f9b 100644
--- a/docs/concepts/index.asciidoc
+++ b/docs/concepts/index.asciidoc
@@ -35,19 +35,19 @@ Open the search bar using the keyboard shortcut Ctrl+/ on Windows and Linux, Com
 image:concepts/images/global-search.png["Global search showing matches to apps and saved objects for the word visualize"]
 
 [float]
-=== Accessing data with index patterns
+=== Accessing data with data views
 
-{kib} requires an index pattern to tell it which {es} data you want to access,
-and whether the data is time-based. An index pattern can point to one or more {es}
+{kib} requires a data view to tell it which {es} data you want to access,
+and whether the data is time-based. A data view can point to one or more {es}
 data streams, indices, or index aliases by name.
 For example, `logs-elasticsearch-prod-*` is an index pattern,
 and it is time-based with a time field of `@timestamp`. The time field is not editable.
 
-Index patterns are typically created by an administrator when sending data to {es}.
-You can <<index-patterns,create or update index patterns>> in *Stack Management*, or by using a script
+Data views are typically created by an administrator when sending data to {es}.
+You can <<data-views,create or update data views>> in *Stack Management*, or by using a script
 that accesses the {kib} API.
 
-{kib} uses the index pattern to show you a list of fields, such as
+{kib} uses the data view to show you a list of fields, such as
 `event.duration`. You can customize the display name and format for each field.
 For example, you can tell {kib} to display `event.duration` in seconds.
 {kib} has <<managing-fields,field formatters>> for strings,
@@ -75,7 +75,7 @@ and can optionally contain the time filter and extra filters.
 ==== Time filter
 
 The <<set-time-filter, global time filter>> limits the time range of data displayed.
-In most cases, the time filter applies to the time field in the index pattern,
+In most cases, the time filter applies to the time field in the data view,
 but some apps allow you to use a different time field.
 
 Using the time filter, you can configure a refresh rate to periodically
@@ -159,7 +159,7 @@ Use the global search to quickly open a saved object.
 * Go to <<discover, Discover>> for instructions on searching your data.
 
 
-include::index-patterns.asciidoc[]
+include::data-views.asciidoc[]
 
 include::set-time-filter.asciidoc[]
 
diff --git a/docs/concepts/set-time-filter.asciidoc b/docs/concepts/set-time-filter.asciidoc
index e4784a97e816b..116bcd6f91f77 100644
--- a/docs/concepts/set-time-filter.asciidoc
+++ b/docs/concepts/set-time-filter.asciidoc
@@ -2,7 +2,7 @@
 === Set the time range
 Display data within a
 specified time range when your index contains time-based events, and a time-field is configured for the
-selected <<index-patterns, index pattern>>.
+selected <<data-views, data view>>.
 The default time range is 15 minutes, but you can customize
 it in <<advanced-options,Advanced Settings>>.
 
diff --git a/docs/discover/search.asciidoc b/docs/discover/search.asciidoc
index 0306be3eb670d..4f4f8f5b48d10 100644
--- a/docs/discover/search.asciidoc
+++ b/docs/discover/search.asciidoc
@@ -3,7 +3,7 @@
 
 You can search your data in any app that has a query bar, or by clicking on
 elements in a visualization.  A search matches indices in the current
-<<index-patterns, index pattern>> and in the current <<set-time-filter,time frame>>.
+<<data-views, data view>> and in the current <<set-time-filter,time frame>>.
 
 
 [float]
diff --git a/docs/maps/search.asciidoc b/docs/maps/search.asciidoc
index 08624e4ddff57..a170bcc414d3b 100644
--- a/docs/maps/search.asciidoc
+++ b/docs/maps/search.asciidoc
@@ -43,7 +43,7 @@ To prevent the global search from applying to a layer, configure the following:
 [[maps-narrow-layer-by-global-time]]
 ==== Narrow layers by global time
 
-Layers that request data from {es} using an <<index-patterns, index pattern>> with a configured time field are narrowed by the <<set-time-filter, global time>>.
+Layers that request data from {es} using a <<data-views, data view>> with a configured time field are narrowed by the <<set-time-filter, global time>>.
 These layers contain the clock icon image:maps/images/clock_icon.png[clock icon] next to the layer name in the legend.
 
 Use the time slider to quickly select time slices within the global time range:
diff --git a/docs/redirects.asciidoc b/docs/redirects.asciidoc
index d5bc2ccd8ef7d..4010083d601b5 100644
--- a/docs/redirects.asciidoc
+++ b/docs/redirects.asciidoc
@@ -358,3 +358,8 @@ This content has moved. Refer to <<xpack-profiler>>.
 == Rendering pre-captured profiler JSON
 
 This content has moved. Refer to <<xpack-profiler>>.
+
+[role="exclude",id="index-patterns"]
+== Index patterns has been renamed to data views.
+
+This content has moved. Refer to <<data-views>>.
diff --git a/docs/setup/connect-to-elasticsearch.asciidoc b/docs/setup/connect-to-elasticsearch.asciidoc
index ad38ac1710fd5..b1d9d3ea2ea18 100644
--- a/docs/setup/connect-to-elasticsearch.asciidoc
+++ b/docs/setup/connect-to-elasticsearch.asciidoc
@@ -84,7 +84,7 @@ You can manage your roles, privileges, and spaces in **{stack-manage-app}** in
 If the {kib} ingest options don't work for you, you can index your
 data into Elasticsearch with {ref}/getting-started-index.html[REST APIs]
 or https://www.elastic.co/guide/en/elasticsearch/client/index.html[client libraries].
-After you add your data, you're required to create an <<index-patterns,index pattern>> to tell
+After you add your data, you're required to create a <<data-views,data view>> to tell
 {kib} where to find the data.
 
 * To add data for Elastic Observability, refer to {observability-guide}/add-observability-data.html[Send data to Elasticsearch].
diff --git a/docs/user/canvas.asciidoc b/docs/user/canvas.asciidoc
index 1cd8eacc456c7..1f469b697c218 100644
--- a/docs/user/canvas.asciidoc
+++ b/docs/user/canvas.asciidoc
@@ -43,7 +43,7 @@ To create workpads, you must meet the minimum requirements.
 
 * If you need to set up {kib}, use https://www.elastic.co/cloud/elasticsearch-service/signup?baymax=docs-body&elektra=docs[our free trial].
 
-* Make sure you have {ref}/getting-started-index.html[data indexed into {es}] and an <<index-patterns,index pattern>>.
+* Make sure you have {ref}/getting-started-index.html[data indexed into {es}] and a <<data-views, data view>>.
 
 * Have an understanding of {ref}/documents-indices.html[{es} documents and indices].
 
diff --git a/docs/user/dashboard/dashboard.asciidoc b/docs/user/dashboard/dashboard.asciidoc
index a2e0eb6bf92e9..474b45f4989fb 100644
--- a/docs/user/dashboard/dashboard.asciidoc
+++ b/docs/user/dashboard/dashboard.asciidoc
@@ -5,7 +5,7 @@
 --
 **_Visualize your data with dashboards._**
 
-The best way to understand your data is to visualize it. With dashboards, you can turn your data from one or more <<index-patterns, index patterns>> into a collection of panels 
+The best way to understand your data is to visualize it. With dashboards, you can turn your data from one or more <<data-views, data views>> into a collection of panels 
 that bring clarity to your data, tell a story about your data, and allow you to focus on only the data that's important to you. 
 
 [role="screenshot"]
@@ -53,7 +53,7 @@ To create dashboards, you must meet the minimum requirements.
 
 * If you need to set up {kib}, use https://www.elastic.co/cloud/elasticsearch-service/signup?baymax=docs-body&elektra=docs[our free trial].
 
-* Make sure you have {ref}/getting-started-index.html[data indexed into {es}] and an <<index-patterns,index pattern>>.
+* Make sure you have {ref}/getting-started-index.html[data indexed into {es}] and a <<data-views, data view>>.
 
 * When the read-only indicator appears, you have insufficient privileges
 to create or save dashboards, and the options to create and save dashboards are not visible. For more information,
diff --git a/docs/user/dashboard/lens-advanced.asciidoc b/docs/user/dashboard/lens-advanced.asciidoc
index d5a52428cff36..02e0afd2c0311 100644
--- a/docs/user/dashboard/lens-advanced.asciidoc
+++ b/docs/user/dashboard/lens-advanced.asciidoc
@@ -33,7 +33,7 @@ Open *Lens*, then make sure the correct fields appear.
 
 . Make sure the *kibana_sample_data_ecommerce* index appears.
 +
-If you are using your own data, select the <<index-patterns, index pattern>> that contains your data.
+If you are using your own data, select the <<data-views, data view>> that contains your data.
 
 [discrete]
 [[custom-time-interval]]
diff --git a/docs/user/dashboard/tsvb.asciidoc b/docs/user/dashboard/tsvb.asciidoc
index 9fe6af2d3da6d..c944ec2c9e083 100644
--- a/docs/user/dashboard/tsvb.asciidoc
+++ b/docs/user/dashboard/tsvb.asciidoc
@@ -8,7 +8,7 @@ With *TSVB*, you can:
 * Combine an infinite number of <<aggregation-reference,aggregations>> to display your data.
 * Annotate time series data with timestamped events from an {es} index.
 * View the data in several types of visualizations, including charts, data tables, and markdown panels.
-* Display multiple <<index-patterns, index patterns>> in each visualization.
+* Display multiple <<data-views, data views>> in each visualization.
 * Use custom functions and some math on aggregations.
 * Customize the data with labels and colors.
 
diff --git a/docs/user/discover.asciidoc b/docs/user/discover.asciidoc
index e52531f9decdc..a485bb4c96efe 100644
--- a/docs/user/discover.asciidoc
+++ b/docs/user/discover.asciidoc
@@ -64,7 +64,7 @@ Tell {kib} where to find the data you want to explore, and then specify the time
 
 . Select the data you want to work with.
 +
-{kib} uses an <<index-patterns,index pattern>> to tell it where to find
+{kib} uses a <<data-views, data view>> to tell it where to find
 your {es} data.
 To view the ecommerce sample data, make sure the index pattern is set to **kibana_sample_data_ecommerce**.
 +
diff --git a/docs/user/graph/getting-started.asciidoc b/docs/user/graph/getting-started.asciidoc
index 086c0707b3c2c..5e87efc5e8aca 100644
--- a/docs/user/graph/getting-started.asciidoc
+++ b/docs/user/graph/getting-started.asciidoc
@@ -3,7 +3,7 @@
 == Create a graph
 
 You must index data into {es} before you can create a graph.
-<<index-patterns, Learn how>> or get started with a <<add-sample-data, sample data set>>.
+<<data-views, Learn how>> or get started with a <<add-sample-data, sample data set>>.
 
 [float]
 [[exploring-connections]]
diff --git a/package.json b/package.json
index 1718c703ee7a7..ae8c9621b1893 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,7 @@
     "**/underscore": "^1.13.1"
   },
   "engines": {
-    "node": "16.11.1",
+    "node": "16.13.0",
     "yarn": "^1.21.1"
   },
   "dependencies": {
@@ -98,7 +98,7 @@
     "@elastic/apm-synthtrace": "link:bazel-bin/packages/elastic-apm-synthtrace",
     "@elastic/apm-rum": "^5.9.1",
     "@elastic/apm-rum-react": "^1.3.1",
-    "@elastic/charts": "38.1.0",
+    "@elastic/charts": "38.1.3",
     "@elastic/datemath": "link:bazel-bin/packages/elastic-datemath",
     "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@^8.0.0-canary.35",
     "@elastic/ems-client": "8.0.0",
diff --git a/packages/kbn-cli-dev-mode/src/dev_server.test.ts b/packages/kbn-cli-dev-mode/src/dev_server.test.ts
index 5e386e3de5972..92dbe484eb005 100644
--- a/packages/kbn-cli-dev-mode/src/dev_server.test.ts
+++ b/packages/kbn-cli-dev-mode/src/dev_server.test.ts
@@ -79,7 +79,6 @@ expect.addSnapshotSerializer(extendedEnvSerializer);
 beforeEach(() => {
   jest.clearAllMocks();
   log.messages.length = 0;
-  process.execArgv = ['--inheritted', '--exec', '--argv'];
   currentProc = undefined;
 });
 
@@ -139,9 +138,8 @@ describe('#run$', () => {
               "isDevCliChild": "true",
             },
             "nodeOptions": Array [
-              "--inheritted",
-              "--exec",
-              "--argv",
+              "--preserve-symlinks-main",
+              "--preserve-symlinks",
             ],
             "stdio": "pipe",
           },
diff --git a/packages/kbn-rule-data-utils/jest.config.js b/packages/kbn-rule-data-utils/jest.config.js
new file mode 100644
index 0000000000000..26cb39fe8b55a
--- /dev/null
+++ b/packages/kbn-rule-data-utils/jest.config.js
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+module.exports = {
+  preset: '@kbn/test',
+  rootDir: '../..',
+  roots: ['<rootDir>/packages/kbn-rule-data-utils'],
+};
diff --git a/packages/kbn-securitysolution-list-constants/jest.config.js b/packages/kbn-securitysolution-list-constants/jest.config.js
new file mode 100644
index 0000000000000..21dffdfcf5a68
--- /dev/null
+++ b/packages/kbn-securitysolution-list-constants/jest.config.js
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+module.exports = {
+  preset: '@kbn/test',
+  rootDir: '../..',
+  roots: ['<rootDir>/packages/kbn-securitysolution-list-constants'],
+};
diff --git a/packages/kbn-securitysolution-t-grid/jest.config.js b/packages/kbn-securitysolution-t-grid/jest.config.js
new file mode 100644
index 0000000000000..21e7d2d71b61a
--- /dev/null
+++ b/packages/kbn-securitysolution-t-grid/jest.config.js
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+module.exports = {
+  preset: '@kbn/test',
+  rootDir: '../..',
+  roots: ['<rootDir>/packages/kbn-securitysolution-t-grid'],
+};
diff --git a/packages/kbn-test/jest-preset.js b/packages/kbn-test/jest-preset.js
index db64f070b37d9..0199aa6e311b6 100644
--- a/packages/kbn-test/jest-preset.js
+++ b/packages/kbn-test/jest-preset.js
@@ -46,15 +46,7 @@ module.exports = {
   modulePathIgnorePatterns: ['__fixtures__/', 'target/'],
 
   // Use this configuration option to add custom reporters to Jest
-  reporters: [
-    'default',
-    [
-      '@kbn/test/target_node/jest/junit_reporter',
-      {
-        rootDirectory: '.',
-      },
-    ],
-  ],
+  reporters: ['default', '@kbn/test/target_node/jest/junit_reporter'],
 
   // The paths to modules that run some code to configure or set up the testing environment before each test
   setupFiles: [
diff --git a/packages/kbn-test/src/jest/run.ts b/packages/kbn-test/src/jest/run.ts
index f2592500beeee..4a5dd4e9281ba 100644
--- a/packages/kbn-test/src/jest/run.ts
+++ b/packages/kbn-test/src/jest/run.ts
@@ -52,12 +52,11 @@ export function runJest(configName = 'jest.config.js') {
 
   const runStartTime = Date.now();
   const reportTime = getTimeReporter(log, 'scripts/jest');
-
+  let cwd: string;
   let testFiles: string[];
 
-  const cwd: string = process.env.INIT_CWD || process.cwd();
-
   if (!argv.config) {
+    cwd = process.env.INIT_CWD || process.cwd();
     testFiles = argv._.splice(2).map((p) => resolve(cwd, p));
     const commonTestFiles = commonBasePath(testFiles);
     const testFilesProvided = testFiles.length > 0;
diff --git a/src/plugins/charts/common/index.ts b/src/plugins/charts/common/index.ts
index d06dbc73e29b1..936ad2d10ac64 100644
--- a/src/plugins/charts/common/index.ts
+++ b/src/plugins/charts/common/index.ts
@@ -34,6 +34,7 @@ export {
   ColorMode,
   LabelRotation,
   defaultCountLabel,
+  MULTILAYER_TIME_AXIS_STYLE,
 } from './static';
 
 export { ColorSchemaParams, Labels, Style } from './types';
diff --git a/src/plugins/charts/common/static/index.ts b/src/plugins/charts/common/static/index.ts
index 9cde3bafe59e4..ac706ac7869c5 100644
--- a/src/plugins/charts/common/static/index.ts
+++ b/src/plugins/charts/common/static/index.ts
@@ -19,3 +19,5 @@ export {
 } from './color_maps';
 
 export { ColorMode, LabelRotation, defaultCountLabel } from './components';
+
+export * from './styles';
diff --git a/src/plugins/charts/common/static/styles/index.ts b/src/plugins/charts/common/static/styles/index.ts
new file mode 100644
index 0000000000000..688103322c53f
--- /dev/null
+++ b/src/plugins/charts/common/static/styles/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 './multilayer_timeaxis';
diff --git a/src/plugins/charts/common/static/styles/multilayer_timeaxis.ts b/src/plugins/charts/common/static/styles/multilayer_timeaxis.ts
new file mode 100644
index 0000000000000..02a5533f53fca
--- /dev/null
+++ b/src/plugins/charts/common/static/styles/multilayer_timeaxis.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 { Position, RecursivePartial, AxisStyle } from '@elastic/charts';
+
+export const MULTILAYER_TIME_AXIS_STYLE: RecursivePartial<AxisStyle> = {
+  tickLabel: {
+    visible: true,
+    padding: 0,
+    rotation: 0,
+    alignment: {
+      vertical: Position.Bottom,
+      horizontal: Position.Left,
+    },
+  },
+  tickLine: {
+    visible: true,
+    size: 0.0001,
+    padding: 4,
+  },
+};
diff --git a/src/plugins/charts/public/static/index.ts b/src/plugins/charts/public/static/index.ts
index 6f5c87ce0df4d..53078eebe9c56 100644
--- a/src/plugins/charts/public/static/index.ts
+++ b/src/plugins/charts/public/static/index.ts
@@ -9,3 +9,4 @@
 export * from './colors';
 export * from './components';
 export * from './utils';
+export * from '../../common/static/styles';
diff --git a/src/plugins/custom_integrations/common/index.ts b/src/plugins/custom_integrations/common/index.ts
index 98148bb22c816..f00b4c39405d5 100755
--- a/src/plugins/custom_integrations/common/index.ts
+++ b/src/plugins/custom_integrations/common/index.ts
@@ -40,16 +40,11 @@ export const INTEGRATION_CATEGORY_DISPLAY = {
   web: 'Web',
 
   // Kibana added
-  communication: 'Communication',
-  customer_support: 'Customer Support',
-  document_storage: 'Document Storage',
-  enterprise_management: 'Enterprise Management',
-  knowledge_platform: 'Knowledge Platform',
+  communications: 'Communications',
+  file_storage: 'File storage',
   language_client: 'Language client',
-  project_management: 'Project Management',
-  software_development: 'Software Development',
   upload_file: 'Upload a file',
-  website_search: 'Website Search',
+  website_search: 'Website search',
 };
 
 /**
diff --git a/src/plugins/data/public/ui/query_string_input/query_bar_top_row.tsx b/src/plugins/data/public/ui/query_string_input/query_bar_top_row.tsx
index f71a3d3b0686a..90db5abe418b7 100644
--- a/src/plugins/data/public/ui/query_string_input/query_bar_top_row.tsx
+++ b/src/plugins/data/public/ui/query_string_input/query_bar_top_row.tsx
@@ -231,6 +231,7 @@ export default function QueryBarTopRow(props: QueryBarTopRowProps) {
         isDisabled={isDateRangeInvalid}
         isLoading={props.isLoading}
         onClick={onClickSubmitButton}
+        fill={false}
         data-test-subj="querySubmitButton"
       />
     );
diff --git a/src/plugins/discover/public/application/apps/context/context_app.tsx b/src/plugins/discover/public/application/apps/context/context_app.tsx
index 9d39c93d250f2..bfc13aac90e4b 100644
--- a/src/plugins/discover/public/application/apps/context/context_app.tsx
+++ b/src/plugins/discover/public/application/apps/context/context_app.tsx
@@ -19,7 +19,7 @@ import { IndexPattern, IndexPatternField } from '../../../../../data/common';
 import { LoadingStatus } from './services/context_query_state';
 import { getServices } from '../../../kibana_services';
 import { AppState, isEqualFilters } from './services/context_state';
-import { useDataGridColumns } from '../../helpers/use_data_grid_columns';
+import { useColumns } from '../../helpers/use_data_grid_columns';
 import { useContextAppState } from './utils/use_context_app_state';
 import { useContextAppFetch } from './utils/use_context_app_fetch';
 import { popularizeField } from '../../helpers/popularize_field';
@@ -84,7 +84,7 @@ export const ContextApp = ({ indexPattern, anchorId }: ContextAppProps) => {
     fetchedState.anchor._id,
   ]);
 
-  const { columns, onAddColumn, onRemoveColumn, onSetColumns } = useDataGridColumns({
+  const { columns, onAddColumn, onRemoveColumn, onSetColumns } = useColumns({
     capabilities,
     config: uiSettings,
     indexPattern,
diff --git a/src/plugins/discover/public/application/apps/context/context_app_content.tsx b/src/plugins/discover/public/application/apps/context/context_app_content.tsx
index 2d4d3cab250f3..153639edc29a1 100644
--- a/src/plugins/discover/public/application/apps/context/context_app_content.tsx
+++ b/src/plugins/discover/public/application/apps/context/context_app_content.tsx
@@ -28,7 +28,7 @@ export interface ContextAppContentProps {
   columns: string[];
   onAddColumn: (columnsName: string) => void;
   onRemoveColumn: (columnsName: string) => void;
-  onSetColumns: (columnsNames: string[]) => void;
+  onSetColumns: (columnsNames: string[], hideTimeColumn: boolean) => void;
   services: DiscoverServices;
   indexPattern: IndexPattern;
   predecessorCount: number;
diff --git a/src/plugins/discover/public/application/apps/main/components/chart/histogram.tsx b/src/plugins/discover/public/application/apps/main/components/chart/histogram.tsx
index d1bc7a7cd7dbc..e35201651d5a7 100644
--- a/src/plugins/discover/public/application/apps/main/components/chart/histogram.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/chart/histogram.tsx
@@ -23,9 +23,6 @@ import {
   Settings,
   TooltipType,
   XYChartElementEvent,
-  GridLineStyle,
-  AxisStyle,
-  RecursivePartial,
 } from '@elastic/charts';
 import { IUiSettingsClient } from 'kibana/public';
 import {
@@ -38,7 +35,7 @@ import { DataCharts$, DataChartsMessage } from '../../services/use_saved_search'
 import { FetchStatus } from '../../../../types';
 import { DiscoverServices } from '../../../../../build_services';
 import { useDataState } from '../../utils/use_data_state';
-import { LEGACY_TIME_AXIS } from '../../../../../../../charts/common';
+import { LEGACY_TIME_AXIS, MULTILAYER_TIME_AXIS_STYLE } from '../../../../../../../charts/common';
 
 export interface DiscoverHistogramProps {
   savedSearchData$: DataCharts$;
@@ -184,46 +181,6 @@ export function DiscoverHistogram({
   const xAxisFormatter = services.data.fieldFormats.deserialize(chartData.yAxisFormat);
 
   const useLegacyTimeAxis = uiSettings.get(LEGACY_TIME_AXIS, false);
-  const gridLineStyle: RecursivePartial<GridLineStyle> = useLegacyTimeAxis
-    ? {}
-    : { strokeWidth: 0.1, stroke: isDarkMode ? 'white' : 'black' };
-  const verticalAxisStyle: RecursivePartial<AxisStyle> = useLegacyTimeAxis
-    ? {}
-    : {
-        axisLine: {
-          visible: false,
-        },
-        tickLabel: {
-          fontSize: 11,
-        },
-      };
-  const xAxisStyle: RecursivePartial<AxisStyle> = useLegacyTimeAxis
-    ? {}
-    : {
-        axisLine: {
-          stroke: isDarkMode ? 'lightgray' : 'darkgray',
-          strokeWidth: 1,
-        },
-        tickLine: {
-          size: 12,
-          strokeWidth: 0.15,
-          stroke: isDarkMode ? 'white' : 'black',
-          padding: -10,
-          visible: true,
-        },
-        tickLabel: {
-          fontSize: 11,
-          padding: 0,
-          alignment: {
-            vertical: Position.Bottom,
-            horizontal: Position.Left,
-          },
-          offset: {
-            x: 1.5,
-            y: 0,
-          },
-        },
-      };
 
   return (
     <React.Fragment>
@@ -244,16 +201,13 @@ export function DiscoverHistogram({
             ticks={2}
             integersOnly
             tickFormat={(value) => xAxisFormatter.convert(value)}
-            gridLine={gridLineStyle}
-            style={verticalAxisStyle}
           />
           <Axis
             id="discover-histogram-bottom-axis"
             position={Position.Bottom}
             tickFormat={formatXValue}
             timeAxisLayerCount={useLegacyTimeAxis ? 0 : 2}
-            gridLine={gridLineStyle}
-            style={xAxisStyle}
+            style={useLegacyTimeAxis ? {} : MULTILAYER_TIME_AXIS_STYLE}
           />
           <CurrentTime isDarkMode={isDarkMode} domainEnd={domainEnd} />
           <Endzones
diff --git a/src/plugins/discover/public/application/apps/main/components/doc_table/actions/columns.test.ts b/src/plugins/discover/public/application/apps/main/components/doc_table/actions/columns.test.ts
index d0984ff6fa797..93b38cfc6519c 100644
--- a/src/plugins/discover/public/application/apps/main/components/doc_table/actions/columns.test.ts
+++ b/src/plugins/discover/public/application/apps/main/components/doc_table/actions/columns.test.ts
@@ -64,7 +64,7 @@ describe('Test column actions', () => {
       sort: [],
     });
     setAppState.mockClear();
-    actions.onSetColumns(['first', 'second', 'third']);
+    actions.onSetColumns(['first', 'second', 'third'], true);
     expect(setAppState).toHaveBeenCalledWith({
       columns: ['first', 'second', 'third'],
     });
diff --git a/src/plugins/discover/public/application/apps/main/components/doc_table/actions/columns.ts b/src/plugins/discover/public/application/apps/main/components/doc_table/actions/columns.ts
index f3ad590ac6ce4..2fc82e25634bd 100644
--- a/src/plugins/discover/public/application/apps/main/components/doc_table/actions/columns.ts
+++ b/src/plugins/discover/public/application/apps/main/components/doc_table/actions/columns.ts
@@ -102,12 +102,13 @@ export function getStateColumnActions({
     setAppState({ columns });
   }
 
-  function onSetColumns(columns: string[]) {
-    // remove first element of columns if it's the configured timeFieldName, which is prepended automatically
+  function onSetColumns(columns: string[], hideTimeColumn: boolean) {
+    // The next line should gone when classic table will be removed
     const actualColumns =
-      indexPattern.timeFieldName && indexPattern.timeFieldName === columns[0]
+      !hideTimeColumn && indexPattern.timeFieldName && indexPattern.timeFieldName === columns[0]
         ? columns.slice(1)
         : columns;
+
     setAppState({ columns: actualColumns });
   }
   return {
diff --git a/src/plugins/discover/public/application/apps/main/components/layout/discover_documents.tsx b/src/plugins/discover/public/application/apps/main/components/layout/discover_documents.tsx
index d6ede9aa7fe5f..64d5e08f25d73 100644
--- a/src/plugins/discover/public/application/apps/main/components/layout/discover_documents.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/layout/discover_documents.tsx
@@ -23,7 +23,7 @@ import {
   SAMPLE_SIZE_SETTING,
   SEARCH_FIELDS_FROM_SOURCE,
 } from '../../../../../../common';
-import { useDataGridColumns } from '../../../../helpers/use_data_grid_columns';
+import { useColumns } from '../../../../helpers/use_data_grid_columns';
 import { IndexPattern } from '../../../../../../../data/common';
 import { SavedSearch } from '../../../../../saved_searches';
 import { DataDocumentsMsg, DataDocuments$ } from '../../services/use_saved_search';
@@ -69,7 +69,7 @@ function DiscoverDocumentsComponent({
 
   const rows = useMemo(() => documentState.result || [], [documentState.result]);
 
-  const { columns, onAddColumn, onRemoveColumn, onMoveColumn, onSetColumns } = useDataGridColumns({
+  const { columns, onAddColumn, onRemoveColumn, onMoveColumn, onSetColumns } = useColumns({
     capabilities,
     config: uiSettings,
     indexPattern,
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
index 37ff50e333124..1d074c002e340 100644
--- 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
@@ -82,8 +82,8 @@ discover-app {
 }
 
 .dscHistogram {
-  height: $euiSize * 8;
-  padding: $euiSizeS $euiSizeS $euiSizeS $euiSizeS;
+  height: $euiSize * 7;
+  padding: 0 $euiSizeS $euiSizeS * 2 $euiSizeS;
 }
 
 .dscHistogramTimeRange {
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
index a0799777a3947..76ed7069b294a 100644
--- 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
@@ -35,7 +35,7 @@ import { getResultState } from '../../utils/get_result_state';
 import { InspectorSession } from '../../../../../../../inspector/public';
 import { DiscoverUninitialized } from '../uninitialized/uninitialized';
 import { DataMainMsg } from '../../services/use_saved_search';
-import { useDataGridColumns } from '../../../../helpers/use_data_grid_columns';
+import { useColumns } from '../../../../helpers/use_data_grid_columns';
 import { DiscoverDocuments } from './discover_documents';
 import { FetchStatus } from '../../../../types';
 import { useDataState } from '../../utils/use_data_state';
@@ -141,7 +141,7 @@ export function DiscoverLayout({
     };
   }, [inspectorSession]);
 
-  const { columns, onAddColumn, onRemoveColumn } = useDataGridColumns({
+  const { columns, onAddColumn, onRemoveColumn } = useColumns({
     capabilities,
     config: uiSettings,
     indexPattern,
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 ca403c813010b..6f96f21c9b8c8 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
@@ -36,7 +36,11 @@ import {
 import { defaultPageSize, gridStyle, pageSizeArr, toolbarVisibility } from './constants';
 import { DiscoverServices } from '../../../build_services';
 import { getDisplayedColumns } from '../../helpers/columns';
-import { MAX_DOC_FIELDS_DISPLAYED, SHOW_MULTIFIELDS } from '../../../../common';
+import {
+  DOC_HIDE_TIME_COLUMN_SETTING,
+  MAX_DOC_FIELDS_DISPLAYED,
+  SHOW_MULTIFIELDS,
+} from '../../../../common';
 import { DiscoverGridDocumentToolbarBtn, getDocId } from './discover_grid_document_selection';
 import { SortPairArr } from '../../apps/main/components/doc_table/lib/get_sort';
 import { getFieldsToShow } from '../../helpers/get_fields_to_show';
@@ -91,7 +95,7 @@ export interface DiscoverGridProps {
   /**
    * Function to set all columns
    */
-  onSetColumns: (columns: string[]) => void;
+  onSetColumns: (columns: string[], hideTimeColumn: boolean) => void;
   /**
    * function to change sorting of the documents, skipped when isSortEnabled is set to false
    */
@@ -302,15 +306,19 @@ export const DiscoverGrid = ({
     [displayedColumns, indexPattern, showTimeCol, settings, defaultColumns, isSortEnabled]
   );
 
+  const hideTimeColumn = useMemo(
+    () => services.uiSettings.get(DOC_HIDE_TIME_COLUMN_SETTING, false),
+    [services.uiSettings]
+  );
   const schemaDetectors = useMemo(() => getSchemaDetectors(), []);
   const columnsVisibility = useMemo(
     () => ({
       visibleColumns: getVisibleColumns(displayedColumns, indexPattern, showTimeCol) as string[],
       setVisibleColumns: (newColumns: string[]) => {
-        onSetColumns(newColumns);
+        onSetColumns(newColumns, hideTimeColumn);
       },
     }),
-    [displayedColumns, indexPattern, showTimeCol, onSetColumns]
+    [displayedColumns, indexPattern, showTimeCol, hideTimeColumn, onSetColumns]
   );
   const sorting = useMemo(() => {
     if (isSortEnabled) {
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
index ccee271b73e32..abb2138e882b1 100644
--- 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
@@ -7,14 +7,14 @@
  */
 
 import { renderHook } from '@testing-library/react-hooks';
-import { useDataGridColumns } from './use_data_grid_columns';
+import { useColumns } 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 '../apps/context/services/context_state';
 import { Capabilities } from '../../../../../core/types';
 
-describe('useDataGridColumns', () => {
+describe('useColumns', () => {
   const defaultProps = {
     capabilities: { discover: { save: true } } as unknown as Capabilities,
     config: configMock,
@@ -29,7 +29,7 @@ describe('useDataGridColumns', () => {
 
   test('should return valid result', () => {
     const { result } = renderHook(() => {
-      return useDataGridColumns(defaultProps);
+      return useColumns(defaultProps);
     });
 
     expect(result.current.columns).toEqual(['Time', 'message']);
@@ -41,7 +41,7 @@ describe('useDataGridColumns', () => {
 
   test('should skip _source column when useNewFieldsApi is set to true', () => {
     const { result } = renderHook(() => {
-      return useDataGridColumns({
+      return useColumns({
         ...defaultProps,
         state: {
           columns: ['Time', '_source'],
@@ -55,7 +55,7 @@ describe('useDataGridColumns', () => {
 
   test('should return empty columns array', () => {
     const { result } = renderHook(() => {
-      return useDataGridColumns({
+      return useColumns({
         ...defaultProps,
         state: {
           columns: [],
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
index 4dbe14017dc6e..888d67e2aaff3 100644
--- a/src/plugins/discover/public/application/helpers/use_data_grid_columns.ts
+++ b/src/plugins/discover/public/application/helpers/use_data_grid_columns.ts
@@ -20,7 +20,7 @@ import {
 } from '../apps/context/services/context_state';
 import { getStateColumnActions } from '../apps/main/components/doc_table/actions/columns';
 
-interface UseDataGridColumnsProps {
+interface UseColumnsProps {
   capabilities: Capabilities;
   config: IUiSettingsClient;
   indexPattern: IndexPattern;
@@ -30,7 +30,7 @@ interface UseDataGridColumnsProps {
   state: DiscoverState | ContextState;
 }
 
-export const useDataGridColumns = ({
+export const useColumns = ({
   capabilities,
   config,
   indexPattern,
@@ -38,7 +38,7 @@ export const useDataGridColumns = ({
   setAppState,
   state,
   useNewFieldsApi,
-}: UseDataGridColumnsProps) => {
+}: UseColumnsProps) => {
   const { onAddColumn, onRemoveColumn, onSetColumns, onMoveColumn } = useMemo(
     () =>
       getStateColumnActions({
diff --git a/src/plugins/expression_error/jest.config.js b/src/plugins/expression_error/jest.config.js
new file mode 100644
index 0000000000000..27774f4003f9e
--- /dev/null
+++ b/src/plugins/expression_error/jest.config.js
@@ -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.
+ */
+
+module.exports = {
+  preset: '@kbn/test',
+  rootDir: '../../..',
+  roots: ['<rootDir>/src/plugins/expression_error'],
+  coverageDirectory: '<rootDir>/target/kibana-coverage/jest/src/plugins/expression_error',
+  coverageReporters: ['text', 'html'],
+  collectCoverageFrom: ['<rootDir>/src/plugins/expression_error/{common,public}/**/*.{ts,tsx}'],
+};
diff --git a/src/plugins/navigation/public/top_nav_menu/__snapshots__/top_nav_menu_item.test.tsx.snap b/src/plugins/navigation/public/top_nav_menu/__snapshots__/top_nav_menu_item.test.tsx.snap
index 155377e5ea335..570699aa0c0e2 100644
--- a/src/plugins/navigation/public/top_nav_menu/__snapshots__/top_nav_menu_item.test.tsx.snap
+++ b/src/plugins/navigation/public/top_nav_menu/__snapshots__/top_nav_menu_item.test.tsx.snap
@@ -2,6 +2,7 @@
 
 exports[`TopNavMenu Should render emphasized item which should be clickable 1`] = `
 <EuiButton
+  fill={true}
   iconSide="right"
   iconType="beaker"
   isDisabled={false}
diff --git a/src/plugins/navigation/public/top_nav_menu/top_nav_menu_item.tsx b/src/plugins/navigation/public/top_nav_menu/top_nav_menu_item.tsx
index f4ca53a9a974e..dd542d5240d9e 100644
--- a/src/plugins/navigation/public/top_nav_menu/top_nav_menu_item.tsx
+++ b/src/plugins/navigation/public/top_nav_menu/top_nav_menu_item.tsx
@@ -38,7 +38,7 @@ export function TopNavMenuItem(props: TopNavMenuData) {
   };
 
   const btn = props.emphasize ? (
-    <EuiButton size="s" {...commonButtonProps}>
+    <EuiButton size="s" {...commonButtonProps} fill>
       {upperFirst(props.label || props.id!)}
     </EuiButton>
   ) : (
diff --git a/src/plugins/vis_types/timeseries/common/types/panel_model.ts b/src/plugins/vis_types/timeseries/common/types/panel_model.ts
index f71602fdf0443..b4b167310a194 100644
--- a/src/plugins/vis_types/timeseries/common/types/panel_model.ts
+++ b/src/plugins/vis_types/timeseries/common/types/panel_model.ts
@@ -115,7 +115,6 @@ export interface Series {
   terms_size?: string;
   time_range_mode?: string;
   trend_arrows?: number;
-  type?: string;
   value_template?: string;
   var_name?: string;
 }
diff --git a/src/plugins/vis_types/timeseries/public/application/components/aggs/agg.tsx b/src/plugins/vis_types/timeseries/public/application/components/aggs/agg.tsx
index 08f8c072eef3b..bc74be2a562f9 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/aggs/agg.tsx
+++ b/src/plugins/vis_types/timeseries/public/application/components/aggs/agg.tsx
@@ -33,13 +33,13 @@ interface AggProps extends HTMLAttributes<HTMLElement> {
   siblings: Metric[];
   uiRestrictions: TimeseriesUIRestrictions;
   dragHandleProps: DragHandleProps;
-  onChange: (part: Partial<Series>) => void;
+  onModelChange: (part: Partial<Series>) => void;
   onAdd: () => void;
   onDelete: () => void;
 }
 
 export function Agg(props: AggProps) {
-  const { model, uiRestrictions, series, name, onChange, fields, siblings } = props;
+  const { model, uiRestrictions, series, name, onModelChange, fields, siblings } = props;
 
   let Component = aggToComponent[model.type];
 
@@ -72,8 +72,8 @@ export function Agg(props: AggProps) {
   const isKibanaIndexPattern = props.panel.use_kibana_indexes || indexPattern === '';
 
   const onAggChange = useMemo(
-    () => seriesChangeHandler({ name, model: series, onChange }, siblings),
-    [name, onChange, siblings, series]
+    () => seriesChangeHandler({ name, model: series, onChange: onModelChange }, siblings),
+    [name, onModelChange, siblings, series]
   );
 
   useEffect(() => {
@@ -86,17 +86,25 @@ export function Agg(props: AggProps) {
       );
 
       if (isNumberFormatter && !isNumericMetric) {
-        onChange({ formatter: DATA_FORMATTERS.DEFAULT });
+        onModelChange({ formatter: DATA_FORMATTERS.DEFAULT });
       }
       // in case of string index pattern mode, change default formatter depending on metric type
       // "number" formatter for numeric metric and "" as custom formatter for any other type
       if (formatterType === DATA_FORMATTERS.DEFAULT && !isKibanaIndexPattern) {
-        onChange({
+        onModelChange({
           formatter: isNumericMetric ? DATA_FORMATTERS.NUMBER : '',
         });
       }
     }
-  }, [indexPattern, model, onChange, fields, series.formatter, isKibanaIndexPattern, siblings]);
+  }, [
+    indexPattern,
+    model,
+    onModelChange,
+    fields,
+    series.formatter,
+    isKibanaIndexPattern,
+    siblings,
+  ]);
 
   return (
     <div className={props.className} style={style}>
diff --git a/src/plugins/vis_types/timeseries/public/application/components/aggs/aggs.tsx b/src/plugins/vis_types/timeseries/public/application/components/aggs/aggs.tsx
index 516e3551fb010..f0172eaba0189 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/aggs/aggs.tsx
+++ b/src/plugins/vis_types/timeseries/public/application/components/aggs/aggs.tsx
@@ -51,7 +51,7 @@ export class Aggs extends PureComponent<AggsProps> {
                 name={name}
                 model={row}
                 onAdd={() => handleAdd(this.props, newMetricAggFn)}
-                onChange={onChange}
+                onModelChange={onChange}
                 onDelete={() => handleDelete(this.props, row)}
                 panel={panel}
                 series={model}
diff --git a/src/plugins/vis_types/timeseries/public/application/components/aggs/histogram_support.test.js b/src/plugins/vis_types/timeseries/public/application/components/aggs/histogram_support.test.js
index c131ba2ae804c..ff96e476814ff 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/aggs/histogram_support.test.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/aggs/histogram_support.test.js
@@ -34,7 +34,7 @@ const runTest = (aggType, name, test, additionalProps = {}) => {
         <div>
           <Agg
             onAdd={jest.fn()}
-            onChange={jest.fn()}
+            onModelChange={jest.fn()}
             onDelete={jest.fn()}
             panel={panel}
             fields={FIELDS}
diff --git a/src/plugins/vis_types/timeseries/public/application/components/index_pattern.js b/src/plugins/vis_types/timeseries/public/application/components/index_pattern.js
index e5d09c745b522..b01dbae8531c1 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/index_pattern.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/index_pattern.js
@@ -27,7 +27,6 @@ import { IndexPatternSelect } from './lib/index_pattern_select';
 import { YesNo } from './yes_no';
 import { LastValueModePopover } from './last_value_mode_popover';
 import { KBN_FIELD_TYPES } from '../../../../../data/public';
-import { FormValidationContext } from '../contexts/form_validation_context';
 import { isGteInterval, validateReInterval, isAutoInterval } from './lib/get_interval';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
@@ -35,6 +34,8 @@ import { PANEL_TYPES, TIME_RANGE_DATA_MODES, TIME_RANGE_MODE_KEY } from '../../.
 import { AUTO_INTERVAL } from '../../../common/constants';
 import { isTimerangeModeEnabled } from '../lib/check_ui_restrictions';
 import { VisDataContext } from '../contexts/vis_data_context';
+import { PanelModelContext } from '../contexts/panel_model_context';
+import { FormValidationContext } from '../contexts/form_validation_context';
 import { getDataStart, getUISettings } from '../../services';
 import { UI_SETTINGS } from '../../../../../data/common';
 import { fetchIndexPattern } from '../../../common/index_patterns_utils';
@@ -76,12 +77,15 @@ export const IndexPattern = ({
   const maxBarsName = `${prefix}max_bars`;
   const dropBucketName = `${prefix}drop_last_bucket`;
   const updateControlValidity = useContext(FormValidationContext);
-
+  const panelModel = useContext(PanelModelContext);
   const uiRestrictions = get(useContext(VisDataContext), 'uiRestrictions');
+
   const maxBarsUiSettings = config.get(UI_SETTINGS.HISTOGRAM_MAX_BARS);
 
   const [fetchedIndex, setFetchedIndex] = useState(null);
 
+  const isTimeSeries = panelModel.type === PANEL_TYPES.TIMESERIES;
+
   const handleMaxBarsChange = useCallback(
     ({ target }) => {
       onChange({
@@ -126,7 +130,7 @@ export const IndexPattern = ({
   const selectedTimeRangeOption = timeRangeOptions.find(
     ({ value }) => model[TIME_RANGE_MODE_KEY] === value
   );
-  const isTimeSeries = model.type === PANEL_TYPES.TIMESERIES;
+
   const isDataTimerangeModeInvalid =
     !disabled &&
     selectedTimeRangeOption &&
diff --git a/src/plugins/vis_types/timeseries/public/application/components/lib/convert_series_to_datatable.test.ts b/src/plugins/vis_types/timeseries/public/application/components/lib/convert_series_to_datatable.test.ts
index bffc9200c9d6f..3df52223c253a 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/lib/convert_series_to_datatable.test.ts
+++ b/src/plugins/vis_types/timeseries/public/application/components/lib/convert_series_to_datatable.test.ts
@@ -154,7 +154,6 @@ describe('convert series to datatables', () => {
           ],
           split_mode: 'terms',
           terms_field: 'Cancelled',
-          type: 'timeseries',
         },
       ],
     } as TimeseriesVisParams;
diff --git a/src/plugins/vis_types/timeseries/public/application/components/vis_types/timeseries/series.js b/src/plugins/vis_types/timeseries/public/application/components/vis_types/timeseries/series.js
index 53ded44353ddb..30a5867d799cb 100644
--- a/src/plugins/vis_types/timeseries/public/application/components/vis_types/timeseries/series.js
+++ b/src/plugins/vis_types/timeseries/public/application/components/vis_types/timeseries/series.js
@@ -24,7 +24,6 @@ import {
 import { Split } from '../../split';
 import { createTextHandler } from '../../lib/create_text_handler';
 import { FormattedMessage, injectI18n } from '@kbn/i18n/react';
-import { PANEL_TYPES } from '../../../../../common/enums';
 
 const TimeseriesSeriesUI = injectI18n(function (props) {
   const {
@@ -45,7 +44,6 @@ const TimeseriesSeriesUI = injectI18n(function (props) {
 
   const defaults = {
     label: '',
-    type: PANEL_TYPES.TIMESERIES,
   };
   const model = { ...defaults, ...props.model };
 
diff --git a/src/plugins/vis_types/timeseries/public/application/visualizations/views/timeseries/index.js b/src/plugins/vis_types/timeseries/public/application/visualizations/views/timeseries/index.js
index 5e98b74c0caa5..9dfddd3457d44 100644
--- a/src/plugins/vis_types/timeseries/public/application/visualizations/views/timeseries/index.js
+++ b/src/plugins/vis_types/timeseries/public/application/visualizations/views/timeseries/index.js
@@ -32,7 +32,11 @@ import { getBaseTheme, getChartClasses } from './utils/theme';
 import { TOOLTIP_MODES } from '../../../../../common/enums';
 import { getValueOrEmpty } from '../../../../../common/empty_label';
 import { getSplitByTermsColor } from '../../../lib/get_split_by_terms_color';
-import { renderEndzoneTooltip, useActiveCursor } from '../../../../../../../charts/public';
+import {
+  MULTILAYER_TIME_AXIS_STYLE,
+  renderEndzoneTooltip,
+  useActiveCursor,
+} from '../../../../../../../charts/public';
 import { getAxisLabelString } from '../../../components/lib/get_axis_label_string';
 import { calculateDomainForSeries } from './utils/series_domain_calculation';
 
@@ -140,49 +144,15 @@ export const TimeSeries = ({
     [palettesService, series, syncColors]
   );
 
-  const darkMode = uiSettings.get('theme:darkMode');
-  const gridLineStyle = !useLegacyTimeAxis
-    ? {
-        visible: showGrid,
-        strokeWidth: 0.1,
-        stroke: darkMode ? 'white' : 'black',
-      }
-    : {
-        ...GRID_LINE_CONFIG,
-        visible: showGrid,
-      };
-  const xAxisStyle = !useLegacyTimeAxis
-    ? {
-        tickLabel: {
-          visible: true,
-          fontSize: 11,
-          padding: 0,
-          alignment: {
-            vertical: Position.Bottom,
-            horizontal: Position.Left,
-          },
-          offset: {
-            x: 1.5,
-            y: 0,
-          },
-        },
-        axisLine: {
-          stroke: darkMode ? 'lightgray' : 'darkgray',
-          strokeWidth: 1,
-        },
-        tickLine: {
-          size: 12,
-          strokeWidth: 0.15,
-          stroke: darkMode ? 'white' : 'black',
-          padding: -10,
-          visible: true,
-        },
-        axisTitle: {
-          visible: true,
-          padding: 0,
-        },
-      }
-    : {};
+  const gridLineStyle = {
+    ...GRID_LINE_CONFIG,
+    visible: showGrid,
+  };
+
+  const shouldUseNewTimeAxis =
+    series.every(
+      ({ stack, bars, lines }) => (bars?.show && stack !== STACKED_OPTIONS.NONE) || lines?.show
+    ) && !useLegacyTimeAxis;
 
   return (
     <Chart ref={chartRef} renderer="canvas" className={classes}>
@@ -361,10 +331,8 @@ export const TimeSeries = ({
           position={position}
           domain={domain}
           hide={hide}
-          gridLine={{
-            ...GRID_LINE_CONFIG,
-            visible: showGrid,
-          }}
+          gridLine={gridLineStyle}
+          ticks={5}
           tickFormat={tickFormatter}
         />
       ))}
@@ -375,8 +343,8 @@ export const TimeSeries = ({
         title={getAxisLabelString(interval)}
         tickFormat={xAxisFormatter}
         gridLine={gridLineStyle}
-        style={xAxisStyle}
-        timeAxisLayerCount={useLegacyTimeAxis ? 0 : 3}
+        style={shouldUseNewTimeAxis ? MULTILAYER_TIME_AXIS_STYLE : undefined}
+        timeAxisLayerCount={shouldUseNewTimeAxis ? 3 : 0}
       />
     </Chart>
   );
diff --git a/src/plugins/vis_types/xy/public/config/get_axis.ts b/src/plugins/vis_types/xy/public/config/get_axis.ts
index 796636ef2cb61..23605feddd381 100644
--- a/src/plugins/vis_types/xy/public/config/get_axis.ts
+++ b/src/plugins/vis_types/xy/public/config/get_axis.ts
@@ -8,16 +8,11 @@
 
 import { identity } from 'lodash';
 
-import {
-  AxisSpec,
-  TickFormatter,
-  YDomainRange,
-  ScaleType as ECScaleType,
-  Position,
-} from '@elastic/charts';
+import { AxisSpec, TickFormatter, YDomainRange, ScaleType as ECScaleType } from '@elastic/charts';
 
 import { LabelRotation } from '../../../../charts/public';
 import { BUCKET_TYPES } from '../../../../data/public';
+import { MULTILAYER_TIME_AXIS_STYLE } from '../../../../charts/common';
 
 import {
   Aspect,
@@ -164,29 +159,13 @@ function getAxisStyle(
 ): AxisSpec['style'] {
   return isMultiLayerTimeAxis
     ? {
+        ...MULTILAYER_TIME_AXIS_STYLE,
         tickLabel: {
+          ...MULTILAYER_TIME_AXIS_STYLE.tickLabel,
           visible: Boolean(ticks?.show),
-          rotation: 0, // rotation is disabled on new time axis
-          fontSize: 11,
-          padding: 0,
-          alignment: {
-            vertical: Position.Bottom,
-            horizontal: Position.Left,
-          },
-          offset: {
-            x: 1.5,
-            y: 0,
-          },
-        },
-        axisLine: {
-          stroke: darkMode ? 'lightgray' : 'darkgray',
-          strokeWidth: 1,
         },
         tickLine: {
-          size: 12,
-          strokeWidth: 0.15,
-          stroke: darkMode ? 'white' : 'black',
-          padding: -10,
+          ...MULTILAYER_TIME_AXIS_STYLE.tickLine,
           visible: Boolean(ticks?.show),
         },
         axisTitle: {
@@ -198,7 +177,7 @@ function getAxisStyle(
           visible: (title ?? '').trim().length > 0,
         },
         tickLabel: {
-          visible: ticks?.show,
+          visible: Boolean(ticks?.show),
           rotation: -(ticks?.rotation ?? rotationFallback),
         },
       };
diff --git a/test/functional/apps/visualize/_tsvb_time_series.ts b/test/functional/apps/visualize/_tsvb_time_series.ts
index 4354e8bb44172..009e4a07cd42a 100644
--- a/test/functional/apps/visualize/_tsvb_time_series.ts
+++ b/test/functional/apps/visualize/_tsvb_time_series.ts
@@ -193,8 +193,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         });
       });
 
-      // FLAKY: https://github.com/elastic/kibana/issues/115529
-      describe.skip('Elastic charts', () => {
+      describe('Elastic charts', () => {
         beforeEach(async () => {
           await visualBuilder.toggleNewChartsLibraryWithDebug(true);
           await visualBuilder.clickPanelOptions('timeSeries');
diff --git a/test/functional/page_objects/visual_builder_page.ts b/test/functional/page_objects/visual_builder_page.ts
index f6e6caf102004..b87962b34291c 100644
--- a/test/functional/page_objects/visual_builder_page.ts
+++ b/test/functional/page_objects/visual_builder_page.ts
@@ -664,7 +664,10 @@ export class VisualBuilderPageObject extends FtrService {
   public async setBackgroundColor(colorHex: string): Promise<void> {
     await this.clickColorPicker();
     await this.checkColorPickerPopUpIsPresent();
-    await this.find.setValue('.euiColorPicker input', colorHex);
+    await this.testSubjects.setValue('euiColorPickerInput_top', colorHex, {
+      clearWithKeyboard: true,
+      typeCharByChar: true,
+    });
     await this.clickColorPicker();
     await this.visChart.waitForVisualizationRenderingStabilized();
   }
@@ -677,7 +680,10 @@ export class VisualBuilderPageObject extends FtrService {
   public async setColorPickerValue(colorHex: string, nth: number = 0): Promise<void> {
     await this.clickColorPicker(nth);
     await this.checkColorPickerPopUpIsPresent();
-    await this.find.setValue('.euiColorPicker input', colorHex);
+    await this.testSubjects.setValue('euiColorPickerInput_top', colorHex, {
+      clearWithKeyboard: true,
+      typeCharByChar: true,
+    });
     await this.clickColorPicker(nth);
     await this.visChart.waitForVisualizationRenderingStabilized();
   }
diff --git a/test/functional/page_objects/visualize_page.ts b/test/functional/page_objects/visualize_page.ts
index 7356ea3fa44c3..7624699928666 100644
--- a/test/functional/page_objects/visualize_page.ts
+++ b/test/functional/page_objects/visualize_page.ts
@@ -315,7 +315,10 @@ export class VisualizePageObject extends FtrService {
 
   public async openSavedVisualization(vizName: string) {
     const dataTestSubj = `visListingTitleLink-${vizName.split(' ').join('-')}`;
-    await this.testSubjects.click(dataTestSubj, 20000);
+    await this.retry.try(async () => {
+      await this.testSubjects.click(dataTestSubj, 20000);
+      await this.notOnLandingPageOrFail();
+    });
     await this.header.waitUntilLoadingHasFinished();
   }
 
@@ -337,6 +340,11 @@ export class VisualizePageObject extends FtrService {
     return await this.testSubjects.exists('visualizationLandingPage');
   }
 
+  public async notOnLandingPageOrFail() {
+    this.log.debug(`VisualizePage.notOnLandingPageOrFail`);
+    return await this.testSubjects.missingOrFail('visualizationLandingPage');
+  }
+
   public async gotoLandingPage() {
     this.log.debug('VisualizePage.gotoLandingPage');
     const onPage = await this.onLandingPage();
diff --git a/x-pack/plugins/actions/server/plugin.ts b/x-pack/plugins/actions/server/plugin.ts
index 8531f4a2bb706..bbf00572935fa 100644
--- a/x-pack/plugins/actions/server/plugin.ts
+++ b/x-pack/plugins/actions/server/plugin.ts
@@ -268,7 +268,8 @@ export class ActionsPlugin implements Plugin<PluginSetupContract, PluginStartCon
         plugins.taskManager,
         core,
         this.kibanaIndex,
-        this.preconfiguredActions
+        this.preconfiguredActions,
+        this.eventLogService
       );
     }
 
diff --git a/x-pack/plugins/actions/server/usage/actions_telemetry.test.ts b/x-pack/plugins/actions/server/usage/actions_telemetry.test.ts
index 229f06f2e47fa..07f7f83333844 100644
--- a/x-pack/plugins/actions/server/usage/actions_telemetry.test.ts
+++ b/x-pack/plugins/actions/server/usage/actions_telemetry.test.ts
@@ -7,7 +7,7 @@
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { elasticsearchClientMock } from '../../../../../src/core/server/elasticsearch/client/mocks';
-import { getInUseTotalCount, getTotalCount } from './actions_telemetry';
+import { getExecutionsPerDayCount, getInUseTotalCount, getTotalCount } from './actions_telemetry';
 
 describe('actions telemetry', () => {
   test('getTotalCount should replace first symbol . to __ for action types names', async () => {
@@ -604,4 +604,102 @@ Object {
 }
 `);
   });
+
+  test('getExecutionsTotalCount', async () => {
+    const mockEsClient = elasticsearchClientMock.createClusterClient().asScoped().asInternalUser;
+    mockEsClient.search.mockReturnValueOnce(
+      // @ts-expect-error not full search response
+      elasticsearchClientMock.createSuccessTransportRequestPromise({
+        aggregations: {
+          totalExecutions: {
+            byConnectorTypeId: {
+              value: {
+                connectorTypes: {
+                  '.slack': 100,
+                  '.server-log': 20,
+                },
+                total: 120,
+              },
+            },
+          },
+          failedExecutions: {
+            refs: {
+              byConnectorTypeId: {
+                value: {
+                  connectorTypes: {
+                    '.slack': 7,
+                  },
+                  total: 7,
+                },
+              },
+            },
+          },
+          avgDuration: { value: 10 },
+          avgDurationByType: {
+            doc_count: 216,
+            actionSavedObjects: {
+              doc_count: 108,
+              byTypeId: {
+                doc_count_error_upper_bound: 0,
+                sum_other_doc_count: 0,
+                buckets: [
+                  {
+                    key: '.server-log',
+                    doc_count: 99,
+                    refs: {
+                      doc_count: 99,
+                      avgDuration: {
+                        value: 919191.9191919192,
+                      },
+                    },
+                  },
+                  {
+                    key: '.email',
+                    doc_count: 9,
+                    refs: {
+                      doc_count: 9,
+                      avgDuration: {
+                        value: 4.196666666666667e8,
+                      },
+                    },
+                  },
+                ],
+              },
+            },
+          },
+        },
+      })
+    );
+
+    // for .slack connectors
+    mockEsClient.search.mockReturnValueOnce(
+      // @ts-expect-error not full search response
+      elasticsearchClientMock.createSuccessTransportRequestPromise({
+        aggregations: {
+          avgDuration: { value: 10 },
+        },
+      })
+    );
+    const telemetry = await getExecutionsPerDayCount(mockEsClient, 'test');
+
+    expect(mockEsClient.search).toHaveBeenCalledTimes(1);
+    expect(telemetry).toStrictEqual({
+      avgExecutionTime: 0,
+      avgExecutionTimeByType: {
+        '__server-log': 919191.9191919192,
+        __email: 419666666.6666667,
+      },
+
+      countByType: {
+        __slack: 100,
+
+        '__server-log': 20,
+      },
+      countFailed: 7,
+      countFailedByType: {
+        __slack: 7,
+      },
+      countTotal: 120,
+    });
+  });
 });
diff --git a/x-pack/plugins/actions/server/usage/actions_telemetry.ts b/x-pack/plugins/actions/server/usage/actions_telemetry.ts
index ab72352d460e3..d288611af5e21 100644
--- a/x-pack/plugins/actions/server/usage/actions_telemetry.ts
+++ b/x-pack/plugins/actions/server/usage/actions_telemetry.ts
@@ -379,4 +379,184 @@ function replaceFirstAndLastDotSymbols(strToReplace: string) {
   return hasLastSymbolDot ? `${appliedString.slice(0, -1)}__` : appliedString;
 }
 
-// TODO: Implement executions count telemetry with eventLog, when it will write to index
+export async function getExecutionsPerDayCount(
+  esClient: ElasticsearchClient,
+  eventLogIndex: string
+): Promise<{
+  countTotal: number;
+  countByType: Record<string, number>;
+  countFailed: number;
+  countFailedByType: Record<string, number>;
+  avgExecutionTime: number;
+  avgExecutionTimeByType: Record<string, number>;
+}> {
+  const scriptedMetric = {
+    scripted_metric: {
+      init_script: 'state.connectorTypes = [:];  state.total = 0;',
+      map_script: `
+        if (doc['kibana.saved_objects.type'].value == 'action') { 
+          String connectorType = doc['kibana.saved_objects.type_id'].value; 
+          state.connectorTypes.put(connectorType, state.connectorTypes.containsKey(connectorType) ? state.connectorTypes.get(connectorType) + 1 : 1);
+          state.total++;
+        }
+      `,
+      // Combine script is executed per cluster, but we already have a key-value pair per cluster.
+      // Despite docs that say this is optional, this script can't be blank.
+      combine_script: 'return state',
+      // Reduce script is executed across all clusters, so we need to add up all the total from each cluster
+      // This also needs to account for having no data
+      reduce_script: `
+          Map connectorTypes = [:];
+          long total = 0;
+          for (state in states) {
+            if (state !== null) {
+              total += state.total;
+              for (String k : state.connectorTypes.keySet()) {
+                connectorTypes.put(k, connectorTypes.containsKey(k) ? connectorTypes.get(k) + state.connectorTypes.get(k) : state.connectorTypes.get(k));
+              }
+            }
+          }
+          Map result = new HashMap();
+          result.total = total;
+          result.connectorTypes = connectorTypes;
+          return result;
+      `,
+    },
+  };
+
+  const { body: actionResults } = await esClient.search({
+    index: eventLogIndex,
+    size: 0,
+    body: {
+      query: {
+        bool: {
+          filter: {
+            bool: {
+              must: [
+                {
+                  term: { 'event.action': 'execute' },
+                },
+                {
+                  term: { 'event.provider': 'actions' },
+                },
+                {
+                  range: {
+                    '@timestamp': {
+                      gte: 'now-1d',
+                    },
+                  },
+                },
+              ],
+            },
+          },
+        },
+      },
+      aggs: {
+        totalExecutions: {
+          nested: {
+            path: 'kibana.saved_objects',
+          },
+          aggs: {
+            byConnectorTypeId: scriptedMetric,
+          },
+        },
+        failedExecutions: {
+          filter: {
+            bool: {
+              filter: [
+                {
+                  term: {
+                    'event.outcome': 'failure',
+                  },
+                },
+              ],
+            },
+          },
+          aggs: {
+            refs: {
+              nested: {
+                path: 'kibana.saved_objects',
+              },
+              aggs: {
+                byConnectorTypeId: scriptedMetric,
+              },
+            },
+          },
+        },
+        avgDuration: { avg: { field: 'event.duration' } },
+        avgDurationByType: {
+          nested: {
+            path: 'kibana.saved_objects',
+          },
+          aggs: {
+            actionSavedObjects: {
+              filter: { term: { 'kibana.saved_objects.type': 'action' } },
+              aggs: {
+                byTypeId: {
+                  terms: {
+                    field: 'kibana.saved_objects.type_id',
+                  },
+                  aggs: {
+                    refs: {
+                      reverse_nested: {},
+                      aggs: {
+                        avgDuration: { avg: { field: 'event.duration' } },
+                      },
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+  });
+
+  // @ts-expect-error aggegation type is not specified
+  const aggsExecutions = actionResults.aggregations.totalExecutions?.byConnectorTypeId.value;
+  // convert nanoseconds to milliseconds
+  const aggsAvgExecutionTime = Math.round(
+    // @ts-expect-error aggegation type is not specified
+    actionResults.aggregations.avgDuration.value / (1000 * 1000)
+  );
+  const aggsFailedExecutions =
+    // @ts-expect-error aggegation type is not specified
+    actionResults.aggregations.failedExecutions?.refs?.byConnectorTypeId.value;
+
+  const avgDurationByType =
+    // @ts-expect-error aggegation type is not specified
+    actionResults.aggregations.avgDurationByType?.actionSavedObjects?.byTypeId?.buckets;
+
+  const avgExecutionTimeByType: Record<string, number> = avgDurationByType.reduce(
+    // @ts-expect-error aggegation type is not specified
+    (res: Record<string, number>, bucket) => {
+      res[replaceFirstAndLastDotSymbols(bucket.key)] = bucket?.refs.avgDuration.value;
+      return res;
+    },
+    {}
+  );
+
+  return {
+    countTotal: aggsExecutions.total,
+    countByType: Object.entries(aggsExecutions.connectorTypes).reduce(
+      (res: Record<string, number>, [key, value]) => {
+        // @ts-expect-error aggegation type is not specified
+        res[replaceFirstAndLastDotSymbols(key)] = value;
+        return res;
+      },
+      {}
+    ),
+    countFailed: aggsFailedExecutions.total,
+    countFailedByType: Object.entries(aggsFailedExecutions.connectorTypes).reduce(
+      (res: Record<string, number>, [key, value]) => {
+        // @ts-expect-error aggegation type is not specified
+        res[replaceFirstAndLastDotSymbols(key)] = value;
+        return res;
+      },
+      {}
+    ),
+    avgExecutionTime: aggsAvgExecutionTime,
+    avgExecutionTimeByType,
+  };
+}
diff --git a/x-pack/plugins/actions/server/usage/actions_usage_collector.ts b/x-pack/plugins/actions/server/usage/actions_usage_collector.ts
index 9ba9d7390a7b6..3e690d18063d6 100644
--- a/x-pack/plugins/actions/server/usage/actions_usage_collector.ts
+++ b/x-pack/plugins/actions/server/usage/actions_usage_collector.ts
@@ -37,8 +37,14 @@ export function createActionsUsageCollector(
         },
       },
       count_active_by_type: byTypeSchema,
+      count_actions_executions_per_day: { type: 'long' },
+      count_actions_executions_by_type_per_day: byTypeSchema,
       count_active_email_connectors_by_service_type: byServiceProviderTypeSchema,
       count_actions_namespaces: { type: 'long' },
+      count_actions_executions_failed_per_day: { type: 'long' },
+      count_actions_executions_failed_by_type_per_day: byTypeSchema,
+      avg_execution_time_per_day: { type: 'long' },
+      avg_execution_time_by_type_per_day: byTypeSchema,
     },
     fetch: async () => {
       try {
@@ -60,6 +66,12 @@ export function createActionsUsageCollector(
           count_active_by_type: {},
           count_active_email_connectors_by_service_type: {},
           count_actions_namespaces: 0,
+          count_actions_executions_per_day: 0,
+          count_actions_executions_by_type_per_day: {},
+          count_actions_executions_failed_per_day: 0,
+          count_actions_executions_failed_by_type_per_day: {},
+          avg_execution_time_per_day: 0,
+          avg_execution_time_by_type_per_day: {},
         };
       }
     },
diff --git a/x-pack/plugins/actions/server/usage/task.ts b/x-pack/plugins/actions/server/usage/task.ts
index bacb9e5f72571..5ddcbab4261d1 100644
--- a/x-pack/plugins/actions/server/usage/task.ts
+++ b/x-pack/plugins/actions/server/usage/task.ts
@@ -7,13 +7,14 @@
 
 import { Logger, CoreSetup } from 'kibana/server';
 import moment from 'moment';
+import { IEventLogService } from '../../../event_log/server';
 import {
   RunContext,
   TaskManagerSetupContract,
   TaskManagerStartContract,
 } from '../../../task_manager/server';
 import { PreConfiguredAction } from '../types';
-import { getTotalCount, getInUseTotalCount } from './actions_telemetry';
+import { getTotalCount, getInUseTotalCount, getExecutionsPerDayCount } from './actions_telemetry';
 
 export const TELEMETRY_TASK_TYPE = 'actions_telemetry';
 
@@ -24,9 +25,17 @@ export function initializeActionsTelemetry(
   taskManager: TaskManagerSetupContract,
   core: CoreSetup,
   kibanaIndex: string,
-  preconfiguredActions: PreConfiguredAction[]
+  preconfiguredActions: PreConfiguredAction[],
+  eventLog: IEventLogService
 ) {
-  registerActionsTelemetryTask(logger, taskManager, core, kibanaIndex, preconfiguredActions);
+  registerActionsTelemetryTask(
+    logger,
+    taskManager,
+    core,
+    kibanaIndex,
+    preconfiguredActions,
+    eventLog
+  );
 }
 
 export function scheduleActionsTelemetry(logger: Logger, taskManager: TaskManagerStartContract) {
@@ -38,13 +47,20 @@ function registerActionsTelemetryTask(
   taskManager: TaskManagerSetupContract,
   core: CoreSetup,
   kibanaIndex: string,
-  preconfiguredActions: PreConfiguredAction[]
+  preconfiguredActions: PreConfiguredAction[],
+  eventLog: IEventLogService
 ) {
   taskManager.registerTaskDefinitions({
     [TELEMETRY_TASK_TYPE]: {
       title: 'Actions usage fetch task',
       timeout: '5m',
-      createTaskRunner: telemetryTaskRunner(logger, core, kibanaIndex, preconfiguredActions),
+      createTaskRunner: telemetryTaskRunner(
+        logger,
+        core,
+        kibanaIndex,
+        preconfiguredActions,
+        eventLog
+      ),
     },
   });
 }
@@ -66,10 +82,12 @@ export function telemetryTaskRunner(
   logger: Logger,
   core: CoreSetup,
   kibanaIndex: string,
-  preconfiguredActions: PreConfiguredAction[]
+  preconfiguredActions: PreConfiguredAction[],
+  eventLog: IEventLogService
 ) {
   return ({ taskInstance }: RunContext) => {
     const { state } = taskInstance;
+    const eventLogIndex = eventLog.getIndexPattern();
     const getEsClient = () =>
       core.getStartServices().then(
         ([
@@ -84,8 +102,9 @@ export function telemetryTaskRunner(
         return Promise.all([
           getTotalCount(esClient, kibanaIndex, preconfiguredActions),
           getInUseTotalCount(esClient, kibanaIndex, undefined, preconfiguredActions),
+          getExecutionsPerDayCount(esClient, eventLogIndex),
         ])
-          .then(([totalAggegations, totalInUse]) => {
+          .then(([totalAggegations, totalInUse, totalExecutionsPerDay]) => {
             return {
               state: {
                 runs: (state.runs || 0) + 1,
@@ -96,6 +115,13 @@ export function telemetryTaskRunner(
                 count_active_alert_history_connectors: totalInUse.countByAlertHistoryConnectorType,
                 count_active_email_connectors_by_service_type: totalInUse.countEmailByService,
                 count_actions_namespaces: totalInUse.countNamespaces,
+                count_actions_executions_per_day: totalExecutionsPerDay.countTotal,
+                count_actions_executions_by_type_per_day: totalExecutionsPerDay.countByType,
+                count_actions_executions_failed_per_day: totalExecutionsPerDay.countFailed,
+                count_actions_executions_failed_by_type_per_day:
+                  totalExecutionsPerDay.countFailedByType,
+                avg_execution_time_per_day: totalExecutionsPerDay.avgExecutionTime,
+                avg_execution_time_by_type_per_day: totalExecutionsPerDay.avgExecutionTimeByType,
               },
               runAt: getNextMidnight(),
             };
diff --git a/x-pack/plugins/actions/server/usage/types.ts b/x-pack/plugins/actions/server/usage/types.ts
index 52677b35ac75b..2d041b1ba0d0e 100644
--- a/x-pack/plugins/actions/server/usage/types.ts
+++ b/x-pack/plugins/actions/server/usage/types.ts
@@ -16,9 +16,12 @@ export interface ActionsUsage {
   count_active_by_type: Record<string, number>;
   count_active_email_connectors_by_service_type: Record<string, number>;
   count_actions_namespaces: number;
-  // TODO: Implement executions count telemetry with eventLog, when it will write to index
-  // executions_by_type: Record<string, number>;
-  // executions_total: number;
+  count_actions_executions_per_day: number;
+  count_actions_executions_by_type_per_day: Record<string, number>;
+  count_actions_executions_failed_per_day: number;
+  count_actions_executions_failed_by_type_per_day: Record<string, number>;
+  avg_execution_time_per_day: number;
+  avg_execution_time_by_type_per_day: Record<string, number>;
 }
 
 export const byTypeSchema: MakeSchemaFrom<ActionsUsage>['count_by_type'] = {
diff --git a/x-pack/plugins/alerting/server/plugin.ts b/x-pack/plugins/alerting/server/plugin.ts
index 9834225e73723..f0703defbca3d 100644
--- a/x-pack/plugins/alerting/server/plugin.ts
+++ b/x-pack/plugins/alerting/server/plugin.ts
@@ -209,7 +209,13 @@ export class AlertingPlugin {
         usageCollection,
         core.getStartServices().then(([_, { taskManager }]) => taskManager)
       );
-      initializeAlertingTelemetry(this.telemetryLogger, core, plugins.taskManager, kibanaIndex);
+      initializeAlertingTelemetry(
+        this.telemetryLogger,
+        core,
+        plugins.taskManager,
+        kibanaIndex,
+        this.eventLogService
+      );
     }
 
     // Usage counter for telemetry
diff --git a/x-pack/plugins/alerting/server/usage/alerts_telemetry.test.ts b/x-pack/plugins/alerting/server/usage/alerts_telemetry.test.ts
index 03a96d19b8e8a..af08c8c75c144 100644
--- a/x-pack/plugins/alerting/server/usage/alerts_telemetry.test.ts
+++ b/x-pack/plugins/alerting/server/usage/alerts_telemetry.test.ts
@@ -7,7 +7,11 @@
 
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { elasticsearchClientMock } from '../../../../../src/core/server/elasticsearch/client/mocks';
-import { getTotalCountAggregations, getTotalCountInUse } from './alerts_telemetry';
+import {
+  getTotalCountAggregations,
+  getTotalCountInUse,
+  getExecutionsPerDayCount,
+} from './alerts_telemetry';
 
 describe('alerts telemetry', () => {
   test('getTotalCountInUse should replace first "." symbol to "__" in alert types names', async () => {
@@ -114,4 +118,74 @@ Object {
 }
 `);
   });
+
+  test('getTotalExecutionsCount should return execution aggregations for total count, count by rule type and number of failed executions', async () => {
+    const mockEsClient = elasticsearchClientMock.createClusterClient().asScoped().asInternalUser;
+    mockEsClient.search.mockReturnValue(
+      // @ts-expect-error @elastic/elasticsearch Aggregate only allows unknown values
+      elasticsearchClientMock.createSuccessTransportRequestPromise({
+        aggregations: {
+          byRuleTypeId: {
+            value: {
+              ruleTypes: {
+                '.index-threshold': 2,
+                'logs.alert.document.count': 1,
+                'document.test.': 1,
+              },
+              ruleTypesDuration: {
+                '.index-threshold': 2087868,
+                'logs.alert.document.count': 1675765,
+                'document.test.': 17687687,
+              },
+            },
+          },
+          failuresByReason: {
+            value: {
+              reasons: {
+                unknown: {
+                  '.index-threshold': 2,
+                  'logs.alert.document.count': 1,
+                  'document.test.': 1,
+                },
+              },
+            },
+          },
+          avgDuration: { value: 10 },
+        },
+        hits: {
+          hits: [],
+        },
+      })
+    );
+
+    const telemetry = await getExecutionsPerDayCount(mockEsClient, 'test');
+
+    expect(mockEsClient.search).toHaveBeenCalledTimes(1);
+
+    expect(telemetry).toStrictEqual({
+      avgExecutionTime: 0,
+      avgExecutionTimeByType: {
+        '__index-threshold': 1043934,
+        'document.test__': 17687687,
+        'logs.alert.document.count': 1675765,
+      },
+      countByType: {
+        '__index-threshold': 2,
+        'document.test__': 1,
+        'logs.alert.document.count': 1,
+      },
+      countFailuresByReason: {
+        unknown: 4,
+      },
+      countFailuresByReasonByType: {
+        unknown: {
+          '.index-threshold': 2,
+          'document.test.': 1,
+          'logs.alert.document.count': 1,
+        },
+      },
+      countTotal: 4,
+      countTotalFailures: 4,
+    });
+  });
 });
diff --git a/x-pack/plugins/alerting/server/usage/alerts_telemetry.ts b/x-pack/plugins/alerting/server/usage/alerts_telemetry.ts
index 7ff9538c1aa26..180ee4300f18c 100644
--- a/x-pack/plugins/alerting/server/usage/alerts_telemetry.ts
+++ b/x-pack/plugins/alerting/server/usage/alerts_telemetry.ts
@@ -38,6 +38,65 @@ const alertTypeMetric = {
   },
 };
 
+const ruleTypeExecutionsMetric = {
+  scripted_metric: {
+    init_script: 'state.ruleTypes = [:]; state.ruleTypesDuration = [:];',
+    map_script: `
+      String ruleType = doc['rule.category'].value;
+      long duration = doc['event.duration'].value / (1000 * 1000); 
+      state.ruleTypes.put(ruleType, state.ruleTypes.containsKey(ruleType) ? state.ruleTypes.get(ruleType) + 1 : 1);
+      state.ruleTypesDuration.put(ruleType, state.ruleTypesDuration.containsKey(ruleType) ? state.ruleTypesDuration.get(ruleType) + duration : duration);
+    `,
+    // Combine script is executed per cluster, but we already have a key-value pair per cluster.
+    // Despite docs that say this is optional, this script can't be blank.
+    combine_script: 'return state',
+    // Reduce script is executed across all clusters, so we need to add up all the total from each cluster
+    // This also needs to account for having no data
+    reduce_script: `
+      Map result = [:];
+      for (Map m : states.toArray()) {
+        if (m !== null) {
+          for (String k : m.keySet()) {
+            result.put(k, result.containsKey(k) ? result.get(k) + m.get(k) : m.get(k));
+          }
+        }
+      }
+      return result;
+    `,
+  },
+};
+
+const ruleTypeFailureExecutionsMetric = {
+  scripted_metric: {
+    init_script: 'state.reasons = [:]',
+    map_script: `
+      if (doc['event.outcome'].value == 'failure') { 
+        String reason = doc['event.reason'].value; 
+        String ruleType = doc['rule.category'].value; 
+        Map ruleTypes = state.reasons.containsKey(reason) ? state.reasons.get(reason) : [:]; 
+        ruleTypes.put(ruleType, ruleTypes.containsKey(ruleType) ? ruleTypes.get(ruleType) + 1 : 1); 
+        state.reasons.put(reason, ruleTypes); 
+      }
+    `,
+    // Combine script is executed per cluster, but we already have a key-value pair per cluster.
+    // Despite docs that say this is optional, this script can't be blank.
+    combine_script: 'return state',
+    // Reduce script is executed across all clusters, so we need to add up all the total from each cluster
+    // This also needs to account for having no data
+    reduce_script: `
+      Map result = [:];
+      for (Map m : states.toArray()) {
+        if (m !== null) {
+          for (String k : m.keySet()) {
+            result.put(k, result.containsKey(k) ? result.get(k) + m.get(k) : m.get(k));
+          }
+        }
+      }
+      return result;
+    `,
+  },
+};
+
 export async function getTotalCountAggregations(
   esClient: ElasticsearchClient,
   kibanaInex: string
@@ -260,4 +319,130 @@ function replaceFirstAndLastDotSymbols(strToReplace: string) {
   return hasLastSymbolDot ? `${appliedString.slice(0, -1)}__` : appliedString;
 }
 
-// TODO: Implement executions count telemetry with eventLog, when it will write to index
+export async function getExecutionsPerDayCount(
+  esClient: ElasticsearchClient,
+  eventLogIndex: string
+) {
+  const { body: searchResult } = await esClient.search({
+    index: eventLogIndex,
+    size: 0,
+    body: {
+      query: {
+        bool: {
+          filter: {
+            bool: {
+              must: [
+                {
+                  term: { 'event.action': 'execute' },
+                },
+                {
+                  term: { 'event.provider': 'alerting' },
+                },
+                {
+                  range: {
+                    '@timestamp': {
+                      gte: 'now-1d',
+                    },
+                  },
+                },
+              ],
+            },
+          },
+        },
+      },
+      aggs: {
+        byRuleTypeId: ruleTypeExecutionsMetric,
+        failuresByReason: ruleTypeFailureExecutionsMetric,
+        avgDuration: { avg: { field: 'event.duration' } },
+      },
+    },
+  });
+
+  const executionsAggregations = searchResult.aggregations as {
+    byRuleTypeId: {
+      value: { ruleTypes: Record<string, string>; ruleTypesDuration: Record<string, number> };
+    };
+  };
+
+  const aggsAvgExecutionTime = Math.round(
+    // @ts-expect-error aggegation type is not specified
+    // convert nanoseconds to milliseconds
+    searchResult.aggregations.avgDuration.value / (1000 * 1000)
+  );
+
+  const executionFailuresAggregations = searchResult.aggregations as {
+    failuresByReason: { value: { reasons: Record<string, Record<string, string>> } };
+  };
+
+  return {
+    countTotal: Object.keys(executionsAggregations.byRuleTypeId.value.ruleTypes).reduce(
+      (total: number, key: string) =>
+        parseInt(executionsAggregations.byRuleTypeId.value.ruleTypes[key], 10) + total,
+      0
+    ),
+    countByType: Object.keys(executionsAggregations.byRuleTypeId.value.ruleTypes).reduce(
+      // ES DSL aggregations are returned as `any` by esClient.search
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      (obj: any, key: string) => ({
+        ...obj,
+        [replaceFirstAndLastDotSymbols(key)]:
+          executionsAggregations.byRuleTypeId.value.ruleTypes[key],
+      }),
+      {}
+    ),
+    countTotalFailures: Object.keys(
+      executionFailuresAggregations.failuresByReason.value.reasons
+    ).reduce((total: number, reason: string) => {
+      const byRuleTypesRefs = executionFailuresAggregations.failuresByReason.value.reasons[reason];
+      const countByRuleTypes = Object.keys(byRuleTypesRefs).reduce(
+        (totalByType, ruleType) => parseInt(byRuleTypesRefs[ruleType] + totalByType, 10),
+        0
+      );
+      return countByRuleTypes + total;
+    }, 0),
+    countFailuresByReason: Object.keys(
+      executionFailuresAggregations.failuresByReason.value.reasons
+    ).reduce(
+      // ES DSL aggregations are returned as `any` by esClient.search
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      (obj: any, reason: string) => {
+        const byRuleTypesRefs =
+          executionFailuresAggregations.failuresByReason.value.reasons[reason];
+        const countByRuleTypes = Object.keys(byRuleTypesRefs).reduce(
+          (totalByType, ruleType) => parseInt(byRuleTypesRefs[ruleType] + totalByType, 10),
+          0
+        );
+        return {
+          ...obj,
+          [replaceFirstAndLastDotSymbols(reason)]: countByRuleTypes,
+        };
+      },
+      {}
+    ),
+    countFailuresByReasonByType: Object.keys(
+      executionFailuresAggregations.failuresByReason.value.reasons
+    ).reduce(
+      // ES DSL aggregations are returned as `any` by esClient.search
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      (obj: any, key: string) => ({
+        ...obj,
+        [replaceFirstAndLastDotSymbols(key)]:
+          executionFailuresAggregations.failuresByReason.value.reasons[key],
+      }),
+      {}
+    ),
+    avgExecutionTime: aggsAvgExecutionTime,
+    avgExecutionTimeByType: Object.keys(executionsAggregations.byRuleTypeId.value.ruleTypes).reduce(
+      // ES DSL aggregations are returned as `any` by esClient.search
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      (obj: any, key: string) => ({
+        ...obj,
+        [replaceFirstAndLastDotSymbols(key)]: Math.round(
+          executionsAggregations.byRuleTypeId.value.ruleTypesDuration[key] /
+            parseInt(executionsAggregations.byRuleTypeId.value.ruleTypes[key], 10)
+        ),
+      }),
+      {}
+    ),
+  };
+}
diff --git a/x-pack/plugins/alerting/server/usage/alerts_usage_collector.ts b/x-pack/plugins/alerting/server/usage/alerts_usage_collector.ts
index e9405c51dbf15..e5b25ea75fc1c 100644
--- a/x-pack/plugins/alerting/server/usage/alerts_usage_collector.ts
+++ b/x-pack/plugins/alerting/server/usage/alerts_usage_collector.ts
@@ -50,6 +50,26 @@ const byTypeSchema: MakeSchemaFrom<AlertsUsage>['count_by_type'] = {
   xpack__ml__anomaly_detection_jobs_health: { type: 'long' }, // eslint-disable-line @typescript-eslint/naming-convention
 };
 
+const byReasonSchema: MakeSchemaFrom<AlertsUsage>['count_rules_executions_failured_by_reason_per_day'] =
+  {
+    // TODO: Find out an automated way to populate the keys or reformat these into an array (and change the Remote Telemetry indexer accordingly)
+    DYNAMIC_KEY: { type: 'long' },
+    read: { type: 'long' },
+    decrypt: { type: 'long' },
+    license: { type: 'long' },
+    unknown: { type: 'long' },
+  };
+
+const byReasonSchemaByType: MakeSchemaFrom<AlertsUsage>['count_rules_executions_failured_by_reason_by_type_per_day'] =
+  {
+    // TODO: Find out an automated way to populate the keys or reformat these into an array (and change the Remote Telemetry indexer accordingly)
+    DYNAMIC_KEY: byTypeSchema,
+    read: byTypeSchema,
+    decrypt: byTypeSchema,
+    license: byTypeSchema,
+    unknown: byTypeSchema,
+  };
+
 export function createAlertsUsageCollector(
   usageCollection: UsageCollectionSetup,
   taskManager: Promise<TaskManagerStartContract>
@@ -92,6 +112,13 @@ export function createAlertsUsageCollector(
           count_active_by_type: {},
           count_by_type: {},
           count_rules_namespaces: 0,
+          count_rules_executions_per_day: 0,
+          count_rules_executions_by_type_per_day: {},
+          count_rules_executions_failured_per_day: 0,
+          count_rules_executions_failured_by_reason_per_day: {},
+          count_rules_executions_failured_by_reason_by_type_per_day: {},
+          avg_execution_time_per_day: 0,
+          avg_execution_time_by_type_per_day: {},
         };
       }
     },
@@ -117,6 +144,13 @@ export function createAlertsUsageCollector(
       count_active_by_type: byTypeSchema,
       count_by_type: byTypeSchema,
       count_rules_namespaces: { type: 'long' },
+      count_rules_executions_per_day: { type: 'long' },
+      count_rules_executions_by_type_per_day: byTypeSchema,
+      count_rules_executions_failured_per_day: { type: 'long' },
+      count_rules_executions_failured_by_reason_per_day: byReasonSchema,
+      count_rules_executions_failured_by_reason_by_type_per_day: byReasonSchemaByType,
+      avg_execution_time_per_day: { type: 'long' },
+      avg_execution_time_by_type_per_day: byTypeSchema,
     },
   });
 }
diff --git a/x-pack/plugins/alerting/server/usage/task.ts b/x-pack/plugins/alerting/server/usage/task.ts
index 9d39b3765cb5d..2fbd56c105c31 100644
--- a/x-pack/plugins/alerting/server/usage/task.ts
+++ b/x-pack/plugins/alerting/server/usage/task.ts
@@ -7,13 +7,18 @@
 
 import { Logger, CoreSetup } from 'kibana/server';
 import moment from 'moment';
+import { IEventLogService } from '../../../event_log/server';
 import {
   RunContext,
   TaskManagerSetupContract,
   TaskManagerStartContract,
 } from '../../../task_manager/server';
 
-import { getTotalCountAggregations, getTotalCountInUse } from './alerts_telemetry';
+import {
+  getTotalCountAggregations,
+  getTotalCountInUse,
+  getExecutionsPerDayCount,
+} from './alerts_telemetry';
 
 export const TELEMETRY_TASK_TYPE = 'alerting_telemetry';
 
@@ -23,9 +28,10 @@ export function initializeAlertingTelemetry(
   logger: Logger,
   core: CoreSetup,
   taskManager: TaskManagerSetupContract,
-  kibanaIndex: string
+  kibanaIndex: string,
+  eventLog: IEventLogService
 ) {
-  registerAlertingTelemetryTask(logger, core, taskManager, kibanaIndex);
+  registerAlertingTelemetryTask(logger, core, taskManager, kibanaIndex, eventLog);
 }
 
 export function scheduleAlertingTelemetry(logger: Logger, taskManager?: TaskManagerStartContract) {
@@ -38,13 +44,14 @@ function registerAlertingTelemetryTask(
   logger: Logger,
   core: CoreSetup,
   taskManager: TaskManagerSetupContract,
-  kibanaIndex: string
+  kibanaIndex: string,
+  eventLog: IEventLogService
 ) {
   taskManager.registerTaskDefinitions({
     [TELEMETRY_TASK_TYPE]: {
       title: 'Alerting usage fetch task',
       timeout: '5m',
-      createTaskRunner: telemetryTaskRunner(logger, core, kibanaIndex),
+      createTaskRunner: telemetryTaskRunner(logger, core, kibanaIndex, eventLog),
     },
   });
 }
@@ -62,9 +69,15 @@ async function scheduleTasks(logger: Logger, taskManager: TaskManagerStartContra
   }
 }
 
-export function telemetryTaskRunner(logger: Logger, core: CoreSetup, kibanaIndex: string) {
+export function telemetryTaskRunner(
+  logger: Logger,
+  core: CoreSetup,
+  kibanaIndex: string,
+  eventLog: IEventLogService
+) {
   return ({ taskInstance }: RunContext) => {
     const { state } = taskInstance;
+    const eventLogIndex = eventLog.getIndexPattern();
     const getEsClient = () =>
       core.getStartServices().then(
         ([
@@ -80,8 +93,9 @@ export function telemetryTaskRunner(logger: Logger, core: CoreSetup, kibanaIndex
         return Promise.all([
           getTotalCountAggregations(esClient, kibanaIndex),
           getTotalCountInUse(esClient, kibanaIndex),
+          getExecutionsPerDayCount(esClient, eventLogIndex),
         ])
-          .then(([totalCountAggregations, totalInUse]) => {
+          .then(([totalCountAggregations, totalInUse, totalExecutions]) => {
             return {
               state: {
                 runs: (state.runs || 0) + 1,
@@ -90,6 +104,15 @@ export function telemetryTaskRunner(logger: Logger, core: CoreSetup, kibanaIndex
                 count_active_total: totalInUse.countTotal,
                 count_disabled_total: totalCountAggregations.count_total - totalInUse.countTotal,
                 count_rules_namespaces: totalInUse.countNamespaces,
+                count_rules_executions_per_day: totalExecutions.countTotal,
+                count_rules_executions_by_type_per_day: totalExecutions.countByType,
+                count_rules_executions_failured_per_day: totalExecutions.countTotalFailures,
+                count_rules_executions_failured_by_reason_per_day:
+                  totalExecutions.countFailuresByReason,
+                count_rules_executions_failured_by_reason_by_type_per_day:
+                  totalExecutions.countFailuresByReasonByType,
+                avg_execution_time_per_day: totalExecutions.avgExecutionTime,
+                avg_execution_time_by_type_per_day: totalExecutions.avgExecutionTimeByType,
               },
               runAt: getNextMidnight(),
             };
diff --git a/x-pack/plugins/alerting/server/usage/types.ts b/x-pack/plugins/alerting/server/usage/types.ts
index 0e489893a1bbc..50d9b80c44b70 100644
--- a/x-pack/plugins/alerting/server/usage/types.ts
+++ b/x-pack/plugins/alerting/server/usage/types.ts
@@ -12,6 +12,13 @@ export interface AlertsUsage {
   count_by_type: Record<string, number>;
   count_active_by_type: Record<string, number>;
   count_rules_namespaces: number;
+  count_rules_executions_per_day: number;
+  count_rules_executions_by_type_per_day: Record<string, number>;
+  count_rules_executions_failured_per_day: number;
+  count_rules_executions_failured_by_reason_per_day: Record<string, number>;
+  count_rules_executions_failured_by_reason_by_type_per_day: Record<string, Record<string, number>>;
+  avg_execution_time_per_day: number;
+  avg_execution_time_by_type_per_day: Record<string, number>;
   throttle_time: {
     min: number;
     avg: number;
diff --git a/x-pack/plugins/apm/server/deprecations/deprecations.test.ts b/x-pack/plugins/apm/server/deprecations/deprecations.test.ts
index 43e8140fb9b3c..8ab632deec809 100644
--- a/x-pack/plugins/apm/server/deprecations/deprecations.test.ts
+++ b/x-pack/plugins/apm/server/deprecations/deprecations.test.ts
@@ -5,6 +5,8 @@
  * 2.0.
  */
 
+import { kibanaPackageJson } from '@kbn/dev-utils';
+
 import { GetDeprecationsContext } from '../../../../../src/core/server';
 import { CloudSetup } from '../../../cloud/server';
 import { getDeprecations } from './';
@@ -19,7 +21,7 @@ const deprecationContext = {
 describe('getDeprecations', () => {
   describe('when fleet is disabled', () => {
     it('returns no deprecations', async () => {
-      const deprecationsCallback = getDeprecations({ branch: 'master' });
+      const deprecationsCallback = getDeprecations({ branch: 'main' });
       const deprecations = await deprecationsCallback(deprecationContext);
       expect(deprecations).toEqual([]);
     });
@@ -28,7 +30,7 @@ describe('getDeprecations', () => {
   describe('when running on cloud with legacy apm-server', () => {
     it('returns deprecations', async () => {
       const deprecationsCallback = getDeprecations({
-        branch: 'master',
+        branch: 'main',
         cloudSetup: { isCloudEnabled: true } as unknown as CloudSetup,
         fleet: {
           start: () => ({
@@ -38,13 +40,20 @@ describe('getDeprecations', () => {
       });
       const deprecations = await deprecationsCallback(deprecationContext);
       expect(deprecations).not.toEqual([]);
+      // TODO: remove when docs support "main"
+      if (kibanaPackageJson.branch === 'main') {
+        for (const { documentationUrl } of deprecations) {
+          expect(documentationUrl).toMatch(/\/master\//);
+          expect(documentationUrl).not.toMatch(/\/main\//);
+        }
+      }
     });
   });
 
   describe('when running on cloud with fleet', () => {
     it('returns no deprecations', async () => {
       const deprecationsCallback = getDeprecations({
-        branch: 'master',
+        branch: 'main',
         cloudSetup: { isCloudEnabled: true } as unknown as CloudSetup,
         fleet: {
           start: () => ({
@@ -60,7 +69,7 @@ describe('getDeprecations', () => {
   describe('when running on prem', () => {
     it('returns no deprecations', async () => {
       const deprecationsCallback = getDeprecations({
-        branch: 'master',
+        branch: 'main',
         cloudSetup: { isCloudEnabled: false } as unknown as CloudSetup,
         fleet: {
           start: () => ({ agentPolicyService: { get: () => undefined } }),
diff --git a/x-pack/plugins/apm/server/deprecations/index.ts b/x-pack/plugins/apm/server/deprecations/index.ts
index 76c90270abb8f..39e282e76d9a6 100644
--- a/x-pack/plugins/apm/server/deprecations/index.ts
+++ b/x-pack/plugins/apm/server/deprecations/index.ts
@@ -38,6 +38,8 @@ export function getDeprecations({
     const isCloudEnabled = !!cloudSetup?.isCloudEnabled;
 
     const hasCloudAgentPolicy = !isEmpty(cloudAgentPolicy);
+    // TODO: remove when docs support "main"
+    const docBranch = branch === 'main' ? 'master' : branch;
 
     if (isCloudEnabled && !hasCloudAgentPolicy) {
       deprecations.push({
@@ -48,7 +50,7 @@ export function getDeprecations({
           defaultMessage:
             'Running the APM Server binary directly is considered a legacy option and is deprecated since 7.16. Switch to APM Server managed by an Elastic Agent instead. Read our documentation to learn more.',
         }),
-        documentationUrl: `https://www.elastic.co/guide/en/apm/server/${branch}/apm-integration.html`,
+        documentationUrl: `https://www.elastic.co/guide/en/apm/server/${docBranch}/apm-integration.html`,
         level: 'warning',
         correctiveActions: {
           manualSteps: [
diff --git a/x-pack/plugins/canvas/public/lib/run_interpreter.ts b/x-pack/plugins/canvas/public/lib/run_interpreter.ts
index 6c10b82fae3fd..9633d91b8b8b2 100644
--- a/x-pack/plugins/canvas/public/lib/run_interpreter.ts
+++ b/x-pack/plugins/canvas/public/lib/run_interpreter.ts
@@ -19,11 +19,13 @@ interface Options {
  */
 export async function interpretAst(
   ast: ExpressionAstExpression,
-  variables: Record<string, any>
+  variables: Record<string, any>,
+  input: ExpressionValue = null
 ): Promise<ExpressionValue> {
   const context = { variables };
   const { execute } = pluginServices.getServices().expressions;
-  return await execute(ast, null, context).getData().pipe(pluck('result')).toPromise();
+
+  return await execute(ast, input, context).getData().pipe(pluck('result')).toPromise();
 }
 
 /**
@@ -43,9 +45,9 @@ export async function runInterpreter(
   options: Options = {}
 ): Promise<ExpressionValue> {
   const context = { variables };
-
   try {
     const { execute } = pluginServices.getServices().expressions;
+
     const renderable = await execute(ast, input, context)
       .getData()
       .pipe(pluck('result'))
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
index 9021c6d6c2753..ca66fa227e4eb 100644
--- 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
@@ -5,6 +5,7 @@
  * 2.0.
  */
 import { useContext, useEffect } from 'react';
+import useEffectOnce from 'react-use/lib/useEffectOnce';
 import { usePlatformService } from '../../../services';
 import { WorkpadRoutingContext } from '..';
 
@@ -27,4 +28,10 @@ export const useFullscreenPresentationHelper = () => {
       setFullscreen(true);
     }
   }, [isFullscreen, setFullscreen]);
+
+  // Remove fullscreen when component unmounts
+  useEffectOnce(() => () => {
+    setFullscreen(true);
+    document.querySelector('body')?.classList.remove(fullscreenClass);
+  });
 };
diff --git a/x-pack/plugins/canvas/public/state/actions/elements.js b/x-pack/plugins/canvas/public/state/actions/elements.js
index a8302cf094016..c8d322163b54f 100644
--- a/x-pack/plugins/canvas/public/state/actions/elements.js
+++ b/x-pack/plugins/canvas/public/state/actions/elements.js
@@ -111,7 +111,8 @@ export const fetchContext = createThunk(
         ...element.ast,
         chain: astChain,
       },
-      variables
+      variables,
+      prevContextValue
     ).then((value) => {
       dispatch(
         args.setValue({
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 d2229b428932f..0a99b0991f4ed 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
@@ -382,7 +382,7 @@ export const INVITATION_PENDING_LABEL = i18n.translate(
 
 export const ROLE_MODAL_TEXT = i18n.translate('xpack.enterpriseSearch.roleMapping.roleModalText', {
   defaultMessage:
-    'Removing a role mapping revokes access to any user corresponding to the mapping attributes, but may not take effect immediately for SAML-governed roles. Users with an active SAML session will retain access until it expires.',
+    'Removing a role mapping could revoke access to the currently logged-in user. Before proceeding, verify that the currently logged-in user has the appropriate access level via a different role mapping to avoid undesired behavior. This action may not take effect immediately for SAML-governed roles. Users with an active SAML session will retain access until it expires.',
 });
 
 export const USER_MODAL_TITLE = (username: string) =>
diff --git a/x-pack/plugins/enterprise_search/server/integrations.ts b/x-pack/plugins/enterprise_search/server/integrations.ts
index eee5cdc3aaec3..633f5638cc05c 100644
--- a/x-pack/plugins/enterprise_search/server/integrations.ts
+++ b/x-pack/plugins/enterprise_search/server/integrations.ts
@@ -30,7 +30,7 @@ const workplaceSearchIntegrations: WorkplaceSearchIntegration[] = [
         defaultMessage: 'Search over your files and folders stored on Box with Workplace Search.',
       }
     ),
-    categories: ['document_storage'],
+    categories: ['file_storage'],
   },
   {
     id: 'confluence_cloud',
@@ -47,7 +47,7 @@ const workplaceSearchIntegrations: WorkplaceSearchIntegration[] = [
           'Search over your organizational content on Confluence Cloud with Workplace Search.',
       }
     ),
-    categories: ['knowledge_platform'],
+    categories: ['productivity'],
   },
   {
     id: 'confluence_server',
@@ -64,7 +64,7 @@ const workplaceSearchIntegrations: WorkplaceSearchIntegration[] = [
           'Search over your organizational content on Confluence Server with Workplace Search.',
       }
     ),
-    categories: ['knowledge_platform'],
+    categories: ['productivity'],
   },
   {
     id: 'dropbox',
@@ -78,7 +78,7 @@ const workplaceSearchIntegrations: WorkplaceSearchIntegration[] = [
           'Search over your files and folders stored on Dropbox with Workplace Search.',
       }
     ),
-    categories: ['document_storage'],
+    categories: ['file_storage'],
   },
   {
     id: 'github',
@@ -91,7 +91,7 @@ const workplaceSearchIntegrations: WorkplaceSearchIntegration[] = [
         defaultMessage: 'Search over your projects and repos on GitHub with Workplace Search.',
       }
     ),
-    categories: ['software_development'],
+    categories: ['productivity'],
   },
   {
     id: 'github_enterprise_server',
@@ -108,7 +108,7 @@ const workplaceSearchIntegrations: WorkplaceSearchIntegration[] = [
           'Search over your projects and repos on GitHub Enterprise Server with Workplace Search.',
       }
     ),
-    categories: ['software_development'],
+    categories: ['productivity'],
   },
   {
     id: 'gmail',
@@ -121,7 +121,7 @@ const workplaceSearchIntegrations: WorkplaceSearchIntegration[] = [
         defaultMessage: 'Search over your emails managed by Gmail with Workplace Search.',
       }
     ),
-    categories: ['communication'],
+    categories: ['communications'],
   },
   {
     id: 'google_drive',
@@ -134,7 +134,7 @@ const workplaceSearchIntegrations: WorkplaceSearchIntegration[] = [
         defaultMessage: 'Search over your documents on Google Drive with Workplace Search.',
       }
     ),
-    categories: ['document_storage'],
+    categories: ['file_storage'],
   },
   {
     id: 'jira_cloud',
@@ -147,7 +147,7 @@ const workplaceSearchIntegrations: WorkplaceSearchIntegration[] = [
         defaultMessage: 'Search over your project workflow on Jira Cloud with Workplace Search.',
       }
     ),
-    categories: ['project_management'],
+    categories: ['productivity'],
   },
   {
     id: 'jira_server',
@@ -160,7 +160,7 @@ const workplaceSearchIntegrations: WorkplaceSearchIntegration[] = [
         defaultMessage: 'Search over your project workflow on Jira Server with Workplace Search.',
       }
     ),
-    categories: ['project_management'],
+    categories: ['productivity'],
   },
   {
     id: 'onedrive',
@@ -173,7 +173,7 @@ const workplaceSearchIntegrations: WorkplaceSearchIntegration[] = [
         defaultMessage: 'Search over your files stored on OneDrive with Workplace Search.',
       }
     ),
-    categories: ['document_storage'],
+    categories: ['file_storage'],
     uiInternalPath: '/app/enterprise_search/workplace_search/sources/add/one_drive',
   },
   {
@@ -187,7 +187,7 @@ const workplaceSearchIntegrations: WorkplaceSearchIntegration[] = [
         defaultMessage: 'Search over your content on Salesforce with Workplace Search.',
       }
     ),
-    categories: ['crm'],
+    categories: ['productivity'],
   },
   {
     id: 'salesforce_sandbox',
@@ -203,7 +203,7 @@ const workplaceSearchIntegrations: WorkplaceSearchIntegration[] = [
         defaultMessage: 'Search over your content on Salesforce Sandbox with Workplace Search.',
       }
     ),
-    categories: ['crm'],
+    categories: ['productivity'],
   },
   {
     id: 'servicenow',
@@ -216,7 +216,7 @@ const workplaceSearchIntegrations: WorkplaceSearchIntegration[] = [
         defaultMessage: 'Search over your content on ServiceNow with Workplace Search.',
       }
     ),
-    categories: ['enterprise_management'],
+    categories: ['productivity'],
   },
   {
     id: 'sharepoint_online',
@@ -232,7 +232,7 @@ const workplaceSearchIntegrations: WorkplaceSearchIntegration[] = [
         defaultMessage: 'Search over your files stored on SharePoint Online with Workplace Search.',
       }
     ),
-    categories: ['document_storage'],
+    categories: ['file_storage'],
     uiInternalPath: '/app/enterprise_search/workplace_search/sources/add/share_point',
   },
   {
@@ -246,7 +246,7 @@ const workplaceSearchIntegrations: WorkplaceSearchIntegration[] = [
         defaultMessage: 'Search over your messages on Slack with Workplace Search.',
       }
     ),
-    categories: ['communication'],
+    categories: ['communications'],
   },
   {
     id: 'zendesk',
@@ -259,7 +259,7 @@ const workplaceSearchIntegrations: WorkplaceSearchIntegration[] = [
         defaultMessage: 'Search over your tickets on Zendesk with Workplace Search.',
       }
     ),
-    categories: ['customer_support'],
+    categories: ['communications'],
   },
   {
     id: 'custom_api_source',
diff --git a/x-pack/plugins/event_log/server/event_log_service.mock.ts b/x-pack/plugins/event_log/server/event_log_service.mock.ts
index a3ad81eb0e5a6..f43f3e025a7cf 100644
--- a/x-pack/plugins/event_log/server/event_log_service.mock.ts
+++ b/x-pack/plugins/event_log/server/event_log_service.mock.ts
@@ -17,6 +17,7 @@ const createEventLogServiceMock = () => {
     getProviderActions: jest.fn(),
     registerSavedObjectProvider: jest.fn(),
     getLogger: jest.fn().mockReturnValue(eventLoggerMock.create()),
+    getIndexPattern: jest.fn(),
   };
   return mock;
 };
diff --git a/x-pack/plugins/event_log/server/event_log_service.ts b/x-pack/plugins/event_log/server/event_log_service.ts
index 993631ed3ca8a..2cf22b0f20755 100644
--- a/x-pack/plugins/event_log/server/event_log_service.ts
+++ b/x-pack/plugins/event_log/server/event_log_service.ts
@@ -92,6 +92,10 @@ export class EventLogService implements IEventLogService {
     return this.savedObjectProviderRegistry.registerProvider(type, provider);
   }
 
+  getIndexPattern() {
+    return this.esContext.esNames.indexPattern;
+  }
+
   getLogger(initialProperties: IEvent): IEventLogger {
     return new EventLogger({
       esContext: this.esContext,
diff --git a/x-pack/plugins/event_log/server/types.ts b/x-pack/plugins/event_log/server/types.ts
index c50bed7e01dd5..6ffde7fd6dbe0 100644
--- a/x-pack/plugins/event_log/server/types.ts
+++ b/x-pack/plugins/event_log/server/types.ts
@@ -33,6 +33,7 @@ export interface IEventLogService {
   getProviderActions(): Map<string, Set<string>>;
   registerSavedObjectProvider(type: string, provider: SavedObjectProvider): void;
   getLogger(properties: IEvent): IEventLogger;
+  getIndexPattern(): string;
 }
 
 export interface IEventLogClientService {
diff --git a/x-pack/plugins/fleet/common/constants/routes.ts b/x-pack/plugins/fleet/common/constants/routes.ts
index 60795799bb32d..aa5e0dbcd5ed1 100644
--- a/x-pack/plugins/fleet/common/constants/routes.ts
+++ b/x-pack/plugins/fleet/common/constants/routes.ts
@@ -89,7 +89,6 @@ export const AGENT_API_ROUTES = {
   CHECKIN_PATTERN: `${API_ROOT}/agents/{agentId}/checkin`,
   ACKS_PATTERN: `${API_ROOT}/agents/{agentId}/acks`,
   ACTIONS_PATTERN: `${API_ROOT}/agents/{agentId}/actions`,
-  ENROLL_PATTERN: `${API_ROOT}/agents/enroll`,
   UNENROLL_PATTERN: `${API_ROOT}/agents/{agentId}/unenroll`,
   BULK_UNENROLL_PATTERN: `${API_ROOT}/agents/bulk_unenroll`,
   REASSIGN_PATTERN: `${API_ROOT}/agents/{agentId}/reassign`,
diff --git a/x-pack/plugins/fleet/kibana.json b/x-pack/plugins/fleet/kibana.json
index 1ca88cac1cc11..d516827ebf9a7 100644
--- a/x-pack/plugins/fleet/kibana.json
+++ b/x-pack/plugins/fleet/kibana.json
@@ -9,7 +9,7 @@
   "ui": true,
   "configPath": ["xpack", "fleet"],
   "requiredPlugins": ["licensing", "data", "encryptedSavedObjects", "navigation", "customIntegrations", "share"],
-  "optionalPlugins": ["security", "features", "cloud", "usageCollection", "home", "globalSearch"],
+  "optionalPlugins": ["security", "features", "cloud", "usageCollection", "home", "globalSearch", "telemetry"],
   "extraPublicDirs": ["common"],
   "requiredBundles": ["kibanaReact", "esUiShared", "home", "infra", "kibanaUtils", "usageCollection"]
 }
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 3daf7fa545f24..b7c7d263d2675 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
@@ -123,16 +123,33 @@ export const CreatePackagePolicyPageLayout: React.FunctionComponent<{
         );
       }
 
-      return isEdit ? (
-        <EuiText>
-          <h1 data-test-subj={`${dataTestSubj}_pageTitle`}>
-            <FormattedMessage
-              id="xpack.fleet.editPackagePolicy.pageTitle"
-              defaultMessage="Edit integration"
-            />
-          </h1>
-        </EuiText>
-      ) : (
+      if (isEdit) {
+        return (
+          <EuiText>
+            <h1 data-test-subj={`${dataTestSubj}_pageTitle`}>
+              <FormattedMessage
+                id="xpack.fleet.editPackagePolicy.pageTitle"
+                defaultMessage="Edit integration"
+              />
+            </h1>
+          </EuiText>
+        );
+      }
+
+      if (isUpgrade) {
+        return (
+          <EuiText>
+            <h1 data-test-subj={`${dataTestSubj}_pageTitle`}>
+              <FormattedMessage
+                id="xpack.fleet.upgradePackagePolicy.pageTitle"
+                defaultMessage="Upgrade integration"
+              />
+            </h1>
+          </EuiText>
+        );
+      }
+
+      return (
         <EuiText>
           <h1>
             <FormattedMessage
diff --git a/x-pack/plugins/fleet/server/mocks/index.ts b/x-pack/plugins/fleet/server/mocks/index.ts
index 282135c7b1bcd..943f100c94f72 100644
--- a/x-pack/plugins/fleet/server/mocks/index.ts
+++ b/x-pack/plugins/fleet/server/mocks/index.ts
@@ -19,6 +19,7 @@ import { securityMock } from '../../../security/server/mocks';
 import type { PackagePolicyServiceInterface } from '../services/package_policy';
 import type { AgentPolicyServiceInterface, AgentService } from '../services';
 import type { FleetAppContext } from '../plugin';
+import { createMockTelemetryEventsSender } from '../telemetry/__mocks__';
 
 // Export all mocks from artifacts
 export * from '../services/artifacts/mocks';
@@ -59,6 +60,7 @@ export const createAppContextStartContractMock = (): MockedFleetAppContext => {
     config$,
     kibanaVersion: '8.99.0', // Fake version :)
     kibanaBranch: 'main',
+    telemetryEventsSender: createMockTelemetryEventsSender(),
   };
 };
 
diff --git a/x-pack/plugins/fleet/server/plugin.ts b/x-pack/plugins/fleet/server/plugin.ts
index 410682a13733c..7cc1b8b1cfcc9 100644
--- a/x-pack/plugins/fleet/server/plugin.ts
+++ b/x-pack/plugins/fleet/server/plugin.ts
@@ -18,6 +18,8 @@ import type {
 } from 'kibana/server';
 import type { UsageCollectionSetup } from 'src/plugins/usage_collection/server';
 
+import type { TelemetryPluginSetup, TelemetryPluginStart } from 'src/plugins/telemetry/server';
+
 import { DEFAULT_APP_CATEGORIES } from '../../../../src/core/server';
 import type { PluginStart as DataPluginStart } from '../../../../src/plugins/data/server';
 import type { LicensingPluginSetup, ILicense } from '../../licensing/server';
@@ -83,6 +85,7 @@ import { RouterWrappers } from './routes/security';
 import { startFleetServerSetup } from './services/fleet_server';
 import { FleetArtifactsClient } from './services/artifacts';
 import type { FleetRouter } from './types/request_context';
+import { TelemetryEventsSender } from './telemetry/sender';
 
 export interface FleetSetupDeps {
   licensing: LicensingPluginSetup;
@@ -91,12 +94,14 @@ export interface FleetSetupDeps {
   encryptedSavedObjects: EncryptedSavedObjectsPluginSetup;
   cloud?: CloudSetup;
   usageCollection?: UsageCollectionSetup;
+  telemetry?: TelemetryPluginSetup;
 }
 
 export interface FleetStartDeps {
   data: DataPluginStart;
   encryptedSavedObjects: EncryptedSavedObjectsPluginStart;
   security?: SecurityPluginStart;
+  telemetry?: TelemetryPluginStart;
 }
 
 export interface FleetAppContext {
@@ -115,6 +120,7 @@ export interface FleetAppContext {
   cloud?: CloudSetup;
   logger?: Logger;
   httpSetup?: HttpServiceSetup;
+  telemetryEventsSender: TelemetryEventsSender;
 }
 
 export type FleetSetupContract = void;
@@ -176,6 +182,7 @@ export class FleetPlugin
   private httpSetup?: HttpServiceSetup;
   private securitySetup?: SecurityPluginSetup;
   private encryptedSavedObjectsSetup?: EncryptedSavedObjectsPluginSetup;
+  private readonly telemetryEventsSender: TelemetryEventsSender;
 
   constructor(private readonly initializerContext: PluginInitializerContext) {
     this.config$ = this.initializerContext.config.create<FleetConfigType>();
@@ -184,6 +191,7 @@ export class FleetPlugin
     this.kibanaBranch = this.initializerContext.env.packageInfo.branch;
     this.logger = this.initializerContext.logger.get();
     this.configInitialValue = this.initializerContext.config.get();
+    this.telemetryEventsSender = new TelemetryEventsSender(this.logger.get('telemetry_events'));
   }
 
   public setup(core: CoreSetup, deps: FleetSetupDeps) {
@@ -302,6 +310,8 @@ export class FleetPlugin
         });
       }
     }
+
+    this.telemetryEventsSender.setup(deps.telemetry);
   }
 
   public start(core: CoreStart, plugins: FleetStartDeps): FleetStartContract {
@@ -321,11 +331,14 @@ export class FleetPlugin
       httpSetup: this.httpSetup,
       cloud: this.cloud,
       logger: this.logger,
+      telemetryEventsSender: this.telemetryEventsSender,
     });
     licenseService.start(this.licensing$);
 
     const fleetServerSetup = startFleetServerSetup();
 
+    this.telemetryEventsSender.start(plugins.telemetry, core);
+
     return {
       fleetSetupCompleted: () =>
         new Promise<void>((resolve) => {
@@ -362,5 +375,6 @@ export class FleetPlugin
   public async stop() {
     appContextService.stop();
     licenseService.stop();
+    this.telemetryEventsSender.stop();
   }
 }
diff --git a/x-pack/plugins/fleet/server/routes/package_policy/handlers.ts b/x-pack/plugins/fleet/server/routes/package_policy/handlers.ts
index 77e7a2c4ede1a..58463bfa5569d 100644
--- a/x-pack/plugins/fleet/server/routes/package_policy/handlers.ts
+++ b/x-pack/plugins/fleet/server/routes/package_policy/handlers.ts
@@ -146,7 +146,8 @@ export const updatePackagePolicyHandler: RequestHandler<
       esClient,
       request.params.packagePolicyId,
       { ...newData, package: pkg, inputs },
-      { user }
+      { user },
+      packagePolicy.package?.version
     );
     return response.ok({
       body: { item: updatedPackagePolicy },
diff --git a/x-pack/plugins/fleet/server/services/app_context.ts b/x-pack/plugins/fleet/server/services/app_context.ts
index a1e6ef4545aef..7ec1607598b8a 100644
--- a/x-pack/plugins/fleet/server/services/app_context.ts
+++ b/x-pack/plugins/fleet/server/services/app_context.ts
@@ -33,6 +33,7 @@ import type {
 } from '../types';
 import type { FleetAppContext } from '../plugin';
 import type { CloudSetup } from '../../../cloud/server';
+import type { TelemetryEventsSender } from '../telemetry/sender';
 
 class AppContextService {
   private encryptedSavedObjects: EncryptedSavedObjectsClient | undefined;
@@ -51,6 +52,7 @@ class AppContextService {
   private logger: Logger | undefined;
   private httpSetup?: HttpServiceSetup;
   private externalCallbacks: ExternalCallbacksStorage = new Map();
+  private telemetryEventsSender: TelemetryEventsSender | undefined;
 
   public start(appContext: FleetAppContext) {
     this.data = appContext.data;
@@ -66,6 +68,7 @@ class AppContextService {
     this.kibanaVersion = appContext.kibanaVersion;
     this.kibanaBranch = appContext.kibanaBranch;
     this.httpSetup = appContext.httpSetup;
+    this.telemetryEventsSender = appContext.telemetryEventsSender;
 
     if (appContext.config$) {
       this.config$ = appContext.config$;
@@ -203,6 +206,10 @@ class AppContextService {
       >;
     }
   }
+
+  public getTelemetryEventsSender() {
+    return this.telemetryEventsSender;
+  }
 }
 
 export const appContextService = new AppContextService();
diff --git a/x-pack/plugins/fleet/server/services/package_policy.test.ts b/x-pack/plugins/fleet/server/services/package_policy.test.ts
index b6207316829ee..dcc00251e70f4 100644
--- a/x-pack/plugins/fleet/server/services/package_policy.test.ts
+++ b/x-pack/plugins/fleet/server/services/package_policy.test.ts
@@ -134,6 +134,12 @@ jest.mock('./epm/packages/cleanup', () => {
   };
 });
 
+jest.mock('./upgrade_usage', () => {
+  return {
+    sendTelemetryEvents: jest.fn(),
+  };
+});
+
 const mockedFetchInfo = fetchInfo as jest.Mock<ReturnType<typeof fetchInfo>>;
 
 type CombinedExternalCallback = PutPackagePolicyUpdateCallback | PostPackagePolicyCreateCallback;
diff --git a/x-pack/plugins/fleet/server/services/package_policy.ts b/x-pack/plugins/fleet/server/services/package_policy.ts
index 39902d35feb08..8968b1b4af3fd 100644
--- a/x-pack/plugins/fleet/server/services/package_policy.ts
+++ b/x-pack/plugins/fleet/server/services/package_policy.ts
@@ -9,7 +9,7 @@ import { omit, partition } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import semverLte from 'semver/functions/lte';
 import { getFlattenedObject } from '@kbn/std';
-import type { KibanaRequest, LogMeta } from 'src/core/server';
+import type { KibanaRequest } from 'src/core/server';
 import type {
   ElasticsearchClient,
   RequestHandlerContext,
@@ -68,6 +68,8 @@ import { compileTemplate } from './epm/agent/agent';
 import { normalizeKuery } from './saved_object';
 import { appContextService } from '.';
 import { removeOldAssets } from './epm/packages/cleanup';
+import type { PackagePolicyUpgradeUsage } from './upgrade_usage';
+import { sendTelemetryEvents } from './upgrade_usage';
 
 export type InputsOverride = Partial<NewPackagePolicyInput> & {
   vars?: Array<NewPackagePolicyInput['vars'] & { name: string }>;
@@ -84,17 +86,6 @@ export const DATA_STREAM_ALLOWED_INDEX_PRIVILEGES = new Set([
   'read_cross_cluster',
 ]);
 
-interface PackagePolicyUpgradeLogMeta extends LogMeta {
-  package_policy_upgrade: {
-    package_name: string;
-    current_version: string;
-    new_version: string;
-    status: 'success' | 'failure';
-    error?: any[];
-    dryRun?: boolean;
-  };
-}
-
 class PackagePolicyService {
   public async create(
     soClient: SavedObjectsClientContract,
@@ -369,7 +360,8 @@ class PackagePolicyService {
     esClient: ElasticsearchClient,
     id: string,
     packagePolicy: UpdatePackagePolicy,
-    options?: { user?: AuthenticatedUser }
+    options?: { user?: AuthenticatedUser },
+    currentVersion?: string
   ): Promise<PackagePolicy> {
     const oldPackagePolicy = await this.get(soClient, id);
     const { version, ...restOfPackagePolicy } = packagePolicy;
@@ -445,22 +437,22 @@ class PackagePolicyService {
         currentVersion: packagePolicy.package.version,
       });
 
-      const upgradeMeta: PackagePolicyUpgradeLogMeta = {
-        package_policy_upgrade: {
+      if (packagePolicy.package.version !== currentVersion) {
+        const upgradeTelemetry: PackagePolicyUpgradeUsage = {
           package_name: packagePolicy.package.name,
+          current_version: currentVersion || 'unknown',
           new_version: packagePolicy.package.version,
-          current_version: 'unknown',
           status: 'success',
           dryRun: false,
-        },
-      };
-
-      appContextService
-        .getLogger()
-        .info<PackagePolicyUpgradeLogMeta>(
-          `Package policy successfully upgraded ${JSON.stringify(upgradeMeta)}`,
-          upgradeMeta
+        };
+        sendTelemetryEvents(
+          appContextService.getLogger(),
+          appContextService.getTelemetryEventsSender(),
+          upgradeTelemetry
         );
+        appContextService.getLogger().info(`Package policy upgraded successfully`);
+        appContextService.getLogger().debug(JSON.stringify(upgradeTelemetry));
+      }
     }
 
     return newPolicy;
@@ -629,7 +621,14 @@ class PackagePolicyService {
         );
         updatePackagePolicy.elasticsearch = registryPkgInfo.elasticsearch;
 
-        await this.update(soClient, esClient, id, updatePackagePolicy, options);
+        await this.update(
+          soClient,
+          esClient,
+          id,
+          updatePackagePolicy,
+          options,
+          packagePolicy.package.version
+        );
         result.push({
           id,
           name: packagePolicy.name,
@@ -691,24 +690,27 @@ class PackagePolicyService {
       const hasErrors = 'errors' in updatedPackagePolicy;
 
       if (packagePolicy.package.version !== packageInfo.version) {
-        const upgradeMeta: PackagePolicyUpgradeLogMeta = {
-          package_policy_upgrade: {
-            package_name: packageInfo.name,
-            current_version: packagePolicy.package.version,
-            new_version: packageInfo.version,
-            status: hasErrors ? 'failure' : 'success',
-            error: hasErrors ? updatedPackagePolicy.errors : undefined,
-            dryRun: true,
-          },
+        const upgradeTelemetry: PackagePolicyUpgradeUsage = {
+          package_name: packageInfo.name,
+          current_version: packagePolicy.package.version,
+          new_version: packageInfo.version,
+          status: hasErrors ? 'failure' : 'success',
+          error: hasErrors ? updatedPackagePolicy.errors : undefined,
+          dryRun: true,
         };
+        sendTelemetryEvents(
+          appContextService.getLogger(),
+          appContextService.getTelemetryEventsSender(),
+          upgradeTelemetry
+        );
         appContextService
           .getLogger()
-          .info<PackagePolicyUpgradeLogMeta>(
+          .info(
             `Package policy upgrade dry run ${
               hasErrors ? 'resulted in errors' : 'ran successfully'
-            } ${JSON.stringify(upgradeMeta)}`,
-            upgradeMeta
+            }`
           );
+        appContextService.getLogger().debug(JSON.stringify(upgradeTelemetry));
       }
 
       return {
diff --git a/x-pack/plugins/fleet/server/services/upgrade_usage.test.ts b/x-pack/plugins/fleet/server/services/upgrade_usage.test.ts
new file mode 100644
index 0000000000000..5445ad233eddc
--- /dev/null
+++ b/x-pack/plugins/fleet/server/services/upgrade_usage.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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { Logger } from 'src/core/server';
+import { loggingSystemMock } from 'src/core/server/mocks';
+
+import type { TelemetryEventsSender } from '../telemetry/sender';
+import { createMockTelemetryEventsSender } from '../telemetry/__mocks__';
+
+import { sendTelemetryEvents, capErrorSize } from './upgrade_usage';
+import type { PackagePolicyUpgradeUsage } from './upgrade_usage';
+
+describe('sendTelemetryEvents', () => {
+  let eventsTelemetryMock: jest.Mocked<TelemetryEventsSender>;
+  let loggerMock: jest.Mocked<Logger>;
+
+  beforeEach(() => {
+    eventsTelemetryMock = createMockTelemetryEventsSender();
+    loggerMock = loggingSystemMock.createLogger();
+  });
+
+  it('should queue telemetry events with generic error', () => {
+    const upgardeMessage: PackagePolicyUpgradeUsage = {
+      package_name: 'aws',
+      current_version: '0.6.1',
+      new_version: '1.3.0',
+      status: 'failure',
+      error: [
+        { key: 'queueUrl', message: ['Queue URL is required'] },
+        { message: 'Invalid format' },
+      ],
+      dryRun: true,
+    };
+
+    sendTelemetryEvents(loggerMock, eventsTelemetryMock, upgardeMessage);
+
+    expect(eventsTelemetryMock.queueTelemetryEvents).toHaveBeenCalledWith('fleet-upgrades', [
+      {
+        current_version: '0.6.1',
+        error: [
+          {
+            key: 'queueUrl',
+            message: ['Queue URL is required'],
+          },
+          {
+            message: 'Invalid format',
+          },
+        ],
+        error_message: ['Field is required', 'Invalid format'],
+        new_version: '1.3.0',
+        package_name: 'aws',
+        status: 'failure',
+        dryRun: true,
+      },
+    ]);
+  });
+
+  it('should cap error size', () => {
+    const maxSize = 2;
+    const errors = [{ message: '1' }, { message: '2' }, { message: '3' }];
+
+    const result = capErrorSize(errors, maxSize);
+
+    expect(result.length).toEqual(maxSize);
+  });
+});
diff --git a/x-pack/plugins/fleet/server/services/upgrade_usage.ts b/x-pack/plugins/fleet/server/services/upgrade_usage.ts
new file mode 100644
index 0000000000000..68bb126496e01
--- /dev/null
+++ b/x-pack/plugins/fleet/server/services/upgrade_usage.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 type { Logger } from 'src/core/server';
+
+import type { TelemetryEventsSender } from '../telemetry/sender';
+
+export interface PackagePolicyUpgradeUsage {
+  package_name: string;
+  current_version: string;
+  new_version: string;
+  status: 'success' | 'failure';
+  error?: UpgradeError[];
+  dryRun?: boolean;
+  error_message?: string[];
+}
+
+export interface UpgradeError {
+  key?: string;
+  message: string | string[];
+}
+
+export const MAX_ERROR_SIZE = 100;
+export const FLEET_UPGRADES_CHANNEL_NAME = 'fleet-upgrades';
+
+export function sendTelemetryEvents(
+  logger: Logger,
+  eventsTelemetry: TelemetryEventsSender | undefined,
+  upgradeUsage: PackagePolicyUpgradeUsage
+) {
+  if (eventsTelemetry === undefined) {
+    return;
+  }
+
+  try {
+    const cappedErrors = capErrorSize(upgradeUsage.error || [], MAX_ERROR_SIZE);
+    eventsTelemetry.queueTelemetryEvents(FLEET_UPGRADES_CHANNEL_NAME, [
+      {
+        ...upgradeUsage,
+        error: upgradeUsage.error ? cappedErrors : undefined,
+        error_message: makeErrorGeneric(cappedErrors),
+      },
+    ]);
+  } catch (exc) {
+    logger.error(`queing telemetry events failed ${exc}`);
+  }
+}
+
+export function capErrorSize(errors: UpgradeError[], maxSize: number): UpgradeError[] {
+  return errors.length > maxSize ? errors?.slice(0, maxSize) : errors;
+}
+
+function makeErrorGeneric(errors: UpgradeError[]): string[] {
+  return errors.map((error) => {
+    if (Array.isArray(error.message)) {
+      const firstMessage = error.message[0];
+      return firstMessage?.indexOf('is required') > -1 ? 'Field is required' : firstMessage;
+    }
+    return error.message as string;
+  });
+}
diff --git a/x-pack/plugins/fleet/server/telemetry/__mocks__/index.ts b/x-pack/plugins/fleet/server/telemetry/__mocks__/index.ts
new file mode 100644
index 0000000000000..2070aeca20861
--- /dev/null
+++ b/x-pack/plugins/fleet/server/telemetry/__mocks__/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.
+ */
+
+import type { TelemetryEventsSender } from '../sender';
+
+/**
+ * Creates a mocked Telemetry Events Sender
+ */
+export const createMockTelemetryEventsSender = (
+  enableTelemetry?: boolean
+): jest.Mocked<TelemetryEventsSender> => {
+  return {
+    setup: jest.fn(),
+    start: jest.fn(),
+    stop: jest.fn(),
+    fetchTelemetryUrl: jest.fn(),
+    queueTelemetryEvents: jest.fn(),
+    isTelemetryOptedIn: jest.fn().mockReturnValue(enableTelemetry ?? jest.fn()),
+    sendIfDue: jest.fn(),
+    sendEvents: jest.fn(),
+  } as unknown as jest.Mocked<TelemetryEventsSender>;
+};
diff --git a/x-pack/plugins/fleet/server/telemetry/queue.test.ts b/x-pack/plugins/fleet/server/telemetry/queue.test.ts
new file mode 100644
index 0000000000000..510b898387036
--- /dev/null
+++ b/x-pack/plugins/fleet/server/telemetry/queue.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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+/* eslint-disable dot-notation */
+import { TelemetryQueue } from './queue';
+
+describe('TelemetryQueue', () => {
+  describe('queueTelemetryEvents', () => {
+    it('queues two events', () => {
+      const queue = new TelemetryQueue();
+      queue.addEvents([{ 'event.kind': '1' }, { 'event.kind': '2' }]);
+      expect(queue['queue'].length).toBe(2);
+    });
+
+    it('queues more than maxQueueSize events', () => {
+      const queue = new TelemetryQueue();
+      queue.addEvents([{ 'event.kind': '1' }, { 'event.kind': '2' }]);
+      queue['maxQueueSize'] = 5;
+      queue.addEvents([{ 'event.kind': '3' }, { 'event.kind': '4' }]);
+      queue.addEvents([{ 'event.kind': '5' }, { 'event.kind': '6' }]);
+      queue.addEvents([{ 'event.kind': '7' }, { 'event.kind': '8' }]);
+      expect(queue['queue'].length).toBe(5);
+    });
+
+    it('get and clear events', async () => {
+      const queue = new TelemetryQueue();
+      queue.addEvents([{ 'event.kind': '1' }, { 'event.kind': '2' }]);
+
+      expect(queue.getEvents().length).toBe(2);
+
+      queue.clearEvents();
+
+      expect(queue['queue'].length).toBe(0);
+    });
+  });
+});
diff --git a/x-pack/plugins/fleet/server/telemetry/queue.ts b/x-pack/plugins/fleet/server/telemetry/queue.ts
new file mode 100644
index 0000000000000..3496cfb94915d
--- /dev/null
+++ b/x-pack/plugins/fleet/server/telemetry/queue.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.
+ */
+
+export const TELEMETRY_MAX_QUEUE_SIZE = 100;
+
+export class TelemetryQueue<T> {
+  private maxQueueSize = TELEMETRY_MAX_QUEUE_SIZE;
+  private queue: T[] = [];
+
+  public addEvents(events: T[]) {
+    const qlength = this.queue.length;
+
+    if (events.length === 0) {
+      return;
+    }
+
+    if (qlength >= this.maxQueueSize) {
+      // we're full already
+      return;
+    }
+
+    if (events.length > this.maxQueueSize - qlength) {
+      this.queue.push(...events.slice(0, this.maxQueueSize - qlength));
+    } else {
+      this.queue.push(...events);
+    }
+  }
+
+  public clearEvents() {
+    this.queue = [];
+  }
+
+  public getEvents(): T[] {
+    return this.queue;
+  }
+}
diff --git a/x-pack/plugins/fleet/server/telemetry/sender.test.ts b/x-pack/plugins/fleet/server/telemetry/sender.test.ts
new file mode 100644
index 0000000000000..8fe4c6e150ff9
--- /dev/null
+++ b/x-pack/plugins/fleet/server/telemetry/sender.test.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.
+ */
+
+/* eslint-disable dot-notation */
+
+import { URL } from 'url';
+
+import axios from 'axios';
+
+import type { InfoResponse } from '@elastic/elasticsearch/lib/api/types';
+
+import { loggingSystemMock } from 'src/core/server/mocks';
+
+import { TelemetryEventsSender } from './sender';
+
+jest.mock('axios', () => {
+  return {
+    post: jest.fn(),
+  };
+});
+
+describe('TelemetryEventsSender', () => {
+  let logger: ReturnType<typeof loggingSystemMock.createLogger>;
+  let sender: TelemetryEventsSender;
+
+  beforeEach(() => {
+    logger = loggingSystemMock.createLogger();
+    sender = new TelemetryEventsSender(logger);
+    sender.start(undefined, {
+      elasticsearch: { client: { asInternalUser: { info: jest.fn(async () => ({})) } } },
+    } as any);
+  });
+
+  describe('queueTelemetryEvents', () => {
+    it('queues two events', () => {
+      sender.queueTelemetryEvents('fleet-upgrades', [
+        { package_name: 'system', current_version: '0.3', new_version: '1.0', status: 'success' },
+      ]);
+      expect(sender['queuesPerChannel']['fleet-upgrades']).toBeDefined();
+    });
+
+    it('should send events when due', async () => {
+      sender['telemetryStart'] = {
+        getIsOptedIn: jest.fn(async () => true),
+      };
+      sender['telemetrySetup'] = {
+        getTelemetryUrl: jest.fn(
+          async () => new URL('https://telemetry-staging.elastic.co/v3/send/snapshot')
+        ),
+      };
+
+      sender.queueTelemetryEvents('fleet-upgrades', [
+        { package_name: 'apache', current_version: '0.3', new_version: '1.0', status: 'success' },
+      ]);
+      sender['sendEvents'] = jest.fn();
+
+      await sender['sendIfDue']();
+
+      expect(sender['sendEvents']).toHaveBeenCalledWith(
+        'https://telemetry-staging.elastic.co/v3/send/fleet-upgrades',
+        undefined,
+        expect.anything()
+      );
+    });
+
+    it("shouldn't send when telemetry is disabled", async () => {
+      const telemetryStart = {
+        getIsOptedIn: jest.fn(async () => false),
+      };
+      sender['telemetryStart'] = telemetryStart;
+
+      sender.queueTelemetryEvents('fleet-upgrades', [
+        { package_name: 'system', current_version: '0.3', new_version: '1.0', status: 'success' },
+      ]);
+      sender['sendEvents'] = jest.fn();
+
+      await sender['sendIfDue']();
+
+      expect(sender['sendEvents']).toBeCalledTimes(0);
+    });
+
+    it('should send events to separate channels', async () => {
+      sender['telemetryStart'] = {
+        getIsOptedIn: jest.fn(async () => true),
+      };
+      sender['telemetrySetup'] = {
+        getTelemetryUrl: jest.fn(
+          async () => new URL('https://telemetry.elastic.co/v3/send/snapshot')
+        ),
+      };
+
+      sender['fetchClusterInfo'] = jest.fn(async () => {
+        return {
+          cluster_uuid: '1',
+          cluster_name: 'name',
+          version: {
+            number: '8.0.0',
+          },
+        } as InfoResponse;
+      });
+
+      const myChannelEvents = [{ 'event.kind': '1' }, { 'event.kind': '2' }];
+      // @ts-ignore
+      sender.queueTelemetryEvents('my-channel', myChannelEvents);
+      sender['queuesPerChannel']['my-channel']['getEvents'] = jest.fn(() => myChannelEvents);
+
+      expect(sender['queuesPerChannel']['my-channel']['queue'].length).toBe(2);
+
+      const myChannel2Events = [{ 'event.kind': '3' }];
+      // @ts-ignore
+      sender.queueTelemetryEvents('my-channel2', myChannel2Events);
+      sender['queuesPerChannel']['my-channel2']['getEvents'] = jest.fn(() => myChannel2Events);
+
+      expect(sender['queuesPerChannel']['my-channel2']['queue'].length).toBe(1);
+
+      await sender['sendIfDue']();
+
+      expect(sender['queuesPerChannel']['my-channel']['getEvents']).toBeCalledTimes(1);
+      expect(sender['queuesPerChannel']['my-channel2']['getEvents']).toBeCalledTimes(1);
+      const headers = {
+        headers: {
+          'Content-Type': 'application/x-ndjson',
+          'X-Elastic-Cluster-ID': '1',
+          'X-Elastic-Stack-Version': '8.0.0',
+        },
+      };
+      expect(axios.post).toHaveBeenCalledWith(
+        'https://telemetry.elastic.co/v3/send/my-channel',
+        '{"event.kind":"1"}\n{"event.kind":"2"}\n',
+        headers
+      );
+      expect(axios.post).toHaveBeenCalledWith(
+        'https://telemetry.elastic.co/v3/send/my-channel2',
+        '{"event.kind":"3"}\n',
+        headers
+      );
+    });
+  });
+});
diff --git a/x-pack/plugins/fleet/server/telemetry/sender.ts b/x-pack/plugins/fleet/server/telemetry/sender.ts
new file mode 100644
index 0000000000000..3bda17fbd1d79
--- /dev/null
+++ b/x-pack/plugins/fleet/server/telemetry/sender.ts
@@ -0,0 +1,192 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { CoreStart, ElasticsearchClient, Logger } from 'src/core/server';
+import type { TelemetryPluginStart, TelemetryPluginSetup } from 'src/plugins/telemetry/server';
+
+import { cloneDeep } from 'lodash';
+
+import axios from 'axios';
+
+import type { InfoResponse } from '@elastic/elasticsearch/lib/api/types';
+
+import { TelemetryQueue } from './queue';
+
+import type { FleetTelemetryChannel, FleetTelemetryChannelEvents } from './types';
+
+/**
+ * Simplified version of https://github.com/elastic/kibana/blob/master/x-pack/plugins/security_solution/server/lib/telemetry/sender.ts
+ * Sends batched events to telemetry v3 api
+ */
+export class TelemetryEventsSender {
+  private readonly initialCheckDelayMs = 10 * 1000;
+  private readonly checkIntervalMs = 30 * 1000;
+  private readonly logger: Logger;
+
+  private telemetryStart?: TelemetryPluginStart;
+  private telemetrySetup?: TelemetryPluginSetup;
+  private intervalId?: NodeJS.Timeout;
+  private isSending = false;
+  private queuesPerChannel: { [channel: string]: TelemetryQueue<any> } = {};
+  private isOptedIn?: boolean = true; // Assume true until the first check
+  private esClient?: ElasticsearchClient;
+
+  constructor(logger: Logger) {
+    this.logger = logger;
+  }
+
+  public setup(telemetrySetup?: TelemetryPluginSetup) {
+    this.telemetrySetup = telemetrySetup;
+  }
+
+  public async start(telemetryStart?: TelemetryPluginStart, core?: CoreStart) {
+    this.telemetryStart = telemetryStart;
+    this.esClient = core?.elasticsearch.client.asInternalUser;
+
+    this.logger.debug(`Starting local task`);
+    setTimeout(() => {
+      this.sendIfDue();
+      this.intervalId = setInterval(() => this.sendIfDue(), this.checkIntervalMs);
+    }, this.initialCheckDelayMs);
+  }
+
+  public stop() {
+    if (this.intervalId) {
+      clearInterval(this.intervalId);
+    }
+  }
+
+  public queueTelemetryEvents<T extends FleetTelemetryChannel>(
+    channel: T,
+    events: Array<FleetTelemetryChannelEvents[T]>
+  ) {
+    if (!this.queuesPerChannel[channel]) {
+      this.queuesPerChannel[channel] = new TelemetryQueue<FleetTelemetryChannelEvents[T]>();
+    }
+    this.queuesPerChannel[channel].addEvents(cloneDeep(events));
+  }
+
+  public async isTelemetryOptedIn() {
+    this.isOptedIn = await this.telemetryStart?.getIsOptedIn();
+    return this.isOptedIn === true;
+  }
+
+  private async sendIfDue() {
+    if (this.isSending) {
+      return;
+    }
+
+    this.isSending = true;
+
+    this.isOptedIn = await this.isTelemetryOptedIn();
+    if (!this.isOptedIn) {
+      this.logger.debug(`Telemetry is not opted-in.`);
+      for (const channel of Object.keys(this.queuesPerChannel)) {
+        this.queuesPerChannel[channel].clearEvents();
+      }
+      this.isSending = false;
+      return;
+    }
+
+    const clusterInfo = await this.fetchClusterInfo();
+
+    for (const channel of Object.keys(this.queuesPerChannel)) {
+      await this.sendEvents(
+        await this.fetchTelemetryUrl(channel),
+        clusterInfo,
+        this.queuesPerChannel[channel]
+      );
+    }
+
+    this.isSending = false;
+  }
+
+  private async fetchClusterInfo(): Promise<InfoResponse> {
+    if (this.esClient === undefined || this.esClient === null) {
+      throw Error('elasticsearch client is unavailable: cannot retrieve cluster infomation');
+    }
+
+    const { body } = await this.esClient.info();
+    return body;
+  }
+
+  public async sendEvents(
+    telemetryUrl: string,
+    clusterInfo: InfoResponse | undefined,
+    queue: TelemetryQueue<any>
+  ) {
+    const events = queue.getEvents();
+    if (events.length === 0) {
+      return;
+    }
+
+    try {
+      this.logger.debug(`Telemetry URL: ${telemetryUrl}`);
+
+      queue.clearEvents();
+
+      this.logger.debug(JSON.stringify(events));
+
+      await this.send(
+        events,
+        telemetryUrl,
+        clusterInfo?.cluster_uuid,
+        clusterInfo?.version?.number
+      );
+    } catch (err) {
+      this.logger.warn(`Error sending telemetry events data: ${err}`);
+      queue.clearEvents();
+    }
+  }
+
+  // Forms URLs like:
+  // https://telemetry.elastic.co/v3/send/my-channel-name or
+  // https://telemetry-staging.elastic.co/v3/send/my-channel-name
+  private async fetchTelemetryUrl(channel: string): Promise<string> {
+    const telemetryUrl = await this.telemetrySetup?.getTelemetryUrl();
+    if (!telemetryUrl) {
+      throw Error("Couldn't get telemetry URL");
+    }
+    telemetryUrl.pathname = `/v3/send/${channel}`;
+    return telemetryUrl.toString();
+  }
+
+  private async send(
+    events: unknown[],
+    telemetryUrl: string,
+    clusterUuid: string | undefined,
+    clusterVersionNumber: string | undefined
+  ) {
+    // using ndjson so that each line will be wrapped in json envelope on server side
+    // see https://github.com/elastic/infra/blob/master/docs/telemetry/telemetry-next-dataflow.md#json-envelope
+    const ndjson = this.transformDataToNdjson(events);
+
+    try {
+      const resp = await axios.post(telemetryUrl, ndjson, {
+        headers: {
+          'Content-Type': 'application/x-ndjson',
+          'X-Elastic-Cluster-ID': clusterUuid,
+          'X-Elastic-Stack-Version': clusterVersionNumber ? clusterVersionNumber : '7.16.0',
+        },
+      });
+      this.logger.debug(`Events sent!. Response: ${resp.status} ${JSON.stringify(resp.data)}`);
+    } catch (err) {
+      this.logger.warn(
+        `Error sending events: ${err.response.status} ${JSON.stringify(err.response.data)}`
+      );
+    }
+  }
+
+  private transformDataToNdjson = (data: unknown[]): string => {
+    if (data.length !== 0) {
+      const dataString = data.map((dataItem) => JSON.stringify(dataItem)).join('\n');
+      return `${dataString}\n`;
+    } else {
+      return '';
+    }
+  };
+}
diff --git a/x-pack/plugins/fleet/server/telemetry/types.ts b/x-pack/plugins/fleet/server/telemetry/types.ts
new file mode 100644
index 0000000000000..4351546ecdf02
--- /dev/null
+++ b/x-pack/plugins/fleet/server/telemetry/types.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { PackagePolicyUpgradeUsage } from '../services/upgrade_usage';
+
+export interface FleetTelemetryChannelEvents {
+  // channel name => event type
+  'fleet-upgrades': PackagePolicyUpgradeUsage;
+}
+
+export type FleetTelemetryChannel = keyof FleetTelemetryChannelEvents;
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 a8436edb63f63..cd26cd3197587 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
@@ -7,7 +7,13 @@
 
 import React from 'react';
 import { act } from 'react-dom/test-utils';
-import { createMockFramePublicAPI, visualizationMap, datasourceMap } from '../../../mocks';
+import {
+  createMockFramePublicAPI,
+  mockVisualizationMap,
+  mockDatasourceMap,
+  mockStoreDeps,
+  MountStoreProps,
+} from '../../../mocks';
 import { Visualization } from '../../../types';
 import { LayerPanels } from './config_panel';
 import { LayerPanel } from './layer_panel';
@@ -16,6 +22,7 @@ import { generateId } from '../../../id_generator';
 import { mountWithProvider } from '../../../mocks';
 import { layerTypes } from '../../../../common';
 import { ReactWrapper } from 'enzyme';
+import { addLayer } from '../../../state_management';
 
 jest.mock('../../../id_generator');
 
@@ -39,8 +46,40 @@ afterEach(() => {
 
 describe('ConfigPanel', () => {
   const frame = createMockFramePublicAPI();
-
-  function getDefaultProps() {
+  function prepareAndMountComponent(
+    props: ReturnType<typeof getDefaultProps>,
+    customStoreProps?: Partial<MountStoreProps>
+  ) {
+    (generateId as jest.Mock).mockReturnValue(`newId`);
+    return mountWithProvider(
+      <LayerPanels {...props} />,
+      {
+        preloadedState: {
+          datasourceStates: {
+            testDatasource: {
+              isLoading: false,
+              state: 'state',
+            },
+          },
+          activeDatasourceId: 'testDatasource',
+        },
+        storeDeps: mockStoreDeps({
+          datasourceMap: props.datasourceMap,
+          visualizationMap: props.visualizationMap,
+        }),
+        ...customStoreProps,
+      },
+      {
+        attachTo: container,
+      }
+    );
+  }
+  function getDefaultProps(
+    { datasourceMap = mockDatasourceMap(), visualizationMap = mockVisualizationMap() } = {
+      datasourceMap: mockDatasourceMap(),
+      visualizationMap: mockVisualizationMap(),
+    }
+  ) {
     frame.datasourceLayers = {
       first: datasourceMap.testDatasource.publicAPIMock,
     };
@@ -75,22 +114,13 @@ describe('ConfigPanel', () => {
   it('should fail to render layerPanels if the public API is out of date', async () => {
     const props = getDefaultProps();
     props.framePublicAPI.datasourceLayers = {};
-    const { instance } = await mountWithProvider(<LayerPanels {...props} />);
+    const { instance } = await prepareAndMountComponent(props);
     expect(instance.find(LayerPanel).exists()).toBe(false);
   });
 
   it('allow datasources and visualizations to use setters', async () => {
     const props = getDefaultProps();
-    const { instance, lensStore } = await mountWithProvider(<LayerPanels {...props} />, {
-      preloadedState: {
-        datasourceStates: {
-          testDatasource: {
-            isLoading: false,
-            state: 'state',
-          },
-        },
-      },
-    });
+    const { instance, lensStore } = await prepareAndMountComponent(props);
     const { updateDatasource, updateAll } = instance.find(LayerPanel).props();
 
     const updater = () => 'updated';
@@ -116,22 +146,7 @@ describe('ConfigPanel', () => {
 
   describe('focus behavior when adding or removing layers', () => {
     it('should focus the only layer when resetting the layer', async () => {
-      const { instance } = await mountWithProvider(
-        <LayerPanels {...getDefaultProps()} />,
-        {
-          preloadedState: {
-            datasourceStates: {
-              testDatasource: {
-                isLoading: false,
-                state: 'state',
-              },
-            },
-          },
-        },
-        {
-          attachTo: container,
-        }
-      );
+      const { instance } = await prepareAndMountComponent(getDefaultProps());
       const firstLayerFocusable = instance
         .find(LayerPanel)
         .first()
@@ -146,29 +161,15 @@ describe('ConfigPanel', () => {
     });
 
     it('should focus the second layer when removing the first layer', async () => {
-      const defaultProps = getDefaultProps();
+      const datasourceMap = mockDatasourceMap();
+      const defaultProps = getDefaultProps({ datasourceMap });
       // overwriting datasourceLayers to test two layers
       frame.datasourceLayers = {
         first: datasourceMap.testDatasource.publicAPIMock,
         second: datasourceMap.testDatasource.publicAPIMock,
       };
-      const { instance } = await mountWithProvider(
-        <LayerPanels {...defaultProps} />,
-        {
-          preloadedState: {
-            datasourceStates: {
-              testDatasource: {
-                isLoading: false,
-                state: 'state',
-              },
-            },
-          },
-        },
-        {
-          attachTo: container,
-        }
-      );
 
+      const { instance } = await prepareAndMountComponent(defaultProps);
       const secondLayerFocusable = instance
         .find(LayerPanel)
         .at(1)
@@ -183,28 +184,14 @@ describe('ConfigPanel', () => {
     });
 
     it('should focus the first layer when removing the second layer', async () => {
-      const defaultProps = getDefaultProps();
+      const datasourceMap = mockDatasourceMap();
+      const defaultProps = getDefaultProps({ datasourceMap });
       // overwriting datasourceLayers to test two layers
       frame.datasourceLayers = {
         first: datasourceMap.testDatasource.publicAPIMock,
         second: datasourceMap.testDatasource.publicAPIMock,
       };
-      const { instance } = await mountWithProvider(
-        <LayerPanels {...defaultProps} />,
-        {
-          preloadedState: {
-            datasourceStates: {
-              testDatasource: {
-                isLoading: false,
-                state: 'state',
-              },
-            },
-          },
-        },
-        {
-          attachTo: container,
-        }
-      );
+      const { instance } = await prepareAndMountComponent(defaultProps);
       const firstLayerFocusable = instance
         .find(LayerPanel)
         .first()
@@ -219,31 +206,22 @@ describe('ConfigPanel', () => {
     });
 
     it('should focus the added layer', async () => {
-      (generateId as jest.Mock).mockReturnValue(`second`);
+      const datasourceMap = mockDatasourceMap();
+      frame.datasourceLayers = {
+        first: datasourceMap.testDatasource.publicAPIMock,
+        newId: datasourceMap.testDatasource.publicAPIMock,
+      };
 
-      const { instance } = await mountWithProvider(
-        <LayerPanels {...getDefaultProps()} />,
+      const defaultProps = getDefaultProps({ datasourceMap });
+
+      const { instance } = await prepareAndMountComponent(defaultProps, {
+        dispatch: jest.fn((x) => {
+          if (x.type === addLayer.type) {
+            frame.datasourceLayers.newId = datasourceMap.testDatasource.publicAPIMock;
+          }
+        }),
+      });
 
-        {
-          preloadedState: {
-            datasourceStates: {
-              testDatasource: {
-                isLoading: false,
-                state: 'state',
-              },
-            },
-            activeDatasourceId: 'testDatasource',
-          },
-          dispatch: jest.fn((x) => {
-            if (x.payload.subType === 'ADD_LAYER') {
-              frame.datasourceLayers.second = datasourceMap.testDatasource.publicAPIMock;
-            }
-          }),
-        },
-        {
-          attachTo: container,
-        }
-      );
       act(() => {
         instance.find('[data-test-subj="lnsLayerAddButton"]').first().simulate('click');
       });
@@ -253,26 +231,6 @@ describe('ConfigPanel', () => {
   });
 
   describe('initial default value', () => {
-    function prepareAndMountComponent(props: ReturnType<typeof getDefaultProps>) {
-      (generateId as jest.Mock).mockReturnValue(`newId`);
-      return mountWithProvider(
-        <LayerPanels {...props} />,
-        {
-          preloadedState: {
-            datasourceStates: {
-              testDatasource: {
-                isLoading: false,
-                state: 'state',
-              },
-            },
-            activeDatasourceId: 'testDatasource',
-          },
-        },
-        {
-          attachTo: container,
-        }
-      );
-    }
     function clickToAddLayer(instance: ReactWrapper) {
       act(() => {
         instance.find('[data-test-subj="lnsLayerAddButton"]').first().simulate('click');
@@ -297,8 +255,10 @@ describe('ConfigPanel', () => {
     }
 
     it('should not add an initial dimension when not specified', async () => {
-      const props = getDefaultProps();
-      props.activeVisualization.getSupportedLayers = jest.fn(() => [
+      const datasourceMap = mockDatasourceMap();
+      const visualizationMap = mockVisualizationMap();
+
+      visualizationMap.testVis.getSupportedLayers = jest.fn(() => [
         { type: layerTypes.DATA, label: 'Data Layer' },
         {
           type: layerTypes.REFERENCELINE,
@@ -306,6 +266,7 @@ describe('ConfigPanel', () => {
         },
       ]);
       datasourceMap.testDatasource.initializeDimension = jest.fn();
+      const props = getDefaultProps({ datasourceMap, visualizationMap });
 
       const { instance, lensStore } = await prepareAndMountComponent(props);
       await clickToAddLayer(instance);
@@ -315,8 +276,11 @@ describe('ConfigPanel', () => {
     });
 
     it('should not add an initial dimension when initialDimensions are not available for the given layer type', async () => {
-      const props = getDefaultProps();
-      props.activeVisualization.getSupportedLayers = jest.fn(() => [
+      const datasourceMap = mockDatasourceMap();
+      const visualizationMap = mockVisualizationMap();
+      datasourceMap.testDatasource.initializeDimension = jest.fn();
+
+      visualizationMap.testVis.getSupportedLayers = jest.fn(() => [
         {
           type: layerTypes.DATA,
           label: 'Data Layer',
@@ -335,8 +299,7 @@ describe('ConfigPanel', () => {
           label: 'Reference layer',
         },
       ]);
-      datasourceMap.testDatasource.initializeDimension = jest.fn();
-
+      const props = getDefaultProps({ datasourceMap, visualizationMap });
       const { instance, lensStore } = await prepareAndMountComponent(props);
       await clickToAddLayer(instance);
 
@@ -345,8 +308,9 @@ describe('ConfigPanel', () => {
     });
 
     it('should use group initial dimension value when adding a new layer if available', async () => {
-      const props = getDefaultProps();
-      props.activeVisualization.getSupportedLayers = jest.fn(() => [
+      const datasourceMap = mockDatasourceMap();
+      const visualizationMap = mockVisualizationMap();
+      visualizationMap.testVis.getSupportedLayers = jest.fn(() => [
         { type: layerTypes.DATA, label: 'Data Layer' },
         {
           type: layerTypes.REFERENCELINE,
@@ -363,6 +327,7 @@ describe('ConfigPanel', () => {
         },
       ]);
       datasourceMap.testDatasource.initializeDimension = jest.fn();
+      const props = getDefaultProps({ datasourceMap, visualizationMap });
 
       const { instance, lensStore } = await prepareAndMountComponent(props);
       await clickToAddLayer(instance);
@@ -378,8 +343,10 @@ describe('ConfigPanel', () => {
     });
 
     it('should add an initial dimension value when clicking on the empty dimension button', async () => {
-      const props = getDefaultProps();
-      props.activeVisualization.getSupportedLayers = jest.fn(() => [
+      const datasourceMap = mockDatasourceMap();
+
+      const visualizationMap = mockVisualizationMap();
+      visualizationMap.testVis.getSupportedLayers = jest.fn(() => [
         {
           type: layerTypes.DATA,
           label: 'Data Layer',
@@ -395,7 +362,7 @@ describe('ConfigPanel', () => {
         },
       ]);
       datasourceMap.testDatasource.initializeDimension = jest.fn();
-
+      const props = getDefaultProps({ visualizationMap, datasourceMap });
       const { instance, lensStore } = await prepareAndMountComponent(props);
 
       await clickToAddDimension(instance);
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 0b6223ac87ce2..d3574abe4f57a 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
@@ -7,26 +7,26 @@
 
 import React, { useMemo, memo } from 'react';
 import { EuiForm } from '@elastic/eui';
-import { mapValues } from 'lodash';
 import { Visualization } from '../../../types';
 import { LayerPanel } from './layer_panel';
 import { trackUiEvent } from '../../../lens_ui_telemetry';
 import { generateId } from '../../../id_generator';
-import { appendLayer } from './layer_actions';
 import { ConfigPanelWrapperProps } from './types';
 import { useFocusUpdate } from './use_focus_update';
 import {
+  setLayerDefaultDimension,
   useLensDispatch,
+  removeOrClearLayer,
+  addLayer,
   updateState,
   updateDatasourceState,
   updateVisualizationState,
   setToggleFullscreen,
   useLensSelector,
   selectVisualization,
-  VisualizationState,
-  LensAppState,
 } from '../../../state_management';
-import { AddLayerButton, getLayerType } from './add_layer';
+import { AddLayerButton } from './add_layer';
+import { getRemoveOperation } from '../../../utils';
 
 export const ConfigPanelWrapper = memo(function ConfigPanelWrapper(props: ConfigPanelWrapperProps) {
   const visualization = useLensSelector(selectVisualization);
@@ -39,18 +39,6 @@ export const ConfigPanelWrapper = memo(function ConfigPanelWrapper(props: Config
   ) : null;
 });
 
-function getRemoveOperation(
-  activeVisualization: Visualization,
-  visualizationState: VisualizationState['state'],
-  layerId: string,
-  layerCount: number
-) {
-  if (activeVisualization.getRemoveOperation) {
-    return activeVisualization.getRemoveOperation(visualizationState, layerId);
-  }
-  // fallback to generic count check
-  return layerCount === 1 ? 'clear' : 'remove';
-}
 export function LayerPanels(
   props: ConfigPanelWrapperProps & {
     activeVisualization: Visualization;
@@ -73,8 +61,7 @@ export function LayerPanels(
       dispatchLens(
         updateVisualizationState({
           visualizationId: activeVisualization.id,
-          updater: newState,
-          clearStagedPreview: false,
+          newState,
         })
       );
     },
@@ -110,7 +97,6 @@ export function LayerPanels(
       setTimeout(() => {
         dispatchLens(
           updateState({
-            subType: 'UPDATE_ALL_STATES',
             updater: (prevState) => {
               const updatedDatasourceState =
                 typeof newDatasourceState === 'function'
@@ -133,7 +119,6 @@ export function LayerPanels(
                   ...prevState.visualization,
                   state: updatedVisualizationState,
                 },
-                stagedPreview: undefined,
               };
             },
           })
@@ -183,66 +168,22 @@ export function LayerPanels(
                 datasourceMap[activeDatasourceId]?.initializeDimension
               ) {
                 dispatchLens(
-                  updateState({
-                    subType: 'LAYER_DEFAULT_DIMENSION',
-                    updater: (state) =>
-                      addInitialValueIfAvailable({
-                        ...props,
-                        state,
-                        activeDatasourceId,
-                        layerId,
-                        layerType: getLayerType(
-                          activeVisualization,
-                          state.visualization.state,
-                          layerId
-                        ),
-                        columnId,
-                        groupId,
-                      }),
+                  setLayerDefaultDimension({
+                    layerId,
+                    columnId,
+                    groupId,
                   })
                 );
               }
             }}
             onRemoveLayer={() => {
               dispatchLens(
-                updateState({
-                  subType: 'REMOVE_OR_CLEAR_LAYER',
-                  updater: (state) => {
-                    const isOnlyLayer =
-                      getRemoveOperation(
-                        activeVisualization,
-                        state.visualization.state,
-                        layerId,
-                        layerIds.length
-                      ) === 'clear';
-
-                    return {
-                      ...state,
-                      datasourceStates: mapValues(
-                        state.datasourceStates,
-                        (datasourceState, datasourceId) => {
-                          const datasource = datasourceMap[datasourceId!];
-                          return {
-                            ...datasourceState,
-                            state: isOnlyLayer
-                              ? datasource.clearLayer(datasourceState.state, layerId)
-                              : datasource.removeLayer(datasourceState.state, layerId),
-                          };
-                        }
-                      ),
-                      visualization: {
-                        ...state.visualization,
-                        state:
-                          isOnlyLayer || !activeVisualization.removeLayer
-                            ? activeVisualization.clearLayer(state.visualization.state, layerId)
-                            : activeVisualization.removeLayer(state.visualization.state, layerId),
-                      },
-                      stagedPreview: undefined,
-                    };
-                  },
+                removeOrClearLayer({
+                  visualizationId: activeVisualization.id,
+                  layerId,
+                  layerIds,
                 })
               );
-
               removeLayerRef(layerId);
             }}
             toggleFullscreen={toggleFullscreen}
@@ -254,96 +195,12 @@ export function LayerPanels(
         visualizationState={visualization.state}
         layersMeta={props.framePublicAPI}
         onAddLayerClick={(layerType) => {
-          const id = generateId();
-          dispatchLens(
-            updateState({
-              subType: 'ADD_LAYER',
-              updater: (state) => {
-                const newState = appendLayer({
-                  activeVisualization,
-                  generateId: () => id,
-                  trackUiEvent,
-                  activeDatasource: datasourceMap[activeDatasourceId!],
-                  state,
-                  layerType,
-                });
-                return addInitialValueIfAvailable({
-                  ...props,
-                  activeDatasourceId: activeDatasourceId!,
-                  state: newState,
-                  layerId: id,
-                  layerType,
-                });
-              },
-            })
-          );
-          setNextFocusedLayerId(id);
+          const layerId = generateId();
+          dispatchLens(addLayer({ layerId, layerType }));
+          trackUiEvent('layer_added');
+          setNextFocusedLayerId(layerId);
         }}
       />
     </EuiForm>
   );
 }
-
-function addInitialValueIfAvailable({
-  state,
-  activeVisualization,
-  framePublicAPI,
-  layerType,
-  activeDatasourceId,
-  datasourceMap,
-  layerId,
-  columnId,
-  groupId,
-}: ConfigPanelWrapperProps & {
-  state: LensAppState;
-  activeDatasourceId: string;
-  activeVisualization: Visualization;
-  layerId: string;
-  layerType: string;
-  columnId?: string;
-  groupId?: string;
-}) {
-  const layerInfo = activeVisualization
-    .getSupportedLayers(state.visualization.state, framePublicAPI)
-    .find(({ type }) => type === layerType);
-
-  const activeDatasource = datasourceMap[activeDatasourceId];
-
-  if (layerInfo?.initialDimensions && activeDatasource?.initializeDimension) {
-    const info = groupId
-      ? layerInfo.initialDimensions.find(({ groupId: id }) => id === groupId)
-      : // pick the first available one if not passed
-        layerInfo.initialDimensions[0];
-
-    if (info) {
-      return {
-        ...state,
-        datasourceStates: {
-          ...state.datasourceStates,
-          [activeDatasourceId]: {
-            ...state.datasourceStates[activeDatasourceId],
-            state: activeDatasource.initializeDimension(
-              state.datasourceStates[activeDatasourceId].state,
-              layerId,
-              {
-                ...info,
-                columnId: columnId || info.columnId,
-              }
-            ),
-          },
-        },
-        visualization: {
-          ...state.visualization,
-          state: activeVisualization.setDimension({
-            groupId: info.groupId,
-            layerId,
-            columnId: columnId || info.columnId,
-            prevState: state.visualization.state,
-            frame: framePublicAPI,
-          }),
-        },
-      };
-    }
-  }
-  return state;
-}
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_actions.test.ts b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_actions.test.ts
deleted file mode 100644
index 44cefb0bf8ec4..0000000000000
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_actions.test.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-import { layerTypes } from '../../../../common';
-import { LensAppState } from '../../../state_management/types';
-import { removeLayer, appendLayer } from './layer_actions';
-
-function createTestArgs(initialLayerIds: string[]) {
-  const trackUiEvent = jest.fn();
-  const testDatasource = (datasourceId: string) => ({
-    id: datasourceId,
-    clearLayer: (layerIds: unknown, layerId: string) =>
-      (layerIds as string[]).map((id: string) =>
-        id === layerId ? `${datasourceId}_clear_${layerId}` : id
-      ),
-    removeLayer: (layerIds: unknown, layerId: string) =>
-      (layerIds as string[]).filter((id: string) => id !== layerId),
-    insertLayer: (layerIds: unknown, layerId: string) => [...(layerIds as string[]), layerId],
-  });
-
-  const activeVisualization = {
-    clearLayer: (layerIds: unknown, layerId: string) =>
-      (layerIds as string[]).map((id: string) => (id === layerId ? `vis_clear_${layerId}` : id)),
-    removeLayer: (layerIds: unknown, layerId: string) =>
-      (layerIds as string[]).filter((id: string) => id !== layerId),
-    getLayerIds: (layerIds: unknown) => layerIds as string[],
-    appendLayer: (layerIds: unknown, layerId: string) => [...(layerIds as string[]), layerId],
-  };
-
-  const datasourceStates = {
-    ds1: {
-      isLoading: false,
-      state: initialLayerIds.slice(0, 1),
-    },
-    ds2: {
-      isLoading: false,
-      state: initialLayerIds.slice(1),
-    },
-  };
-
-  return {
-    state: {
-      activeDatasourceId: 'ds1',
-      datasourceStates,
-      title: 'foo',
-      visualization: {
-        activeId: 'testVis',
-        state: initialLayerIds,
-      },
-    } as unknown as LensAppState,
-    activeVisualization,
-    datasourceMap: {
-      ds1: testDatasource('ds1'),
-      ds2: testDatasource('ds2'),
-    },
-    trackUiEvent,
-    stagedPreview: {
-      visualization: {
-        activeId: 'testVis',
-        state: initialLayerIds,
-      },
-      datasourceStates,
-    },
-  };
-}
-
-describe('removeLayer', () => {
-  it('should clear the layer if it is the only layer', () => {
-    const { state, trackUiEvent, datasourceMap, activeVisualization } = createTestArgs(['layer1']);
-    const newState = removeLayer({
-      activeVisualization,
-      datasourceMap,
-      layerId: 'layer1',
-      state,
-      trackUiEvent,
-    });
-
-    expect(newState.visualization.state).toEqual(['vis_clear_layer1']);
-    expect(newState.datasourceStates.ds1.state).toEqual(['ds1_clear_layer1']);
-    expect(newState.datasourceStates.ds2.state).toEqual([]);
-    expect(newState.stagedPreview).not.toBeDefined();
-    expect(trackUiEvent).toHaveBeenCalledWith('layer_cleared');
-  });
-
-  it('should remove the layer if it is not the only layer', () => {
-    const { state, trackUiEvent, datasourceMap, activeVisualization } = createTestArgs([
-      'layer1',
-      'layer2',
-    ]);
-    const newState = removeLayer({
-      activeVisualization,
-      datasourceMap,
-      layerId: 'layer1',
-      state,
-      trackUiEvent,
-    });
-
-    expect(newState.visualization.state).toEqual(['layer2']);
-    expect(newState.datasourceStates.ds1.state).toEqual([]);
-    expect(newState.datasourceStates.ds2.state).toEqual(['layer2']);
-    expect(newState.stagedPreview).not.toBeDefined();
-    expect(trackUiEvent).toHaveBeenCalledWith('layer_removed');
-  });
-});
-
-describe('appendLayer', () => {
-  it('should add the layer to the datasource and visualization', () => {
-    const { state, trackUiEvent, datasourceMap, activeVisualization } = createTestArgs([
-      'layer1',
-      'layer2',
-    ]);
-    const newState = appendLayer({
-      activeDatasource: datasourceMap.ds1,
-      activeVisualization,
-      generateId: () => 'foo',
-      state,
-      trackUiEvent,
-      layerType: layerTypes.DATA,
-    });
-
-    expect(newState.visualization.state).toEqual(['layer1', 'layer2', 'foo']);
-    expect(newState.datasourceStates.ds1.state).toEqual(['layer1', 'foo']);
-    expect(newState.datasourceStates.ds2.state).toEqual(['layer2']);
-    expect(newState.stagedPreview).not.toBeDefined();
-    expect(trackUiEvent).toHaveBeenCalledWith('layer_added');
-  });
-});
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
deleted file mode 100644
index c0f0847e8ff5c..0000000000000
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_actions.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 { mapValues } from 'lodash';
-import type { LayerType } from '../../../../common';
-import { LensAppState } from '../../../state_management';
-
-import { Datasource, Visualization } from '../../../types';
-
-interface RemoveLayerOptions {
-  trackUiEvent: (name: string) => void;
-  state: LensAppState;
-  layerId: string;
-  activeVisualization: Pick<Visualization, 'getLayerIds' | 'clearLayer' | 'removeLayer'>;
-  datasourceMap: Record<string, Pick<Datasource, 'clearLayer' | 'removeLayer'>>;
-}
-
-interface AppendLayerOptions {
-  trackUiEvent: (name: string) => void;
-  state: LensAppState;
-  generateId: () => string;
-  activeDatasource: Pick<Datasource, 'insertLayer' | 'id'>;
-  activeVisualization: Pick<Visualization, 'appendLayer'>;
-  layerType: LayerType;
-}
-
-export function removeLayer(opts: RemoveLayerOptions): LensAppState {
-  const { state, trackUiEvent: trackUiEvent, activeVisualization, layerId, datasourceMap } = opts;
-  const isOnlyLayer = activeVisualization
-    .getLayerIds(state.visualization.state)
-    .every((id) => id === opts.layerId);
-
-  trackUiEvent(isOnlyLayer ? 'layer_cleared' : 'layer_removed');
-
-  return {
-    ...state,
-    datasourceStates: mapValues(state.datasourceStates, (datasourceState, datasourceId) => {
-      const datasource = datasourceMap[datasourceId!];
-      return {
-        ...datasourceState,
-        state: isOnlyLayer
-          ? datasource.clearLayer(datasourceState.state, layerId)
-          : datasource.removeLayer(datasourceState.state, layerId),
-      };
-    }),
-    visualization: {
-      ...state.visualization,
-      state:
-        isOnlyLayer || !activeVisualization.removeLayer
-          ? activeVisualization.clearLayer(state.visualization.state, layerId)
-          : activeVisualization.removeLayer(state.visualization.state, layerId),
-    },
-    stagedPreview: undefined,
-  };
-}
-
-export function appendLayer({
-  trackUiEvent,
-  activeVisualization,
-  state,
-  generateId,
-  activeDatasource,
-  layerType,
-}: AppendLayerOptions): LensAppState {
-  trackUiEvent('layer_added');
-
-  if (!activeVisualization.appendLayer) {
-    return state;
-  }
-
-  const layerId = generateId();
-
-  return {
-    ...state,
-    datasourceStates: {
-      ...state.datasourceStates,
-      [activeDatasource.id]: {
-        ...state.datasourceStates[activeDatasource.id],
-        state: activeDatasource.insertLayer(
-          state.datasourceStates[activeDatasource.id].state,
-          layerId
-        ),
-      },
-    },
-    visualization: {
-      ...state.visualization,
-      state: activeVisualization.appendLayer(state.visualization.state, layerId, layerType),
-    },
-    stagedPreview: undefined,
-  };
-}
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/editor_frame.test.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/editor_frame.test.tsx
index d289b69f4105e..37191ffa89fdc 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/editor_frame.test.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/editor_frame.test.tsx
@@ -38,6 +38,7 @@ import {
   createMockDatasource,
   DatasourceMock,
   createExpressionRendererMock,
+  mockStoreDeps,
 } from '../../mocks';
 import { inspectorPluginMock } from 'src/plugins/inspector/public/mocks';
 import { ReactExpressionRendererType } from 'src/plugins/expressions/public';
@@ -144,21 +145,19 @@ describe('editor_frame', () => {
 
         ExpressionRenderer: expressionRendererMock,
       };
-      const lensStore = (
-        await mountWithProvider(<EditorFrame {...props} />, {
-          preloadedState: {
-            activeDatasourceId: 'testDatasource',
-            datasourceStates: {
-              testDatasource: {
-                isLoading: true,
-                state: {
-                  internalState1: '',
-                },
+      const { lensStore } = await mountWithProvider(<EditorFrame {...props} />, {
+        preloadedState: {
+          activeDatasourceId: 'testDatasource',
+          datasourceStates: {
+            testDatasource: {
+              isLoading: true,
+              state: {
+                internalState1: '',
               },
             },
           },
-        })
-      ).lensStore;
+        },
+      });
       expect(mockDatasource.renderDataPanel).not.toHaveBeenCalled();
       lensStore.dispatch(
         setState({
@@ -553,6 +552,7 @@ describe('editor_frame', () => {
     }
 
     beforeEach(async () => {
+      mockVisualization2.initialize.mockReturnValue({ initial: true });
       mockDatasource.getLayers.mockReturnValue(['first', 'second']);
       mockDatasource.getDatasourceSuggestionsFromCurrentState.mockReturnValue([
         {
@@ -567,20 +567,27 @@ describe('editor_frame', () => {
         },
       ]);
 
+      const visualizationMap = {
+        testVis: mockVisualization,
+        testVis2: mockVisualization2,
+      };
+
+      const datasourceMap = {
+        testDatasource: mockDatasource,
+        testDatasource2: mockDatasource2,
+      };
+
       const props = {
         ...getDefaultProps(),
-        visualizationMap: {
-          testVis: mockVisualization,
-          testVis2: mockVisualization2,
-        },
-        datasourceMap: {
-          testDatasource: mockDatasource,
-          testDatasource2: mockDatasource2,
-        },
-
+        visualizationMap,
+        datasourceMap,
         ExpressionRenderer: expressionRendererMock,
       };
-      instance = (await mountWithProvider(<EditorFrame {...props} />)).instance;
+      instance = (
+        await mountWithProvider(<EditorFrame {...props} />, {
+          storeDeps: mockStoreDeps({ datasourceMap, visualizationMap }),
+        })
+      ).instance;
 
       // necessary to flush elements to dom synchronously
       instance.update();
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/chart_switch.test.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/chart_switch.test.tsx
index 7cb97882a5e03..c325e6d516c8b 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/chart_switch.test.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/workspace_panel/chart_switch.test.tsx
@@ -9,8 +9,9 @@ import React from 'react';
 import { ReactWrapper } from 'enzyme';
 import {
   createMockVisualization,
+  mockStoreDeps,
   createMockFramePublicAPI,
-  createMockDatasource,
+  mockDatasourceMap,
   mockDatasourceStates,
 } from '../../../mocks';
 import { mountWithProvider } from '../../../mocks';
@@ -71,7 +72,7 @@ describe('chart_switch', () => {
    *  - Allows a switch to subvisC3
    *  - Allows a switch to subvisC1
    */
-  function mockVisualizations() {
+  function mockVisualizationMap() {
     return {
       visA: generateVisualization('visA'),
       visB: generateVisualization('visB'),
@@ -143,27 +144,6 @@ describe('chart_switch', () => {
     } as FramePublicAPI;
   }
 
-  function mockDatasourceMap() {
-    const datasource = createMockDatasource('testDatasource');
-    datasource.getDatasourceSuggestionsFromCurrentState.mockReturnValue([
-      {
-        state: {},
-        table: {
-          columns: [],
-          isMultiRow: true,
-          layerId: 'a',
-          changeType: 'unchanged',
-        },
-        keptLayerIds: ['a'],
-      },
-    ]);
-
-    datasource.getLayers.mockReturnValue(['a']);
-    return {
-      testDatasource: datasource,
-    };
-  }
-
   function showFlyout(instance: ReactWrapper) {
     instance.find('[data-test-subj="lnsChartSwitchPopover"]').first().simulate('click');
   }
@@ -178,10 +158,10 @@ describe('chart_switch', () => {
     return instance.find(`[data-test-subj="lnsChartSwitchPopover_${subType}"]`).first();
   }
   it('should use suggested state if there is a suggestion from the target visualization', async () => {
-    const visualizations = mockVisualizations();
+    const visualizationMap = mockVisualizationMap();
     const { instance, lensStore } = await mountWithProvider(
       <ChartSwitch
-        visualizationMap={visualizations}
+        visualizationMap={visualizationMap}
         framePublicAPI={mockFrame(['a'])}
         datasourceMap={mockDatasourceMap()}
       />,
@@ -212,19 +192,20 @@ describe('chart_switch', () => {
   });
 
   it('should use initial state if there is no suggestion from the target visualization', async () => {
-    const visualizations = mockVisualizations();
-    visualizations.visB.getSuggestions.mockReturnValueOnce([]);
+    const visualizationMap = mockVisualizationMap();
+    visualizationMap.visB.getSuggestions.mockReturnValueOnce([]);
     const frame = mockFrame(['a']);
     (frame.datasourceLayers.a.getTableSpec as jest.Mock).mockReturnValue([]);
     const datasourceMap = mockDatasourceMap();
     const datasourceStates = mockDatasourceStates();
     const { instance, lensStore } = await mountWithProvider(
       <ChartSwitch
-        visualizationMap={visualizations}
+        visualizationMap={visualizationMap}
         framePublicAPI={frame}
         datasourceMap={datasourceMap}
       />,
       {
+        storeDeps: mockStoreDeps({ datasourceMap, visualizationMap }),
         preloadedState: {
           datasourceStates,
           activeDatasourceId: 'testDatasource',
@@ -249,18 +230,14 @@ describe('chart_switch', () => {
       },
     });
     expect(lensStore.dispatch).toHaveBeenCalledWith({
-      type: 'lens/updateLayer',
-      payload: expect.objectContaining({
-        datasourceId: 'testDatasource',
-        layerId: 'a',
-      }),
+      type: 'lens/removeLayers',
+      payload: { layerIds: ['a'], visualizationId: 'visA' },
     });
   });
 
   it('should indicate data loss if not all columns will be used', async () => {
-    const visualizations = mockVisualizations();
+    const visualizationMap = mockVisualizationMap();
     const frame = mockFrame(['a']);
-
     const datasourceMap = mockDatasourceMap();
     datasourceMap.testDatasource.getDatasourceSuggestionsFromCurrentState.mockReturnValue([
       {
@@ -299,9 +276,9 @@ describe('chart_switch', () => {
 
     const { instance } = await mountWithProvider(
       <ChartSwitch
-        visualizationMap={visualizations}
+        visualizationMap={visualizationMap}
         framePublicAPI={frame}
-        datasourceMap={mockDatasourceMap()}
+        datasourceMap={datasourceMap}
       />,
       {
         preloadedState: {
@@ -322,12 +299,11 @@ describe('chart_switch', () => {
   });
 
   it('should indicate data loss if not all layers will be used', async () => {
-    const visualizations = mockVisualizations();
+    const visualizationMap = mockVisualizationMap();
     const frame = mockFrame(['a', 'b']);
-
     const { instance } = await mountWithProvider(
       <ChartSwitch
-        visualizationMap={visualizations}
+        visualizationMap={visualizationMap}
         framePublicAPI={frame}
         datasourceMap={mockDatasourceMap()}
       />,
@@ -350,9 +326,8 @@ describe('chart_switch', () => {
   });
 
   it('should support multi-layer suggestions without data loss', async () => {
-    const visualizations = mockVisualizations();
+    const visualizationMap = mockVisualizationMap();
     const frame = mockFrame(['a', 'b']);
-
     const datasourceMap = mockDatasourceMap();
     datasourceMap.testDatasource.getDatasourceSuggestionsFromCurrentState.mockReturnValue([
       {
@@ -378,7 +353,7 @@ describe('chart_switch', () => {
 
     const { instance } = await mountWithProvider(
       <ChartSwitch
-        visualizationMap={visualizations}
+        visualizationMap={visualizationMap}
         framePublicAPI={frame}
         datasourceMap={datasourceMap}
       />,
@@ -398,13 +373,13 @@ describe('chart_switch', () => {
   });
 
   it('should indicate data loss if no data will be used', async () => {
-    const visualizations = mockVisualizations();
-    visualizations.visB.getSuggestions.mockReturnValueOnce([]);
+    const visualizationMap = mockVisualizationMap();
+    visualizationMap.visB.getSuggestions.mockReturnValueOnce([]);
     const frame = mockFrame(['a']);
 
     const { instance } = await mountWithProvider(
       <ChartSwitch
-        visualizationMap={visualizations}
+        visualizationMap={visualizationMap}
         framePublicAPI={frame}
         datasourceMap={mockDatasourceMap()}
       />,
@@ -427,14 +402,14 @@ describe('chart_switch', () => {
   });
 
   it('should not indicate data loss if there is no data', async () => {
-    const visualizations = mockVisualizations();
-    visualizations.visB.getSuggestions.mockReturnValueOnce([]);
+    const visualizationMap = mockVisualizationMap();
+    visualizationMap.visB.getSuggestions.mockReturnValueOnce([]);
     const frame = mockFrame(['a']);
     (frame.datasourceLayers.a.getTableSpec as jest.Mock).mockReturnValue([]);
 
     const { instance } = await mountWithProvider(
       <ChartSwitch
-        visualizationMap={visualizations}
+        visualizationMap={visualizationMap}
         framePublicAPI={frame}
         datasourceMap={mockDatasourceMap()}
       />,
@@ -456,20 +431,19 @@ describe('chart_switch', () => {
 
   it('should not show a warning when the subvisualization is the same', async () => {
     const frame = mockFrame(['a', 'b', 'c']);
-    const visualizations = mockVisualizations();
-    visualizations.visC.getVisualizationTypeId.mockReturnValue('subvisC2');
+    const visualizationMap = mockVisualizationMap();
+    visualizationMap.visC.getVisualizationTypeId.mockReturnValue('subvisC2');
     const switchVisualizationType = jest.fn(() => ({ type: 'subvisC1' }));
 
-    visualizations.visC.switchVisualizationType = switchVisualizationType;
+    visualizationMap.visC.switchVisualizationType = switchVisualizationType;
 
-    const datasourceMap = mockDatasourceMap();
     const datasourceStates = mockDatasourceStates();
 
     const { instance } = await mountWithProvider(
       <ChartSwitch
-        visualizationMap={visualizations}
+        visualizationMap={visualizationMap}
         framePublicAPI={frame}
-        datasourceMap={datasourceMap}
+        datasourceMap={mockDatasourceMap()}
       />,
       {
         preloadedState: {
@@ -491,8 +465,8 @@ describe('chart_switch', () => {
   });
 
   it('should get suggestions when switching subvisualization', async () => {
-    const visualizations = mockVisualizations();
-    visualizations.visB.getSuggestions.mockReturnValueOnce([]);
+    const visualizationMap = mockVisualizationMap();
+    visualizationMap.visB.getSuggestions.mockReturnValueOnce([]);
     const frame = mockFrame(['a', 'b', 'c']);
     const datasourceMap = mockDatasourceMap();
     datasourceMap.testDatasource.getLayers.mockReturnValue(['a', 'b', 'c']);
@@ -500,11 +474,12 @@ describe('chart_switch', () => {
 
     const { instance, lensStore } = await mountWithProvider(
       <ChartSwitch
-        visualizationMap={visualizations}
+        visualizationMap={visualizationMap}
         framePublicAPI={frame}
         datasourceMap={datasourceMap}
       />,
       {
+        storeDeps: mockStoreDeps({ datasourceMap, visualizationMap }),
         preloadedState: {
           datasourceStates,
           visualization: {
@@ -519,7 +494,7 @@ describe('chart_switch', () => {
     expect(datasourceMap.testDatasource.removeLayer).toHaveBeenCalledWith({}, 'a');
     expect(datasourceMap.testDatasource.removeLayer).toHaveBeenCalledWith(undefined, 'b');
     expect(datasourceMap.testDatasource.removeLayer).toHaveBeenCalledWith(undefined, 'c');
-    expect(visualizations.visB.getSuggestions).toHaveBeenCalledWith(
+    expect(visualizationMap.visB.getSuggestions).toHaveBeenCalledWith(
       expect.objectContaining({
         keptLayerIds: ['a'],
       })
@@ -540,19 +515,18 @@ describe('chart_switch', () => {
   });
 
   it('should query main palette from active chart and pass into suggestions', async () => {
-    const visualizations = mockVisualizations();
+    const visualizationMap = mockVisualizationMap();
     const mockPalette: PaletteOutput = { type: 'palette', name: 'mock' };
-    visualizations.visA.getMainPalette = jest.fn(() => mockPalette);
-    visualizations.visB.getSuggestions.mockReturnValueOnce([]);
+    visualizationMap.visA.getMainPalette = jest.fn(() => mockPalette);
+    visualizationMap.visB.getSuggestions.mockReturnValueOnce([]);
     const frame = mockFrame(['a', 'b', 'c']);
     const currentVisState = {};
-
     const datasourceMap = mockDatasourceMap();
     datasourceMap.testDatasource.getLayers.mockReturnValue(['a', 'b', 'c']);
 
     const { instance } = await mountWithProvider(
       <ChartSwitch
-        visualizationMap={visualizations}
+        visualizationMap={visualizationMap}
         framePublicAPI={frame}
         datasourceMap={datasourceMap}
       />,
@@ -563,14 +537,15 @@ describe('chart_switch', () => {
             state: currentVisState,
           },
         },
+        storeDeps: mockStoreDeps({ datasourceMap, visualizationMap }),
       }
     );
 
     switchTo('visB', instance);
 
-    expect(visualizations.visA.getMainPalette).toHaveBeenCalledWith(currentVisState);
+    expect(visualizationMap.visA.getMainPalette).toHaveBeenCalledWith(currentVisState);
 
-    expect(visualizations.visB.getSuggestions).toHaveBeenCalledWith(
+    expect(visualizationMap.visB.getSuggestions).toHaveBeenCalledWith(
       expect.objectContaining({
         keptLayerIds: ['a'],
         mainPalette: mockPalette,
@@ -580,14 +555,14 @@ describe('chart_switch', () => {
 
   it('should not remove layers when switching between subtypes', async () => {
     const frame = mockFrame(['a', 'b', 'c']);
-    const visualizations = mockVisualizations();
+    const visualizationMap = mockVisualizationMap();
     const switchVisualizationType = jest.fn(() => 'switched');
 
-    visualizations.visC.switchVisualizationType = switchVisualizationType;
+    visualizationMap.visC.switchVisualizationType = switchVisualizationType;
     const datasourceMap = mockDatasourceMap();
     const { instance, lensStore } = await mountWithProvider(
       <ChartSwitch
-        visualizationMap={visualizations}
+        visualizationMap={visualizationMap}
         framePublicAPI={frame}
         datasourceMap={datasourceMap}
       />,
@@ -598,6 +573,7 @@ describe('chart_switch', () => {
             state: { type: 'subvisC1' },
           },
         },
+        storeDeps: mockStoreDeps({ datasourceMap, visualizationMap }),
       }
     );
 
@@ -622,13 +598,13 @@ describe('chart_switch', () => {
   it('should not remove layers and initialize with existing state when switching between subtypes without data', async () => {
     const frame = mockFrame(['a']);
     frame.datasourceLayers.a.getTableSpec = jest.fn().mockReturnValue([]);
-    const visualizations = mockVisualizations();
-    visualizations.visC.getSuggestions = jest.fn().mockReturnValue([]);
-    visualizations.visC.switchVisualizationType = jest.fn(() => 'switched');
+    const visualizationMap = mockVisualizationMap();
+    visualizationMap.visC.getSuggestions = jest.fn().mockReturnValue([]);
+    visualizationMap.visC.switchVisualizationType = jest.fn(() => 'switched');
     const datasourceMap = mockDatasourceMap();
     const { instance } = await mountWithProvider(
       <ChartSwitch
-        visualizationMap={visualizations}
+        visualizationMap={visualizationMap}
         framePublicAPI={frame}
         datasourceMap={datasourceMap}
       />,
@@ -639,21 +615,21 @@ describe('chart_switch', () => {
             state: { type: 'subvisC1' },
           },
         },
+        storeDeps: mockStoreDeps({ datasourceMap, visualizationMap }),
       }
     );
 
     switchTo('subvisC3', instance);
 
-    expect(visualizations.visC.switchVisualizationType).toHaveBeenCalledWith('subvisC3', {
+    expect(visualizationMap.visC.switchVisualizationType).toHaveBeenCalledWith('subvisC3', {
       type: 'subvisC1',
     });
     expect(datasourceMap.testDatasource.removeLayer).not.toHaveBeenCalled();
   });
 
   it('should switch to the updated datasource state', async () => {
-    const visualizations = mockVisualizations();
+    const visualizationMap = mockVisualizationMap();
     const frame = mockFrame(['a', 'b']);
-
     const datasourceMap = mockDatasourceMap();
     datasourceMap.testDatasource.getDatasourceSuggestionsFromCurrentState.mockReturnValue([
       {
@@ -684,14 +660,14 @@ describe('chart_switch', () => {
         keptLayerIds: [],
       },
     ]);
-
     const { instance, lensStore } = await mountWithProvider(
       <ChartSwitch
-        visualizationMap={visualizations}
+        visualizationMap={visualizationMap}
         framePublicAPI={frame}
         datasourceMap={datasourceMap}
       />,
       {
+        storeDeps: mockStoreDeps({ datasourceMap, visualizationMap }),
         preloadedState: {
           visualization: {
             activeId: 'visA',
@@ -718,20 +694,21 @@ describe('chart_switch', () => {
   });
 
   it('should ensure the new visualization has the proper subtype', async () => {
-    const visualizations = mockVisualizations();
+    const visualizationMap = mockVisualizationMap();
     const switchVisualizationType = jest.fn(
       (visualizationType, state) => `${state} ${visualizationType}`
     );
 
-    visualizations.visB.switchVisualizationType = switchVisualizationType;
-
+    visualizationMap.visB.switchVisualizationType = switchVisualizationType;
+    const datasourceMap = mockDatasourceMap();
     const { instance, lensStore } = await mountWithProvider(
       <ChartSwitch
-        visualizationMap={visualizations}
         framePublicAPI={mockFrame(['a'])}
-        datasourceMap={mockDatasourceMap()}
+        visualizationMap={visualizationMap}
+        datasourceMap={datasourceMap}
       />,
       {
+        storeDeps: mockStoreDeps({ datasourceMap, visualizationMap }),
         preloadedState: {
           visualization: {
             activeId: 'visA',
@@ -758,16 +735,16 @@ describe('chart_switch', () => {
   });
 
   it('should use the suggestion that matches the subtype', async () => {
-    const visualizations = mockVisualizations();
+    const visualizationMap = mockVisualizationMap();
     const switchVisualizationType = jest.fn();
 
-    visualizations.visC.switchVisualizationType = switchVisualizationType;
-
+    visualizationMap.visC.switchVisualizationType = switchVisualizationType;
+    const datasourceMap = mockDatasourceMap();
     const { instance } = await mountWithProvider(
       <ChartSwitch
-        visualizationMap={visualizations}
+        visualizationMap={visualizationMap}
         framePublicAPI={mockFrame(['a'])}
-        datasourceMap={mockDatasourceMap()}
+        datasourceMap={datasourceMap}
       />,
       {
         preloadedState: {
@@ -787,11 +764,12 @@ describe('chart_switch', () => {
   });
 
   it('should show all visualization types', async () => {
+    const datasourceMap = mockDatasourceMap();
     const { instance } = await mountWithProvider(
       <ChartSwitch
-        visualizationMap={mockVisualizations()}
+        visualizationMap={mockVisualizationMap()}
         framePublicAPI={mockFrame(['a', 'b'])}
-        datasourceMap={mockDatasourceMap()}
+        datasourceMap={datasourceMap}
       />,
       {
         preloadedState: {
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 a5ba12941cf7f..427306cb54fb9 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
@@ -31,8 +31,8 @@ import { getSuggestions, switchToSuggestion, Suggestion } from '../suggestion_he
 import { trackUiEvent } from '../../../lens_ui_telemetry';
 import { ToolbarButton } from '../../../../../../../src/plugins/kibana_react/public';
 import {
-  updateLayer,
-  updateVisualizationState,
+  insertLayer,
+  removeLayers,
   useLensDispatch,
   useLensSelector,
   VisualizationState,
@@ -120,41 +120,6 @@ export const ChartSwitch = memo(function ChartSwitch(props: Props) {
   const visualization = useLensSelector(selectVisualization);
   const datasourceStates = useLensSelector(selectDatasourceStates);
 
-  function removeLayers(layerIds: string[]) {
-    const activeVisualization =
-      visualization.activeId && props.visualizationMap[visualization.activeId];
-    if (activeVisualization && activeVisualization.removeLayer && visualization.state) {
-      dispatchLens(
-        updateVisualizationState({
-          visualizationId: activeVisualization.id,
-          updater: layerIds.reduce(
-            (acc, layerId) =>
-              activeVisualization.removeLayer ? activeVisualization.removeLayer(acc, layerId) : acc,
-            visualization.state
-          ),
-        })
-      );
-    }
-    layerIds.forEach((layerId) => {
-      const [layerDatasourceId] =
-        Object.entries(props.datasourceMap).find(([datasourceId, datasource]) => {
-          return (
-            datasourceStates[datasourceId] &&
-            datasource.getLayers(datasourceStates[datasourceId].state).includes(layerId)
-          );
-        }) ?? [];
-      if (layerDatasourceId) {
-        dispatchLens(
-          updateLayer({
-            layerId,
-            datasourceId: layerDatasourceId,
-            updater: props.datasourceMap[layerDatasourceId].removeLayer,
-          })
-        );
-      }
-    });
-  }
-
   const commitSelection = (selection: VisualizationSelection) => {
     setFlyoutOpen(false);
 
@@ -173,7 +138,12 @@ export const ChartSwitch = memo(function ChartSwitch(props: Props) {
       (!selection.datasourceId && !selection.sameDatasources) ||
       selection.dataLoss === 'everything'
     ) {
-      removeLayers(Object.keys(props.framePublicAPI.datasourceLayers));
+      dispatchLens(
+        removeLayers({
+          visualizationId: visualization.activeId,
+          layerIds: Object.keys(props.framePublicAPI.datasourceLayers),
+        })
+      );
     }
   };
 
@@ -231,13 +201,11 @@ export const ChartSwitch = memo(function ChartSwitch(props: Props) {
     function addNewLayer() {
       const newLayerId = generateId();
       dispatchLens(
-        updateLayer({
+        insertLayer({
           datasourceId: activeDatasourceId!,
           layerId: newLayerId,
-          updater: props.datasourceMap[activeDatasourceId!].insertLayer,
         })
       );
-
       return newLayerId;
     }
 
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 a03c9292d2da8..4b98b2842a01b 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
@@ -52,7 +52,7 @@ import { DefaultInspectorAdapters } from '../../../../../../../src/plugins/expre
 import {
   onActiveDataChange,
   useLensDispatch,
-  updateVisualizationState,
+  editVisualizationAction,
   updateDatasourceState,
   setSaveable,
   useLensSelector,
@@ -246,9 +246,9 @@ export const InnerWorkspacePanel = React.memo(function InnerWorkspacePanel({
       }
       if (isLensEditEvent(event) && activeVisualization?.onEditAction) {
         dispatchLens(
-          updateVisualizationState({
+          editVisualizationAction({
             visualizationId: activeVisualization.id,
-            updater: (oldState: unknown) => activeVisualization.onEditAction!(oldState, event),
+            event,
           })
         );
       }
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 d8959e714d16e..f13ecb78593d9 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
@@ -54,8 +54,7 @@ export function WorkspacePanelWrapper({
       dispatchLens(
         updateVisualizationState({
           visualizationId: activeVisualization.id,
-          updater: newState,
-          clearStagedPreview: false,
+          newState,
         })
       );
     },
diff --git a/x-pack/plugins/lens/public/state_management/index.ts b/x-pack/plugins/lens/public/state_management/index.ts
index 0aa7185931c5a..5f3b60d95d77d 100644
--- a/x-pack/plugins/lens/public/state_management/index.ts
+++ b/x-pack/plugins/lens/public/state_management/index.ts
@@ -25,13 +25,18 @@ export const {
   updateState,
   updateDatasourceState,
   updateVisualizationState,
-  updateLayer,
+  insertLayer,
   switchVisualization,
   rollbackSuggestion,
   submitSuggestion,
   switchDatasource,
   setToggleFullscreen,
   initEmpty,
+  editVisualizationAction,
+  removeLayers,
+  removeOrClearLayer,
+  addLayer,
+  setLayerDefaultDimension,
 } = lensActions;
 
 export const makeConfigureStore = (
diff --git a/x-pack/plugins/lens/public/state_management/lens_slice.test.ts b/x-pack/plugins/lens/public/state_management/lens_slice.test.ts
index 7d88e6ceb616c..85061f36ce35e 100644
--- a/x-pack/plugins/lens/public/state_management/lens_slice.test.ts
+++ b/x-pack/plugins/lens/public/state_management/lens_slice.test.ts
@@ -13,8 +13,13 @@ import {
   updateState,
   updateDatasourceState,
   updateVisualizationState,
+  removeOrClearLayer,
+  addLayer,
+  LensRootStore,
 } from '.';
-import { makeLensStore, defaultState } from '../mocks';
+import { layerTypes } from '../../common';
+import { makeLensStore, defaultState, mockStoreDeps } from '../mocks';
+import { DatasourceMap, VisualizationMap } from '../types';
 
 describe('lensSlice', () => {
   const { store } = makeLensStore({});
@@ -31,7 +36,7 @@ describe('lensSlice', () => {
 
     it('updateState: updates state with updater', () => {
       const customUpdater = jest.fn((state) => ({ ...state, query: customQuery }));
-      store.dispatch(updateState({ subType: 'UPDATE', updater: customUpdater }));
+      store.dispatch(updateState({ updater: customUpdater }));
       const changedState = store.getState().lens;
       expect(changedState).toEqual({ ...defaultState, query: customQuery });
     });
@@ -40,7 +45,7 @@ describe('lensSlice', () => {
       store.dispatch(
         updateVisualizationState({
           visualizationId: 'testVis',
-          updater: newVisState,
+          newState: newVisState,
         })
       );
 
@@ -117,7 +122,7 @@ describe('lensSlice', () => {
       expect(store.getState().lens.datasourceStates.testDatasource2.isLoading).toEqual(true);
     });
 
-    it('not initialize already initialized datasource on switch', () => {
+    it('should not initialize already initialized datasource on switch', () => {
       const datasource2State = {};
       const { store: customStore } = makeLensStore({
         preloadedState: {
@@ -146,5 +151,109 @@ describe('lensSlice', () => {
         datasource2State
       );
     });
+
+    describe('adding or removing layer', () => {
+      const testDatasource = (datasourceId: string) => {
+        return {
+          id: datasourceId,
+          getPublicAPI: () => ({
+            datasourceId: 'testDatasource',
+            getOperationForColumnId: jest.fn(),
+            getTableSpec: jest.fn(),
+          }),
+          getLayers: () => ['layer1'],
+          clearLayer: (layerIds: unknown, layerId: string) =>
+            (layerIds as string[]).map((id: string) =>
+              id === layerId ? `${datasourceId}_clear_${layerId}` : id
+            ),
+          removeLayer: (layerIds: unknown, layerId: string) =>
+            (layerIds as string[]).filter((id: string) => id !== layerId),
+          insertLayer: (layerIds: unknown, layerId: string) => [...(layerIds as string[]), layerId],
+        };
+      };
+      const datasourceStates = {
+        testDatasource: {
+          isLoading: false,
+          state: ['layer1'],
+        },
+        testDatasource2: {
+          isLoading: false,
+          state: ['layer2'],
+        },
+      };
+      const datasourceMap = {
+        testDatasource: testDatasource('testDatasource'),
+        testDatasource2: testDatasource('testDatasource2'),
+      };
+      const visualizationMap = {
+        testVis: {
+          clearLayer: (layerIds: unknown, layerId: string) =>
+            (layerIds as string[]).map((id: string) =>
+              id === layerId ? `vis_clear_${layerId}` : id
+            ),
+          removeLayer: (layerIds: unknown, layerId: string) =>
+            (layerIds as string[]).filter((id: string) => id !== layerId),
+          getLayerIds: (layerIds: unknown) => layerIds as string[],
+          appendLayer: (layerIds: unknown, layerId: string) => [...(layerIds as string[]), layerId],
+          getSupportedLayers: jest.fn(() => [{ type: layerTypes.DATA, label: 'Data Layer' }]),
+        },
+      };
+
+      let customStore: LensRootStore;
+      beforeEach(() => {
+        customStore = makeLensStore({
+          preloadedState: {
+            activeDatasourceId: 'testDatasource',
+            datasourceStates,
+            visualization: {
+              activeId: 'testVis',
+              state: ['layer1', 'layer2'],
+            },
+            stagedPreview: {
+              visualization: {
+                activeId: 'testVis',
+                state: ['layer1', 'layer2'],
+              },
+              datasourceStates,
+            },
+          },
+          storeDeps: mockStoreDeps({
+            visualizationMap: visualizationMap as unknown as VisualizationMap,
+            datasourceMap: datasourceMap as unknown as DatasourceMap,
+          }),
+        }).store;
+      });
+
+      it('addLayer: should add the layer to the datasource and visualization', () => {
+        customStore.dispatch(
+          addLayer({
+            layerId: 'foo',
+            layerType: layerTypes.DATA,
+          })
+        );
+        const state = customStore.getState().lens;
+
+        expect(state.visualization.state).toEqual(['layer1', 'layer2', 'foo']);
+        expect(state.datasourceStates.testDatasource.state).toEqual(['layer1', 'foo']);
+        expect(state.datasourceStates.testDatasource2.state).toEqual(['layer2']);
+        expect(state.stagedPreview).not.toBeDefined();
+      });
+
+      it('removeLayer: should remove the layer if it is not the only layer', () => {
+        customStore.dispatch(
+          removeOrClearLayer({
+            visualizationId: 'testVis',
+            layerId: 'layer1',
+            layerIds: ['layer1', 'layer2'],
+          })
+        );
+        const state = customStore.getState().lens;
+
+        expect(state.visualization.state).toEqual(['layer2']);
+        expect(state.datasourceStates.testDatasource.state).toEqual([]);
+        expect(state.datasourceStates.testDatasource2.state).toEqual(['layer2']);
+        expect(state.stagedPreview).not.toBeDefined();
+      });
+    });
   });
 });
diff --git a/x-pack/plugins/lens/public/state_management/lens_slice.ts b/x-pack/plugins/lens/public/state_management/lens_slice.ts
index df178cadf6c30..af9897581fcf4 100644
--- a/x-pack/plugins/lens/public/state_management/lens_slice.ts
+++ b/x-pack/plugins/lens/public/state_management/lens_slice.ts
@@ -7,16 +7,22 @@
 
 import { createAction, createReducer, current, PayloadAction } from '@reduxjs/toolkit';
 import { VisualizeFieldContext } from 'src/plugins/ui_actions/public';
+import { mapValues } from 'lodash';
 import { History } from 'history';
 import { LensEmbeddableInput } from '..';
+import { getDatasourceLayers } from '../editor_frame_service/editor_frame';
 import { TableInspectorAdapter } from '../editor_frame_service/types';
-import { getInitialDatasourceId, getResolvedDateRange } from '../utils';
-import { LensAppState, LensStoreDeps } from './types';
+import { getInitialDatasourceId, getResolvedDateRange, getRemoveOperation } from '../utils';
+import { LensAppState, LensStoreDeps, VisualizationState } from './types';
+import { Datasource, Visualization } from '../types';
 import { generateId } from '../id_generator';
+import type { LayerType } from '../../common/types';
+import { getLayerType } from '../editor_frame_service/editor_frame/config_panel/add_layer';
 import {
   getVisualizeFieldSuggestions,
   Suggestion,
 } from '../editor_frame_service/editor_frame/suggestion_helpers';
+import { FramePublicAPI, LensEditContextMapping, LensEditEvent } from '../types';
 
 export const initialState: LensAppState = {
   persistedDoc: undefined,
@@ -80,7 +86,6 @@ export const setState = createAction<Partial<LensAppState>>('lens/setState');
 export const onActiveDataChange = createAction<TableInspectorAdapter>('lens/onActiveDataChange');
 export const setSaveable = createAction<boolean>('lens/setSaveable');
 export const updateState = createAction<{
-  subType: string;
   updater: (prevState: LensAppState) => LensAppState;
 }>('lens/updateState');
 export const updateDatasourceState = createAction<{
@@ -90,15 +95,13 @@ export const updateDatasourceState = createAction<{
 }>('lens/updateDatasourceState');
 export const updateVisualizationState = createAction<{
   visualizationId: string;
-  updater: unknown;
-  clearStagedPreview?: boolean;
+  newState: unknown;
 }>('lens/updateVisualizationState');
 
-export const updateLayer = createAction<{
+export const insertLayer = createAction<{
   layerId: string;
   datasourceId: string;
-  updater: (state: unknown, layerId: string) => unknown;
-}>('lens/updateLayer');
+}>('lens/insertLayer');
 
 export const switchVisualization = createAction<{
   suggestion: {
@@ -133,6 +136,29 @@ export const initEmpty = createAction(
     return { payload: { layerId: generateId(), newState, initialContext } };
   }
 );
+export const editVisualizationAction = createAction<{
+  visualizationId: string;
+  event: LensEditEvent<keyof LensEditContextMapping>;
+}>('lens/editVisualizationAction');
+export const removeLayers = createAction<{
+  visualizationId: VisualizationState['activeId'];
+  layerIds: string[];
+}>('lens/removeLayers');
+export const removeOrClearLayer = createAction<{
+  visualizationId: string;
+  layerId: string;
+  layerIds: string[];
+}>('lens/removeOrClearLayer');
+export const addLayer = createAction<{
+  layerId: string;
+  layerType: LayerType;
+}>('lens/addLayer');
+
+export const setLayerDefaultDimension = createAction<{
+  layerId: string;
+  columnId: string;
+  groupId: string;
+}>('lens/setLayerDefaultDimension');
 
 export const lensActions = {
   setState,
@@ -141,7 +167,7 @@ export const lensActions = {
   updateState,
   updateDatasourceState,
   updateVisualizationState,
-  updateLayer,
+  insertLayer,
   switchVisualization,
   rollbackSuggestion,
   setToggleFullscreen,
@@ -150,6 +176,11 @@ export const lensActions = {
   navigateAway,
   loadInitial,
   initEmpty,
+  editVisualizationAction,
+  removeLayers,
+  removeOrClearLayer,
+  addLayer,
+  setLayerDefaultDimension,
 };
 
 export const makeLensReducer = (storeDeps: LensStoreDeps) => {
@@ -175,14 +206,58 @@ export const makeLensReducer = (storeDeps: LensStoreDeps) => {
     },
     [updateState.type]: (
       state,
-      action: {
+      {
+        payload: { updater },
+      }: {
         payload: {
-          subType: string;
           updater: (prevState: LensAppState) => LensAppState;
         };
       }
     ) => {
-      return action.payload.updater(current(state) as LensAppState);
+      const newState = updater(current(state) as LensAppState);
+      return {
+        ...newState,
+        stagedPreview: undefined,
+      };
+    },
+    [removeOrClearLayer.type]: (
+      state,
+      {
+        payload: { visualizationId, layerId, layerIds },
+      }: {
+        payload: {
+          visualizationId: string;
+          layerId: string;
+          layerIds: string[];
+        };
+      }
+    ) => {
+      const activeVisualization = visualizationMap[visualizationId];
+      const isOnlyLayer =
+        getRemoveOperation(
+          activeVisualization,
+          state.visualization.state,
+          layerId,
+          layerIds.length
+        ) === 'clear';
+
+      state.datasourceStates = mapValues(
+        state.datasourceStates,
+        (datasourceState, datasourceId) => {
+          const datasource = datasourceMap[datasourceId!];
+          return {
+            ...datasourceState,
+            state: isOnlyLayer
+              ? datasource.clearLayer(datasourceState.state, layerId)
+              : datasource.removeLayer(datasourceState.state, layerId),
+          };
+        }
+      );
+      state.stagedPreview = undefined;
+      state.visualization.state =
+        isOnlyLayer || !activeVisualization.removeLayer
+          ? activeVisualization.clearLayer(state.visualization.state, layerId)
+          : activeVisualization.removeLayer(state.visualization.state, layerId);
     },
     [updateDatasourceState.type]: (
       state,
@@ -218,8 +293,7 @@ export const makeLensReducer = (storeDeps: LensStoreDeps) => {
       }: {
         payload: {
           visualizationId: string;
-          updater: unknown | ((state: unknown) => unknown);
-          clearStagedPreview?: boolean;
+          newState: unknown;
         };
       }
     ) => {
@@ -236,37 +310,7 @@ export const makeLensReducer = (storeDeps: LensStoreDeps) => {
         ...state,
         visualization: {
           ...state.visualization,
-          state:
-            typeof payload.updater === 'function'
-              ? payload.updater(current(state.visualization.state))
-              : payload.updater,
-        },
-        stagedPreview: payload.clearStagedPreview ? undefined : state.stagedPreview,
-      };
-    },
-    [updateLayer.type]: (
-      state,
-      {
-        payload,
-      }: {
-        payload: {
-          layerId: string;
-          datasourceId: string;
-          updater: (state: unknown, layerId: string) => unknown;
-        };
-      }
-    ) => {
-      return {
-        ...state,
-        datasourceStates: {
-          ...state.datasourceStates,
-          [payload.datasourceId]: {
-            ...state.datasourceStates[payload.datasourceId],
-            state: payload.updater(
-              current(state).datasourceStates[payload.datasourceId].state,
-              payload.layerId
-            ),
-          },
+          state: payload.newState,
         },
       };
     },
@@ -433,5 +477,248 @@ export const makeLensReducer = (storeDeps: LensStoreDeps) => {
       }
       return newState;
     },
+    [editVisualizationAction.type]: (
+      state,
+      {
+        payload,
+      }: {
+        payload: {
+          visualizationId: string;
+          event: LensEditEvent<keyof LensEditContextMapping>;
+        };
+      }
+    ) => {
+      if (!state.visualization.activeId) {
+        throw new Error('Invariant: visualization state got updated without active visualization');
+      }
+      // This is a safeguard that prevents us from accidentally updating the
+      // wrong visualization. This occurs in some cases due to the uncoordinated
+      // way we manage state across plugins.
+      if (state.visualization.activeId !== payload.visualizationId) {
+        return state;
+      }
+      const activeVisualization = visualizationMap[payload.visualizationId];
+      if (activeVisualization?.onEditAction) {
+        state.visualization.state = activeVisualization.onEditAction(
+          state.visualization.state,
+          payload.event
+        );
+      }
+    },
+    [insertLayer.type]: (
+      state,
+      {
+        payload,
+      }: {
+        payload: {
+          layerId: string;
+          datasourceId: string;
+        };
+      }
+    ) => {
+      const updater = datasourceMap[payload.datasourceId].insertLayer;
+      return {
+        ...state,
+        datasourceStates: {
+          ...state.datasourceStates,
+          [payload.datasourceId]: {
+            ...state.datasourceStates[payload.datasourceId],
+            state: updater(
+              current(state).datasourceStates[payload.datasourceId].state,
+              payload.layerId
+            ),
+          },
+        },
+      };
+    },
+    [removeLayers.type]: (
+      state,
+      {
+        payload: { visualizationId, layerIds },
+      }: {
+        payload: {
+          visualizationId: VisualizationState['activeId'];
+          layerIds: string[];
+        };
+      }
+    ) => {
+      if (!state.visualization.activeId) {
+        throw new Error('Invariant: visualization state got updated without active visualization');
+      }
+
+      const activeVisualization = visualizationId && visualizationMap[visualizationId];
+
+      // This is a safeguard that prevents us from accidentally updating the
+      // wrong visualization. This occurs in some cases due to the uncoordinated
+      // way we manage state across plugins.
+      if (
+        state.visualization.activeId === visualizationId &&
+        activeVisualization &&
+        activeVisualization.removeLayer &&
+        state.visualization.state
+      ) {
+        const updater = layerIds.reduce(
+          (acc, layerId) =>
+            activeVisualization.removeLayer ? activeVisualization.removeLayer(acc, layerId) : acc,
+          state.visualization.state
+        );
+
+        state.visualization.state =
+          typeof updater === 'function' ? updater(current(state.visualization.state)) : updater;
+      }
+      layerIds.forEach((layerId) => {
+        const [layerDatasourceId] =
+          Object.entries(datasourceMap).find(([datasourceId, datasource]) => {
+            return (
+              state.datasourceStates[datasourceId] &&
+              datasource.getLayers(state.datasourceStates[datasourceId].state).includes(layerId)
+            );
+          }) ?? [];
+        if (layerDatasourceId) {
+          state.datasourceStates[layerDatasourceId].state = datasourceMap[
+            layerDatasourceId
+          ].removeLayer(current(state).datasourceStates[layerDatasourceId].state, layerId);
+        }
+      });
+    },
+
+    [addLayer.type]: (
+      state,
+      {
+        payload: { layerId, layerType },
+      }: {
+        payload: {
+          layerId: string;
+          layerType: LayerType;
+        };
+      }
+    ) => {
+      if (!state.activeDatasourceId || !state.visualization.activeId) {
+        return state;
+      }
+
+      const activeDatasource = datasourceMap[state.activeDatasourceId];
+      const activeVisualization = visualizationMap[state.visualization.activeId];
+
+      const datasourceState = activeDatasource.insertLayer(
+        state.datasourceStates[state.activeDatasourceId].state,
+        layerId
+      );
+
+      const visualizationState = activeVisualization.appendLayer!(
+        state.visualization.state,
+        layerId,
+        layerType
+      );
+
+      const { activeDatasourceState, activeVisualizationState } = addInitialValueIfAvailable({
+        datasourceState,
+        visualizationState,
+        framePublicAPI: {
+          // any better idea to avoid `as`?
+          activeData: state.activeData as TableInspectorAdapter,
+          datasourceLayers: getDatasourceLayers(state.datasourceStates, datasourceMap),
+        },
+        activeVisualization,
+        activeDatasource,
+        layerId,
+        layerType,
+      });
+
+      state.visualization.state = activeVisualizationState;
+      state.datasourceStates[state.activeDatasourceId].state = activeDatasourceState;
+      state.stagedPreview = undefined;
+    },
+    [setLayerDefaultDimension.type]: (
+      state,
+      {
+        payload: { layerId, columnId, groupId },
+      }: {
+        payload: {
+          layerId: string;
+          columnId: string;
+          groupId: string;
+        };
+      }
+    ) => {
+      if (!state.activeDatasourceId || !state.visualization.activeId) {
+        return state;
+      }
+
+      const activeDatasource = datasourceMap[state.activeDatasourceId];
+      const activeVisualization = visualizationMap[state.visualization.activeId];
+      const layerType = getLayerType(activeVisualization, state.visualization.state, layerId);
+      const { activeDatasourceState, activeVisualizationState } = addInitialValueIfAvailable({
+        datasourceState: state.datasourceStates[state.activeDatasourceId].state,
+        visualizationState: state.visualization.state,
+        framePublicAPI: {
+          // any better idea to avoid `as`?
+          activeData: state.activeData as TableInspectorAdapter,
+          datasourceLayers: getDatasourceLayers(state.datasourceStates, datasourceMap),
+        },
+        activeVisualization,
+        activeDatasource,
+        layerId,
+        layerType,
+        columnId,
+        groupId,
+      });
+
+      state.visualization.state = activeVisualizationState;
+      state.datasourceStates[state.activeDatasourceId].state = activeDatasourceState;
+    },
   });
 };
+
+function addInitialValueIfAvailable({
+  visualizationState,
+  datasourceState,
+  activeVisualization,
+  activeDatasource,
+  framePublicAPI,
+  layerType,
+  layerId,
+  columnId,
+  groupId,
+}: {
+  framePublicAPI: FramePublicAPI;
+  visualizationState: unknown;
+  datasourceState: unknown;
+  activeDatasource: Datasource;
+  activeVisualization: Visualization;
+  layerId: string;
+  layerType: string;
+  columnId?: string;
+  groupId?: string;
+}) {
+  const layerInfo = activeVisualization
+    .getSupportedLayers(visualizationState, framePublicAPI)
+    .find(({ type }) => type === layerType);
+
+  if (layerInfo?.initialDimensions && activeDatasource?.initializeDimension) {
+    const info = groupId
+      ? layerInfo.initialDimensions.find(({ groupId: id }) => id === groupId)
+      : // pick the first available one if not passed
+        layerInfo.initialDimensions[0];
+
+    if (info) {
+      return {
+        activeDatasourceState: activeDatasource.initializeDimension(datasourceState, layerId, {
+          ...info,
+          columnId: columnId || info.columnId,
+        }),
+        activeVisualizationState: activeVisualization.setDimension({
+          groupId: info.groupId,
+          layerId,
+          columnId: columnId || info.columnId,
+          prevState: visualizationState,
+          frame: framePublicAPI,
+        }),
+      };
+    }
+  }
+  return {
+    activeDatasourceState: datasourceState,
+    activeVisualizationState: visualizationState,
+  };
+}
diff --git a/x-pack/plugins/lens/public/types.ts b/x-pack/plugins/lens/public/types.ts
index e207f2938dd3c..975e44f703959 100644
--- a/x-pack/plugins/lens/public/types.ts
+++ b/x-pack/plugins/lens/public/types.ts
@@ -776,7 +776,7 @@ export interface LensBrushEvent {
 }
 
 // Use same technique as TriggerContext
-interface LensEditContextMapping {
+export interface LensEditContextMapping {
   [LENS_EDIT_SORT_ACTION]: LensSortActionData;
   [LENS_EDIT_RESIZE_ACTION]: LensResizeActionData;
   [LENS_TOGGLE_ACTION]: LensToggleActionData;
diff --git a/x-pack/plugins/lens/public/utils.ts b/x-pack/plugins/lens/public/utils.ts
index 993be9a06a2d9..921cc8fb364a2 100644
--- a/x-pack/plugins/lens/public/utils.ts
+++ b/x-pack/plugins/lens/public/utils.ts
@@ -16,8 +16,8 @@ import type {
 import type { IUiSettingsClient } from 'kibana/public';
 import type { SavedObjectReference } from 'kibana/public';
 import type { Document } from './persistence/saved_object_store';
-import type { Datasource, DatasourceMap } from './types';
-import type { DatasourceStates } from './state_management';
+import type { Datasource, DatasourceMap, Visualization } from './types';
+import type { DatasourceStates, VisualizationState } from './state_management';
 
 export function getVisualizeGeoFieldMessage(fieldType: string) {
   return i18n.translate('xpack.lens.visualizeGeoFieldMessage', {
@@ -94,3 +94,16 @@ export async function getIndexPatternsObjects(
   // return also the rejected ids in case we want to show something later on
   return { indexPatterns: fullfilled.map((response) => response.value), rejectedIds };
 }
+
+export function getRemoveOperation(
+  activeVisualization: Visualization,
+  visualizationState: VisualizationState['state'],
+  layerId: string,
+  layerCount: number
+) {
+  if (activeVisualization.getRemoveOperation) {
+    return activeVisualization.getRemoveOperation(visualizationState, layerId);
+  }
+  // fallback to generic count check
+  return layerCount === 1 ? 'clear' : 'remove';
+}
diff --git a/x-pack/plugins/lens/public/xy_visualization/__snapshots__/expression.test.tsx.snap b/x-pack/plugins/lens/public/xy_visualization/__snapshots__/expression.test.tsx.snap
index 6601167e1f83a..e2566aa22ce9e 100644
--- a/x-pack/plugins/lens/public/xy_visualization/__snapshots__/expression.test.tsx.snap
+++ b/x-pack/plugins/lens/public/xy_visualization/__snapshots__/expression.test.tsx.snap
@@ -46,7 +46,7 @@ exports[`xy_expression XYChart component it renders area 1`] = `
   <Connect(SpecInstance)
     gridLine={
       Object {
-        "strokeWidth": 2,
+        "strokeWidth": 1,
         "visible": true,
       }
     }
@@ -101,6 +101,7 @@ exports[`xy_expression XYChart component it renders area 1`] = `
       }
     }
     tickFormat={[Function]}
+    ticks={5}
     title="a"
   />
   <XyEndzones
@@ -276,7 +277,7 @@ exports[`xy_expression XYChart component it renders bar 1`] = `
   <Connect(SpecInstance)
     gridLine={
       Object {
-        "strokeWidth": 2,
+        "strokeWidth": 1,
         "visible": true,
       }
     }
@@ -331,6 +332,7 @@ exports[`xy_expression XYChart component it renders bar 1`] = `
       }
     }
     tickFormat={[Function]}
+    ticks={5}
     title="a"
   />
   <XyEndzones
@@ -520,7 +522,7 @@ exports[`xy_expression XYChart component it renders horizontal bar 1`] = `
   <Connect(SpecInstance)
     gridLine={
       Object {
-        "strokeWidth": 2,
+        "strokeWidth": 1,
         "visible": true,
       }
     }
@@ -575,6 +577,7 @@ exports[`xy_expression XYChart component it renders horizontal bar 1`] = `
       }
     }
     tickFormat={[Function]}
+    ticks={5}
     title="a"
   />
   <XyEndzones
@@ -764,7 +767,7 @@ exports[`xy_expression XYChart component it renders line 1`] = `
   <Connect(SpecInstance)
     gridLine={
       Object {
-        "strokeWidth": 2,
+        "strokeWidth": 1,
         "visible": true,
       }
     }
@@ -819,6 +822,7 @@ exports[`xy_expression XYChart component it renders line 1`] = `
       }
     }
     tickFormat={[Function]}
+    ticks={5}
     title="a"
   />
   <XyEndzones
@@ -994,7 +998,7 @@ exports[`xy_expression XYChart component it renders stacked area 1`] = `
   <Connect(SpecInstance)
     gridLine={
       Object {
-        "strokeWidth": 2,
+        "strokeWidth": 1,
         "visible": true,
       }
     }
@@ -1049,6 +1053,7 @@ exports[`xy_expression XYChart component it renders stacked area 1`] = `
       }
     }
     tickFormat={[Function]}
+    ticks={5}
     title="a"
   />
   <XyEndzones
@@ -1232,7 +1237,7 @@ exports[`xy_expression XYChart component it renders stacked bar 1`] = `
   <Connect(SpecInstance)
     gridLine={
       Object {
-        "strokeWidth": 2,
+        "strokeWidth": 1,
         "visible": true,
       }
     }
@@ -1287,6 +1292,7 @@ exports[`xy_expression XYChart component it renders stacked bar 1`] = `
       }
     }
     tickFormat={[Function]}
+    ticks={5}
     title="a"
   />
   <XyEndzones
@@ -1484,7 +1490,7 @@ exports[`xy_expression XYChart component it renders stacked horizontal bar 1`] =
   <Connect(SpecInstance)
     gridLine={
       Object {
-        "strokeWidth": 2,
+        "strokeWidth": 1,
         "visible": true,
       }
     }
@@ -1539,6 +1545,7 @@ exports[`xy_expression XYChart component it renders stacked horizontal bar 1`] =
       }
     }
     tickFormat={[Function]}
+    ticks={5}
     title="a"
   />
   <XyEndzones
diff --git a/x-pack/plugins/lens/public/xy_visualization/expression.tsx b/x-pack/plugins/lens/public/xy_visualization/expression.tsx
index 80e4a8d4dc8f7..a16537d3aae94 100644
--- a/x-pack/plugins/lens/public/xy_visualization/expression.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/expression.tsx
@@ -32,7 +32,6 @@ import {
   DisplayValueStyle,
   RecursivePartial,
   AxisStyle,
-  GridLineStyle,
   ScaleType,
 } from '@elastic/charts';
 import { I18nProvider } from '@kbn/i18n/react';
@@ -59,6 +58,7 @@ import {
   SeriesLayer,
   useActiveCursor,
 } from '../../../../../src/plugins/charts/public';
+import { MULTILAYER_TIME_AXIS_STYLE } from '../../../../../src/plugins/charts/common';
 import { EmptyPlaceholder } from '../shared_components';
 import { getFitOptions } from './fitting_functions';
 import { getAxesConfiguration, GroupsConfiguration, validateExtent } from './axes_configuration';
@@ -561,53 +561,35 @@ export function XYChart({
     floatingColumns: legend?.floatingColumns ?? 1,
   } as LegendPositionConfig;
 
-  // todo be moved in the chart plugin
-  const shouldUseNewTimeAxis = isTimeViz && !useLegacyTimeAxis && !shouldRotate;
+  const isHistogramModeEnabled = filteredLayers.some(
+    ({ isHistogram, seriesType, splitAccessor }) =>
+      isHistogram &&
+      (seriesType.includes('stacked') || !splitAccessor) &&
+      (seriesType.includes('stacked') ||
+        !seriesType.includes('bar') ||
+        !chartHasMoreThanOneBarSeries)
+  );
 
-  const gridLineStyle: RecursivePartial<GridLineStyle> = shouldUseNewTimeAxis
-    ? {
-        visible: gridlinesVisibilitySettings?.x,
-        strokeWidth: 0.1,
-        stroke: darkMode ? 'white' : 'black',
-      }
-    : {
-        visible: gridlinesVisibilitySettings?.x,
-        strokeWidth: 2,
-      };
+  const shouldUseNewTimeAxis =
+    isTimeViz && isHistogramModeEnabled && !useLegacyTimeAxis && !shouldRotate;
+
+  const gridLineStyle = {
+    visible: gridlinesVisibilitySettings?.x,
+    strokeWidth: 1,
+  };
   const xAxisStyle: RecursivePartial<AxisStyle> = shouldUseNewTimeAxis
     ? {
+        ...MULTILAYER_TIME_AXIS_STYLE,
         tickLabel: {
+          ...MULTILAYER_TIME_AXIS_STYLE.tickLabel,
           visible: Boolean(tickLabelsVisibilitySettings?.x),
-          rotation: 0, // rotation is disabled on new time axis
-          fontSize: 11,
-          padding:
-            referenceLinePaddings.bottom != null ? { inner: referenceLinePaddings.bottom } : 0,
-          alignment: {
-            vertical: Position.Bottom,
-            horizontal: Position.Left,
-          },
-          offset: {
-            x: 1.5,
-            y: 0,
-          },
-        },
-        axisLine: {
-          stroke: darkMode ? 'lightgray' : 'darkgray',
-          strokeWidth: 1,
         },
         tickLine: {
-          size: 12,
-          strokeWidth: 0.15,
-          stroke: darkMode ? 'white' : 'black',
-          padding: -10,
+          ...MULTILAYER_TIME_AXIS_STYLE.tickLine,
           visible: Boolean(tickLabelsVisibilitySettings?.x),
         },
         axisTitle: {
           visible: axisTitlesVisibilitySettings.x,
-          padding:
-            !tickLabelsVisibilitySettings?.x && referenceLinePaddings.bottom != null
-              ? { inner: referenceLinePaddings.bottom }
-              : undefined,
         },
       }
     : {
@@ -715,6 +697,7 @@ export function XYChart({
             tickFormat={(d) => axis.formatter?.convert(d) || ''}
             style={getYAxesStyle(axis.groupId as 'left' | 'right')}
             domain={getYAxisDomain(axis)}
+            ticks={5}
           />
         );
       })}
diff --git a/x-pack/plugins/lists/common/schemas/response/exception_list_schema.mock.ts b/x-pack/plugins/lists/common/schemas/response/exception_list_schema.mock.ts
index 42c35ba1a5d7a..eca17b4c835d6 100644
--- a/x-pack/plugins/lists/common/schemas/response/exception_list_schema.mock.ts
+++ b/x-pack/plugins/lists/common/schemas/response/exception_list_schema.mock.ts
@@ -16,6 +16,7 @@ import {
 import {
   DATE_NOW,
   DESCRIPTION,
+  DETECTION_TYPE,
   ELASTIC_USER,
   ENDPOINT_TYPE,
   IMMUTABLE,
@@ -48,6 +49,26 @@ export const getExceptionListSchemaMock = (): ExceptionListSchema => ({
   version: VERSION,
 });
 
+export const getDetectionsExceptionListSchemaMock = (): ExceptionListSchema => ({
+  _version: _VERSION,
+  created_at: DATE_NOW,
+  created_by: USER,
+  description: DESCRIPTION,
+  id: '1',
+  immutable: IMMUTABLE,
+  list_id: 'exception_list_id',
+  meta: META,
+  name: 'Sample Exception List',
+  namespace_type: 'single',
+  os_types: ['linux'],
+  tags: ['user added string for a tag', 'malware'],
+  tie_breaker_id: TIE_BREAKER,
+  type: DETECTION_TYPE,
+  updated_at: DATE_NOW,
+  updated_by: 'user_name',
+  version: VERSION,
+});
+
 export const getTrustedAppsListSchemaMock = (): ExceptionListSchema => {
   return {
     ...getExceptionListSchemaMock(),
diff --git a/x-pack/plugins/lists/server/scripts/check_env_variables.sh b/x-pack/plugins/lists/server/scripts/check_env_variables.sh
index 4df0e42adf9f3..df2354ed8398a 100755
--- a/x-pack/plugins/lists/server/scripts/check_env_variables.sh
+++ b/x-pack/plugins/lists/server/scripts/check_env_variables.sh
@@ -30,13 +30,3 @@ if [ -z "${KIBANA_URL}" ]; then
   echo "Set KIBANA_URL in your environment"
   exit 1
 fi
-
-if [ -z "${TASK_MANAGER_INDEX}" ]; then
-  echo "Set TASK_MANAGER_INDEX in your environment"
-  exit 1
-fi
-
-if [ -z "${KIBANA_INDEX}" ]; then
-  echo "Set KIBANA_INDEX in your environment"
-  exit 1
-fi
diff --git a/x-pack/plugins/lists/server/services/exception_lists/exception_list_client.mock.ts b/x-pack/plugins/lists/server/services/exception_lists/exception_list_client.mock.ts
index f5f6a4f1f2d5a..a780080dabc83 100644
--- a/x-pack/plugins/lists/server/services/exception_lists/exception_list_client.mock.ts
+++ b/x-pack/plugins/lists/server/services/exception_lists/exception_list_client.mock.ts
@@ -11,6 +11,7 @@ import { getFoundExceptionListSchemaMock } from '../../../common/schemas/respons
 import { getFoundExceptionListItemSchemaMock } from '../../../common/schemas/response/found_exception_list_item_schema.mock';
 import { getExceptionListItemSchemaMock } from '../../../common/schemas/response/exception_list_item_schema.mock';
 import {
+  getDetectionsExceptionListSchemaMock,
   getExceptionListSchemaMock,
   getTrustedAppsListSchemaMock,
 } from '../../../common/schemas/response/exception_list_schema.mock';
@@ -31,10 +32,12 @@ export class ExceptionListClientMock extends ExceptionListClient {
   public createTrustedAppsList = jest.fn().mockResolvedValue(getTrustedAppsListSchemaMock());
   public createEndpointList = jest.fn().mockResolvedValue(getExceptionListSchemaMock());
   public exportExceptionListAndItems = jest.fn().mockResolvedValue({
-    exportData: 'exportString',
+    exportData: `${JSON.stringify(getDetectionsExceptionListSchemaMock())}\n${JSON.stringify(
+      getExceptionListItemSchemaMock({ list_id: 'exception_list_id' })
+    )}`,
     exportDetails: {
-      exported_exception_list_count: 0,
-      exported_exception_list_item_count: 0,
+      exported_exception_list_count: 1,
+      exported_exception_list_item_count: 1,
       missing_exception_list_item_count: 0,
       missing_exception_list_items: [],
       missing_exception_lists: [],
diff --git a/x-pack/plugins/metrics_entities/jest.config.js b/x-pack/plugins/metrics_entities/jest.config.js
new file mode 100644
index 0000000000000..98a391223cc0f
--- /dev/null
+++ b/x-pack/plugins/metrics_entities/jest.config.js
@@ -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.
+ */
+
+module.exports = {
+  collectCoverageFrom: ['<rootDir>/x-pack/plugins/metrics_entities/{common,server}/**/*.{ts,tsx}'],
+  coverageDirectory: '<rootDir>/target/kibana-coverage/jest/x-pack/plugins/metrics_entities',
+  coverageReporters: ['text', 'html'],
+  preset: '@kbn/test',
+  rootDir: '../../..',
+  roots: ['<rootDir>/x-pack/plugins/metrics_entities'],
+};
diff --git a/x-pack/plugins/ml/public/application/app.tsx b/x-pack/plugins/ml/public/application/app.tsx
index 1df0a7afe475b..de212cbe4916e 100644
--- a/x-pack/plugins/ml/public/application/app.tsx
+++ b/x-pack/plugins/ml/public/application/app.tsx
@@ -70,7 +70,7 @@ const App: FC<AppProps> = ({ coreStart, deps, appMountParams }) => {
 
   const pageDeps = {
     history: appMountParams.history,
-    indexPatterns: deps.data.indexPatterns,
+    dataViewsContract: deps.data.dataViews,
     config: coreStart.uiSettings!,
     setBreadcrumbs: coreStart.chrome!.setBreadcrumbs,
     redirectToMlAccessDeniedPage,
diff --git a/x-pack/plugins/ml/public/application/components/anomalies_table/links_menu.js b/x-pack/plugins/ml/public/application/components/anomalies_table/links_menu.js
index 18fc10e69bc05..b0561893eb19f 100644
--- a/x-pack/plugins/ml/public/application/components/anomalies_table/links_menu.js
+++ b/x-pack/plugins/ml/public/application/components/anomalies_table/links_menu.js
@@ -28,7 +28,7 @@ import { ml } from '../../services/ml_api_service';
 import { mlJobService } from '../../services/job_service';
 import { getUrlForRecord, openCustomUrlWindow } from '../../util/custom_url_utils';
 import { formatHumanReadableDateTimeSeconds } from '../../../../common/util/date_utils';
-import { getIndexPatternIdFromName } from '../../util/index_utils';
+import { getDataViewIdFromName } from '../../util/index_utils';
 import { replaceStringTokens } from '../../util/string_utils';
 import { ML_APP_LOCATOR, ML_PAGES } from '../../../../common/constants/locator';
 /*
@@ -258,18 +258,18 @@ class LinksMenuUI extends Component {
     };
 
     const createAndOpenUrl = (index, categorizationFieldType) => {
-      // Find the ID of the data view with a title attribute which matches the
-      // index configured in the datafeed. If a Kibana data view has not been created
-      // for this index, then the user will see a warning message on the Discover tab advising
-      // them that no matching data view has been configured.
-      const indexPatternId = getIndexPatternIdFromName(index) || index;
-
       // Get the definition of the category and use the terms or regex to view the
       // matching events in the Kibana Discover tab depending on whether the
       // categorization field is of mapping type text (preferred) or keyword.
       ml.results
         .getCategoryDefinition(record.job_id, categoryId)
-        .then((resp) => {
+        .then(async (resp) => {
+          // Find the ID of the data view with a title attribute which matches the
+          // index configured in the datafeed. If a Kibana data view has not been created
+          // for this index, then the user will see a warning message on the Discover tab advising
+          // them that no matching data view has been configured.
+          const dataViewId = (await getDataViewIdFromName(index)) ?? index;
+
           let query = null;
           // Build query using categorization regex (if keyword type) or terms (if text type).
           // Check for terms or regex in case categoryId represents an anomaly from the absence of the
@@ -313,7 +313,7 @@ class LinksMenuUI extends Component {
           });
 
           const appStateProps = {
-            index: indexPatternId,
+            index: dataViewId,
             filters: [],
           };
           if (query !== null) {
diff --git a/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.test.tsx b/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.test.tsx
index afa4acdd8583d..d04f8f7b648f5 100644
--- a/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.test.tsx
+++ b/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.test.tsx
@@ -21,7 +21,7 @@ jest.mock('./full_time_range_selector_service', () => ({
 }));
 
 describe('FullTimeRangeSelector', () => {
-  const indexPattern = {
+  const dataView = {
     id: '0844fc70-5ab5-11e9-935e-836737467b0f',
     fields: [],
     title: 'test-data-view',
@@ -34,7 +34,7 @@ describe('FullTimeRangeSelector', () => {
   };
 
   const requiredProps = {
-    indexPattern,
+    dataView,
     query,
   };
 
diff --git a/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx b/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx
index 4ab35a7c03f5a..846c79468b823 100644
--- a/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx
+++ b/x-pack/plugins/ml/public/application/components/full_time_range_selector/full_time_range_selector.tsx
@@ -14,7 +14,7 @@ import type { DataView } from '../../../../../../../src/plugins/data_views/publi
 import { setFullTimeRange } from './full_time_range_selector_service';
 
 interface Props {
-  indexPattern: DataView;
+  dataView: DataView;
   query: Query;
   disabled: boolean;
   callback?: (a: any) => void;
@@ -22,7 +22,7 @@ interface Props {
 
 // 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> = ({ indexPattern, query, disabled, callback }) => {
+export const FullTimeRangeSelector: FC<Props> = ({ dataView, query, disabled, callback }) => {
   // wrapper around setFullTimeRange to allow for the calling of the optional callBack prop
   async function setRange(i: DataView, q: Query) {
     const fullTimeRange = await setFullTimeRange(i, q);
@@ -33,14 +33,14 @@ export const FullTimeRangeSelector: FC<Props> = ({ indexPattern, query, disabled
   return (
     <EuiButton
       isDisabled={disabled}
-      onClick={() => setRange(indexPattern, query)}
+      onClick={() => setRange(dataView, query)}
       data-test-subj="mlButtonUseFullData"
     >
       <FormattedMessage
         id="xpack.ml.fullTimeRangeSelector.useFullDataButtonLabel"
         defaultMessage="Use full {dataViewTitle} data"
         values={{
-          dataViewTitle: indexPattern.title,
+          dataViewTitle: dataView.title,
         }}
       />
     </EuiButton>
diff --git a/x-pack/plugins/ml/public/application/components/severity_control/severity_control.tsx b/x-pack/plugins/ml/public/application/components/severity_control/severity_control.tsx
index 7be72b8430233..4cc182988778d 100644
--- a/x-pack/plugins/ml/public/application/components/severity_control/severity_control.tsx
+++ b/x-pack/plugins/ml/public/application/components/severity_control/severity_control.tsx
@@ -16,7 +16,6 @@ import {
   EuiRangeProps,
 } from '@elastic/eui';
 import { ANOMALY_THRESHOLD } from '../../../../common';
-import './styles.scss';
 
 export interface SeveritySelectorProps {
   value: number | undefined;
@@ -29,23 +28,23 @@ export const SeverityControl: FC<SeveritySelectorProps> = React.memo(({ value, o
   const levels: EuiRangeProps['levels'] = [
     {
       min: ANOMALY_THRESHOLD.LOW,
-      max: ANOMALY_THRESHOLD.MINOR - 1,
-      color: 'success',
+      max: ANOMALY_THRESHOLD.MINOR,
+      color: '#8BC8FB',
     },
     {
       min: ANOMALY_THRESHOLD.MINOR,
-      max: ANOMALY_THRESHOLD.MAJOR - 1,
-      color: 'primary',
+      max: ANOMALY_THRESHOLD.MAJOR,
+      color: '#FDEC25',
     },
     {
       min: ANOMALY_THRESHOLD.MAJOR,
       max: ANOMALY_THRESHOLD.CRITICAL,
-      color: 'warning',
+      color: '#FBA740',
     },
     {
       min: ANOMALY_THRESHOLD.CRITICAL,
       max: MAX_ANOMALY_SCORE,
-      color: 'danger',
+      color: '#FE5050',
     },
   ];
 
diff --git a/x-pack/plugins/ml/public/application/components/severity_control/styles.scss b/x-pack/plugins/ml/public/application/components/severity_control/styles.scss
deleted file mode 100644
index 9a5fa8f2b160a..0000000000000
--- a/x-pack/plugins/ml/public/application/components/severity_control/styles.scss
+++ /dev/null
@@ -1,18 +0,0 @@
-//  Color overrides are required (https://github.com/elastic/eui/issues/4467)
-
-.mlSeverityControl {
-  .euiRangeLevel-- {
-    &success {
-      background-color: #8BC8FB;
-    }
-    &primary {
-      background-color: #FDEC25;
-    }
-    &warning {
-      background-color: #FBA740;
-    }
-    &danger {
-      background-color: #FE5050;
-    }
-  }
-}
diff --git a/x-pack/plugins/ml/public/application/contexts/ml/__mocks__/index_pattern.ts b/x-pack/plugins/ml/public/application/contexts/ml/__mocks__/data_view.ts
similarity index 92%
rename from x-pack/plugins/ml/public/application/contexts/ml/__mocks__/index_pattern.ts
rename to x-pack/plugins/ml/public/application/contexts/ml/__mocks__/data_view.ts
index 93f92002c4bfd..0d3c0993c880b 100644
--- a/x-pack/plugins/ml/public/application/contexts/ml/__mocks__/index_pattern.ts
+++ b/x-pack/plugins/ml/public/application/contexts/ml/__mocks__/data_view.ts
@@ -7,7 +7,7 @@
 
 import type { DataView } from '../../../../../../../../src/plugins/data_views/public';
 
-export const indexPatternMock = {
+export const dataViewMock = {
   id: 'the-index-pattern-id',
   title: 'the-index-pattern-title',
   fields: [],
diff --git a/x-pack/plugins/ml/public/application/contexts/ml/__mocks__/index_patterns.ts b/x-pack/plugins/ml/public/application/contexts/ml/__mocks__/data_view_contract.ts
similarity index 92%
rename from x-pack/plugins/ml/public/application/contexts/ml/__mocks__/index_patterns.ts
rename to x-pack/plugins/ml/public/application/contexts/ml/__mocks__/data_view_contract.ts
index 571ce8ac3f423..61a466b6496ef 100644
--- a/x-pack/plugins/ml/public/application/contexts/ml/__mocks__/index_patterns.ts
+++ b/x-pack/plugins/ml/public/application/contexts/ml/__mocks__/data_view_contract.ts
@@ -7,7 +7,7 @@
 
 import type { DataViewsContract } from '../../../../../../../../src/plugins/data_views/public';
 
-export const indexPatternsMock = new (class {
+export const dataViewsContractMock = new (class {
   fieldFormats = [];
   config = {};
   savedObjectsClient = {};
diff --git a/x-pack/plugins/ml/public/application/contexts/ml/__mocks__/kibana_context_value.ts b/x-pack/plugins/ml/public/application/contexts/ml/__mocks__/kibana_context_value.ts
index 7045e08947f35..642bc4baee712 100644
--- a/x-pack/plugins/ml/public/application/contexts/ml/__mocks__/kibana_context_value.ts
+++ b/x-pack/plugins/ml/public/application/contexts/ml/__mocks__/kibana_context_value.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { indexPatternMock } from './index_pattern';
-import { indexPatternsMock } from './index_patterns';
+import { dataViewMock } from './data_view';
+import { dataViewsContractMock } from './data_view_contract';
 import { kibanaConfigMock } from './kibana_config';
 import { savedSearchMock } from './saved_search';
 
@@ -15,8 +15,8 @@ export const kibanaContextValueMock = {
     query: 'the-query-string',
     language: 'the-query-language',
   },
-  currentIndexPattern: indexPatternMock,
+  currentDataView: dataViewMock,
   currentSavedSearch: savedSearchMock,
-  indexPatterns: indexPatternsMock,
+  dataViewsContract: dataViewsContractMock,
   kibanaConfig: kibanaConfigMock,
 };
diff --git a/x-pack/plugins/ml/public/application/contexts/ml/ml_context.ts b/x-pack/plugins/ml/public/application/contexts/ml/ml_context.ts
index cd7059b5302f2..d707f56b10a34 100644
--- a/x-pack/plugins/ml/public/application/contexts/ml/ml_context.ts
+++ b/x-pack/plugins/ml/public/application/contexts/ml/ml_context.ts
@@ -12,25 +12,17 @@ import { MlServicesContext } from '../../app';
 
 export interface MlContextValue {
   combinedQuery: any;
-  currentIndexPattern: DataView; // TODO this should be IndexPattern or null
+  currentDataView: DataView; // TODO this should be DataView or null
   currentSavedSearch: SavedSearchSavedObject | null;
-  indexPatterns: DataViewsContract;
+  dataViewsContract: DataViewsContract;
   kibanaConfig: any; // IUiSettingsClient;
   kibanaVersion: string;
 }
 
 export type SavedSearchQuery = object;
 
-// This context provides dependencies which can be injected
-// via angularjs only (like services, currentIndexPattern etc.).
-// Because we cannot just import these dependencies, the default value
-// for the context is just {} and of type `Partial<KibanaContextValue>`
-// for the angularjs based dependencies. Therefore, the
-// actual dependencies are set like we did previously with KibanaContext
-// in the wrapping angularjs directive. In the custom hook we check if
-// the dependencies are present with error reporting if they weren't
-// added properly. That's why in tests, these custom hooks must not
-// be mocked, instead <UiChrome.Provider value="mocked-value">` needs
+// In tests, these custom hooks must not be mocked,
+// instead <UiChrome.Provider value="mocked-value">` needs
 // to be used. This guarantees that we have both properly set up
 // TypeScript support and runtime checks for these dependencies.
 // Multiple custom hooks can be created to access subsets of
diff --git a/x-pack/plugins/ml/public/application/contexts/ml/use_current_index_pattern.ts b/x-pack/plugins/ml/public/application/contexts/ml/use_current_index_pattern.ts
index 4a8b77bdb2fde..69c36ee09d745 100644
--- a/x-pack/plugins/ml/public/application/contexts/ml/use_current_index_pattern.ts
+++ b/x-pack/plugins/ml/public/application/contexts/ml/use_current_index_pattern.ts
@@ -12,9 +12,9 @@ import { MlContext } from './ml_context';
 export const useCurrentIndexPattern = () => {
   const context = useContext(MlContext);
 
-  if (context.currentIndexPattern === undefined) {
-    throw new Error('currentIndexPattern is undefined');
+  if (context.currentDataView === undefined) {
+    throw new Error('currentDataView is undefined');
   }
 
-  return context.currentIndexPattern;
+  return context.currentDataView;
 };
diff --git a/x-pack/plugins/ml/public/application/contexts/ml/use_ml_context.ts b/x-pack/plugins/ml/public/application/contexts/ml/use_ml_context.ts
index 3d81c46684bef..1a07cb0338855 100644
--- a/x-pack/plugins/ml/public/application/contexts/ml/use_ml_context.ts
+++ b/x-pack/plugins/ml/public/application/contexts/ml/use_ml_context.ts
@@ -14,9 +14,9 @@ export const useMlContext = () => {
 
   if (
     context.combinedQuery === undefined ||
-    context.currentIndexPattern === undefined ||
+    context.currentDataView === undefined ||
     context.currentSavedSearch === undefined ||
-    context.indexPatterns === undefined ||
+    context.dataViewsContract === undefined ||
     context.kibanaConfig === undefined
   ) {
     throw new Error('required attribute is undefined');
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/common/use_results_view_config.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/common/use_results_view_config.ts
index ac638fe1f41a0..43dff4142023d 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/common/use_results_view_config.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/common/use_results_view_config.ts
@@ -13,7 +13,7 @@ import type { DataView } from '../../../../../../../src/plugins/data_views/publi
 
 import { extractErrorMessage } from '../../../../common/util/errors';
 
-import { getIndexPatternIdFromName } from '../../util/index_utils';
+import { getDataViewIdFromName } from '../../util/index_utils';
 import { ml } from '../../services/ml_api_service';
 import { newJobCapsServiceAnalytics } from '../../services/new_job_capabilities/new_job_capabilities_service_analytics';
 import { useMlContext } from '../../contexts/ml';
@@ -98,36 +98,36 @@ export const useResultsViewConfig = (jobId: string) => {
             const destIndex = Array.isArray(jobConfigUpdate.dest.index)
               ? jobConfigUpdate.dest.index[0]
               : jobConfigUpdate.dest.index;
-            const destIndexPatternId = getIndexPatternIdFromName(destIndex) || destIndex;
-            let indexP: DataView | undefined;
+            const destDataViewId = (await getDataViewIdFromName(destIndex)) ?? destIndex;
+            let dataView: DataView | undefined;
 
             try {
-              indexP = await mlContext.indexPatterns.get(destIndexPatternId);
+              dataView = await mlContext.dataViewsContract.get(destDataViewId);
 
               // Force refreshing the fields list here because a user directly coming
               // from the job creation wizard might land on the page without the
               // data view being fully initialized because it was created
               // before the analytics job populated the destination index.
-              await mlContext.indexPatterns.refreshFields(indexP);
+              await mlContext.dataViewsContract.refreshFields(dataView);
             } catch (e) {
-              indexP = undefined;
+              dataView = undefined;
             }
 
-            if (indexP === undefined) {
+            if (dataView === undefined) {
               setNeedsDestIndexPattern(true);
               const sourceIndex = jobConfigUpdate.source.index[0];
-              const sourceIndexPatternId = getIndexPatternIdFromName(sourceIndex) || sourceIndex;
+              const sourceDataViewId = (await getDataViewIdFromName(sourceIndex)) ?? sourceIndex;
               try {
-                indexP = await mlContext.indexPatterns.get(sourceIndexPatternId);
+                dataView = await mlContext.dataViewsContract.get(sourceDataViewId);
               } catch (e) {
-                indexP = undefined;
+                dataView = undefined;
               }
             }
 
-            if (indexP !== undefined) {
-              await newJobCapsServiceAnalytics.initializeFromIndexPattern(indexP);
+            if (dataView !== undefined) {
+              await newJobCapsServiceAnalytics.initializeFromDataVIew(dataView);
               setJobConfig(analyticsConfigs.data_frame_analytics[0]);
-              setIndexPattern(indexP);
+              setIndexPattern(dataView);
               setIsInitialized(true);
               setIsLoadingJobConfig(false);
             } else {
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/configuration_step_details.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/configuration_step_details.tsx
index 53270bf60ae8e..2c812226bfabb 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/configuration_step_details.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/configuration_step_details.tsx
@@ -31,7 +31,7 @@ interface Props {
 
 export const ConfigurationStepDetails: FC<Props> = ({ setCurrentStep, state }) => {
   const mlContext = useMlContext();
-  const { currentIndexPattern } = mlContext;
+  const { currentDataView } = mlContext;
   const { form, isJobCreated } = state;
   const { dependentVariable, includes, jobConfigQueryString, jobType, trainingPercent } = form;
 
@@ -43,7 +43,7 @@ export const ConfigurationStepDetails: FC<Props> = ({ setCurrentStep, state }) =
       title: i18n.translate('xpack.ml.dataframe.analytics.create.configDetails.sourceIndex', {
         defaultMessage: 'Source index',
       }),
-      description: currentIndexPattern.title || UNSET_CONFIG_ITEM,
+      description: currentDataView.title || UNSET_CONFIG_ITEM,
     },
     {
       title: i18n.translate('xpack.ml.dataframe.analytics.create.configDetails.Query', {
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/configuration_step_form.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/configuration_step_form.tsx
index 9bf751eec797f..21090ce671d02 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/configuration_step_form.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/configuration_step_form.tsx
@@ -101,7 +101,7 @@ export const ConfigurationStepForm: FC<ConfigurationStepProps> = ({
   setCurrentStep,
 }) => {
   const mlContext = useMlContext();
-  const { currentSavedSearch, currentIndexPattern } = mlContext;
+  const { currentSavedSearch, currentDataView } = mlContext;
   const { savedSearchQuery, savedSearchQueryStr } = useSavedSearch();
 
   const [fieldOptionsFetchFail, setFieldOptionsFetchFail] = useState<boolean>(false);
@@ -167,7 +167,7 @@ export const ConfigurationStepForm: FC<ConfigurationStepProps> = ({
   };
 
   const indexData = useIndexData(
-    currentIndexPattern,
+    currentDataView,
     getIndexDataQuery(savedSearchQuery, jobConfigQuery),
     toastNotifications,
     runtimeMappings
@@ -196,7 +196,7 @@ export const ConfigurationStepForm: FC<ConfigurationStepProps> = ({
     setMaxDistinctValuesError(undefined);
 
     try {
-      if (currentIndexPattern !== undefined) {
+      if (currentDataView !== undefined) {
         const depVarOptions = [];
         let depVarUpdate = formState.dependentVariable;
         // Get fields and filter for supported types for job type
@@ -334,7 +334,7 @@ export const ConfigurationStepForm: FC<ConfigurationStepProps> = ({
   }, 300);
 
   useEffect(() => {
-    setFormState({ sourceIndex: currentIndexPattern.title });
+    setFormState({ sourceIndex: currentDataView.title });
   }, []);
 
   const indexPatternFieldsTableItems = useMemo(() => {
@@ -356,7 +356,7 @@ export const ConfigurationStepForm: FC<ConfigurationStepProps> = ({
 
   useEffect(() => {
     if (isJobTypeWithDepVar) {
-      const indexPatternRuntimeFields = getCombinedRuntimeMappings(currentIndexPattern);
+      const indexPatternRuntimeFields = getCombinedRuntimeMappings(currentDataView);
       let runtimeOptions;
 
       if (indexPatternRuntimeFields) {
@@ -498,14 +498,14 @@ export const ConfigurationStepForm: FC<ConfigurationStepProps> = ({
       fields: includesTableItems
         .filter((d) => d.feature_type === 'numerical' && d.is_included)
         .map((d) => d.name),
-      index: currentIndexPattern.title,
+      index: currentDataView.title,
       legendType: getScatterplotMatrixLegendType(jobType),
       searchQuery: jobConfigQuery,
       runtimeMappings,
-      indexPattern: currentIndexPattern,
+      indexPattern: currentDataView,
     }),
     [
-      currentIndexPattern.title,
+      currentDataView.title,
       dependentVariable,
       includesTableItems,
       isJobTypeWithDepVar,
@@ -548,7 +548,7 @@ export const ConfigurationStepForm: FC<ConfigurationStepProps> = ({
           fullWidth
         >
           <ExplorationQueryBar
-            indexPattern={currentIndexPattern}
+            indexPattern={currentDataView}
             setSearchQuery={setJobConfigQuery}
             query={query}
           />
@@ -568,7 +568,7 @@ export const ConfigurationStepForm: FC<ConfigurationStepProps> = ({
             <EuiBadge color="hollow">
               {savedSearchQuery !== null
                 ? currentSavedSearch?.attributes.title
-                : currentIndexPattern.title}
+                : currentDataView.title}
             </EuiBadge>
           </Fragment>
         }
@@ -586,7 +586,7 @@ export const ConfigurationStepForm: FC<ConfigurationStepProps> = ({
             helpText={
               dependentVariableOptions.length === 0 &&
               dependentVariableFetchFail === false &&
-              currentIndexPattern &&
+              currentDataView &&
               i18n.translate(
                 'xpack.ml.dataframe.analytics.create.dependentVariableOptionsNoNumericalFields',
                 {
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/use_saved_search.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/use_saved_search.ts
index ad23c018afbbb..c4611a1740913 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/use_saved_search.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/configuration_step/use_saved_search.ts
@@ -33,7 +33,7 @@ export function useSavedSearch() {
   const [savedSearchQueryStr, setSavedSearchQueryStr] = useState<SavedSearchQueryStr>(undefined);
 
   const mlContext = useMlContext();
-  const { currentSavedSearch, currentIndexPattern, kibanaConfig } = mlContext;
+  const { currentSavedSearch, currentDataView, kibanaConfig } = mlContext;
 
   const getQueryData = () => {
     let qry: estypes.QueryDslQueryContainer = {};
@@ -46,7 +46,7 @@ export function useSavedSearch() {
 
       if (queryLanguage === SEARCH_QUERY_LANGUAGE.KUERY) {
         const ast = fromKueryExpression(qryString);
-        qry = toElasticsearchQuery(ast, currentIndexPattern);
+        qry = toElasticsearchQuery(ast, currentDataView);
       } else {
         qry = luceneStringToDsl(qryString);
         decorateQuery(qry, kibanaConfig.get('query:queryString:options'));
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/runtime_mappings/runtime_mappings.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/runtime_mappings/runtime_mappings.tsx
index 95881fc328976..e24d8e89d464e 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/runtime_mappings/runtime_mappings.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/components/runtime_mappings/runtime_mappings.tsx
@@ -95,7 +95,7 @@ export const RuntimeMappings: FC<Props> = ({ actions, state }) => {
   } = useXJsonMode(runtimeMappings || '');
 
   const mlContext = useMlContext();
-  const { currentIndexPattern } = mlContext;
+  const { currentDataView } = mlContext;
 
   const applyChanges = () => {
     const removeRuntimeMappings = advancedRuntimeMappingsConfig === '';
@@ -133,10 +133,7 @@ export const RuntimeMappings: FC<Props> = ({ actions, state }) => {
   };
 
   useEffect(function getInitialRuntimeMappings() {
-    const combinedRuntimeMappings = getCombinedRuntimeMappings(
-      currentIndexPattern,
-      runtimeMappings
-    );
+    const combinedRuntimeMappings = getCombinedRuntimeMappings(currentDataView, runtimeMappings);
 
     const prettySourceConfig = JSON.stringify(combinedRuntimeMappings, null, 2);
 
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/page.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/page.tsx
index 42a56d6327a60..8b136cfcd3637 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/page.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_creation/page.tsx
@@ -57,7 +57,7 @@ export const Page: FC<Props> = ({ jobId }) => {
   ]);
 
   const mlContext = useMlContext();
-  const { currentIndexPattern } = mlContext;
+  const { currentDataView } = mlContext;
 
   const createAnalyticsForm = useCreateAnalyticsForm();
   const { state } = createAnalyticsForm;
@@ -69,7 +69,7 @@ export const Page: FC<Props> = ({ jobId }) => {
   useEffect(() => {
     initiateWizard();
 
-    if (currentIndexPattern) {
+    if (currentDataView) {
       (async function () {
         if (jobId !== undefined) {
           const analyticsConfigs = await ml.dataFrameAnalytics.getDataFrameAnalytics(jobId, true);
@@ -192,7 +192,7 @@ export const Page: FC<Props> = ({ jobId }) => {
                     <FormattedMessage
                       id="xpack.ml.dataframe.analytics.creationPageSourceIndexTitle"
                       defaultMessage="Source data view: {dataViewTitle}"
-                      values={{ dataViewTitle: currentIndexPattern.title }}
+                      values={{ dataViewTitle: currentDataView.title }}
                     />
                   </h2>
                 </EuiFlexItem>
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.test.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.test.tsx
index 48760f412725f..c9bf469bd1f40 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.test.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.test.tsx
@@ -10,10 +10,7 @@ import { render, fireEvent, waitFor, screen } from '@testing-library/react';
 
 import { __IntlProvider as IntlProvider } from '@kbn/i18n/react';
 
-import {
-  getIndexPatternAndSavedSearch,
-  IndexPatternAndSavedSearch,
-} from '../../../../../util/index_utils';
+import { getDataViewAndSavedSearch, DataViewAndSavedSearch } from '../../../../../util/index_utils';
 
 import { SourceSelection } from './source_selection';
 
@@ -83,27 +80,25 @@ jest.mock('../../../../../contexts/kibana', () => ({
 
 jest.mock('../../../../../util/index_utils', () => {
   return {
-    getIndexPatternAndSavedSearch: jest.fn(
-      async (id: string): Promise<IndexPatternAndSavedSearch> => {
-        return {
-          indexPattern: {
-            // @ts-expect-error fields should not be empty
-            fields: [],
-            title:
-              id === 'the-remote-saved-search-id'
-                ? 'my_remote_cluster:index-pattern-title'
-                : 'index-pattern-title',
-          },
-          savedSearch: null,
-        };
-      }
-    ),
+    getDataViewAndSavedSearch: jest.fn(async (id: string): Promise<DataViewAndSavedSearch> => {
+      return {
+        dataView: {
+          // @ts-expect-error fields should not be empty
+          fields: [],
+          title:
+            id === 'the-remote-saved-search-id'
+              ? 'my_remote_cluster:index-pattern-title'
+              : 'index-pattern-title',
+        },
+        savedSearch: null,
+      };
+    }),
     isCcsIndexPattern: (a: string) => a.includes(':'),
   };
 });
 
 const mockOnClose = jest.fn();
-const mockGetDataViewAndSavedSearch = getIndexPatternAndSavedSearch as jest.Mock;
+const mockGetDataViewAndSavedSearch = getDataViewAndSavedSearch as jest.Mock;
 
 describe('Data Frame Analytics: <SourceSelection />', () => {
   afterEach(() => {
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.tsx
index c2f17a45c1e06..e0922d7e12653 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.tsx
@@ -25,7 +25,7 @@ import { useMlKibana, useNavigateToPath } from '../../../../../contexts/kibana';
 
 import { getNestedProperty } from '../../../../../util/object_utils';
 
-import { getIndexPatternAndSavedSearch, isCcsIndexPattern } from '../../../../../util/index_utils';
+import { getDataViewAndSavedSearch, isCcsIndexPattern } from '../../../../../util/index_utils';
 
 const fixedPageSize: number = 8;
 
@@ -57,8 +57,8 @@ export const SourceSelection: FC<Props> = ({ onClose }) => {
     if (type === 'index-pattern') {
       dataViewName = getNestedProperty(savedObject, 'attributes.title');
     } else if (type === 'search') {
-      const indexPatternAndSavedSearch = await getIndexPatternAndSavedSearch(id);
-      dataViewName = indexPatternAndSavedSearch.indexPattern?.title ?? '';
+      const dataViewAndSavedSearch = await getDataViewAndSavedSearch(id);
+      dataViewName = dataViewAndSavedSearch.dataView?.title ?? '';
     }
 
     if (isCcsIndexPattern(dataViewName)) {
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.ts
index 18abc9be270be..88b0774e107e2 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/hooks/use_create_analytics_form/use_create_analytics_form.ts
@@ -127,7 +127,7 @@ export const useCreateAnalyticsForm = (): CreateAnalyticsFormProps => {
     const dataViewName = destinationIndex;
 
     try {
-      await mlContext.indexPatterns.createAndSave(
+      await mlContext.dataViewsContract.createAndSave(
         {
           title: dataViewName,
         },
@@ -179,7 +179,7 @@ export const useCreateAnalyticsForm = (): CreateAnalyticsFormProps => {
     try {
       // Set the existing data view names.
       const indexPatternsMap: SourceIndexMap = {};
-      const savedObjects = (await mlContext.indexPatterns.getCache()) || [];
+      const savedObjects = (await mlContext.dataViewsContract.getCache()) || [];
       savedObjects.forEach((obj) => {
         const title = obj?.attributes?.title;
         if (title !== undefined) {
@@ -201,7 +201,7 @@ export const useCreateAnalyticsForm = (): CreateAnalyticsFormProps => {
   };
 
   const initiateWizard = async () => {
-    await mlContext.indexPatterns.clearCache();
+    await mlContext.dataViewsContract.clearCache();
     await prepareFormValidation();
   };
 
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/job_map/components/controls.tsx b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/job_map/components/controls.tsx
index 1b961c05b2f30..b2879e2ffde54 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/job_map/components/controls.tsx
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/job_map/components/controls.tsx
@@ -33,7 +33,7 @@ import { JOB_MAP_NODE_TYPES } from '../../../../../../common/constants/data_fram
 import { ML_PAGES } from '../../../../../../common/constants/locator';
 import { checkPermission } from '../../../../capabilities/check_capabilities';
 import { useMlLocator, useNotifications, useNavigateToPath } from '../../../../contexts/kibana';
-import { getIndexPatternIdFromName } from '../../../../util/index_utils';
+import { getDataViewIdFromName } from '../../../../util/index_utils';
 import { useNavigateToWizardWithClonedJob } from '../../analytics_management/components/action_clone/clone_action_name';
 import {
   useDeleteAction,
@@ -112,12 +112,12 @@ export const Controls: FC<Props> = React.memo(
     const nodeType = selectedNode?.data('type');
 
     const onCreateJobClick = useCallback(async () => {
-      const indexId = getIndexPatternIdFromName(nodeLabel);
+      const dataViewId = await getDataViewIdFromName(nodeLabel);
 
-      if (indexId) {
+      if (dataViewId !== null) {
         const path = await mlLocator.getUrl({
           page: ML_PAGES.DATA_FRAME_ANALYTICS_CREATE_JOB,
-          pageState: { index: indexId },
+          pageState: { index: dataViewId },
         });
 
         await navigateToPath(path);
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 5fe519f25efb6..93c0291d4f9d4 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
@@ -30,7 +30,7 @@ export const FileDataVisualizerPage: FC = () => {
       docLinks,
       dataVisualizer,
       data: {
-        indexPatterns: { get: getIndexPattern },
+        dataViews: { get: getDataView },
       },
     },
   } = useMlKibana();
@@ -60,7 +60,7 @@ export const FileDataVisualizerPage: FC = () => {
         },
         canDisplay: async ({ indexPatternId }) => {
           try {
-            const { timeFieldName } = await getIndexPattern(indexPatternId);
+            const { timeFieldName } = await getDataView(indexPatternId);
             return (
               isFullLicense() &&
               timeFieldName !== undefined &&
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/index_data_visualizer.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/index_data_visualizer.tsx
index 0faf5b775d23e..7ae2712a2edd8 100644
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/index_data_visualizer.tsx
+++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/index_data_visualizer.tsx
@@ -29,7 +29,7 @@ export const IndexDataVisualizerPage: FC = () => {
       docLinks,
       dataVisualizer,
       data: {
-        indexPatterns: { get: getIndexPattern },
+        dataViews: { get: getDataView },
       },
     },
   } = useMlKibana();
@@ -74,7 +74,7 @@ export const IndexDataVisualizerPage: FC = () => {
         },
         canDisplay: async ({ indexPatternId }) => {
           try {
-            const { timeFieldName } = await getIndexPattern(indexPatternId);
+            const { timeFieldName } = await getDataView(indexPatternId);
             return (
               isFullLicense() &&
               timeFieldName !== undefined &&
diff --git a/x-pack/plugins/ml/public/application/explorer/actions/job_selection.ts b/x-pack/plugins/ml/public/application/explorer/actions/job_selection.ts
index 46d47bb554705..ed244cbd894ba 100644
--- a/x-pack/plugins/ml/public/application/explorer/actions/job_selection.ts
+++ b/x-pack/plugins/ml/public/application/explorer/actions/job_selection.ts
@@ -17,8 +17,7 @@ import { createJobs } from '../explorer_utils';
 export function jobSelectionActionCreator(selectedJobIds: string[]) {
   return from(mlFieldFormatService.populateFormats(selectedJobIds)).pipe(
     map((resp) => {
-      if (resp.err) {
-        console.log('Error populating field formats:', resp.err); // eslint-disable-line no-console
+      if (resp.error) {
         return null;
       }
 
diff --git a/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.test.tsx b/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.test.tsx
index 409f6a5911bb7..8fb4c43d77207 100644
--- a/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.test.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.test.tsx
@@ -16,7 +16,7 @@ import React from 'react';
 import { CustomUrlEditor } from './editor';
 import { TIME_RANGE_TYPE, URL_TYPE } from './constants';
 import { CustomUrlSettings } from './utils';
-import { DataView } from '../../../../../../../../src/plugins/data_views/common';
+import { DataViewListItem } from '../../../../../../../../src/plugins/data_views/common';
 
 function prepareTest(customUrl: CustomUrlSettings, setEditCustomUrlFn: (url: UrlConfig) => void) {
   const savedCustomUrls = [
@@ -47,10 +47,10 @@ function prepareTest(customUrl: CustomUrlSettings, setEditCustomUrlFn: (url: Url
     { id: 'dash2', title: 'Dashboard 2' },
   ];
 
-  const indexPatterns = [
+  const dataViewListItems = [
     { id: 'pattern1', title: 'Data view 1' },
     { id: 'pattern2', title: 'Data view 2' },
-  ] as DataView[];
+  ] as DataViewListItem[];
 
   const queryEntityFieldNames = ['airline'];
 
@@ -59,7 +59,7 @@ function prepareTest(customUrl: CustomUrlSettings, setEditCustomUrlFn: (url: Url
     setEditCustomUrl: setEditCustomUrlFn,
     savedCustomUrls,
     dashboards,
-    indexPatterns,
+    dataViewListItems,
     queryEntityFieldNames,
   };
 
diff --git a/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.tsx b/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.tsx
index c769e2548370c..b140c950d52ef 100644
--- a/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/editor.tsx
@@ -29,7 +29,7 @@ import { isValidLabel } from '../../../util/custom_url_utils';
 
 import { TIME_RANGE_TYPE, URL_TYPE } from './constants';
 import { UrlConfig } from '../../../../../common/types/custom_urls';
-import { DataView } from '../../../../../../../../src/plugins/data_views/common';
+import { DataViewListItem } from '../../../../../../../../src/plugins/data_views/common';
 
 function getLinkToOptions() {
   return [
@@ -59,7 +59,7 @@ interface CustomUrlEditorProps {
   setEditCustomUrl: (url: any) => void;
   savedCustomUrls: UrlConfig[];
   dashboards: any[];
-  indexPatterns: DataView[];
+  dataViewListItems: DataViewListItem[];
   queryEntityFieldNames: string[];
 }
 
@@ -71,7 +71,7 @@ export const CustomUrlEditor: FC<CustomUrlEditorProps> = ({
   setEditCustomUrl,
   savedCustomUrls,
   dashboards,
-  indexPatterns,
+  dataViewListItems,
   queryEntityFieldNames,
 }) => {
   if (customUrl === undefined) {
@@ -164,8 +164,8 @@ export const CustomUrlEditor: FC<CustomUrlEditorProps> = ({
     return { value: dashboard.id, text: dashboard.title };
   });
 
-  const indexPatternOptions = indexPatterns.map((indexPattern) => {
-    return { value: indexPattern.id, text: indexPattern.title };
+  const dataViewOptions = dataViewListItems.map(({ id, title }) => {
+    return { value: id, text: title };
   });
 
   const entityOptions = queryEntityFieldNames.map((fieldName) => ({ label: fieldName }));
@@ -274,7 +274,7 @@ export const CustomUrlEditor: FC<CustomUrlEditorProps> = ({
             display="rowCompressed"
           >
             <EuiSelect
-              options={indexPatternOptions}
+              options={dataViewOptions}
               value={kibanaSettings.discoverIndexPatternId}
               onChange={onDiscoverIndexPatternChange}
               data-test-subj="mlJobCustomUrlDiscoverIndexPatternInput"
diff --git a/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/utils.d.ts b/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/utils.d.ts
index 1f815759c6242..1c7978a54b2b0 100644
--- a/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/utils.d.ts
+++ b/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/utils.d.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DataView } from '../../../../../../../../src/plugins/data_views/common';
+import { DataViewListItem } from '../../../../../../../../src/plugins/data_views/common';
 import { UrlConfig } from '../../../../../common/types/custom_urls';
 import { Job } from '../../../../../common/types/anomaly_detection_jobs';
 import { TimeRangeType } from './constants';
@@ -34,7 +34,7 @@ export function isValidCustomUrlSettingsTimeRange(timeRangeSettings: any): boole
 export function getNewCustomUrlDefaults(
   job: Job,
   dashboards: any[],
-  indexPatterns: DataView[]
+  dataViews: DataViewListItem[]
 ): CustomUrlSettings;
 export function getQueryEntityFieldNames(job: Job): string[];
 export function isValidCustomUrlSettings(
diff --git a/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/utils.js b/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/utils.js
index 0f12afe36b388..623e9a69cca93 100644
--- a/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/utils.js
+++ b/x-pack/plugins/ml/public/application/jobs/components/custom_url_editor/utils.js
@@ -15,12 +15,11 @@ import { DASHBOARD_APP_URL_GENERATOR } from '../../../../../../../../src/plugins
 import { getPartitioningFieldNames } from '../../../../../common/util/job_utils';
 import { parseInterval } from '../../../../../common/util/parse_interval';
 import { replaceTokensInUrlValue, isValidLabel } from '../../../util/custom_url_utils';
-import { getIndexPatternIdFromName } from '../../../util/index_utils';
 import { ml } from '../../../services/ml_api_service';
 import { escapeForElasticsearchQuery } from '../../../util/string_utils';
 import { getSavedObjectsClient, getGetUrlGenerator } from '../../../util/dependency_cache';
 
-export function getNewCustomUrlDefaults(job, dashboards, indexPatterns) {
+export function getNewCustomUrlDefaults(job, dashboards, dataViews) {
   // Returns the settings object in the format used by the custom URL editor
   // for a new custom URL.
   const kibanaSettings = {
@@ -32,7 +31,7 @@ export function getNewCustomUrlDefaults(job, dashboards, indexPatterns) {
   if (dashboards !== undefined && dashboards.length > 0) {
     urlType = URL_TYPE.KIBANA_DASHBOARD;
     kibanaSettings.dashboardId = dashboards[0].id;
-  } else if (indexPatterns !== undefined && indexPatterns.length > 0) {
+  } else if (dataViews !== undefined && dataViews.length > 0) {
     urlType = URL_TYPE.KIBANA_DISCOVER;
   }
 
@@ -40,15 +39,15 @@ export function getNewCustomUrlDefaults(job, dashboards, indexPatterns) {
   // which matches the indices configured in the job datafeed.
   const datafeedConfig = job.datafeed_config;
   if (
-    indexPatterns !== undefined &&
-    indexPatterns.length > 0 &&
+    dataViews !== undefined &&
+    dataViews.length > 0 &&
     datafeedConfig !== undefined &&
     datafeedConfig.indices !== undefined &&
     datafeedConfig.indices.length > 0
   ) {
-    const defaultIndexPatternId =
-      getIndexPatternIdFromName(datafeedConfig.indices.join()) ?? indexPatterns[0].id;
-    kibanaSettings.discoverIndexPatternId = defaultIndexPatternId;
+    const indicesName = datafeedConfig.indices.join();
+    const defaultDataViewId = dataViews.find((dv) => dv.title === indicesName)?.id;
+    kibanaSettings.discoverIndexPatternId = defaultDataViewId;
   }
 
   return {
diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.d.ts b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.d.ts
index 32e99e3e433e0..9e9f112cee25d 100644
--- a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.d.ts
+++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.d.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { DataView } from 'src/plugins/data_views/common';
+import type { DataViewListItem } from 'src/plugins/data_views/common';
 
 export function loadSavedDashboards(maxNumber: number): Promise<any[]>;
-export function loadIndexPatterns(maxNumber: number): Promise<DataView[]>;
+export function loadDataViewListItems(): Promise<DataViewListItem[]>;
diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.js b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.js
index f32800d6b7b7f..3a94cf6c673f3 100644
--- a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.js
+++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/edit_utils.js
@@ -102,20 +102,9 @@ export function loadSavedDashboards(maxNumber) {
   });
 }
 
-export function loadIndexPatterns(maxNumber) {
-  // Loads the list of Kibana data views, as used in editing custom URLs.
-  return new Promise((resolve, reject) => {
-    const dataViewsContract = getDataViews();
-    dataViewsContract
-      .find('*', maxNumber)
-      .then((dataViews) => {
-        const sortedDataViews = dataViews.sort((a, b) => a.title.localeCompare(b.title));
-        resolve(sortedDataViews);
-      })
-      .catch((resp) => {
-        reject(resp);
-      });
-  });
+export async function loadDataViewListItems() {
+  const dataViewsContract = getDataViews();
+  return (await dataViewsContract.getIdsWithTitle()).sort((a, b) => a.title.localeCompare(b.title));
 }
 
 function extractDescription(job, newJobData) {
diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/tabs/custom_urls.tsx b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/tabs/custom_urls.tsx
index 45f059690c3a9..035836373adf6 100644
--- a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/tabs/custom_urls.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/edit_job_flyout/tabs/custom_urls.tsx
@@ -33,15 +33,14 @@ import {
   CustomUrlSettings,
 } from '../../../../components/custom_url_editor/utils';
 import { withKibana } from '../../../../../../../../../../src/plugins/kibana_react/public';
-import { loadSavedDashboards, loadIndexPatterns } from '../edit_utils';
+import { loadSavedDashboards, loadDataViewListItems } from '../edit_utils';
 import { openCustomUrlWindow } from '../../../../../util/custom_url_utils';
 import { Job } from '../../../../../../../common/types/anomaly_detection_jobs';
 import { UrlConfig } from '../../../../../../../common/types/custom_urls';
-import { DataView } from '../../../../../../../../../../src/plugins/data_views/common';
+import { DataViewListItem } from '../../../../../../../../../../src/plugins/data_views/common';
 import { MlKibanaReactContextValue } from '../../../../../contexts/kibana';
 
 const MAX_NUMBER_DASHBOARDS = 1000;
-const MAX_NUMBER_INDEX_PATTERNS = 1000;
 
 interface CustomUrlsProps {
   job: Job;
@@ -54,7 +53,7 @@ interface CustomUrlsProps {
 interface CustomUrlsState {
   customUrls: UrlConfig[];
   dashboards: any[];
-  indexPatterns: DataView[];
+  dataViewListItems: DataViewListItem[];
   queryEntityFieldNames: string[];
   editorOpen: boolean;
   editorSettings?: CustomUrlSettings;
@@ -67,7 +66,7 @@ class CustomUrlsUI extends Component<CustomUrlsProps, CustomUrlsState> {
     this.state = {
       customUrls: [],
       dashboards: [],
-      indexPatterns: [],
+      dataViewListItems: [],
       queryEntityFieldNames: [],
       editorOpen: false,
     };
@@ -100,9 +99,9 @@ class CustomUrlsUI extends Component<CustomUrlsProps, CustomUrlsState> {
         );
       });
 
-    loadIndexPatterns(MAX_NUMBER_INDEX_PATTERNS)
-      .then((indexPatterns) => {
-        this.setState({ indexPatterns });
+    loadDataViewListItems()
+      .then((dataViewListItems) => {
+        this.setState({ dataViewListItems });
       })
       .catch((resp) => {
         // eslint-disable-next-line no-console
@@ -121,11 +120,11 @@ class CustomUrlsUI extends Component<CustomUrlsProps, CustomUrlsState> {
   editNewCustomUrl = () => {
     // Opens the editor for configuring a new custom URL.
     this.setState((prevState) => {
-      const { dashboards, indexPatterns } = prevState;
+      const { dashboards, dataViewListItems } = prevState;
 
       return {
         editorOpen: true,
-        editorSettings: getNewCustomUrlDefaults(this.props.job, dashboards, indexPatterns),
+        editorSettings: getNewCustomUrlDefaults(this.props.job, dashboards, dataViewListItems),
       };
     });
   };
@@ -209,7 +208,7 @@ class CustomUrlsUI extends Component<CustomUrlsProps, CustomUrlsState> {
       editorOpen,
       editorSettings,
       dashboards,
-      indexPatterns,
+      dataViewListItems,
       queryEntityFieldNames,
     } = this.state;
 
@@ -220,7 +219,7 @@ class CustomUrlsUI extends Component<CustomUrlsProps, CustomUrlsState> {
         setEditCustomUrl={this.setEditCustomUrl}
         savedCustomUrls={customUrls}
         dashboards={dashboards}
-        indexPatterns={indexPatterns}
+        dataViewListItems={dataViewListItems}
         queryEntityFieldNames={queryEntityFieldNames}
       />
     );
diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_actions/management.js b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_actions/management.js
index 1124052f86367..64bc7f4a517c2 100644
--- a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_actions/management.js
+++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/job_actions/management.js
@@ -7,7 +7,6 @@
 
 import { checkPermission } from '../../../../capabilities/check_capabilities';
 import { mlNodesAvailable } from '../../../../ml_nodes_check/check_ml_nodes';
-import { getIndexPatternNames } from '../../../../util/index_utils';
 import { JOB_ACTION } from '../../../../../../common/constants/job_actions';
 
 import {
@@ -19,7 +18,6 @@ import {
   isClosable,
   isResettable,
 } from '../utils';
-import { getToastNotifications } from '../../../../util/dependency_cache';
 import { i18n } from '@kbn/i18n';
 
 export function actionsMenuContent(
@@ -136,21 +134,7 @@ export function actionsMenuContent(
         return isJobBlocked(item) === false && canCreateJob;
       },
       onClick: (item) => {
-        const indexPatternNames = getIndexPatternNames();
-        const indexPatternTitle = item.datafeedIndices.join(',');
-        const jobIndicesAvailable = indexPatternNames.includes(indexPatternTitle);
-
-        if (!jobIndicesAvailable) {
-          getToastNotifications().addDanger(
-            i18n.translate('xpack.ml.jobsList.managementActions.noSourceDataViewForClone', {
-              defaultMessage:
-                'Unable to clone the anomaly detection job {jobId}. No data view exists for index {indexPatternTitle}.',
-              values: { jobId: item.id, indexPatternTitle },
-            })
-          );
-        } else {
-          cloneJob(item.id);
-        }
+        cloneJob(item.id);
         closeMenu(true);
       },
       'data-test-subj': 'mlActionButtonCloneJob',
diff --git a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/utils.js b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/utils.js
index 414d920237e8c..fe09ed45f1274 100644
--- a/x-pack/plugins/ml/public/application/jobs/jobs_list/components/utils.js
+++ b/x-pack/plugins/ml/public/application/jobs/jobs_list/components/utils.js
@@ -16,6 +16,7 @@ import {
 import { getToastNotifications } from '../../../util/dependency_cache';
 import { ml } from '../../../services/ml_api_service';
 import { stringMatch } from '../../../util/string_utils';
+import { getDataViewNames } from '../../../util/index_utils';
 import { JOB_STATE, DATAFEED_STATE } from '../../../../../common/constants/states';
 import { JOB_ACTION } from '../../../../../common/constants/job_actions';
 import { parseInterval } from '../../../../../common/util/parse_interval';
@@ -217,6 +218,14 @@ export async function cloneJob(jobId) {
       loadJobForCloning(jobId),
       loadFullJob(jobId, false),
     ]);
+
+    const dataViewNames = await getDataViewNames();
+    const jobIndicesAvailable = dataViewNames.includes(datafeed.indices.join(','));
+
+    if (jobIndicesAvailable === false) {
+      return;
+    }
+
     if (cloneableJob !== undefined && originalJob?.custom_settings?.created_by !== undefined) {
       // if the job is from a wizards, i.e. contains a created_by property
       // use tempJobCloningObjects to temporarily store the job
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 88ed17cba0003..eb9c4bf755707 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
@@ -38,10 +38,10 @@ export function useEstimateBucketSpan() {
       end: jobCreator.end,
     },
     fields: jobCreator.fields.map((f) => (f.id === EVENT_RATE_FIELD_ID ? null : f.id)),
-    index: mlContext.currentIndexPattern.title,
+    index: mlContext.currentDataView.title,
     query: mlContext.combinedQuery,
     splitField: undefined,
-    timeField: mlContext.currentIndexPattern.timeFieldName,
+    timeField: mlContext.currentDataView.timeFieldName,
     runtimeMappings: jobCreator.runtimeMappings ?? undefined,
     indicesOptions: jobCreator.datafeedConfig.indices_options,
   };
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 4c13130ae4ce3..9924bf1674f79 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
@@ -104,7 +104,7 @@ export const TimeRangeStep: FC<StepProps> = ({ setCurrentStep, isCurrentStep })
             </EuiFlexItem>
             <EuiFlexItem grow={false}>
               <FullTimeRangeSelector
-                indexPattern={mlContext.currentIndexPattern}
+                dataView={mlContext.currentDataView}
                 query={mlContext.combinedQuery}
                 disabled={false}
                 callback={fullTimeRangeCallback}
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/preconfigured_job_redirect.ts b/x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/preconfigured_job_redirect.ts
index 03428bd47e490..d607fd2edf4ba 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/preconfigured_job_redirect.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/index_or_search/preconfigured_job_redirect.ts
@@ -8,20 +8,24 @@
 import type { ApplicationStart } from 'kibana/public';
 import type { DataViewsContract } from '../../../../../../../../../src/plugins/data_views/public';
 import { mlJobService } from '../../../../services/job_service';
-import { loadIndexPatterns, getIndexPatternIdFromName } from '../../../../util/index_utils';
-import { Datafeed, Job } from '../../../../../../common/types/anomaly_detection_jobs';
+import { Datafeed } from '../../../../../../common/types/anomaly_detection_jobs';
 import { CREATED_BY_LABEL, JOB_TYPE } from '../../../../../../common/constants/new_job';
 
 export async function preConfiguredJobRedirect(
-  indexPatterns: DataViewsContract,
+  dataViewsContract: DataViewsContract,
   basePath: string,
   navigateToUrl: ApplicationStart['navigateToUrl']
 ) {
   const { createdBy, job, datafeed } = mlJobService.tempJobCloningObjects;
+
   if (job && datafeed) {
+    const dataViewId = await getDataViewIdFromName(datafeed, dataViewsContract);
+    if (dataViewId === null) {
+      return Promise.resolve();
+    }
+
     try {
-      await loadIndexPatterns(indexPatterns);
-      const redirectUrl = getWizardUrlFromCloningJob(createdBy, job, datafeed);
+      const redirectUrl = await getWizardUrlFromCloningJob(createdBy, dataViewId);
       await navigateToUrl(`${basePath}/app/ml/${redirectUrl}`);
       return Promise.reject();
     } catch (error) {
@@ -34,7 +38,7 @@ export async function preConfiguredJobRedirect(
   }
 }
 
-function getWizardUrlFromCloningJob(createdBy: string | undefined, job: Job, datafeed: Datafeed) {
+async function getWizardUrlFromCloningJob(createdBy: string | undefined, dataViewId: string) {
   const created = createdBy;
   let page = '';
 
@@ -59,7 +63,20 @@ function getWizardUrlFromCloningJob(createdBy: string | undefined, job: Job, dat
       break;
   }
 
-  const indexPatternId = getIndexPatternIdFromName(datafeed.indices.join());
+  return `jobs/new_job/${page}?index=${dataViewId}&_g=()`;
+}
+
+async function getDataViewIdFromName(
+  datafeed: Datafeed,
+  dataViewsContract: DataViewsContract
+): Promise<string | null> {
+  if (dataViewsContract === null) {
+    throw new Error('Data views are not initialized!');
+  }
 
-  return `jobs/new_job/${page}?index=${indexPatternId}&_g=()`;
+  const [dv] = await dataViewsContract?.find(datafeed.indices.join(','));
+  if (!dv) {
+    return null;
+  }
+  return dv.id ?? dv.title;
 }
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/job_type/page.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/job_type/page.tsx
index 15ca0b82695ff..5e62158977280 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/job_type/page.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/job_type/page.tsx
@@ -45,9 +45,9 @@ export const Page: FC = () => {
 
   const [recognizerResultsCount, setRecognizerResultsCount] = useState(0);
 
-  const { currentSavedSearch, currentIndexPattern } = mlContext;
+  const { currentSavedSearch, currentDataView } = mlContext;
 
-  const isTimeBasedIndex = timeBasedIndexCheck(currentIndexPattern);
+  const isTimeBasedIndex = timeBasedIndexCheck(currentDataView);
   const indexWarningTitle =
     !isTimeBasedIndex && isSavedSearchSavedObject(currentSavedSearch)
       ? i18n.translate(
@@ -57,13 +57,13 @@ export const Page: FC = () => {
               '{savedSearchTitle} uses data view {dataViewName} which is not time based',
             values: {
               savedSearchTitle: currentSavedSearch.attributes.title as string,
-              dataViewName: currentIndexPattern.title,
+              dataViewName: currentDataView.title,
             },
           }
         )
       : i18n.translate('xpack.ml.newJob.wizard.jobType.dataViewNotTimeBasedMessage', {
           defaultMessage: 'Data view {dataViewName} is not time based',
-          values: { dataViewName: currentIndexPattern.title },
+          values: { dataViewName: currentDataView.title },
         });
 
   const pageTitleLabel = isSavedSearchSavedObject(currentSavedSearch)
@@ -73,7 +73,7 @@ export const Page: FC = () => {
       })
     : i18n.translate('xpack.ml.newJob.wizard.jobType.dataViewPageTitleLabel', {
         defaultMessage: 'data view {dataViewName}',
-        values: { dataViewName: currentIndexPattern.title },
+        values: { dataViewName: currentDataView.title },
       });
 
   const recognizerResults = {
@@ -85,13 +85,13 @@ export const Page: FC = () => {
 
   const getUrlParams = () => {
     return !isSavedSearchSavedObject(currentSavedSearch)
-      ? `?index=${currentIndexPattern.id}`
+      ? `?index=${currentDataView.id}`
       : `?savedSearchId=${currentSavedSearch.id}`;
   };
 
   const addSelectionToRecentlyAccessed = async () => {
     const title = !isSavedSearchSavedObject(currentSavedSearch)
-      ? currentIndexPattern.title
+      ? currentDataView.title
       : (currentSavedSearch.attributes.title as string);
     const mlLocator = share.url.locators.get(ML_APP_LOCATOR)!;
 
@@ -101,7 +101,7 @@ export const Page: FC = () => {
         pageState: {
           ...(currentSavedSearch?.id
             ? { savedSearchId: currentSavedSearch.id }
-            : { index: currentIndexPattern.id }),
+            : { index: currentDataView.id }),
         },
       },
       { absolute: true }
@@ -270,7 +270,7 @@ export const Page: FC = () => {
 
           <EuiFlexGrid gutterSize="l" columns={4}>
             <DataRecognizer
-              indexPattern={currentIndexPattern}
+              indexPattern={currentDataView}
               savedSearch={currentSavedSearch}
               results={recognizerResults}
             />
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/new_job/page.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/new_job/page.tsx
index f708ea83f1d0d..52e3c55afc15a 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/new_job/page.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/new_job/page.tsx
@@ -55,7 +55,7 @@ export interface PageProps {
 export const Page: FC<PageProps> = ({ existingJobsAndGroups, jobType }) => {
   const mlContext = useMlContext();
   const jobCreator = jobCreatorFactory(jobType)(
-    mlContext.currentIndexPattern,
+    mlContext.currentDataView,
     mlContext.currentSavedSearch,
     mlContext.combinedQuery
   );
@@ -184,7 +184,7 @@ export const Page: FC<PageProps> = ({ existingJobsAndGroups, jobType }) => {
   chartInterval.setMaxBars(MAX_BARS);
   chartInterval.setInterval('auto');
 
-  const chartLoader = new ChartLoader(mlContext.currentIndexPattern, mlContext.combinedQuery);
+  const chartLoader = new ChartLoader(mlContext.currentDataView, mlContext.combinedQuery);
 
   const jobValidator = new JobValidator(jobCreator);
 
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/new_job/wizard_steps.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/new_job/wizard_steps.tsx
index c24fb2521ea58..b2e5a4ee1c22f 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/new_job/wizard_steps.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/new_job/wizard_steps.tsx
@@ -40,10 +40,10 @@ export const WizardSteps: FC<Props> = ({ currentStep, setCurrentStep }) => {
         defaultMessage: 'New job from saved search {title}',
         values: { title: mlContext.currentSavedSearch.attributes.title as string },
       });
-    } else if (mlContext.currentIndexPattern.id !== undefined) {
+    } else if (mlContext.currentDataView.id !== undefined) {
       return i18n.translate('xpack.ml.newJob.wizard.stepComponentWrapper.summaryTitleDataView', {
         defaultMessage: 'New job from data view {dataViewName}',
-        values: { dataViewName: mlContext.currentIndexPattern.title },
+        values: { dataViewName: mlContext.currentDataView.title },
       });
     }
     return '';
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/recognize/components/job_settings_form.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/recognize/components/job_settings_form.tsx
index 8dc0ca0ddbdc4..c996f50ea5018 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/recognize/components/job_settings_form.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/recognize/components/job_settings_form.tsx
@@ -53,7 +53,7 @@ export const JobSettingsForm: FC<JobSettingsFormProps> = ({
   jobs,
 }) => {
   const { from, to } = getTimeFilterRange();
-  const { currentIndexPattern: indexPattern } = useMlContext();
+  const { currentDataView: dataView } = useMlContext();
 
   const jobPrefixValidator = composeValidators(
     patternValidator(/^([a-z0-9]+[a-z0-9\-_]*)?$/),
@@ -181,7 +181,7 @@ export const JobSettingsForm: FC<JobSettingsFormProps> = ({
               <FormattedMessage
                 id="xpack.ml.newJob.recognize.useFullDataLabel"
                 defaultMessage="Use full {indexPatternTitle} data"
-                values={{ indexPatternTitle: indexPattern.title }}
+                values={{ indexPatternTitle: dataView.title }}
               />
             }
             checked={formState.useFullIndexData}
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/recognize/page.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/recognize/page.tsx
index dbf9bce64b114..7603855d47e5c 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/recognize/page.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/recognize/page.tsx
@@ -92,7 +92,7 @@ export const Page: FC<PageProps> = ({ moduleId, existingGroupIds }) => {
 
   const {
     currentSavedSearch: savedSearch,
-    currentIndexPattern: indexPattern,
+    currentDataView: dataView,
     combinedQuery,
   } = useMlContext();
   const pageTitle =
@@ -103,7 +103,7 @@ export const Page: FC<PageProps> = ({ moduleId, existingGroupIds }) => {
         })
       : i18n.translate('xpack.ml.newJob.recognize.dataViewPageTitle', {
           defaultMessage: 'data view {dataViewName}',
-          values: { dataViewName: indexPattern.title },
+          values: { dataViewName: dataView.title },
         });
   const displayQueryWarning = savedSearch !== null;
   const tempQuery = savedSearch === null ? undefined : combinedQuery;
@@ -135,10 +135,10 @@ export const Page: FC<PageProps> = ({ moduleId, existingGroupIds }) => {
     timeRange: TimeRange
   ): Promise<TimeRange> => {
     if (useFullIndexData) {
-      const runtimeMappings = indexPattern.getComputedFields().runtimeFields as RuntimeMappings;
+      const runtimeMappings = dataView.getComputedFields().runtimeFields as RuntimeMappings;
       const { start, end } = await ml.getTimeFieldRange({
-        index: indexPattern.title,
-        timeFieldName: indexPattern.timeFieldName,
+        index: dataView.title,
+        timeFieldName: dataView.timeFieldName,
         query: combinedQuery,
         ...(isPopulatedObject(runtimeMappings) ? { runtimeMappings } : {}),
       });
@@ -178,7 +178,7 @@ export const Page: FC<PageProps> = ({ moduleId, existingGroupIds }) => {
         moduleId,
         prefix: resultJobPrefix,
         query: tempQuery,
-        indexPatternName: indexPattern.title,
+        indexPatternName: dataView.title,
         useDedicatedIndex,
         startDatafeed: startDatafeedAfterSave,
         ...(jobOverridesPayload !== null ? { jobOverrides: jobOverridesPayload } : {}),
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/recognize/resolvers.ts b/x-pack/plugins/ml/public/application/jobs/new_job/recognize/resolvers.ts
index b4e581d46bcc3..6dca394c0227d 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/recognize/resolvers.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/recognize/resolvers.ts
@@ -19,7 +19,7 @@ import { CreateLinkWithUserDefaults } from '../../../components/custom_hooks/use
  */
 export function checkViewOrCreateJobs(
   moduleId: string,
-  indexPatternId: string,
+  dataViewId: string,
   createLinkWithUserDefaults: CreateLinkWithUserDefaults,
   navigateToPath: NavigateToPath
 ): Promise<any> {
@@ -36,7 +36,7 @@ export function checkViewOrCreateJobs(
           await navigateToPath(url);
           reject();
         } else {
-          await navigateToPath(`/jobs/new_job/recognize?id=${moduleId}&index=${indexPatternId}`);
+          await navigateToPath(`/jobs/new_job/recognize?id=${moduleId}&index=${dataViewId}`);
           reject();
         }
       })
diff --git a/x-pack/plugins/ml/public/application/routing/resolvers.ts b/x-pack/plugins/ml/public/application/routing/resolvers.ts
index 3479005809efb..d95dfc9d2784f 100644
--- a/x-pack/plugins/ml/public/application/routing/resolvers.ts
+++ b/x-pack/plugins/ml/public/application/routing/resolvers.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { loadIndexPatterns, loadSavedSearches } from '../util/index_utils';
+import { cacheDataViewsContract, loadSavedSearches } from '../util/index_utils';
 import { checkFullLicense } from '../license';
 import { checkGetJobsCapabilitiesResolver } from '../capabilities/check_capabilities';
 import { getMlNodeCount } from '../ml_nodes_check/check_ml_nodes';
@@ -21,18 +21,18 @@ export interface ResolverResults {
 }
 
 interface BasicResolverDependencies {
-  indexPatterns: DataViewsContract;
+  dataViewsContract: DataViewsContract;
   redirectToMlAccessDeniedPage: () => Promise<void>;
 }
 
 export const basicResolvers = ({
-  indexPatterns,
+  dataViewsContract,
   redirectToMlAccessDeniedPage,
 }: BasicResolverDependencies): Resolvers => ({
   checkFullLicense,
   getMlNodeCount,
   loadMlServerInfo,
-  loadIndexPatterns: () => loadIndexPatterns(indexPatterns),
+  cacheDataViewsContract: () => cacheDataViewsContract(dataViewsContract),
   checkGetJobsCapabilities: () => checkGetJobsCapabilitiesResolver(redirectToMlAccessDeniedPage),
   loadSavedSearches,
 });
diff --git a/x-pack/plugins/ml/public/application/routing/router.tsx b/x-pack/plugins/ml/public/application/routing/router.tsx
index 847dcc1ae1107..5f220d86cd6ad 100644
--- a/x-pack/plugins/ml/public/application/routing/router.tsx
+++ b/x-pack/plugins/ml/public/application/routing/router.tsx
@@ -43,7 +43,7 @@ export interface PageProps {
 interface PageDependencies {
   config: IUiSettingsClient;
   history: AppMountParameters['history'];
-  indexPatterns: DataViewsContract;
+  dataViewsContract: DataViewsContract;
   setBreadcrumbs: ChromeStart['setBreadcrumbs'];
   redirectToMlAccessDeniedPage: () => Promise<void>;
 }
diff --git a/x-pack/plugins/ml/public/application/routing/routes/access_denied.tsx b/x-pack/plugins/ml/public/application/routing/routes/access_denied.tsx
index afb36b89732f1..10b2d1438c32b 100644
--- a/x-pack/plugins/ml/public/application/routing/routes/access_denied.tsx
+++ b/x-pack/plugins/ml/public/application/routing/routes/access_denied.tsx
@@ -27,7 +27,7 @@ export const accessDeniedRouteFactory = (): MlRoute => ({
 });
 
 const PageWrapper: FC<PageProps> = ({ deps }) => {
-  const { context } = useResolver(undefined, undefined, deps.config, {});
+  const { context } = useResolver(undefined, undefined, deps.config, deps.dataViewsContract, {});
 
   return (
     <PageLoader context={context}>
diff --git a/x-pack/plugins/ml/public/application/routing/routes/data_frame_analytics/analytics_job_creation.tsx b/x-pack/plugins/ml/public/application/routing/routes/data_frame_analytics/analytics_job_creation.tsx
index ab57c264683ca..e550eaa338b08 100644
--- a/x-pack/plugins/ml/public/application/routing/routes/data_frame_analytics/analytics_job_creation.tsx
+++ b/x-pack/plugins/ml/public/application/routing/routes/data_frame_analytics/analytics_job_creation.tsx
@@ -44,10 +44,10 @@ const PageWrapper: FC<PageProps> = ({ location, deps }) => {
     sort: false,
   });
 
-  const { context } = useResolver(index, savedSearchId, deps.config, {
+  const { context } = useResolver(index, savedSearchId, deps.config, deps.dataViewsContract, {
     ...basicResolvers(deps),
     analyticsFields: () =>
-      loadNewJobCapabilities(index, savedSearchId, deps.indexPatterns, DATA_FRAME_ANALYTICS),
+      loadNewJobCapabilities(index, savedSearchId, deps.dataViewsContract, DATA_FRAME_ANALYTICS),
   });
 
   return (
diff --git a/x-pack/plugins/ml/public/application/routing/routes/data_frame_analytics/analytics_job_exploration.tsx b/x-pack/plugins/ml/public/application/routing/routes/data_frame_analytics/analytics_job_exploration.tsx
index 98603f69f382f..49a756fd12ced 100644
--- a/x-pack/plugins/ml/public/application/routing/routes/data_frame_analytics/analytics_job_exploration.tsx
+++ b/x-pack/plugins/ml/public/application/routing/routes/data_frame_analytics/analytics_job_exploration.tsx
@@ -39,7 +39,13 @@ export const analyticsJobExplorationRouteFactory = (
 });
 
 const PageWrapper: FC<PageProps> = ({ location, deps }) => {
-  const { context } = useResolver(undefined, undefined, deps.config, basicResolvers(deps));
+  const { context } = useResolver(
+    undefined,
+    undefined,
+    deps.config,
+    deps.dataViewsContract,
+    basicResolvers(deps)
+  );
 
   const [globalState] = useUrlState('_g');
 
diff --git a/x-pack/plugins/ml/public/application/routing/routes/data_frame_analytics/analytics_jobs_list.tsx b/x-pack/plugins/ml/public/application/routing/routes/data_frame_analytics/analytics_jobs_list.tsx
index d6a70105a71b4..2e55a9e85fb6e 100644
--- a/x-pack/plugins/ml/public/application/routing/routes/data_frame_analytics/analytics_jobs_list.tsx
+++ b/x-pack/plugins/ml/public/application/routing/routes/data_frame_analytics/analytics_jobs_list.tsx
@@ -35,7 +35,13 @@ export const analyticsJobsListRouteFactory = (
 });
 
 const PageWrapper: FC<PageProps> = ({ location, deps }) => {
-  const { context } = useResolver(undefined, undefined, deps.config, basicResolvers(deps));
+  const { context } = useResolver(
+    undefined,
+    undefined,
+    deps.config,
+    deps.dataViewsContract,
+    basicResolvers(deps)
+  );
   return (
     <PageLoader context={context}>
       <Page />
diff --git a/x-pack/plugins/ml/public/application/routing/routes/data_frame_analytics/analytics_map.tsx b/x-pack/plugins/ml/public/application/routing/routes/data_frame_analytics/analytics_map.tsx
index 77e7d3b3740ef..29bf616041624 100644
--- a/x-pack/plugins/ml/public/application/routing/routes/data_frame_analytics/analytics_map.tsx
+++ b/x-pack/plugins/ml/public/application/routing/routes/data_frame_analytics/analytics_map.tsx
@@ -35,7 +35,13 @@ export const analyticsMapRouteFactory = (
 });
 
 const PageWrapper: FC<PageProps> = ({ deps }) => {
-  const { context } = useResolver(undefined, undefined, deps.config, basicResolvers(deps));
+  const { context } = useResolver(
+    undefined,
+    undefined,
+    deps.config,
+    deps.dataViewsContract,
+    basicResolvers(deps)
+  );
 
   return (
     <PageLoader context={context}>
diff --git a/x-pack/plugins/ml/public/application/routing/routes/datavisualizer/datavisualizer.tsx b/x-pack/plugins/ml/public/application/routing/routes/datavisualizer/datavisualizer.tsx
index b2466c7466747..4db8d9a0c72f3 100644
--- a/x-pack/plugins/ml/public/application/routing/routes/datavisualizer/datavisualizer.tsx
+++ b/x-pack/plugins/ml/public/application/routing/routes/datavisualizer/datavisualizer.tsx
@@ -32,7 +32,7 @@ export const selectorRouteFactory = (
 const PageWrapper: FC<PageProps> = ({ location, deps }) => {
   const { redirectToMlAccessDeniedPage } = deps;
 
-  const { context } = useResolver(undefined, undefined, deps.config, {
+  const { context } = useResolver(undefined, undefined, deps.config, deps.dataViewsContract, {
     checkBasicLicense,
     checkFindFileStructurePrivilege: () =>
       checkFindFileStructurePrivilegeResolver(redirectToMlAccessDeniedPage),
diff --git a/x-pack/plugins/ml/public/application/routing/routes/datavisualizer/file_based.tsx b/x-pack/plugins/ml/public/application/routing/routes/datavisualizer/file_based.tsx
index 5b16bf8352b27..9e48940a29b56 100644
--- a/x-pack/plugins/ml/public/application/routing/routes/datavisualizer/file_based.tsx
+++ b/x-pack/plugins/ml/public/application/routing/routes/datavisualizer/file_based.tsx
@@ -16,7 +16,7 @@ import { FileDataVisualizerPage } from '../../../datavisualizer/file_based';
 
 import { checkBasicLicense } from '../../../license';
 import { checkFindFileStructurePrivilegeResolver } from '../../../capabilities/check_capabilities';
-import { loadIndexPatterns } from '../../../util/index_utils';
+import { cacheDataViewsContract } from '../../../util/index_utils';
 
 import { getBreadcrumbWithUrlForApp } from '../../breadcrumbs';
 
@@ -41,9 +41,9 @@ export const fileBasedRouteFactory = (
 const PageWrapper: FC<PageProps> = ({ deps }) => {
   const { redirectToMlAccessDeniedPage } = deps;
 
-  const { context } = useResolver(undefined, undefined, deps.config, {
+  const { context } = useResolver(undefined, undefined, deps.config, deps.dataViewsContract, {
     checkBasicLicense,
-    loadIndexPatterns: () => loadIndexPatterns(deps.indexPatterns),
+    cacheDataViewsContract: () => cacheDataViewsContract(deps.dataViewsContract),
     checkFindFileStructurePrivilege: () =>
       checkFindFileStructurePrivilegeResolver(redirectToMlAccessDeniedPage),
   });
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 04543a28ab3e6..dde1a3a768553 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
@@ -18,7 +18,7 @@ import { IndexDataVisualizerPage as Page } from '../../../datavisualizer/index_b
 
 import { checkBasicLicense } from '../../../license';
 import { checkGetJobsCapabilitiesResolver } from '../../../capabilities/check_capabilities';
-import { loadIndexPatterns } from '../../../util/index_utils';
+import { cacheDataViewsContract } from '../../../util/index_utils';
 import { getBreadcrumbWithUrlForApp } from '../../breadcrumbs';
 
 export const indexBasedRouteFactory = (
@@ -43,9 +43,9 @@ const PageWrapper: FC<PageProps> = ({ location, deps }) => {
   const { redirectToMlAccessDeniedPage } = deps;
 
   const { index, savedSearchId }: Record<string, any> = parse(location.search, { sort: false });
-  const { context } = useResolver(index, savedSearchId, deps.config, {
+  const { context } = useResolver(index, savedSearchId, deps.config, deps.dataViewsContract, {
     checkBasicLicense,
-    loadIndexPatterns: () => loadIndexPatterns(deps.indexPatterns),
+    cacheDataViewsContract: () => cacheDataViewsContract(deps.dataViewsContract),
     checkGetJobsCapabilities: () => checkGetJobsCapabilitiesResolver(redirectToMlAccessDeniedPage),
   });
 
diff --git a/x-pack/plugins/ml/public/application/routing/routes/explorer.tsx b/x-pack/plugins/ml/public/application/routing/routes/explorer.tsx
index 49e7857eee082..e50dc301f970b 100644
--- a/x-pack/plugins/ml/public/application/routing/routes/explorer.tsx
+++ b/x-pack/plugins/ml/public/application/routing/routes/explorer.tsx
@@ -57,11 +57,17 @@ export const explorerRouteFactory = (
 });
 
 const PageWrapper: FC<PageProps> = ({ deps }) => {
-  const { context, results } = useResolver(undefined, undefined, deps.config, {
-    ...basicResolvers(deps),
-    jobs: mlJobService.loadJobsWrapper,
-    jobsWithTimeRange: () => ml.jobs.jobsWithTimerange(getDateFormatTz()),
-  });
+  const { context, results } = useResolver(
+    undefined,
+    undefined,
+    deps.config,
+    deps.dataViewsContract,
+    {
+      ...basicResolvers(deps),
+      jobs: mlJobService.loadJobsWrapper,
+      jobsWithTimeRange: () => ml.jobs.jobsWithTimerange(getDateFormatTz()),
+    }
+  );
   const annotationUpdatesService = useMemo(() => new AnnotationUpdatesService(), []);
 
   return (
diff --git a/x-pack/plugins/ml/public/application/routing/routes/jobs_list.tsx b/x-pack/plugins/ml/public/application/routing/routes/jobs_list.tsx
index ecaa0a9e42e3f..52cdfc5c42b2d 100644
--- a/x-pack/plugins/ml/public/application/routing/routes/jobs_list.tsx
+++ b/x-pack/plugins/ml/public/application/routing/routes/jobs_list.tsx
@@ -39,7 +39,13 @@ export const jobListRouteFactory = (navigateToPath: NavigateToPath, basePath: st
 });
 
 const PageWrapper: FC<PageProps> = ({ deps }) => {
-  const { context } = useResolver(undefined, undefined, deps.config, basicResolvers(deps));
+  const { context } = useResolver(
+    undefined,
+    undefined,
+    deps.config,
+    deps.dataViewsContract,
+    basicResolvers(deps)
+  );
   const timefilter = useTimefilter({ timeRangeSelector: false, autoRefreshSelector: true });
 
   const [globalState, setGlobalState] = useUrlState('_g');
diff --git a/x-pack/plugins/ml/public/application/routing/routes/new_job/index_or_search.tsx b/x-pack/plugins/ml/public/application/routing/routes/new_job/index_or_search.tsx
index 53057cb16c132..e92bac32debcb 100644
--- a/x-pack/plugins/ml/public/application/routing/routes/new_job/index_or_search.tsx
+++ b/x-pack/plugins/ml/public/application/routing/routes/new_job/index_or_search.tsx
@@ -17,7 +17,7 @@ import { basicResolvers } from '../../resolvers';
 import { Page, preConfiguredJobRedirect } from '../../../jobs/new_job/pages/index_or_search';
 import { getBreadcrumbWithUrlForApp } from '../../breadcrumbs';
 import { checkBasicLicense } from '../../../license';
-import { loadIndexPatterns } from '../../../util/index_utils';
+import { cacheDataViewsContract } from '../../../util/index_utils';
 import { checkGetJobsCapabilitiesResolver } from '../../../capabilities/check_capabilities';
 
 enum MODE {
@@ -86,11 +86,11 @@ const PageWrapper: FC<IndexOrSearchPageProps> = ({ nextStepPath, deps, mode }) =
   const newJobResolvers = {
     ...basicResolvers(deps),
     preConfiguredJobRedirect: () =>
-      preConfiguredJobRedirect(deps.indexPatterns, basePath.get(), navigateToUrl),
+      preConfiguredJobRedirect(deps.dataViewsContract, basePath.get(), navigateToUrl),
   };
   const dataVizResolvers = {
     checkBasicLicense,
-    loadIndexPatterns: () => loadIndexPatterns(deps.indexPatterns),
+    cacheDataViewsContract: () => cacheDataViewsContract(deps.dataViewsContract),
     checkGetJobsCapabilities: () => checkGetJobsCapabilitiesResolver(redirectToMlAccessDeniedPage),
   };
 
@@ -98,6 +98,7 @@ const PageWrapper: FC<IndexOrSearchPageProps> = ({ nextStepPath, deps, mode }) =
     undefined,
     undefined,
     deps.config,
+    deps.dataViewsContract,
     mode === MODE.NEW_JOB ? newJobResolvers : dataVizResolvers
   );
   return (
diff --git a/x-pack/plugins/ml/public/application/routing/routes/new_job/job_type.tsx b/x-pack/plugins/ml/public/application/routing/routes/new_job/job_type.tsx
index 235a91ea73791..cdd2b890f086e 100644
--- a/x-pack/plugins/ml/public/application/routing/routes/new_job/job_type.tsx
+++ b/x-pack/plugins/ml/public/application/routing/routes/new_job/job_type.tsx
@@ -35,7 +35,13 @@ export const jobTypeRouteFactory = (navigateToPath: NavigateToPath, basePath: st
 
 const PageWrapper: FC<PageProps> = ({ location, deps }) => {
   const { index, savedSearchId }: Record<string, any> = parse(location.search, { sort: false });
-  const { context } = useResolver(index, savedSearchId, deps.config, basicResolvers(deps));
+  const { context } = useResolver(
+    index,
+    savedSearchId,
+    deps.config,
+    deps.dataViewsContract,
+    basicResolvers(deps)
+  );
   return (
     <PageLoader context={context}>
       <Page />
diff --git a/x-pack/plugins/ml/public/application/routing/routes/new_job/recognize.tsx b/x-pack/plugins/ml/public/application/routing/routes/new_job/recognize.tsx
index 125d7cbb0f84a..7e7da6c79a858 100644
--- a/x-pack/plugins/ml/public/application/routing/routes/new_job/recognize.tsx
+++ b/x-pack/plugins/ml/public/application/routing/routes/new_job/recognize.tsx
@@ -49,10 +49,16 @@ export const checkViewOrCreateRouteFactory = (): MlRoute => ({
 
 const PageWrapper: FC<PageProps> = ({ location, deps }) => {
   const { id, index, savedSearchId }: Record<string, any> = parse(location.search, { sort: false });
-  const { context, results } = useResolver(index, savedSearchId, deps.config, {
-    ...basicResolvers(deps),
-    existingJobsAndGroups: mlJobService.getJobAndGroupIds,
-  });
+  const { context, results } = useResolver(
+    index,
+    savedSearchId,
+    deps.config,
+    deps.dataViewsContract,
+    {
+      ...basicResolvers(deps),
+      existingJobsAndGroups: mlJobService.getJobAndGroupIds,
+    }
+  );
 
   return (
     <PageLoader context={context}>
@@ -62,7 +68,7 @@ const PageWrapper: FC<PageProps> = ({ location, deps }) => {
 };
 
 const CheckViewOrCreateWrapper: FC<PageProps> = ({ location, deps }) => {
-  const { id: moduleId, index: indexPatternId }: Record<string, any> = parse(location.search, {
+  const { id: moduleId, index: dataViewId }: Record<string, any> = parse(location.search, {
     sort: false,
   });
   const { createLinkWithUserDefaults } = useCreateADLinks();
@@ -70,9 +76,9 @@ const CheckViewOrCreateWrapper: FC<PageProps> = ({ location, deps }) => {
   const navigateToPath = useNavigateToPath();
 
   // the single resolver checkViewOrCreateJobs redirects only. so will always reject
-  useResolver(undefined, undefined, deps.config, {
+  useResolver(undefined, undefined, deps.config, deps.dataViewsContract, {
     checkViewOrCreateJobs: () =>
-      checkViewOrCreateJobs(moduleId, indexPatternId, createLinkWithUserDefaults, navigateToPath),
+      checkViewOrCreateJobs(moduleId, dataViewId, createLinkWithUserDefaults, navigateToPath),
   });
   return null;
 };
diff --git a/x-pack/plugins/ml/public/application/routing/routes/new_job/wizard.tsx b/x-pack/plugins/ml/public/application/routing/routes/new_job/wizard.tsx
index d95fbcaba9f67..7953d15a55b1e 100644
--- a/x-pack/plugins/ml/public/application/routing/routes/new_job/wizard.tsx
+++ b/x-pack/plugins/ml/public/application/routing/routes/new_job/wizard.tsx
@@ -153,13 +153,19 @@ const PageWrapper: FC<WizardPageProps> = ({ location, jobType, deps }) => {
   );
 
   const { index, savedSearchId }: Record<string, any> = parse(location.search, { sort: false });
-  const { context, results } = useResolver(index, savedSearchId, deps.config, {
-    ...basicResolvers(deps),
-    privileges: () => checkCreateJobsCapabilitiesResolver(redirectToJobsManagementPage),
-    jobCaps: () =>
-      loadNewJobCapabilities(index, savedSearchId, deps.indexPatterns, ANOMALY_DETECTOR),
-    existingJobsAndGroups: mlJobService.getJobAndGroupIds,
-  });
+  const { context, results } = useResolver(
+    index,
+    savedSearchId,
+    deps.config,
+    deps.dataViewsContract,
+    {
+      ...basicResolvers(deps),
+      privileges: () => checkCreateJobsCapabilitiesResolver(redirectToJobsManagementPage),
+      jobCaps: () =>
+        loadNewJobCapabilities(index, savedSearchId, deps.dataViewsContract, ANOMALY_DETECTOR),
+      existingJobsAndGroups: mlJobService.getJobAndGroupIds,
+    }
+  );
 
   return (
     <PageLoader context={context}>
diff --git a/x-pack/plugins/ml/public/application/routing/routes/overview.tsx b/x-pack/plugins/ml/public/application/routing/routes/overview.tsx
index 9f21609db35ca..dd3fc70a6425e 100644
--- a/x-pack/plugins/ml/public/application/routing/routes/overview.tsx
+++ b/x-pack/plugins/ml/public/application/routing/routes/overview.tsx
@@ -44,7 +44,7 @@ export const overviewRouteFactory = (
 const PageWrapper: FC<PageProps> = ({ deps }) => {
   const { redirectToMlAccessDeniedPage } = deps;
 
-  const { context } = useResolver(undefined, undefined, deps.config, {
+  const { context } = useResolver(undefined, undefined, deps.config, deps.dataViewsContract, {
     checkFullLicense,
     checkGetJobsCapabilities: () => checkGetJobsCapabilitiesResolver(redirectToMlAccessDeniedPage),
     getMlNodeCount,
diff --git a/x-pack/plugins/ml/public/application/routing/routes/settings/calendar_list.tsx b/x-pack/plugins/ml/public/application/routing/routes/settings/calendar_list.tsx
index d8a59ebed9de6..08949d5d514b2 100644
--- a/x-pack/plugins/ml/public/application/routing/routes/settings/calendar_list.tsx
+++ b/x-pack/plugins/ml/public/application/routing/routes/settings/calendar_list.tsx
@@ -38,7 +38,7 @@ export const calendarListRouteFactory = (
 const PageWrapper: FC<PageProps> = ({ deps }) => {
   const { redirectToMlAccessDeniedPage } = deps;
 
-  const { context } = useResolver(undefined, undefined, deps.config, {
+  const { context } = useResolver(undefined, undefined, deps.config, deps.dataViewsContract, {
     checkFullLicense,
     checkGetJobsCapabilities: () => checkGetJobsCapabilitiesResolver(redirectToMlAccessDeniedPage),
     getMlNodeCount,
diff --git a/x-pack/plugins/ml/public/application/routing/routes/settings/calendar_new_edit.tsx b/x-pack/plugins/ml/public/application/routing/routes/settings/calendar_new_edit.tsx
index 18c4d43b564d7..05f9f92479f45 100644
--- a/x-pack/plugins/ml/public/application/routing/routes/settings/calendar_new_edit.tsx
+++ b/x-pack/plugins/ml/public/application/routing/routes/settings/calendar_new_edit.tsx
@@ -83,7 +83,7 @@ const PageWrapper: FC<NewCalendarPageProps> = ({ location, mode, deps }) => {
     ML_PAGES.ANOMALY_DETECTION_JOBS_MANAGE
   );
 
-  const { context } = useResolver(undefined, undefined, deps.config, {
+  const { context } = useResolver(undefined, undefined, deps.config, deps.dataViewsContract, {
     checkFullLicense,
     checkGetJobsCapabilities: () => checkGetJobsCapabilitiesResolver(redirectToMlAccessDeniedPage),
     checkMlNodesAvailable: () => checkMlNodesAvailable(redirectToJobsManagementPage),
diff --git a/x-pack/plugins/ml/public/application/routing/routes/settings/filter_list.tsx b/x-pack/plugins/ml/public/application/routing/routes/settings/filter_list.tsx
index d28569ff8aaa4..8e956ecf59d5d 100644
--- a/x-pack/plugins/ml/public/application/routing/routes/settings/filter_list.tsx
+++ b/x-pack/plugins/ml/public/application/routing/routes/settings/filter_list.tsx
@@ -39,7 +39,7 @@ export const filterListRouteFactory = (
 const PageWrapper: FC<PageProps> = ({ deps }) => {
   const { redirectToMlAccessDeniedPage } = deps;
 
-  const { context } = useResolver(undefined, undefined, deps.config, {
+  const { context } = useResolver(undefined, undefined, deps.config, deps.dataViewsContract, {
     checkFullLicense,
     checkGetJobsCapabilities: () => checkGetJobsCapabilitiesResolver(redirectToMlAccessDeniedPage),
     getMlNodeCount,
diff --git a/x-pack/plugins/ml/public/application/routing/routes/settings/filter_list_new_edit.tsx b/x-pack/plugins/ml/public/application/routing/routes/settings/filter_list_new_edit.tsx
index e12a33b48439c..cf32063210624 100644
--- a/x-pack/plugins/ml/public/application/routing/routes/settings/filter_list_new_edit.tsx
+++ b/x-pack/plugins/ml/public/application/routing/routes/settings/filter_list_new_edit.tsx
@@ -85,7 +85,7 @@ const PageWrapper: FC<NewFilterPageProps> = ({ location, mode, deps }) => {
     ML_PAGES.ANOMALY_DETECTION_JOBS_MANAGE
   );
 
-  const { context } = useResolver(undefined, undefined, deps.config, {
+  const { context } = useResolver(undefined, undefined, deps.config, deps.dataViewsContract, {
     checkFullLicense,
     checkGetJobsCapabilities: () => checkGetJobsCapabilitiesResolver(redirectToMlAccessDeniedPage),
     checkMlNodesAvailable: () => checkMlNodesAvailable(redirectToJobsManagementPage),
diff --git a/x-pack/plugins/ml/public/application/routing/routes/settings/settings.tsx b/x-pack/plugins/ml/public/application/routing/routes/settings/settings.tsx
index 51b8e8e837633..5e0e8dbc801e7 100644
--- a/x-pack/plugins/ml/public/application/routing/routes/settings/settings.tsx
+++ b/x-pack/plugins/ml/public/application/routing/routes/settings/settings.tsx
@@ -37,7 +37,7 @@ export const settingsRouteFactory = (
 const PageWrapper: FC<PageProps> = ({ deps }) => {
   const { redirectToMlAccessDeniedPage } = deps;
 
-  const { context } = useResolver(undefined, undefined, deps.config, {
+  const { context } = useResolver(undefined, undefined, deps.config, deps.dataViewsContract, {
     checkFullLicense,
     checkGetJobsCapabilities: () => checkGetJobsCapabilitiesResolver(redirectToMlAccessDeniedPage),
     getMlNodeCount,
diff --git a/x-pack/plugins/ml/public/application/routing/routes/timeseriesexplorer.tsx b/x-pack/plugins/ml/public/application/routing/routes/timeseriesexplorer.tsx
index 8c704ef4240a0..91697b8a89bd7 100644
--- a/x-pack/plugins/ml/public/application/routing/routes/timeseriesexplorer.tsx
+++ b/x-pack/plugins/ml/public/application/routing/routes/timeseriesexplorer.tsx
@@ -65,11 +65,17 @@ export const timeSeriesExplorerRouteFactory = (
 });
 
 const PageWrapper: FC<PageProps> = ({ deps }) => {
-  const { context, results } = useResolver(undefined, undefined, deps.config, {
-    ...basicResolvers(deps),
-    jobs: mlJobService.loadJobsWrapper,
-    jobsWithTimeRange: () => ml.jobs.jobsWithTimerange(getDateFormatTz()),
-  });
+  const { context, results } = useResolver(
+    undefined,
+    undefined,
+    deps.config,
+    deps.dataViewsContract,
+    {
+      ...basicResolvers(deps),
+      jobs: mlJobService.loadJobsWrapper,
+      jobsWithTimeRange: () => ml.jobs.jobsWithTimerange(getDateFormatTz()),
+    }
+  );
   const annotationUpdatesService = useMemo(() => new AnnotationUpdatesService(), []);
 
   return (
diff --git a/x-pack/plugins/ml/public/application/routing/routes/trained_models/models_list.tsx b/x-pack/plugins/ml/public/application/routing/routes/trained_models/models_list.tsx
index 9367a58372484..646df84aee5e7 100644
--- a/x-pack/plugins/ml/public/application/routing/routes/trained_models/models_list.tsx
+++ b/x-pack/plugins/ml/public/application/routing/routes/trained_models/models_list.tsx
@@ -35,7 +35,13 @@ export const modelsListRouteFactory = (
 });
 
 const PageWrapper: FC<PageProps> = ({ location, deps }) => {
-  const { context } = useResolver(undefined, undefined, deps.config, basicResolvers(deps));
+  const { context } = useResolver(
+    undefined,
+    undefined,
+    deps.config,
+    deps.dataViewsContract,
+    basicResolvers(deps)
+  );
   return (
     <PageLoader context={context}>
       <Page />
diff --git a/x-pack/plugins/ml/public/application/routing/routes/trained_models/nodes_list.tsx b/x-pack/plugins/ml/public/application/routing/routes/trained_models/nodes_list.tsx
index bd88527af1a8d..c0bd22e657bb0 100644
--- a/x-pack/plugins/ml/public/application/routing/routes/trained_models/nodes_list.tsx
+++ b/x-pack/plugins/ml/public/application/routing/routes/trained_models/nodes_list.tsx
@@ -35,7 +35,13 @@ export const nodesListRouteFactory = (
 });
 
 const PageWrapper: FC<PageProps> = ({ location, deps }) => {
-  const { context } = useResolver(undefined, undefined, deps.config, basicResolvers(deps));
+  const { context } = useResolver(
+    undefined,
+    undefined,
+    deps.config,
+    deps.dataViewsContract,
+    basicResolvers(deps)
+  );
   return (
     <PageLoader context={context}>
       <Page />
diff --git a/x-pack/plugins/ml/public/application/routing/use_resolver.test.ts b/x-pack/plugins/ml/public/application/routing/use_resolver.test.ts
index 4c5c8c7b21ddd..98deb8df7b60d 100644
--- a/x-pack/plugins/ml/public/application/routing/use_resolver.test.ts
+++ b/x-pack/plugins/ml/public/application/routing/use_resolver.test.ts
@@ -11,6 +11,7 @@ import { IUiSettingsClient } from 'kibana/public';
 
 import { useCreateAndNavigateToMlLink } from '../contexts/kibana/use_create_url';
 import { useNotifications } from '../contexts/kibana';
+import type { DataViewsContract } from '../../../../../../src/plugins/data_views/public';
 
 import { useResolver } from './use_resolver';
 
@@ -44,9 +45,9 @@ describe('useResolver', () => {
     jest.useRealTimers();
   });
 
-  it('should accept undefined as indexPatternId and savedSearchId.', async () => {
+  it('should accept undefined as dataViewId and savedSearchId.', async () => {
     const { result, waitForNextUpdate } = renderHook(() =>
-      useResolver(undefined, undefined, {} as IUiSettingsClient, {})
+      useResolver(undefined, undefined, {} as IUiSettingsClient, {} as DataViewsContract, {})
     );
 
     await act(async () => {
@@ -64,9 +65,9 @@ describe('useResolver', () => {
             ],
           },
         },
-        currentIndexPattern: null,
+        currentDataView: null,
         currentSavedSearch: null,
-        indexPatterns: null,
+        dataViewsContract: {},
         kibanaConfig: {},
       },
       results: {},
@@ -75,8 +76,10 @@ describe('useResolver', () => {
     expect(redirectToJobsManagementPage).toHaveBeenCalledTimes(0);
   });
 
-  it('should add an error toast and redirect if indexPatternId is an empty string.', async () => {
-    const { result } = renderHook(() => useResolver('', undefined, {} as IUiSettingsClient, {}));
+  it('should add an error toast and redirect if dataViewId is an empty string.', async () => {
+    const { result } = renderHook(() =>
+      useResolver('', undefined, {} as IUiSettingsClient, {} as DataViewsContract, {})
+    );
 
     await act(async () => {});
 
diff --git a/x-pack/plugins/ml/public/application/routing/use_resolver.ts b/x-pack/plugins/ml/public/application/routing/use_resolver.ts
index 62450106d0dfb..59d64f412cc80 100644
--- a/x-pack/plugins/ml/public/application/routing/use_resolver.ts
+++ b/x-pack/plugins/ml/public/application/routing/use_resolver.ts
@@ -9,10 +9,9 @@ import { useEffect, useState } from 'react';
 import { IUiSettingsClient } from 'kibana/public';
 import { i18n } from '@kbn/i18n';
 import {
-  getIndexPatternById,
-  getIndexPatternsContract,
-  getIndexPatternAndSavedSearch,
-  IndexPatternAndSavedSearch,
+  getDataViewById,
+  getDataViewAndSavedSearch,
+  DataViewAndSavedSearch,
 } from '../util/index_utils';
 import { createSearchItems } from '../jobs/new_job/utils/new_job_utils';
 import { ResolverResults, Resolvers } from './resolvers';
@@ -20,19 +19,21 @@ import { MlContextValue } from '../contexts/ml';
 import { useNotifications } from '../contexts/kibana';
 import { useCreateAndNavigateToMlLink } from '../contexts/kibana/use_create_url';
 import { ML_PAGES } from '../../../common/constants/locator';
+import type { DataViewsContract } from '../../../../../../src/plugins/data_views/public';
 
 /**
  * Hook to resolve route specific requirements
- * @param indexPatternId optional Kibana index pattern id, used for wizards
+ * @param dataViewId optional Kibana data view id, used for wizards
  * @param savedSearchId optional Kibana saved search id, used for wizards
  * @param config Kibana UI Settings
  * @param resolvers an array of resolvers to be executed for the route
  * @return { context, results } returns the ML context and resolver results
  */
 export const useResolver = (
-  indexPatternId: string | undefined,
+  dataViewId: string | undefined,
   savedSearchId: string | undefined,
   config: IUiSettingsClient,
+  dataViewsContract: DataViewsContract,
   resolvers: Resolvers
 ): { context: MlContextValue; results: ResolverResults } => {
   const notifications = useNotifications();
@@ -63,38 +64,38 @@ export const useResolver = (
       }
 
       try {
-        if (indexPatternId === '') {
+        if (dataViewId === '') {
           throw new Error(
             i18n.translate('xpack.ml.useResolver.errorIndexPatternIdEmptyString', {
-              defaultMessage: 'indexPatternId must not be empty string.',
+              defaultMessage: 'dataViewId must not be empty string.',
             })
           );
         }
 
-        let indexPatternAndSavedSearch: IndexPatternAndSavedSearch = {
+        let dataViewAndSavedSearch: DataViewAndSavedSearch = {
           savedSearch: null,
-          indexPattern: null,
+          dataView: null,
         };
 
         if (savedSearchId !== undefined) {
-          indexPatternAndSavedSearch = await getIndexPatternAndSavedSearch(savedSearchId);
-        } else if (indexPatternId !== undefined) {
-          indexPatternAndSavedSearch.indexPattern = await getIndexPatternById(indexPatternId);
+          dataViewAndSavedSearch = await getDataViewAndSavedSearch(savedSearchId);
+        } else if (dataViewId !== undefined) {
+          dataViewAndSavedSearch.dataView = await getDataViewById(dataViewId);
         }
 
-        const { savedSearch, indexPattern } = indexPatternAndSavedSearch;
+        const { savedSearch, dataView } = dataViewAndSavedSearch;
 
         const { combinedQuery } = createSearchItems(
           config,
-          indexPattern !== null ? indexPattern : undefined,
+          dataView !== null ? dataView : undefined,
           savedSearch
         );
 
         setContext({
           combinedQuery,
-          currentIndexPattern: indexPattern,
+          currentDataView: dataView,
           currentSavedSearch: savedSearch,
-          indexPatterns: getIndexPatternsContract(),
+          dataViewsContract,
           kibanaConfig: config,
         });
       } catch (error) {
diff --git a/x-pack/plugins/ml/public/application/services/annotations_service.tsx b/x-pack/plugins/ml/public/application/services/annotations_service.tsx
index a84cd7ee000f2..f3d50115f0206 100644
--- a/x-pack/plugins/ml/public/application/services/annotations_service.tsx
+++ b/x-pack/plugins/ml/public/application/services/annotations_service.tsx
@@ -17,7 +17,7 @@ export type AnnotationState = Annotation | null;
 /*
   This observable offers a way to share state between components
   that don't have a direct parent -> * -> child relationship.
-  It's also useful in mixed angularjs/React environments.
+  It's also useful in mixed React environments.
 
   For example, we want to trigger the flyout for editing annotations from both
   the timeseries_chart and the annotations_table. Since we don't want two flyout instances,
@@ -75,8 +75,7 @@ export const annotation$ = new BehaviorSubject<AnnotationState>(null);
 
 /*
   This observable provides a way to trigger a reload of annotations based on a given event.
-  Instead of passing around callbacks or deeply nested props, it can be imported for both
-  angularjs controllers/directives and React components.
+  Instead of passing around callbacks or deeply nested props, it can be imported in React components.
 */
 export const annotationsRefresh$ = new BehaviorSubject(Date.now());
 export const annotationsRefreshed = () => annotationsRefresh$.next(Date.now());
diff --git a/x-pack/plugins/ml/public/application/services/field_format_service.ts b/x-pack/plugins/ml/public/application/services/field_format_service.ts
index d95975156a99d..ddcb447430a45 100644
--- a/x-pack/plugins/ml/public/application/services/field_format_service.ts
+++ b/x-pack/plugins/ml/public/application/services/field_format_service.ts
@@ -6,7 +6,7 @@
  */
 
 import { mlFunctionToESAggregation } from '../../../common/util/job_utils';
-import { getIndexPatternById, getIndexPatternIdFromName } from '../util/index_utils';
+import { getDataViewById, getDataViewIdFromName } from '../util/index_utils';
 import { mlJobService } from './job_service';
 import type { DataView } from '../../../../../../src/plugins/data_views/public';
 
@@ -25,35 +25,40 @@ class FieldFormatService {
   // configured in the datafeed of each job.
   // Builds a map of Kibana FieldFormats (plugins/data/common/field_formats)
   // against detector index by job ID.
-  populateFormats(jobIds: string[]): Promise<FormatsByJobId> {
-    return new Promise((resolve, reject) => {
-      // Populate a map of data view IDs against job ID, by finding the ID of the data
-      // view with a title attribute which matches the indices configured in the datafeed.
-      // If a Kibana data view has not been created
-      // for this index, then no custom field formatting will occur.
-      jobIds.forEach((jobId) => {
-        const jobObj = mlJobService.getJob(jobId);
-        const datafeedIndices = jobObj.datafeed_config.indices;
-        const id = getIndexPatternIdFromName(datafeedIndices.length ? datafeedIndices[0] : '');
-        if (id !== null) {
-          this.indexPatternIdsByJob[jobId] = id;
-        }
-      });
+  async populateFormats(jobIds: string[]): Promise<FormatsByJobId> {
+    // Populate a map of data view IDs against job ID, by finding the ID of the data
+    // view with a title attribute which matches the indices configured in the datafeed.
+    // If a Kibana data view has not been created
+    // for this index, then no custom field formatting will occur.
+    (
+      await Promise.all(
+        jobIds.map(async (jobId) => {
+          const jobObj = mlJobService.getJob(jobId);
+          return {
+            jobId,
+            dataViewId: await getDataViewIdFromName(jobObj.datafeed_config.indices.join(',')),
+          };
+        })
+      )
+    ).forEach(({ jobId, dataViewId }) => {
+      if (dataViewId !== null) {
+        this.indexPatternIdsByJob[jobId] = dataViewId;
+      }
+    });
 
-      const promises = jobIds.map((jobId) => Promise.all([this.getFormatsForJob(jobId)]));
+    const promises = jobIds.map((jobId) => Promise.all([this.getFormatsForJob(jobId)]));
 
-      Promise.all(promises)
-        .then((fmtsByJobByDetector) => {
-          fmtsByJobByDetector.forEach((formatsByDetector, i) => {
-            this.formatsByJob[jobIds[i]] = formatsByDetector[0];
-          });
+    try {
+      const fmtsByJobByDetector = await Promise.all(promises);
+      fmtsByJobByDetector.forEach((formatsByDetector, i) => {
+        this.formatsByJob[jobIds[i]] = formatsByDetector[0];
+      });
 
-          resolve(this.formatsByJob);
-        })
-        .catch((err) => {
-          reject({ formats: {}, err });
-        });
-    });
+      return this.formatsByJob;
+    } catch (error) {
+      console.log('Error populating field formats:', error); // eslint-disable-line no-console
+      return { formats: {}, error };
+    }
   }
 
   // Return the FieldFormat to use for formatting values from
@@ -87,13 +92,13 @@ class FieldFormatService {
       const detectors = jobObj.analysis_config.detectors || [];
       const formatsByDetector: any[] = [];
 
-      const indexPatternId = this.indexPatternIdsByJob[jobId];
-      if (indexPatternId !== undefined) {
+      const dataViewId = this.indexPatternIdsByJob[jobId];
+      if (dataViewId !== undefined) {
         // Load the full data view configuration to obtain the formats of each field.
-        getIndexPatternById(indexPatternId)
-          .then((indexPatternData) => {
+        getDataViewById(dataViewId)
+          .then((dataView) => {
             // Store the FieldFormat for each job by detector_index.
-            const fieldList = indexPatternData.fields;
+            const fieldList = dataView.fields;
             detectors.forEach((dtr) => {
               const esAgg = mlFunctionToESAggregation(dtr.function);
               // distinct_count detectors should fall back to the default
@@ -101,8 +106,7 @@ class FieldFormatService {
               if (dtr.field_name !== undefined && esAgg !== 'cardinality') {
                 const field = fieldList.getByName(dtr.field_name);
                 if (field !== undefined) {
-                  formatsByDetector[dtr.detector_index!] =
-                    indexPatternData.getFormatterForField(field);
+                  formatsByDetector[dtr.detector_index!] = dataView.getFormatterForField(field);
                 }
               }
             });
diff --git a/x-pack/plugins/ml/public/application/services/new_job_capabilities/load_new_job_capabilities.ts b/x-pack/plugins/ml/public/application/services/new_job_capabilities/load_new_job_capabilities.ts
index b4d3c47364a3d..8c05d5a418219 100644
--- a/x-pack/plugins/ml/public/application/services/new_job_capabilities/load_new_job_capabilities.ts
+++ b/x-pack/plugins/ml/public/application/services/new_job_capabilities/load_new_job_capabilities.ts
@@ -6,7 +6,7 @@
  */
 
 import { DataView, DataViewsContract } from '../../../../../../../src/plugins/data_views/public';
-import { getIndexPatternAndSavedSearch } from '../../util/index_utils';
+import { getDataViewAndSavedSearch } from '../../util/index_utils';
 import { JobType } from '../../../../common/types/saved_objects';
 import { newJobCapsServiceAnalytics } from '../new_job_capabilities/new_job_capabilities_service_analytics';
 import { newJobCapsService } from '../new_job_capabilities/new_job_capabilities_service';
@@ -17,9 +17,9 @@ export const DATA_FRAME_ANALYTICS = 'data-frame-analytics';
 // called in the routing resolve block to initialize the NewJobCapabilites
 // service for the corresponding job type with the currently selected data view
 export function loadNewJobCapabilities(
-  indexPatternId: string,
+  dataViewId: string,
   savedSearchId: string,
-  indexPatterns: DataViewsContract,
+  dataViewContract: DataViewsContract,
   jobType: JobType
 ) {
   return new Promise(async (resolve, reject) => {
@@ -27,24 +27,24 @@ export function loadNewJobCapabilities(
       const serviceToUse =
         jobType === ANOMALY_DETECTOR ? newJobCapsService : newJobCapsServiceAnalytics;
 
-      if (indexPatternId !== undefined) {
+      if (dataViewId !== undefined) {
         // index pattern is being used
-        const indexPattern: DataView = await indexPatterns.get(indexPatternId);
-        await serviceToUse.initializeFromIndexPattern(indexPattern);
+        const dataView: DataView = await dataViewContract.get(dataViewId);
+        await serviceToUse.initializeFromDataVIew(dataView);
         resolve(serviceToUse.newJobCaps);
       } else if (savedSearchId !== undefined) {
         // saved search is being used
         // load the data view from the saved search
-        const { indexPattern } = await getIndexPatternAndSavedSearch(savedSearchId);
+        const { dataView } = await getDataViewAndSavedSearch(savedSearchId);
 
-        if (indexPattern === null) {
+        if (dataView === null) {
           // eslint-disable-next-line no-console
           console.error('Cannot retrieve data view from saved search');
           reject();
           return;
         }
 
-        await serviceToUse.initializeFromIndexPattern(indexPattern);
+        await serviceToUse.initializeFromDataVIew(dataView);
         resolve(serviceToUse.newJobCaps);
       } else {
         reject();
diff --git a/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities._service.test.ts b/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities._service.test.ts
index 49c8b08007d52..373de76d59457 100644
--- a/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities._service.test.ts
+++ b/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities._service.test.ts
@@ -20,7 +20,7 @@ jest.mock('../ml_api_service', () => ({
   },
 }));
 
-const indexPattern = {
+const dataView = {
   id: 'cloudwatch-*',
   title: 'cloudwatch-*',
 } as unknown as DataView;
@@ -28,7 +28,7 @@ const indexPattern = {
 describe('new_job_capabilities_service', () => {
   describe('cloudwatch newJobCaps()', () => {
     it('can construct job caps objects from endpoint json', async () => {
-      await newJobCapsService.initializeFromIndexPattern(indexPattern);
+      await newJobCapsService.initializeFromDataVIew(dataView);
       const { fields, aggs } = await newJobCapsService.newJobCaps;
 
       const networkOutField = fields.find((f) => f.id === 'NetworkOut') || { aggs: [] };
@@ -47,7 +47,7 @@ describe('new_job_capabilities_service', () => {
     });
 
     it('job caps including text fields', async () => {
-      await newJobCapsService.initializeFromIndexPattern(indexPattern, true, false);
+      await newJobCapsService.initializeFromDataVIew(dataView, true, false);
       const { fields, aggs } = await newJobCapsService.newJobCaps;
 
       expect(fields).toHaveLength(13); // one more field
@@ -55,7 +55,7 @@ describe('new_job_capabilities_service', () => {
     });
 
     it('job caps excluding event rate', async () => {
-      await newJobCapsService.initializeFromIndexPattern(indexPattern, false, true);
+      await newJobCapsService.initializeFromDataVIew(dataView, false, true);
       const { fields, aggs } = await newJobCapsService.newJobCaps;
 
       expect(fields).toHaveLength(11); // one less field
diff --git a/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service.ts b/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service.ts
index 45dc71ed6a6b9..210c409e8e281 100644
--- a/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service.ts
+++ b/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service.ts
@@ -36,8 +36,8 @@ class NewJobCapsService extends NewJobCapabilitiesServiceBase {
     return filterCategoryFields(this._fields);
   }
 
-  public async initializeFromIndexPattern(
-    indexPattern: DataView,
+  public async initializeFromDataVIew(
+    dataView: DataView,
     includeEventRateField = true,
     removeTextFields = true
   ) {
@@ -45,8 +45,8 @@ class NewJobCapsService extends NewJobCapabilitiesServiceBase {
       this._includeEventRateField = includeEventRateField;
       this._removeTextFields = removeTextFields;
 
-      const resp = await ml.jobs.newJobCaps(indexPattern.title, indexPattern.type === 'rollup');
-      const { fields: allFields, aggs } = createObjects(resp, indexPattern.title);
+      const resp = await ml.jobs.newJobCaps(dataView.title, dataView.type === 'rollup');
+      const { fields: allFields, aggs } = createObjects(resp, dataView.title);
 
       if (this._includeEventRateField === true) {
         addEventRateField(aggs, allFields);
diff --git a/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service_analytics.ts b/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service_analytics.ts
index f8f9ae6b2b0a3..2786c14127ecd 100644
--- a/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service_analytics.ts
+++ b/x-pack/plugins/ml/public/application/services/new_job_capabilities/new_job_capabilities_service_analytics.ts
@@ -43,14 +43,14 @@ export function removeNestedFieldChildren(resp: NewJobCapsResponse, indexPattern
 }
 
 class NewJobCapsServiceAnalytics extends NewJobCapabilitiesServiceBase {
-  public async initializeFromIndexPattern(indexPattern: DataView) {
+  public async initializeFromDataVIew(dataView: DataView) {
     try {
       const resp: NewJobCapsResponse = await ml.dataFrameAnalytics.newJobCapsAnalytics(
-        indexPattern.title,
-        indexPattern.type === 'rollup'
+        dataView.title,
+        dataView.type === 'rollup'
       );
 
-      const allFields = removeNestedFieldChildren(resp, indexPattern.title);
+      const allFields = removeNestedFieldChildren(resp, dataView.title);
 
       const { fieldsPreferringKeyword } = processTextAndKeywordFields(allFields);
 
diff --git a/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer.js b/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer.js
index e4d7fc457de0b..7d90d748218e9 100644
--- a/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer.js
+++ b/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer.js
@@ -720,9 +720,7 @@ export class TimeSeriesExplorer extends React.Component {
       appStateHandler(APP_STATE_ACTION.SET_DETECTOR_INDEX, detectorId);
     }
     // Populate the map of jobs / detectors / field formatters for the selected IDs and refresh.
-    mlFieldFormatService.populateFormats([jobId]).catch((err) => {
-      console.log('Error populating field formats:', err);
-    });
+    mlFieldFormatService.populateFormats([jobId]);
   }
 
   componentDidMount() {
diff --git a/x-pack/plugins/ml/public/application/util/index_utils.ts b/x-pack/plugins/ml/public/application/util/index_utils.ts
index b105761e5ebcf..5d35081dcb0fc 100644
--- a/x-pack/plugins/ml/public/application/util/index_utils.ts
+++ b/x-pack/plugins/ml/public/application/util/index_utils.ts
@@ -9,17 +9,13 @@ import { i18n } from '@kbn/i18n';
 import type { Query } from '../../../../../../src/plugins/data/public';
 import type { DataView, DataViewsContract } from '../../../../../../src/plugins/data_views/public';
 import type { SavedSearchSavedObject } from '../../../common/types/kibana';
-import { getToastNotifications, getSavedObjectsClient, getDataViews } from './dependency_cache';
+import { getToastNotifications, getSavedObjectsClient } from './dependency_cache';
 
-let indexPatternCache: DataView[] = [];
 let savedSearchesCache: SavedSearchSavedObject[] = [];
-let indexPatternsContract: DataViewsContract | null = null;
+let dataViewsContract: DataViewsContract | null = null;
 
-export async function loadIndexPatterns(indexPatterns: DataViewsContract) {
-  indexPatternsContract = indexPatterns;
-  const dataViewsContract = getDataViews();
-  indexPatternCache = await dataViewsContract.find('*', 10000);
-  return indexPatternCache;
+export async function cacheDataViewsContract(dvc: DataViewsContract) {
+  dataViewsContract = dvc;
 }
 
 export function loadSavedSearches() {
@@ -41,29 +37,45 @@ export async function loadSavedSearchById(id: string) {
   return ss.error === undefined ? ss : null;
 }
 
-export function getIndexPatterns() {
-  return indexPatternCache;
+export async function getDataViewNames() {
+  if (dataViewsContract === null) {
+    throw new Error('Data views are not initialized!');
+  }
+  return (await dataViewsContract.getIdsWithTitle()).map(({ title }) => title);
 }
 
-export function getIndexPatternsContract() {
-  return indexPatternsContract;
+export async function getDataViewIdFromName(name: string): Promise<string | null> {
+  if (dataViewsContract === null) {
+    throw new Error('Data views are not initialized!');
+  }
+  const [dv] = await dataViewsContract?.find(name);
+  if (!dv) {
+    return null;
+  }
+  return dv.id ?? dv.title;
 }
 
-export function getIndexPatternNames() {
-  return indexPatternCache.map((i) => i.title);
-}
+export function getDataViewById(id: string): Promise<DataView> {
+  if (dataViewsContract === null) {
+    throw new Error('Data views are not initialized!');
+  }
 
-export function getIndexPatternIdFromName(name: string) {
-  return indexPatternCache.find((i) => i.title === name)?.id ?? null;
+  if (id) {
+    return dataViewsContract.get(id);
+  } else {
+    return dataViewsContract.create({});
+  }
 }
-export interface IndexPatternAndSavedSearch {
+
+export interface DataViewAndSavedSearch {
   savedSearch: SavedSearchSavedObject | null;
-  indexPattern: DataView | null;
+  dataView: DataView | null;
 }
-export async function getIndexPatternAndSavedSearch(savedSearchId: string) {
-  const resp: IndexPatternAndSavedSearch = {
+
+export async function getDataViewAndSavedSearch(savedSearchId: string) {
+  const resp: DataViewAndSavedSearch = {
     savedSearch: null,
-    indexPattern: null,
+    dataView: null,
   };
 
   if (savedSearchId === undefined) {
@@ -74,8 +86,8 @@ export async function getIndexPatternAndSavedSearch(savedSearchId: string) {
   if (ss === null) {
     return resp;
   }
-  const indexPatternId = ss.references.find((r) => r.type === 'index-pattern')?.id;
-  resp.indexPattern = await getIndexPatternById(indexPatternId!);
+  const dataViewId = ss.references.find((r) => r.type === 'index-pattern')?.id;
+  resp.dataView = await getDataViewById(dataViewId!);
   resp.savedSearch = ss;
   return resp;
 }
@@ -88,18 +100,6 @@ export function getQueryFromSavedSearchObject(savedSearch: SavedSearchSavedObjec
   };
 }
 
-export function getIndexPatternById(id: string): Promise<DataView> {
-  if (indexPatternsContract !== null) {
-    if (id) {
-      return indexPatternsContract.get(id);
-    } else {
-      return indexPatternsContract.create({});
-    }
-  } else {
-    throw new Error('Data views are not initialized!');
-  }
-}
-
 export function getSavedSearchById(id: string): SavedSearchSavedObject | undefined {
   return savedSearchesCache.find((s) => s.id === id);
 }
@@ -109,14 +109,14 @@ export function getSavedSearchById(id: string): SavedSearchSavedObject | undefin
  * an optional flag will trigger the display a notification at the top of the page
  * warning that the index is not time based
  */
-export function timeBasedIndexCheck(indexPattern: DataView, showNotification = false) {
-  if (!indexPattern.isTimeBased()) {
+export function timeBasedIndexCheck(dataView: DataView, showNotification = false) {
+  if (!dataView.isTimeBased()) {
     if (showNotification) {
       const toastNotifications = getToastNotifications();
       toastNotifications.addWarning({
         title: i18n.translate('xpack.ml.dataViewNotBasedOnTimeSeriesNotificationTitle', {
           defaultMessage: 'The data view {dataViewName} is not based on a time series',
-          values: { dataViewName: indexPattern.title },
+          values: { dataViewName: dataView.title },
         }),
         text: i18n.translate('xpack.ml.dataViewNotBasedOnTimeSeriesNotificationDescription', {
           defaultMessage: 'Anomaly detection only runs over time-based indices',
diff --git a/x-pack/plugins/ml/server/models/data_frame_analytics/index_patterns.ts b/x-pack/plugins/ml/server/models/data_frame_analytics/index_patterns.ts
index 568be4197baf8..b0135b0295fd8 100644
--- a/x-pack/plugins/ml/server/models/data_frame_analytics/index_patterns.ts
+++ b/x-pack/plugins/ml/server/models/data_frame_analytics/index_patterns.ts
@@ -7,17 +7,17 @@
 
 import { DataViewsService } from '../../../../../../src/plugins/data_views/common';
 
-export class IndexPatternHandler {
+export class DataViewHandler {
   constructor(private dataViewService: DataViewsService) {}
   // returns a id based on an index pattern name
-  async getIndexPatternId(indexName: string) {
+  async getDataViewId(indexName: string) {
     const dv = (await this.dataViewService.find(indexName)).find(
       ({ title }) => title === indexName
     );
     return dv?.id;
   }
 
-  async deleteIndexPatternById(indexId: string) {
-    return await this.dataViewService.delete(indexId);
+  async deleteDataViewById(dataViewId: string) {
+    return await this.dataViewService.delete(dataViewId);
   }
 }
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 ac90659a6f3c9..7c435a247d7fa 100644
--- a/x-pack/plugins/ml/server/routes/data_frame_analytics.ts
+++ b/x-pack/plugins/ml/server/routes/data_frame_analytics.ts
@@ -29,7 +29,7 @@ import type {
   GetAnalyticsMapArgs,
   ExtendAnalyticsMapArgs,
 } from '../models/data_frame_analytics/types';
-import { IndexPatternHandler } from '../models/data_frame_analytics/index_patterns';
+import { DataViewHandler } from '../models/data_frame_analytics/index_patterns';
 import { AnalyticsManager } from '../models/data_frame_analytics/analytics_manager';
 import { validateAnalyticsJob } from '../models/data_frame_analytics/validation';
 import { fieldServiceProvider } from '../models/job_service/new_job_caps/field_service';
@@ -38,14 +38,14 @@ import { getAuthorizationHeader } from '../lib/request_authorization';
 import type { MlClient } from '../lib/ml_client';
 import type { DataViewsService } from '../../../../../src/plugins/data_views/common';
 
-function getIndexPatternId(dataViewsService: DataViewsService, patternName: string) {
-  const iph = new IndexPatternHandler(dataViewsService);
-  return iph.getIndexPatternId(patternName);
+function getDataViewId(dataViewsService: DataViewsService, patternName: string) {
+  const iph = new DataViewHandler(dataViewsService);
+  return iph.getDataViewId(patternName);
 }
 
-function deleteDestIndexPatternById(dataViewsService: DataViewsService, indexPatternId: string) {
-  const iph = new IndexPatternHandler(dataViewsService);
-  return iph.deleteIndexPatternById(indexPatternId);
+function deleteDestDataViewById(dataViewsService: DataViewsService, dataViewId: string) {
+  const iph = new DataViewHandler(dataViewsService);
+  return iph.deleteDataViewById(dataViewId);
 }
 
 function getAnalyticsMap(
@@ -427,9 +427,9 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense, routeGuard }: Rout
             if (destinationIndex && deleteDestIndexPattern) {
               try {
                 const dataViewsService = await getDataViewsService();
-                const indexPatternId = await getIndexPatternId(dataViewsService, destinationIndex);
-                if (indexPatternId) {
-                  await deleteDestIndexPatternById(dataViewsService, indexPatternId);
+                const dataViewId = await getDataViewId(dataViewsService, destinationIndex);
+                if (dataViewId) {
+                  await deleteDestDataViewById(dataViewsService, dataViewId);
                 }
                 destIndexPatternDeleted.success = true;
               } catch (deleteDestIndexPatternError) {
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/components/date_range_picker.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/components/date_range_picker.tsx
index 5529f28927028..32994b37fffe3 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/components/date_range_picker.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/components/date_range_picker.tsx
@@ -79,8 +79,10 @@ export function DateRangePicker({ seriesId, series }: { seriesId: number; series
   return (
     <EuiDatePickerRange
       fullWidth
+      isCustom
       startDateControl={
         <EuiDatePicker
+          fullWidth
           selected={startDate}
           onChange={onStartChange}
           startDate={startDate}
@@ -91,11 +93,13 @@ export function DateRangePicker({ seriesId, series }: { seriesId: number; series
           })}
           dateFormat={dateFormat.replace('ss.SSS', 'ss')}
           showTimeSelect
-          popoverPlacement="left"
+          popoverPlacement="right"
         />
       }
       endDateControl={
         <EuiDatePicker
+          fullWidth
+          showIcon={false}
           selected={endDate}
           onChange={onEndChange}
           startDate={startDate}
@@ -106,7 +110,7 @@ export function DateRangePicker({ seriesId, series }: { seriesId: number; series
           })}
           dateFormat={dateFormat.replace('ss.SSS', 'ss')}
           showTimeSelect
-          popoverPlacement="left"
+          popoverPlacement="right"
         />
       }
     />
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 c12e67bc9b1ae..aac5ac7136d7a 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
@@ -21,6 +21,7 @@ import {
   BROWSER_VERSION_LABEL,
   CLS_LABEL,
   CORE_WEB_VITALS_LABEL,
+  DCL_LABEL,
   DEVICE_DISTRIBUTION_LABEL,
   DEVICE_LABEL,
   ENVIRONMENT_LABEL,
@@ -50,8 +51,18 @@ import {
   PAGE_LOAD_TIME_LABEL,
   LABELS_FIELD,
   STEP_NAME_LABEL,
+  STEP_DURATION_LABEL,
 } from './labels';
-import { SYNTHETICS_STEP_NAME } from './field_names/synthetics';
+import {
+  MONITOR_DURATION_US,
+  SYNTHETICS_CLS,
+  SYNTHETICS_DCL,
+  SYNTHETICS_DOCUMENT_ONLOAD,
+  SYNTHETICS_FCP,
+  SYNTHETICS_LCP,
+  SYNTHETICS_STEP_DURATION,
+  SYNTHETICS_STEP_NAME,
+} from './field_names/synthetics';
 
 export const DEFAULT_TIME = { from: 'now-1h', to: 'now' };
 
@@ -73,12 +84,19 @@ export const FieldLabels: Record<string, string> = {
   [TBT_FIELD]: TBT_LABEL,
   [FID_FIELD]: FID_LABEL,
   [CLS_FIELD]: CLS_LABEL,
+
+  [SYNTHETICS_CLS]: CLS_LABEL,
+  [SYNTHETICS_DCL]: DCL_LABEL,
+  [SYNTHETICS_STEP_DURATION]: STEP_DURATION_LABEL,
+  [SYNTHETICS_LCP]: LCP_LABEL,
+  [SYNTHETICS_FCP]: FCP_LABEL,
+  [SYNTHETICS_DOCUMENT_ONLOAD]: PAGE_LOAD_TIME_LABEL,
   [TRANSACTION_TIME_TO_FIRST_BYTE]: BACKEND_TIME_LABEL,
   [TRANSACTION_DURATION]: PAGE_LOAD_TIME_LABEL,
 
   'monitor.id': MONITOR_ID_LABEL,
   'monitor.status': MONITOR_STATUS_LABEL,
-  'monitor.duration.us': MONITORS_DURATION_LABEL,
+  [MONITOR_DURATION_US]: MONITORS_DURATION_LABEL,
   [SYNTHETICS_STEP_NAME]: STEP_NAME_LABEL,
 
   'agent.hostname': AGENT_HOST_LABEL,
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/synthetics/kpi_over_time_config.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/synthetics/kpi_over_time_config.ts
index e548ec2714e14..63bd7e0cf3e81 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/synthetics/kpi_over_time_config.ts
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/synthetics/kpi_over_time_config.ts
@@ -16,13 +16,13 @@ import {
 import {
   CLS_LABEL,
   DCL_LABEL,
-  DOCUMENT_ONLOAD_LABEL,
   DOWN_LABEL,
   FCP_LABEL,
   LCP_LABEL,
   MONITORS_DURATION_LABEL,
   STEP_DURATION_LABEL,
   UP_LABEL,
+  PAGE_LOAD_TIME_LABEL,
 } from '../constants/labels';
 import {
   MONITOR_DURATION_US,
@@ -128,7 +128,7 @@ export function getSyntheticsKPIConfig({ indexPattern }: ConfigProps): SeriesCon
         columnFilters: getStepMetricColumnFilter(SYNTHETICS_DCL),
       },
       {
-        label: DOCUMENT_ONLOAD_LABEL,
+        label: PAGE_LOAD_TIME_LABEL,
         field: SYNTHETICS_DOCUMENT_ONLOAD,
         id: SYNTHETICS_DOCUMENT_ONLOAD,
         columnType: OPERATION_COLUMN,
diff --git a/x-pack/plugins/observability/public/pages/alerts/default_cell_actions.tsx b/x-pack/plugins/observability/public/pages/alerts/default_cell_actions.tsx
index 5ad4804f88d5e..3adfb0a1d9c89 100644
--- a/x-pack/plugins/observability/public/pages/alerts/default_cell_actions.tsx
+++ b/x-pack/plugins/observability/public/pages/alerts/default_cell_actions.tsx
@@ -7,58 +7,16 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { ObservabilityPublicPluginsStart } from '../..';
 import { getMappedNonEcsValue } from './render_cell_value';
 import FilterForValueButton from './filter_for_value';
-import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
 import { TimelineNonEcsData } from '../../../../timelines/common/search_strategy';
 import { TGridCellAction } from '../../../../timelines/common/types/timeline';
-import { getPageRowIndex, TimelinesUIStart } from '../../../../timelines/public';
+import { getPageRowIndex } from '../../../../timelines/public';
 
 export const FILTER_FOR_VALUE = i18n.translate('xpack.observability.hoverActions.filterForValue', {
   defaultMessage: 'Filter for value',
 });
 
-/** a hook to eliminate the verbose boilerplate required to use common services */
-const useKibanaServices = () => {
-  const { timelines } = useKibana<{ timelines: TimelinesUIStart }>().services;
-  const {
-    services: {
-      data: {
-        query: { filterManager },
-      },
-    },
-  } = useKibana<ObservabilityPublicPluginsStart>();
-
-  return { timelines, filterManager };
-};
-
-/** actions common to all cells (e.g. copy to clipboard) */
-const commonCellActions: TGridCellAction[] = [
-  ({ data, pageSize }: { data: TimelineNonEcsData[][]; pageSize: number }) =>
-    ({ rowIndex, columnId, Component }) => {
-      const { timelines } = useKibanaServices();
-
-      const value = getMappedNonEcsValue({
-        data: data[getPageRowIndex(rowIndex, pageSize)],
-        fieldName: columnId,
-      });
-
-      return (
-        <>
-          {timelines.getHoverActions().getCopyButton({
-            Component,
-            field: columnId,
-            isHoverAction: false,
-            ownFocus: false,
-            showTooltip: false,
-            value,
-          })}
-        </>
-      );
-    },
-];
-
 /** actions for adding filters to the search bar */
 const buildFilterCellActions = (addToQuery: (value: string) => void): TGridCellAction[] => [
   ({ data, pageSize }: { data: TimelineNonEcsData[][]; pageSize: number }) =>
@@ -80,7 +38,5 @@ const buildFilterCellActions = (addToQuery: (value: string) => void): TGridCellA
 ];
 
 /** returns the default actions shown in `EuiDataGrid` cells */
-export const getDefaultCellActions = ({ addToQuery }: { addToQuery: (value: string) => void }) => [
-  ...buildFilterCellActions(addToQuery),
-  ...commonCellActions,
-];
+export const getDefaultCellActions = ({ addToQuery }: { addToQuery: (value: string) => void }) =>
+  buildFilterCellActions(addToQuery);
diff --git a/x-pack/plugins/observability/public/pages/alerts/filter_for_value.tsx b/x-pack/plugins/observability/public/pages/alerts/filter_for_value.tsx
index 77cac9d482a37..f75ae488c9b28 100644
--- a/x-pack/plugins/observability/public/pages/alerts/filter_for_value.tsx
+++ b/x-pack/plugins/observability/public/pages/alerts/filter_for_value.tsx
@@ -11,7 +11,7 @@ import { i18n } from '@kbn/i18n';
 export const filterForValueButtonLabel = i18n.translate(
   'xpack.observability.hoverActions.filterForValueButtonLabel',
   {
-    defaultMessage: 'Filter for value',
+    defaultMessage: 'Filter in',
   }
 );
 
diff --git a/x-pack/plugins/osquery/public/saved_queries/use_saved_queries.ts b/x-pack/plugins/osquery/public/saved_queries/use_saved_queries.ts
index 8f697581642e6..9de40c759c2cf 100644
--- a/x-pack/plugins/osquery/public/saved_queries/use_saved_queries.ts
+++ b/x-pack/plugins/osquery/public/saved_queries/use_saved_queries.ts
@@ -24,6 +24,7 @@ export const useSavedQueries = ({
   return useQuery(
     [SAVED_QUERIES_ID, { pageIndex, pageSize, sortField, sortDirection }],
     () =>
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       http.get<any>('/internal/osquery/saved_query', {
         query: { pageIndex, pageSize, sortField, sortDirection },
       }),
diff --git a/x-pack/plugins/osquery/public/saved_queries/use_saved_query.ts b/x-pack/plugins/osquery/public/saved_queries/use_saved_query.ts
index 8f24f7734fc46..f05f38b8259ce 100644
--- a/x-pack/plugins/osquery/public/saved_queries/use_saved_query.ts
+++ b/x-pack/plugins/osquery/public/saved_queries/use_saved_query.ts
@@ -26,6 +26,7 @@ export const useSavedQuery = ({ savedQueryId }: UseSavedQueryProps) => {
 
   return useQuery(
     [SAVED_QUERY_ID, { savedQueryId }],
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     () => http.get<any>(`/internal/osquery/saved_query/${savedQueryId}`),
     {
       keepPreviousData: true,
diff --git a/x-pack/plugins/reporting/server/browsers/download/ensure_downloaded.test.ts b/x-pack/plugins/reporting/server/browsers/download/ensure_downloaded.test.ts
index 9db128c019ac0..955e8214af8fa 100644
--- a/x-pack/plugins/reporting/server/browsers/download/ensure_downloaded.test.ts
+++ b/x-pack/plugins/reporting/server/browsers/download/ensure_downloaded.test.ts
@@ -17,8 +17,7 @@ import { LevelLogger } from '../../lib';
 jest.mock('./checksum');
 jest.mock('./download');
 
-// https://github.com/elastic/kibana/issues/115881
-describe.skip('ensureBrowserDownloaded', () => {
+describe('ensureBrowserDownloaded', () => {
   let logger: jest.Mocked<LevelLogger>;
 
   beforeEach(() => {
diff --git a/x-pack/plugins/reporting/server/config/create_config.test.ts b/x-pack/plugins/reporting/server/config/create_config.test.ts
index e042142a54a0f..718638e1ba62b 100644
--- a/x-pack/plugins/reporting/server/config/create_config.test.ts
+++ b/x-pack/plugins/reporting/server/config/create_config.test.ts
@@ -5,27 +5,29 @@
  * 2.0.
  */
 
-import { CoreSetup, PluginInitializerContext } from 'src/core/server';
+import * as Rx from 'rxjs';
+import { CoreSetup, HttpServerInfo, PluginInitializerContext } from 'src/core/server';
 import { coreMock } from 'src/core/server/mocks';
-import { LevelLogger } from '../lib';
-import { createMockConfigSchema } from '../test_helpers';
+import { LevelLogger } from '../lib/level_logger';
+import { createMockConfigSchema, createMockLevelLogger } from '../test_helpers';
+import { ReportingConfigType } from './';
 import { createConfig$ } from './create_config';
 
+const createMockConfig = (
+  mockInitContext: PluginInitializerContext<unknown>
+): Rx.Observable<ReportingConfigType> => mockInitContext.config.create();
+
 describe('Reporting server createConfig$', () => {
   let mockCoreSetup: CoreSetup;
   let mockInitContext: PluginInitializerContext;
-  let mockLogger: LevelLogger;
+  let mockLogger: jest.Mocked<LevelLogger>;
 
   beforeEach(() => {
     mockCoreSetup = coreMock.createSetup();
     mockInitContext = coreMock.createPluginInitializerContext(
       createMockConfigSchema({ kibanaServer: {} })
     );
-    mockLogger = {
-      warn: jest.fn(),
-      debug: jest.fn(),
-      clone: jest.fn().mockImplementation(() => mockLogger),
-    } as unknown as LevelLogger;
+    mockLogger = createMockLevelLogger();
   });
 
   afterEach(() => {
@@ -37,19 +39,12 @@ describe('Reporting server createConfig$', () => {
       ...createMockConfigSchema({ kibanaServer: {} }),
       encryptionKey: undefined,
     });
-    const mockConfig$: any = mockInitContext.config.create();
+    const mockConfig$ = createMockConfig(mockInitContext);
     const result = await createConfig$(mockCoreSetup, mockConfig$, mockLogger).toPromise();
 
     expect(result.encryptionKey).toMatch(/\S{32,}/); // random 32 characters
-    expect(result.kibanaServer).toMatchInlineSnapshot(`
-      Object {
-        "hostname": "localhost",
-        "port": 80,
-        "protocol": "http",
-      }
-    `);
-    expect((mockLogger.warn as any).mock.calls.length).toBe(1);
-    expect((mockLogger.warn as any).mock.calls[0]).toMatchObject([
+    expect(mockLogger.warn.mock.calls.length).toBe(1);
+    expect(mockLogger.warn.mock.calls[0]).toMatchObject([
       'Generating a random key for xpack.reporting.encryptionKey. To prevent sessions from being invalidated on restart, please set xpack.reporting.encryptionKey in the kibana.yml or use the bin/kibana-encryption-keys command.',
     ]);
   });
@@ -60,10 +55,10 @@ describe('Reporting server createConfig$', () => {
         encryptionKey: 'iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii',
       })
     );
-    const mockConfig$: any = mockInitContext.config.create();
+    const mockConfig$ = createMockConfig(mockInitContext);
     const result = await createConfig$(mockCoreSetup, mockConfig$, mockLogger).toPromise();
     expect(result.encryptionKey).toMatch('iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii');
-    expect((mockLogger.warn as any).mock.calls.length).toBe(0);
+    expect(mockLogger.warn.mock.calls.length).toBe(0);
   });
 
   it('uses the user-provided encryption key, reporting kibanaServer settings to override server info', async () => {
@@ -77,7 +72,7 @@ describe('Reporting server createConfig$', () => {
         },
       })
     );
-    const mockConfig$: any = mockInitContext.config.create();
+    const mockConfig$ = createMockConfig(mockInitContext);
     const result = await createConfig$(mockCoreSetup, mockConfig$, mockLogger).toPromise();
 
     expect(result).toMatchInlineSnapshot(`
@@ -108,7 +103,7 @@ describe('Reporting server createConfig$', () => {
         },
       }
     `);
-    expect((mockLogger.warn as any).mock.calls.length).toBe(0);
+    expect(mockLogger.warn.mock.calls.length).toBe(0);
   });
 
   it('uses user-provided disableSandbox: false', async () => {
@@ -118,11 +113,11 @@ describe('Reporting server createConfig$', () => {
         capture: { browser: { chromium: { disableSandbox: false } } },
       })
     );
-    const mockConfig$: any = mockInitContext.config.create();
+    const mockConfig$ = createMockConfig(mockInitContext);
     const result = await createConfig$(mockCoreSetup, mockConfig$, mockLogger).toPromise();
 
     expect(result.capture.browser.chromium).toMatchObject({ disableSandbox: false });
-    expect((mockLogger.warn as any).mock.calls.length).toBe(0);
+    expect(mockLogger.warn.mock.calls.length).toBe(0);
   });
 
   it('uses user-provided disableSandbox: true', async () => {
@@ -132,11 +127,11 @@ describe('Reporting server createConfig$', () => {
         capture: { browser: { chromium: { disableSandbox: true } } },
       })
     );
-    const mockConfig$: any = mockInitContext.config.create();
+    const mockConfig$ = createMockConfig(mockInitContext);
     const result = await createConfig$(mockCoreSetup, mockConfig$, mockLogger).toPromise();
 
     expect(result.capture.browser.chromium).toMatchObject({ disableSandbox: true });
-    expect((mockLogger.warn as any).mock.calls.length).toBe(0);
+    expect(mockLogger.warn.mock.calls.length).toBe(0);
   });
 
   it('provides a default for disableSandbox', async () => {
@@ -145,10 +140,49 @@ describe('Reporting server createConfig$', () => {
         encryptionKey: '888888888888888888888888888888888',
       })
     );
-    const mockConfig$: any = mockInitContext.config.create();
+    const mockConfig$ = createMockConfig(mockInitContext);
     const result = await createConfig$(mockCoreSetup, mockConfig$, mockLogger).toPromise();
 
     expect(result.capture.browser.chromium).toMatchObject({ disableSandbox: expect.any(Boolean) });
-    expect((mockLogger.warn as any).mock.calls.length).toBe(0);
+    expect(mockLogger.warn.mock.calls.length).toBe(0);
   });
+
+  for (const hostname of [
+    '0',
+    '0.0',
+    '0.0.0',
+    '0.0.0.0',
+    '0000:0000:0000:0000:0000:0000:0000:0000',
+    '::',
+  ]) {
+    it(`apply failover logic when hostname is given as ${hostname}`, async () => {
+      mockInitContext = coreMock.createPluginInitializerContext(
+        createMockConfigSchema({
+          encryptionKey: 'aaaaaaaaaaaaabbbbbbbbbbbbaaaaaaaaa',
+          // overwrite settings added by createMockConfigSchema and apply the default settings
+          // TODO make createMockConfigSchema _not_ default xpack.reporting.kibanaServer.hostname to 'localhost'
+          kibanaServer: {
+            hostname: undefined,
+            port: undefined,
+          },
+        })
+      );
+      mockCoreSetup.http.getServerInfo = jest.fn().mockImplementation(
+        (): HttpServerInfo => ({
+          name: 'cool server',
+          hostname,
+          port: 5601,
+          protocol: 'http',
+        })
+      );
+
+      const mockConfig$ = createMockConfig(mockInitContext);
+      const result = await createConfig$(mockCoreSetup, mockConfig$, mockLogger).toPromise();
+      expect(result.kibanaServer).toMatchObject({
+        hostname: 'localhost',
+        port: 5601,
+        protocol: 'http',
+      });
+    });
+  }
 });
diff --git a/x-pack/plugins/reporting/server/config/create_config.ts b/x-pack/plugins/reporting/server/config/create_config.ts
index b1d69d17334be..5de54a43582ab 100644
--- a/x-pack/plugins/reporting/server/config/create_config.ts
+++ b/x-pack/plugins/reporting/server/config/create_config.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-import { i18n } from '@kbn/i18n';
 import crypto from 'crypto';
-import { upperFirst } from 'lodash';
+import ipaddr from 'ipaddr.js';
+import { sum, upperFirst } from 'lodash';
 import { Observable } from 'rxjs';
 import { map, mergeMap } from 'rxjs/operators';
 import { CoreSetup } from 'src/core/server';
@@ -33,20 +33,29 @@ export function createConfig$(
       let encryptionKey = config.encryptionKey;
       if (encryptionKey === undefined) {
         logger.warn(
-          i18n.translate('xpack.reporting.serverConfig.randomEncryptionKey', {
-            defaultMessage:
-              'Generating a random key for xpack.reporting.encryptionKey. To prevent sessions from being invalidated on ' +
-              'restart, please set xpack.reporting.encryptionKey in the kibana.yml or use the bin/kibana-encryption-keys command.',
-          })
+          'Generating a random key for xpack.reporting.encryptionKey. To prevent sessions from being invalidated on ' +
+            'restart, please set xpack.reporting.encryptionKey in the kibana.yml or use the bin/kibana-encryption-keys command.'
         );
         encryptionKey = crypto.randomBytes(16).toString('hex');
       }
       const { kibanaServer: reportingServer } = config;
       const serverInfo = core.http.getServerInfo();
-      // kibanaServer.hostname, default to server.host
-      const kibanaServerHostname = reportingServer.hostname
+      // set kibanaServer.hostname, default to server.host, don't allow "0.0.0.0" as it breaks in Windows
+      let kibanaServerHostname = reportingServer.hostname
         ? reportingServer.hostname
         : serverInfo.hostname;
+
+      if (
+        ipaddr.isValid(kibanaServerHostname) &&
+        !sum(ipaddr.parse(kibanaServerHostname).toByteArray())
+      ) {
+        logger.warn(
+          `Found 'server.host: "0.0.0.0"' in Kibana configuration. Reporting is not able to use this as the Kibana server hostname.` +
+            ` To enable PNG/PDF Reporting to work, 'xpack.reporting.kibanaServer.hostname: localhost' is automatically set in the configuration.` +
+            ` You can prevent this message by adding 'xpack.reporting.kibanaServer.hostname: localhost' in kibana.yml.`
+        );
+        kibanaServerHostname = 'localhost';
+      }
       // kibanaServer.port, default to server.port
       const kibanaServerPort = reportingServer.port ? reportingServer.port : serverInfo.port;
       // kibanaServer.protocol, default to server.protocol
@@ -66,36 +75,24 @@ export function createConfig$(
     mergeMap(async (config) => {
       if (config.capture.browser.chromium.disableSandbox != null) {
         // disableSandbox was set by user
-        return config;
+        return { ...config };
       }
 
       // disableSandbox was not set by user, apply default for OS
       const { os, disableSandbox } = await getDefaultChromiumSandboxDisabled();
       const osName = [os.os, os.dist, os.release].filter(Boolean).map(upperFirst).join(' ');
 
-      logger.debug(
-        i18n.translate('xpack.reporting.serverConfig.osDetected', {
-          defaultMessage: `Running on OS: '{osName}'`,
-          values: { osName },
-        })
-      );
+      logger.debug(`Running on OS: '{osName}'`);
 
       if (disableSandbox === true) {
         logger.warn(
-          i18n.translate('xpack.reporting.serverConfig.autoSet.sandboxDisabled', {
-            defaultMessage: `Chromium sandbox provides an additional layer of protection, but is not supported for {osName} OS. Automatically setting '{configKey}: true'.`,
-            values: {
-              configKey: 'xpack.reporting.capture.browser.chromium.disableSandbox',
-              osName,
-            },
-          })
+          `Chromium sandbox provides an additional layer of protection, but is not supported for ${osName} OS.` +
+            ` Automatically setting 'xpack.reporting.capture.browser.chromium.disableSandbox: true'.`
         );
       } else {
         logger.info(
-          i18n.translate('xpack.reporting.serverConfig.autoSet.sandboxEnabled', {
-            defaultMessage: `Chromium sandbox provides an additional layer of protection, and is supported for {osName} OS. Automatically enabling Chromium sandbox.`,
-            values: { osName },
-          })
+          `Chromium sandbox provides an additional layer of protection, and is supported for ${osName} OS.` +
+            ` Automatically enabling Chromium sandbox.`
         );
       }
 
diff --git a/x-pack/plugins/reporting/server/config/schema.test.ts b/x-pack/plugins/reporting/server/config/schema.test.ts
index 6ad7d03bd1a8f..7f1da5b55ccb6 100644
--- a/x-pack/plugins/reporting/server/config/schema.test.ts
+++ b/x-pack/plugins/reporting/server/config/schema.test.ts
@@ -288,11 +288,25 @@ describe('Reporting Config Schema', () => {
     `);
   });
 
-  it(`logs the proper validation messages`, () => {
-    // kibanaServer
-    const throwValidationErr = () => ConfigSchema.validate({ kibanaServer: { hostname: '0' } });
-    expect(throwValidationErr).toThrowError(
-      `[kibanaServer.hostname]: value must be a valid hostname (see RFC 1123).`
-    );
-  });
+  for (const address of ['0', '0.0', '0.0.0']) {
+    it(`fails to validate "kibanaServer.hostname" with an invalid hostname: "${address}"`, () => {
+      expect(() =>
+        ConfigSchema.validate({
+          kibanaServer: { hostname: address },
+        })
+      ).toThrowError(`[kibanaServer.hostname]: value must be a valid hostname (see RFC 1123).`);
+    });
+  }
+
+  for (const address of ['0.0.0.0', '0000:0000:0000:0000:0000:0000:0000:0000', '::']) {
+    it(`fails to validate "kibanaServer.hostname" hostname as zero: "${address}"`, () => {
+      expect(() =>
+        ConfigSchema.validate({
+          kibanaServer: { hostname: address },
+        })
+      ).toThrowError(
+        `[kibanaServer.hostname]: cannot use '0.0.0.0' as Kibana host name, consider using the default (localhost) instead`
+      );
+    });
+  }
 });
diff --git a/x-pack/plugins/reporting/server/config/schema.ts b/x-pack/plugins/reporting/server/config/schema.ts
index 5b15260be06cb..4c56fc4c6db60 100644
--- a/x-pack/plugins/reporting/server/config/schema.ts
+++ b/x-pack/plugins/reporting/server/config/schema.ts
@@ -6,10 +6,22 @@
  */
 
 import { ByteSizeValue, schema, TypeOf } from '@kbn/config-schema';
+import ipaddr from 'ipaddr.js';
+import { sum } from 'lodash';
 import moment from 'moment';
 
 const KibanaServerSchema = schema.object({
-  hostname: schema.maybe(schema.string({ hostname: true })),
+  hostname: schema.maybe(
+    schema.string({
+      hostname: true,
+      validate(value) {
+        if (ipaddr.isValid(value) && !sum(ipaddr.parse(value).toByteArray())) {
+          // prevent setting a hostname that fails in Chromium on Windows
+          return `cannot use '0.0.0.0' as Kibana host name, consider using the default (localhost) instead`;
+        }
+      },
+    })
+  ),
   port: schema.maybe(schema.number()),
   protocol: schema.maybe(
     schema.string({
diff --git a/x-pack/plugins/reporting/server/deprecations/reporting_role.ts b/x-pack/plugins/reporting/server/deprecations/reporting_role.ts
index e4575f9875315..355a83c13a37e 100644
--- a/x-pack/plugins/reporting/server/deprecations/reporting_role.ts
+++ b/x-pack/plugins/reporting/server/deprecations/reporting_role.ts
@@ -19,8 +19,11 @@ import { ReportingCore } from '../';
 import { deprecations } from '../lib/deprecations';
 
 const REPORTING_USER_ROLE_NAME = 'reporting_user';
-const getDocumentationUrl = (branch: string) =>
-  `https://www.elastic.co/guide/en/kibana/${branch}/kibana-privileges.html`;
+const getDocumentationUrl = (branch: string) => {
+  // TODO: remove when docs support "main"
+  const docBranch = branch === 'main' ? 'master' : branch;
+  return `https://www.elastic.co/guide/en/kibana/${docBranch}/kibana-privileges.html`;
+};
 
 interface ExtraDependencies {
   reportingCore: ReportingCore;
diff --git a/x-pack/plugins/reporting/server/routes/deprecations.test.ts b/x-pack/plugins/reporting/server/routes/deprecations.test.ts
index 63be2acf52c25..5367b6bd531ed 100644
--- a/x-pack/plugins/reporting/server/routes/deprecations.test.ts
+++ b/x-pack/plugins/reporting/server/routes/deprecations.test.ts
@@ -24,8 +24,7 @@ import { registerDeprecationsRoutes } from './deprecations';
 
 type SetupServerReturn = UnwrapPromise<ReturnType<typeof setupServer>>;
 
-// https://github.com/elastic/kibana/issues/115881
-describe.skip(`GET ${API_GET_ILM_POLICY_STATUS}`, () => {
+describe(`GET ${API_GET_ILM_POLICY_STATUS}`, () => {
   const reportingSymbol = Symbol('reporting');
   let server: SetupServerReturn['server'];
   let httpSetup: SetupServerReturn['httpSetup'];
diff --git a/x-pack/plugins/reporting/server/test_helpers/create_mock_levellogger.ts b/x-pack/plugins/reporting/server/test_helpers/create_mock_levellogger.ts
index 1a8bfe7b70208..a6e6be47bdfcd 100644
--- a/x-pack/plugins/reporting/server/test_helpers/create_mock_levellogger.ts
+++ b/x-pack/plugins/reporting/server/test_helpers/create_mock_levellogger.ts
@@ -16,7 +16,6 @@ export function createMockLevelLogger() {
 
   const logger = new LevelLogger(loggingSystemMock.create()) as jest.Mocked<LevelLogger>;
 
-  logger.clone.mockImplementation(createMockLevelLogger);
   // logger.debug.mockImplementation(consoleLogger('debug')); // uncomment this to see debug logs in jest tests
   logger.info.mockImplementation(consoleLogger('info'));
   logger.warn.mockImplementation(consoleLogger('warn'));
@@ -24,5 +23,7 @@ export function createMockLevelLogger() {
   logger.error.mockImplementation(consoleLogger('error'));
   logger.trace.mockImplementation(consoleLogger('trace'));
 
+  logger.clone.mockImplementation(() => logger);
+
   return logger;
 }
diff --git a/x-pack/plugins/security/public/management/users/edit_user/edit_user_page.test.tsx b/x-pack/plugins/security/public/management/users/edit_user/edit_user_page.test.tsx
index f61b2ac2f8056..b8e98042b1cff 100644
--- a/x-pack/plugins/security/public/management/users/edit_user/edit_user_page.test.tsx
+++ b/x-pack/plugins/security/public/management/users/edit_user/edit_user_page.test.tsx
@@ -28,7 +28,13 @@ const userMock = {
   roles: ['superuser'],
 };
 
-describe('EditUserPage', () => {
+// FLAKY: https://github.com/elastic/kibana/issues/115473
+// FLAKY: https://github.com/elastic/kibana/issues/115474
+// FLAKY: https://github.com/elastic/kibana/issues/116889
+// FLAKY: https://github.com/elastic/kibana/issues/117081
+// FLAKY: https://github.com/elastic/kibana/issues/116891
+// FLAKY: https://github.com/elastic/kibana/issues/116890
+describe.skip('EditUserPage', () => {
   const coreStart = coreMock.createStart();
   let history = createMemoryHistory({ initialEntries: ['/edit/jdoe'] });
   const authc = securityMock.createSetup().authc;
diff --git a/x-pack/plugins/security/server/config_deprecations.ts b/x-pack/plugins/security/server/config_deprecations.ts
index 3a71dbb28add2..8b778950036b5 100644
--- a/x-pack/plugins/security/server/config_deprecations.ts
+++ b/x-pack/plugins/security/server/config_deprecations.ts
@@ -34,6 +34,8 @@ export const securityConfigDeprecationProvider: ConfigDeprecationProvider = ({
   // Deprecation warning for the old array-based format of `xpack.security.authc.providers`.
   (settings, _fromPath, addDeprecation, { branch }) => {
     if (Array.isArray(settings?.xpack?.security?.authc?.providers)) {
+      // TODO: remove when docs support "main"
+      const docsBranch = branch === 'main' ? 'master' : 'main';
       addDeprecation({
         configPath: 'xpack.security.authc.providers',
         title: i18n.translate('xpack.security.deprecations.authcProvidersTitle', {
@@ -43,7 +45,7 @@ export const securityConfigDeprecationProvider: ConfigDeprecationProvider = ({
           defaultMessage: 'Use the new object format instead of an array of provider types.',
         }),
         level: 'warning',
-        documentationUrl: `https://www.elastic.co/guide/en/kibana/${branch}/security-settings-kb.html#authentication-security-settings`,
+        documentationUrl: `https://www.elastic.co/guide/en/kibana/${docsBranch}/security-settings-kb.html#authentication-security-settings`,
         correctiveActions: {
           manualSteps: [
             i18n.translate('xpack.security.deprecations.authcProviders.manualSteps1', {
@@ -59,6 +61,9 @@ export const securityConfigDeprecationProvider: ConfigDeprecationProvider = ({
     }
   },
   (settings, _fromPath, addDeprecation, { branch }) => {
+    // TODO: remove when docs support "main"
+    const docsBranch = branch === 'main' ? 'master' : 'main';
+
     const hasProviderType = (providerType: string) => {
       const providers = settings?.xpack?.security?.authc?.providers;
       if (Array.isArray(providers)) {
@@ -86,7 +91,7 @@ export const securityConfigDeprecationProvider: ConfigDeprecationProvider = ({
           values: { tokenProvider },
         }),
         level: 'warning',
-        documentationUrl: `https://www.elastic.co/guide/en/kibana/${branch}/security-settings-kb.html#authentication-security-settings`,
+        documentationUrl: `https://www.elastic.co/guide/en/kibana/${docsBranch}/security-settings-kb.html#authentication-security-settings`,
         correctiveActions: {
           manualSteps: [
             i18n.translate('xpack.security.deprecations.basicAndTokenProviders.manualSteps1', {
@@ -100,6 +105,8 @@ export const securityConfigDeprecationProvider: ConfigDeprecationProvider = ({
     }
   },
   (settings, _fromPath, addDeprecation, { branch }) => {
+    // TODO: remove when docs support "main"
+    const docsBranch = branch === 'main' ? 'master' : 'main';
     const samlProviders = (settings?.xpack?.security?.authc?.providers?.saml ?? {}) as Record<
       string,
       any
@@ -119,7 +126,7 @@ export const securityConfigDeprecationProvider: ConfigDeprecationProvider = ({
           defaultMessage: 'This setting is no longer used.',
         }),
         level: 'warning',
-        documentationUrl: `https://www.elastic.co/guide/en/kibana/${branch}/security-settings-kb.html#authentication-security-settings`,
+        documentationUrl: `https://www.elastic.co/guide/en/kibana/${docsBranch}/security-settings-kb.html#authentication-security-settings`,
         correctiveActions: {
           manualSteps: [
             i18n.translate('xpack.security.deprecations.maxRedirectURLSize.manualSteps1', {
diff --git a/x-pack/plugins/security/server/deprecations/kibana_user_role.ts b/x-pack/plugins/security/server/deprecations/kibana_user_role.ts
index ba32446611a62..9746597aa95b8 100644
--- a/x-pack/plugins/security/server/deprecations/kibana_user_role.ts
+++ b/x-pack/plugins/security/server/deprecations/kibana_user_role.ts
@@ -98,13 +98,16 @@ async function getUsersDeprecations(
     return [];
   }
 
+  // TODO: remove when docs support "main"
+  const docsBranch = packageInfo.branch === 'main' ? 'master' : packageInfo.branch;
+
   return [
     {
       title: getDeprecationTitle(),
       message: getDeprecationMessage(),
       level: 'warning',
       deprecationType: 'feature',
-      documentationUrl: `https://www.elastic.co/guide/en/elasticsearch/reference/${packageInfo.branch}/built-in-roles.html`,
+      documentationUrl: `https://www.elastic.co/guide/en/elasticsearch/reference/${docsBranch}/built-in-roles.html`,
       correctiveActions: {
         api: {
           method: 'POST',
@@ -159,13 +162,16 @@ async function getRoleMappingsDeprecations(
     return [];
   }
 
+  // TODO: remove when docs support "main"
+  const docsBranch = packageInfo.branch === 'main' ? 'master' : packageInfo.branch;
+
   return [
     {
       title: getDeprecationTitle(),
       message: getDeprecationMessage(),
       level: 'warning',
       deprecationType: 'feature',
-      documentationUrl: `https://www.elastic.co/guide/en/elasticsearch/reference/${packageInfo.branch}/built-in-roles.html`,
+      documentationUrl: `https://www.elastic.co/guide/en/elasticsearch/reference/${docsBranch}/built-in-roles.html`,
       correctiveActions: {
         api: {
           method: 'POST',
@@ -193,6 +199,9 @@ async function getRoleMappingsDeprecations(
 function deprecationError(packageInfo: PackageInfo, error: Error): DeprecationsDetails[] {
   const title = getDeprecationTitle();
 
+  // TODO: remove when docs support "main"
+  const docsBranch = packageInfo.branch === 'main' ? 'master' : packageInfo.branch;
+
   if (getErrorStatusCode(error) === 403) {
     return [
       {
@@ -202,7 +211,7 @@ function deprecationError(packageInfo: PackageInfo, error: Error): DeprecationsD
         message: i18n.translate('xpack.security.deprecations.kibanaUser.forbiddenErrorMessage', {
           defaultMessage: 'You do not have enough permissions to fix this deprecation.',
         }),
-        documentationUrl: `https://www.elastic.co/guide/en/kibana/${packageInfo.branch}/xpack-security.html#_required_permissions_7`,
+        documentationUrl: `https://www.elastic.co/guide/en/kibana/${docsBranch}/xpack-security.html#_required_permissions_7`,
         correctiveActions: {
           manualSteps: [
             i18n.translate(
diff --git a/x-pack/plugins/security_solution/cypress/integration/timelines/data_providers.spec.ts b/x-pack/plugins/security_solution/cypress/integration/timelines/data_providers.spec.ts
index eeb7f91f8c050..de754f8602667 100644
--- a/x-pack/plugins/security_solution/cypress/integration/timelines/data_providers.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/timelines/data_providers.spec.ts
@@ -20,7 +20,7 @@ import { addDataProvider, closeTimeline, createNewTimeline } from '../../tasks/t
 import { HOSTS_URL } from '../../urls/navigation';
 import { cleanKibana, scrollToBottom } from '../../tasks/common';
 
-describe.skip('timeline data providers', () => {
+describe('timeline data providers', () => {
   before(() => {
     cleanKibana();
     loginAndWaitForPage(HOSTS_URL);
diff --git a/x-pack/plugins/security_solution/cypress/tasks/timeline.ts b/x-pack/plugins/security_solution/cypress/tasks/timeline.ts
index 6841a9afdc42b..01a3b6f18be80 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/timeline.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/timeline.ts
@@ -175,6 +175,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.get(LOADING_INDICATOR).should('not.exist');
   cy.get(TIMELINE_DATA_PROVIDER_VALUE).should('have.focus'); // make sure the focus is ready before start typing
 
   cy.get(TIMELINE_DATA_PROVIDER_FIELD)
diff --git a/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/artifact_entry_card.tsx b/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/artifact_entry_card.tsx
index d5f8c2dc74788..89d2f029e9538 100644
--- a/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/artifact_entry_card.tsx
+++ b/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/artifact_entry_card.tsx
@@ -80,16 +80,20 @@ export const ArtifactEntryCard = memo<ArtifactEntryCardProps>(
             data-test-subj={getTestId('subHeader')}
           />
 
-          <EuiSpacer size="l" />
-
           {!hideDescription && (
-            <DescriptionField data-test-subj={getTestId('description')}>
-              {artifact.description}
-            </DescriptionField>
+            <>
+              <EuiSpacer size="s" />
+              <DescriptionField data-test-subj={getTestId('description')}>
+                {artifact.description}
+              </DescriptionField>
+            </>
           )}
 
           {!hideComments ? (
-            <CardComments comments={artifact.comments} data-test-subj={getTestId('comments')} />
+            <>
+              <EuiSpacer size="s" />
+              <CardComments comments={artifact.comments} data-test-subj={getTestId('comments')} />
+            </>
           ) : null}
         </CardSectionPanel>
 
diff --git a/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/components/criteria_conditions.tsx b/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/components/criteria_conditions.tsx
index 743eac7a15458..24244aad3ef99 100644
--- a/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/components/criteria_conditions.tsx
+++ b/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/components/criteria_conditions.tsx
@@ -6,7 +6,14 @@
  */
 
 import React, { memo, useCallback, useMemo } from 'react';
-import { CommonProps, EuiExpression, EuiToken, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import {
+  CommonProps,
+  EuiExpression,
+  EuiToken,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiBadge,
+} from '@elastic/eui';
 import styled from 'styled-components';
 import { ListOperatorTypeEnum } from '@kbn/securitysolution-io-ts-list-types';
 import {
@@ -21,6 +28,8 @@ import {
   CONDITION_OPERATOR_TYPE_MATCH_ANY,
   CONDITION_OPERATOR_TYPE_EXISTS,
   CONDITION_OPERATOR_TYPE_LIST,
+  CONDITION_OPERATOR_TYPE_NOT_MATCH_ANY,
+  CONDITION_OPERATOR_TYPE_NOT_MATCH,
 } from './translations';
 import { ArtifactInfo, ArtifactInfoEntry } from '../types';
 import { useTestIdGenerator } from '../../hooks/use_test_id_generator';
@@ -32,7 +41,7 @@ const OS_LABELS = Object.freeze({
   windows: OS_WINDOWS,
 });
 
-const OPERATOR_TYPE_LABELS = Object.freeze({
+const OPERATOR_TYPE_LABELS_INCLUDED = Object.freeze({
   [ListOperatorTypeEnum.NESTED]: CONDITION_OPERATOR_TYPE_NESTED,
   [ListOperatorTypeEnum.MATCH_ANY]: CONDITION_OPERATOR_TYPE_MATCH_ANY,
   [ListOperatorTypeEnum.MATCH]: CONDITION_OPERATOR_TYPE_MATCH,
@@ -41,8 +50,13 @@ const OPERATOR_TYPE_LABELS = Object.freeze({
   [ListOperatorTypeEnum.LIST]: CONDITION_OPERATOR_TYPE_LIST,
 });
 
+const OPERATOR_TYPE_LABELS_EXCLUDED = Object.freeze({
+  [ListOperatorTypeEnum.MATCH_ANY]: CONDITION_OPERATOR_TYPE_NOT_MATCH_ANY,
+  [ListOperatorTypeEnum.MATCH]: CONDITION_OPERATOR_TYPE_NOT_MATCH,
+});
+
 const EuiFlexGroupNested = styled(EuiFlexGroup)`
-  margin-left: ${({ theme }) => theme.eui.spacerSizes.l};
+  margin-left: ${({ theme }) => theme.eui.spacerSizes.xl};
 `;
 
 const EuiFlexItemNested = styled(EuiFlexItem)`
@@ -67,11 +81,30 @@ export const CriteriaConditions = memo<CriteriaConditionsProps>(
         .join(', ');
     }, [os]);
 
+    const getEntryValue = (type: string, value: string | string[]) => {
+      if (type === 'match_any' && Array.isArray(value)) {
+        return value.map((currentValue) => <EuiBadge color="hollow">{currentValue}</EuiBadge>);
+      }
+      return value;
+    };
+
+    const getEntryOperator = (type: string, operator: string) => {
+      if (type === 'nested') return;
+      return operator === 'included'
+        ? OPERATOR_TYPE_LABELS_INCLUDED[type as keyof typeof OPERATOR_TYPE_LABELS_INCLUDED] ?? type
+        : OPERATOR_TYPE_LABELS_EXCLUDED[type as keyof typeof OPERATOR_TYPE_LABELS_EXCLUDED] ?? type;
+    };
+
     const getNestedEntriesContent = useCallback(
       (type: string, nestedEntries: ArtifactInfoEntry[]) => {
         if (type === 'nested' && nestedEntries.length) {
           return nestedEntries.map(
-            ({ field: nestedField, type: nestedType, value: nestedValue }) => {
+            ({
+              field: nestedField,
+              type: nestedType,
+              value: nestedValue,
+              operator: nestedOperator,
+            }) => {
               return (
                 <EuiFlexGroupNested
                   data-test-subj={getTestId('nestedCondition')}
@@ -89,11 +122,8 @@ export const CriteriaConditions = memo<CriteriaConditionsProps>(
                   </EuiFlexItemNested>
                   <EuiFlexItemNested grow={false}>
                     <EuiExpression
-                      description={
-                        OPERATOR_TYPE_LABELS[nestedType as keyof typeof OPERATOR_TYPE_LABELS] ??
-                        nestedType
-                      }
-                      value={nestedValue}
+                      description={getEntryOperator(nestedType, nestedOperator)}
+                      value={getEntryValue(nestedType, nestedValue)}
                     />
                   </EuiFlexItemNested>
                 </EuiFlexGroupNested>
@@ -113,7 +143,7 @@ export const CriteriaConditions = memo<CriteriaConditionsProps>(
             <EuiExpression description={CONDITION_OPERATOR_TYPE_MATCH} value={osLabel} />
           </strong>
         </div>
-        {entries.map(({ field, type, value, entries: nestedEntries = [] }) => {
+        {entries.map(({ field, type, value, operator, entries: nestedEntries = [] }) => {
           return (
             <div data-test-subj={getTestId('condition')} key={field + type + value}>
               <EuiExpression
@@ -122,10 +152,8 @@ export const CriteriaConditions = memo<CriteriaConditionsProps>(
                 color="subdued"
               />
               <EuiExpression
-                description={
-                  OPERATOR_TYPE_LABELS[type as keyof typeof OPERATOR_TYPE_LABELS] ?? type
-                }
-                value={value}
+                description={getEntryOperator(type, operator)}
+                value={getEntryValue(type, value)}
               />
               {getNestedEntriesContent(type, nestedEntries)}
             </div>
diff --git a/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/components/translations.ts b/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/components/translations.ts
index b2c0edfb2b9eb..3290a52c1c37d 100644
--- a/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/components/translations.ts
+++ b/x-pack/plugins/security_solution/public/management/components/artifact_entry_card/components/translations.ts
@@ -54,6 +54,13 @@ export const CONDITION_OPERATOR_TYPE_MATCH = i18n.translate(
   }
 );
 
+export const CONDITION_OPERATOR_TYPE_NOT_MATCH = i18n.translate(
+  'xpack.securitySolution.artifactCard.conditions.matchOperator.not',
+  {
+    defaultMessage: 'IS NOT',
+  }
+);
+
 export const CONDITION_OPERATOR_TYPE_WILDCARD = i18n.translate(
   'xpack.securitySolution.artifactCard.conditions.wildcardOperator',
   {
@@ -71,7 +78,14 @@ export const CONDITION_OPERATOR_TYPE_NESTED = i18n.translate(
 export const CONDITION_OPERATOR_TYPE_MATCH_ANY = i18n.translate(
   'xpack.securitySolution.artifactCard.conditions.matchAnyOperator',
   {
-    defaultMessage: 'is any',
+    defaultMessage: 'is one of',
+  }
+);
+
+export const CONDITION_OPERATOR_TYPE_NOT_MATCH_ANY = i18n.translate(
+  'xpack.securitySolution.artifactCard.conditions.matchAnyOperator.not',
+  {
+    defaultMessage: 'is not one of',
   }
 );
 
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 ea5869f79275f..f22cc1179f0d3 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
@@ -743,7 +743,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                 </div>
               </div>
               <div
-                class="euiSpacer euiSpacer--l"
+                class="euiSpacer euiSpacer--s"
               />
               <div
                 class="euiText euiText--medium eui-textBreakWord"
@@ -1123,7 +1123,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                 </div>
               </div>
               <div
-                class="euiSpacer euiSpacer--l"
+                class="euiSpacer euiSpacer--s"
               />
               <div
                 class="euiText euiText--medium eui-textBreakWord"
@@ -1503,7 +1503,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                 </div>
               </div>
               <div
-                class="euiSpacer euiSpacer--l"
+                class="euiSpacer euiSpacer--s"
               />
               <div
                 class="euiText euiText--medium eui-textBreakWord"
@@ -1883,7 +1883,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                 </div>
               </div>
               <div
-                class="euiSpacer euiSpacer--l"
+                class="euiSpacer euiSpacer--s"
               />
               <div
                 class="euiText euiText--medium eui-textBreakWord"
@@ -2263,7 +2263,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                 </div>
               </div>
               <div
-                class="euiSpacer euiSpacer--l"
+                class="euiSpacer euiSpacer--s"
               />
               <div
                 class="euiText euiText--medium eui-textBreakWord"
@@ -2643,7 +2643,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                 </div>
               </div>
               <div
-                class="euiSpacer euiSpacer--l"
+                class="euiSpacer euiSpacer--s"
               />
               <div
                 class="euiText euiText--medium eui-textBreakWord"
@@ -3023,7 +3023,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                 </div>
               </div>
               <div
-                class="euiSpacer euiSpacer--l"
+                class="euiSpacer euiSpacer--s"
               />
               <div
                 class="euiText euiText--medium eui-textBreakWord"
@@ -3403,7 +3403,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                 </div>
               </div>
               <div
-                class="euiSpacer euiSpacer--l"
+                class="euiSpacer euiSpacer--s"
               />
               <div
                 class="euiText euiText--medium eui-textBreakWord"
@@ -3783,7 +3783,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                 </div>
               </div>
               <div
-                class="euiSpacer euiSpacer--l"
+                class="euiSpacer euiSpacer--s"
               />
               <div
                 class="euiText euiText--medium eui-textBreakWord"
@@ -4163,7 +4163,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                 </div>
               </div>
               <div
-                class="euiSpacer euiSpacer--l"
+                class="euiSpacer euiSpacer--s"
               />
               <div
                 class="euiText euiText--medium eui-textBreakWord"
@@ -4850,7 +4850,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                 </div>
               </div>
               <div
-                class="euiSpacer euiSpacer--l"
+                class="euiSpacer euiSpacer--s"
               />
               <div
                 class="euiText euiText--medium eui-textBreakWord"
@@ -5230,7 +5230,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                 </div>
               </div>
               <div
-                class="euiSpacer euiSpacer--l"
+                class="euiSpacer euiSpacer--s"
               />
               <div
                 class="euiText euiText--medium eui-textBreakWord"
@@ -5610,7 +5610,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                 </div>
               </div>
               <div
-                class="euiSpacer euiSpacer--l"
+                class="euiSpacer euiSpacer--s"
               />
               <div
                 class="euiText euiText--medium eui-textBreakWord"
@@ -5990,7 +5990,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                 </div>
               </div>
               <div
-                class="euiSpacer euiSpacer--l"
+                class="euiSpacer euiSpacer--s"
               />
               <div
                 class="euiText euiText--medium eui-textBreakWord"
@@ -6370,7 +6370,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                 </div>
               </div>
               <div
-                class="euiSpacer euiSpacer--l"
+                class="euiSpacer euiSpacer--s"
               />
               <div
                 class="euiText euiText--medium eui-textBreakWord"
@@ -6750,7 +6750,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                 </div>
               </div>
               <div
-                class="euiSpacer euiSpacer--l"
+                class="euiSpacer euiSpacer--s"
               />
               <div
                 class="euiText euiText--medium eui-textBreakWord"
@@ -7130,7 +7130,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                 </div>
               </div>
               <div
-                class="euiSpacer euiSpacer--l"
+                class="euiSpacer euiSpacer--s"
               />
               <div
                 class="euiText euiText--medium eui-textBreakWord"
@@ -7510,7 +7510,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                 </div>
               </div>
               <div
-                class="euiSpacer euiSpacer--l"
+                class="euiSpacer euiSpacer--s"
               />
               <div
                 class="euiText euiText--medium eui-textBreakWord"
@@ -7890,7 +7890,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                 </div>
               </div>
               <div
-                class="euiSpacer euiSpacer--l"
+                class="euiSpacer euiSpacer--s"
               />
               <div
                 class="euiText euiText--medium eui-textBreakWord"
@@ -8270,7 +8270,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                 </div>
               </div>
               <div
-                class="euiSpacer euiSpacer--l"
+                class="euiSpacer euiSpacer--s"
               />
               <div
                 class="euiText euiText--medium eui-textBreakWord"
@@ -8914,7 +8914,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                 </div>
               </div>
               <div
-                class="euiSpacer euiSpacer--l"
+                class="euiSpacer euiSpacer--s"
               />
               <div
                 class="euiText euiText--medium eui-textBreakWord"
@@ -9294,7 +9294,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                 </div>
               </div>
               <div
-                class="euiSpacer euiSpacer--l"
+                class="euiSpacer euiSpacer--s"
               />
               <div
                 class="euiText euiText--medium eui-textBreakWord"
@@ -9674,7 +9674,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                 </div>
               </div>
               <div
-                class="euiSpacer euiSpacer--l"
+                class="euiSpacer euiSpacer--s"
               />
               <div
                 class="euiText euiText--medium eui-textBreakWord"
@@ -10054,7 +10054,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                 </div>
               </div>
               <div
-                class="euiSpacer euiSpacer--l"
+                class="euiSpacer euiSpacer--s"
               />
               <div
                 class="euiText euiText--medium eui-textBreakWord"
@@ -10434,7 +10434,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                 </div>
               </div>
               <div
-                class="euiSpacer euiSpacer--l"
+                class="euiSpacer euiSpacer--s"
               />
               <div
                 class="euiText euiText--medium eui-textBreakWord"
@@ -10814,7 +10814,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                 </div>
               </div>
               <div
-                class="euiSpacer euiSpacer--l"
+                class="euiSpacer euiSpacer--s"
               />
               <div
                 class="euiText euiText--medium eui-textBreakWord"
@@ -11194,7 +11194,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                 </div>
               </div>
               <div
-                class="euiSpacer euiSpacer--l"
+                class="euiSpacer euiSpacer--s"
               />
               <div
                 class="euiText euiText--medium eui-textBreakWord"
@@ -11574,7 +11574,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                 </div>
               </div>
               <div
-                class="euiSpacer euiSpacer--l"
+                class="euiSpacer euiSpacer--s"
               />
               <div
                 class="euiText euiText--medium eui-textBreakWord"
@@ -11954,7 +11954,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                 </div>
               </div>
               <div
-                class="euiSpacer euiSpacer--l"
+                class="euiSpacer euiSpacer--s"
               />
               <div
                 class="euiText euiText--medium eui-textBreakWord"
@@ -12334,7 +12334,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                 </div>
               </div>
               <div
-                class="euiSpacer euiSpacer--l"
+                class="euiSpacer euiSpacer--s"
               />
               <div
                 class="euiText euiText--medium eui-textBreakWord"
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_all.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_all.test.ts
index 80df4c94971cc..99f5f76be1a7c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_all.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_all.test.ts
@@ -101,8 +101,8 @@ describe.each([
       exceptions_list: getListArrayMock(),
     });
     expect(detailsJson).toEqual({
-      exported_exception_list_count: 0,
-      exported_exception_list_item_count: 0,
+      exported_exception_list_count: 1,
+      exported_exception_list_item_count: 1,
       exported_rules_count: 1,
       missing_exception_list_item_count: 0,
       missing_exception_list_items: [],
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_rule_exceptions.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_rule_exceptions.test.ts
index dd7e59c74601c..614c0ae0a1281 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_rule_exceptions.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_rule_exceptions.test.ts
@@ -8,15 +8,15 @@
 import { ENDPOINT_LIST_ID } from '@kbn/securitysolution-list-constants';
 
 import { getExceptionListClientMock } from '../../../../../lists/server/services/exception_lists/exception_list_client.mock';
+import { getDetectionsExceptionListSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_schema.mock';
+import { getExceptionListItemSchemaMock } from '../../../../../lists/common/schemas/response/exception_list_item_schema.mock';
+
 import {
   getRuleExceptionsForExport,
   getExportableExceptions,
   getDefaultExportDetails,
 } from './get_export_rule_exceptions';
-import {
-  getListArrayMock,
-  getListMock,
-} from '../../../../common/detection_engine/schemas/types/lists.mock';
+import { getListMock } from '../../../../common/detection_engine/schemas/types/lists.mock';
 
 describe('get_export_rule_exceptions', () => {
   describe('getRuleExceptionsForExport', () => {
@@ -36,7 +36,24 @@ describe('get_export_rule_exceptions', () => {
         getExceptionListClientMock()
       );
 
-      expect(exportData).toEqual('exportString');
+      expect(exportData).toEqual(
+        `${JSON.stringify(getDetectionsExceptionListSchemaMock())}\n${JSON.stringify(
+          getExceptionListItemSchemaMock({ list_id: 'exception_list_id' })
+        )}`
+      );
+    });
+
+    test('it does not return duplicate exception lists', async () => {
+      const { exportData } = await getRuleExceptionsForExport(
+        [getListMock(), getListMock()],
+        getExceptionListClientMock()
+      );
+
+      expect(exportData).toEqual(
+        `${JSON.stringify(getDetectionsExceptionListSchemaMock())}\n${JSON.stringify(
+          getExceptionListItemSchemaMock({ list_id: 'exception_list_id' })
+        )}`
+      );
     });
 
     test('it does not return a global endpoint list', async () => {
@@ -60,11 +77,15 @@ describe('get_export_rule_exceptions', () => {
     test('it returns stringified exception lists and items', async () => {
       // This rule has 2 exception lists tied to it
       const { exportData } = await getExportableExceptions(
-        getListArrayMock(),
+        [getListMock()],
         getExceptionListClientMock()
       );
 
-      expect(exportData).toEqual('exportStringexportString');
+      expect(exportData).toEqual(
+        `${JSON.stringify(getDetectionsExceptionListSchemaMock())}\n${JSON.stringify(
+          getExceptionListItemSchemaMock({ list_id: 'exception_list_id' })
+        )}`
+      );
     });
 
     test('it throws error if error occurs in getting exceptions', async () => {
@@ -72,7 +93,7 @@ describe('get_export_rule_exceptions', () => {
       exceptionsClient.exportExceptionListAndItems = jest.fn().mockRejectedValue(new Error('oops'));
       // This rule has 2 exception lists tied to it
       await expect(async () => {
-        await getExportableExceptions(getListArrayMock(), exceptionsClient);
+        await getExportableExceptions([getListMock()], exceptionsClient);
       }).rejects.toThrowErrorMatchingInlineSnapshot(`"oops"`);
     });
   });
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_rule_exceptions.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_rule_exceptions.ts
index 719649d35c0f0..6faf3fdfe6104 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_rule_exceptions.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/get_export_rule_exceptions.ts
@@ -21,10 +21,17 @@ export const getRuleExceptionsForExport = async (
   exceptions: ListArray,
   exceptionsListClient: ExceptionListClient | undefined
 ): Promise<ExportExceptionListAndItemsReturn> => {
+  const uniqueExceptionLists = new Set();
+
   if (exceptionsListClient != null) {
-    const exceptionsWithoutUnexportableLists = exceptions.filter(
-      ({ list_id: listId }) => !NON_EXPORTABLE_LIST_IDS.includes(listId)
-    );
+    const exceptionsWithoutUnexportableLists = exceptions.filter((list) => {
+      if (!uniqueExceptionLists.has(list.id)) {
+        uniqueExceptionLists.add(list.id);
+        return !NON_EXPORTABLE_LIST_IDS.includes(list.list_id);
+      } else {
+        return false;
+      }
+    });
     return getExportableExceptions(exceptionsWithoutUnexportableLists, exceptionsListClient);
   } else {
     return { exportData: '', exportDetails: getDefaultExportDetails() };
@@ -72,9 +79,9 @@ export const getExportableExceptions = async (
 };
 
 /**
- * Creates promises of the rules and returns them.
+ * Creates promises of the exceptions to be exported and returns them.
  * @param exceptionsListClient Exception Lists client
- * @param exceptions The rules to apply the update for
+ * @param exceptions The exceptions to be exported
  * @returns Promise of export ready exceptions.
  */
 export const createPromises = (
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/check_env_variables.sh b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/check_env_variables.sh
index 4df0e42adf9f3..df2354ed8398a 100755
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/check_env_variables.sh
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/check_env_variables.sh
@@ -30,13 +30,3 @@ if [ -z "${KIBANA_URL}" ]; then
   echo "Set KIBANA_URL in your environment"
   exit 1
 fi
-
-if [ -z "${TASK_MANAGER_INDEX}" ]; then
-  echo "Set TASK_MANAGER_INDEX in your environment"
-  exit 1
-fi
-
-if [ -z "${KIBANA_INDEX}" ]; then
-  echo "Set KIBANA_INDEX in your environment"
-  exit 1
-fi
diff --git a/x-pack/plugins/task_manager/server/lib/log_health_metrics.ts b/x-pack/plugins/task_manager/server/lib/log_health_metrics.ts
index d541ffb5684da..5d513c645a862 100644
--- a/x-pack/plugins/task_manager/server/lib/log_health_metrics.ts
+++ b/x-pack/plugins/task_manager/server/lib/log_health_metrics.ts
@@ -46,7 +46,10 @@ export function logHealthMetrics(
   }
 
   const message = `Latest Monitored Stats: ${JSON.stringify(monitoredHealth)}`;
-  const docLink = `https://www.elastic.co/guide/en/kibana/${kibanaPackageJson.branch}/task-manager-health-monitoring.html`;
+  // TODO: remove when docs support "main"
+  const docsBranch = kibanaPackageJson.branch === 'main' ? 'master' : 'main';
+
+  const docLink = `https://www.elastic.co/guide/en/kibana/${docsBranch}/task-manager-health-monitoring.html`;
   const detectedProblemMessage = `Task Manager detected a degradation in performance. This is usually temporary, and Kibana can recover automatically. If the problem persists, check the docs for troubleshooting information: ${docLink} .`;
   if (enabled) {
     const driftInSeconds = (monitoredHealth.stats.runtime?.value.drift.p99 ?? 0) / 1000;
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 2786cab4fe963..8ac619d479bef 100644
--- a/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json
+++ b/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json
@@ -100,6 +100,49 @@
             }
           }
         },
+        "count_actions_executions_per_day": {
+          "type": "long"
+        },
+        "count_actions_executions_by_type_per_day": {
+          "properties": {
+            "DYNAMIC_KEY": {
+              "type": "long"
+            },
+            "__email": {
+              "type": "long"
+            },
+            "__index": {
+              "type": "long"
+            },
+            "__pagerduty": {
+              "type": "long"
+            },
+            "__swimlane": {
+              "type": "long"
+            },
+            "__server-log": {
+              "type": "long"
+            },
+            "__slack": {
+              "type": "long"
+            },
+            "__webhook": {
+              "type": "long"
+            },
+            "__servicenow": {
+              "type": "long"
+            },
+            "__jira": {
+              "type": "long"
+            },
+            "__resilient": {
+              "type": "long"
+            },
+            "__teams": {
+              "type": "long"
+            }
+          }
+        },
         "count_active_email_connectors_by_service_type": {
           "properties": {
             "DYNAMIC_KEY": {
@@ -127,6 +170,92 @@
         },
         "count_actions_namespaces": {
           "type": "long"
+        },
+        "count_actions_executions_failed_per_day": {
+          "type": "long"
+        },
+        "count_actions_executions_failed_by_type_per_day": {
+          "properties": {
+            "DYNAMIC_KEY": {
+              "type": "long"
+            },
+            "__email": {
+              "type": "long"
+            },
+            "__index": {
+              "type": "long"
+            },
+            "__pagerduty": {
+              "type": "long"
+            },
+            "__swimlane": {
+              "type": "long"
+            },
+            "__server-log": {
+              "type": "long"
+            },
+            "__slack": {
+              "type": "long"
+            },
+            "__webhook": {
+              "type": "long"
+            },
+            "__servicenow": {
+              "type": "long"
+            },
+            "__jira": {
+              "type": "long"
+            },
+            "__resilient": {
+              "type": "long"
+            },
+            "__teams": {
+              "type": "long"
+            }
+          }
+        },
+        "avg_execution_time_per_day": {
+          "type": "long"
+        },
+        "avg_execution_time_by_type_per_day": {
+          "properties": {
+            "DYNAMIC_KEY": {
+              "type": "long"
+            },
+            "__email": {
+              "type": "long"
+            },
+            "__index": {
+              "type": "long"
+            },
+            "__pagerduty": {
+              "type": "long"
+            },
+            "__swimlane": {
+              "type": "long"
+            },
+            "__server-log": {
+              "type": "long"
+            },
+            "__slack": {
+              "type": "long"
+            },
+            "__webhook": {
+              "type": "long"
+            },
+            "__servicenow": {
+              "type": "long"
+            },
+            "__jira": {
+              "type": "long"
+            },
+            "__resilient": {
+              "type": "long"
+            },
+            "__teams": {
+              "type": "long"
+            }
+          }
         }
       }
     },
@@ -352,6 +481,633 @@
         },
         "count_rules_namespaces": {
           "type": "long"
+        },
+        "count_rules_executions_per_day": {
+          "type": "long"
+        },
+        "count_rules_executions_by_type_per_day": {
+          "properties": {
+            "DYNAMIC_KEY": {
+              "type": "long"
+            },
+            "__index-threshold": {
+              "type": "long"
+            },
+            "__es-query": {
+              "type": "long"
+            },
+            "transform_health": {
+              "type": "long"
+            },
+            "apm__error_rate": {
+              "type": "long"
+            },
+            "apm__transaction_error_rate": {
+              "type": "long"
+            },
+            "apm__transaction_duration": {
+              "type": "long"
+            },
+            "apm__transaction_duration_anomaly": {
+              "type": "long"
+            },
+            "metrics__alert__threshold": {
+              "type": "long"
+            },
+            "metrics__alert__inventory__threshold": {
+              "type": "long"
+            },
+            "logs__alert__document__count": {
+              "type": "long"
+            },
+            "monitoring_alert_cluster_health": {
+              "type": "long"
+            },
+            "monitoring_alert_cpu_usage": {
+              "type": "long"
+            },
+            "monitoring_alert_disk_usage": {
+              "type": "long"
+            },
+            "monitoring_alert_elasticsearch_version_mismatch": {
+              "type": "long"
+            },
+            "monitoring_alert_kibana_version_mismatch": {
+              "type": "long"
+            },
+            "monitoring_alert_license_expiration": {
+              "type": "long"
+            },
+            "monitoring_alert_logstash_version_mismatch": {
+              "type": "long"
+            },
+            "monitoring_alert_nodes_changed": {
+              "type": "long"
+            },
+            "siem__signals": {
+              "type": "long"
+            },
+            "siem__notifications": {
+              "type": "long"
+            },
+            "xpack__uptime__alerts__monitorStatus": {
+              "type": "long"
+            },
+            "xpack__uptime__alerts__tls": {
+              "type": "long"
+            },
+            "xpack__uptime__alerts__durationAnomaly": {
+              "type": "long"
+            },
+            "__geo-containment": {
+              "type": "long"
+            },
+            "xpack__ml__anomaly_detection_alert": {
+              "type": "long"
+            },
+            "xpack__ml__anomaly_detection_jobs_health": {
+              "type": "long"
+            }
+          }
+        },
+        "count_rules_executions_failured_per_day": {
+          "type": "long"
+        },
+        "count_rules_executions_failured_by_reason_per_day": {
+          "properties": {
+            "DYNAMIC_KEY": {
+              "type": "long"
+            },
+            "read": {
+              "type": "long"
+            },
+            "decrypt": {
+              "type": "long"
+            },
+            "license": {
+              "type": "long"
+            },
+            "unknown": {
+              "type": "long"
+            }
+          }
+        },
+        "count_rules_executions_failured_by_reason_by_type_per_day": {
+          "properties": {
+            "DYNAMIC_KEY": {
+              "properties": {
+                "DYNAMIC_KEY": {
+                  "type": "long"
+                },
+                "__index-threshold": {
+                  "type": "long"
+                },
+                "__es-query": {
+                  "type": "long"
+                },
+                "transform_health": {
+                  "type": "long"
+                },
+                "apm__error_rate": {
+                  "type": "long"
+                },
+                "apm__transaction_error_rate": {
+                  "type": "long"
+                },
+                "apm__transaction_duration": {
+                  "type": "long"
+                },
+                "apm__transaction_duration_anomaly": {
+                  "type": "long"
+                },
+                "metrics__alert__threshold": {
+                  "type": "long"
+                },
+                "metrics__alert__inventory__threshold": {
+                  "type": "long"
+                },
+                "logs__alert__document__count": {
+                  "type": "long"
+                },
+                "monitoring_alert_cluster_health": {
+                  "type": "long"
+                },
+                "monitoring_alert_cpu_usage": {
+                  "type": "long"
+                },
+                "monitoring_alert_disk_usage": {
+                  "type": "long"
+                },
+                "monitoring_alert_elasticsearch_version_mismatch": {
+                  "type": "long"
+                },
+                "monitoring_alert_kibana_version_mismatch": {
+                  "type": "long"
+                },
+                "monitoring_alert_license_expiration": {
+                  "type": "long"
+                },
+                "monitoring_alert_logstash_version_mismatch": {
+                  "type": "long"
+                },
+                "monitoring_alert_nodes_changed": {
+                  "type": "long"
+                },
+                "siem__signals": {
+                  "type": "long"
+                },
+                "siem__notifications": {
+                  "type": "long"
+                },
+                "xpack__uptime__alerts__monitorStatus": {
+                  "type": "long"
+                },
+                "xpack__uptime__alerts__tls": {
+                  "type": "long"
+                },
+                "xpack__uptime__alerts__durationAnomaly": {
+                  "type": "long"
+                },
+                "__geo-containment": {
+                  "type": "long"
+                },
+                "xpack__ml__anomaly_detection_alert": {
+                  "type": "long"
+                },
+                "xpack__ml__anomaly_detection_jobs_health": {
+                  "type": "long"
+                }
+              }
+            },
+            "read": {
+              "properties": {
+                "DYNAMIC_KEY": {
+                  "type": "long"
+                },
+                "__index-threshold": {
+                  "type": "long"
+                },
+                "__es-query": {
+                  "type": "long"
+                },
+                "transform_health": {
+                  "type": "long"
+                },
+                "apm__error_rate": {
+                  "type": "long"
+                },
+                "apm__transaction_error_rate": {
+                  "type": "long"
+                },
+                "apm__transaction_duration": {
+                  "type": "long"
+                },
+                "apm__transaction_duration_anomaly": {
+                  "type": "long"
+                },
+                "metrics__alert__threshold": {
+                  "type": "long"
+                },
+                "metrics__alert__inventory__threshold": {
+                  "type": "long"
+                },
+                "logs__alert__document__count": {
+                  "type": "long"
+                },
+                "monitoring_alert_cluster_health": {
+                  "type": "long"
+                },
+                "monitoring_alert_cpu_usage": {
+                  "type": "long"
+                },
+                "monitoring_alert_disk_usage": {
+                  "type": "long"
+                },
+                "monitoring_alert_elasticsearch_version_mismatch": {
+                  "type": "long"
+                },
+                "monitoring_alert_kibana_version_mismatch": {
+                  "type": "long"
+                },
+                "monitoring_alert_license_expiration": {
+                  "type": "long"
+                },
+                "monitoring_alert_logstash_version_mismatch": {
+                  "type": "long"
+                },
+                "monitoring_alert_nodes_changed": {
+                  "type": "long"
+                },
+                "siem__signals": {
+                  "type": "long"
+                },
+                "siem__notifications": {
+                  "type": "long"
+                },
+                "xpack__uptime__alerts__monitorStatus": {
+                  "type": "long"
+                },
+                "xpack__uptime__alerts__tls": {
+                  "type": "long"
+                },
+                "xpack__uptime__alerts__durationAnomaly": {
+                  "type": "long"
+                },
+                "__geo-containment": {
+                  "type": "long"
+                },
+                "xpack__ml__anomaly_detection_alert": {
+                  "type": "long"
+                },
+                "xpack__ml__anomaly_detection_jobs_health": {
+                  "type": "long"
+                }
+              }
+            },
+            "decrypt": {
+              "properties": {
+                "DYNAMIC_KEY": {
+                  "type": "long"
+                },
+                "__index-threshold": {
+                  "type": "long"
+                },
+                "__es-query": {
+                  "type": "long"
+                },
+                "transform_health": {
+                  "type": "long"
+                },
+                "apm__error_rate": {
+                  "type": "long"
+                },
+                "apm__transaction_error_rate": {
+                  "type": "long"
+                },
+                "apm__transaction_duration": {
+                  "type": "long"
+                },
+                "apm__transaction_duration_anomaly": {
+                  "type": "long"
+                },
+                "metrics__alert__threshold": {
+                  "type": "long"
+                },
+                "metrics__alert__inventory__threshold": {
+                  "type": "long"
+                },
+                "logs__alert__document__count": {
+                  "type": "long"
+                },
+                "monitoring_alert_cluster_health": {
+                  "type": "long"
+                },
+                "monitoring_alert_cpu_usage": {
+                  "type": "long"
+                },
+                "monitoring_alert_disk_usage": {
+                  "type": "long"
+                },
+                "monitoring_alert_elasticsearch_version_mismatch": {
+                  "type": "long"
+                },
+                "monitoring_alert_kibana_version_mismatch": {
+                  "type": "long"
+                },
+                "monitoring_alert_license_expiration": {
+                  "type": "long"
+                },
+                "monitoring_alert_logstash_version_mismatch": {
+                  "type": "long"
+                },
+                "monitoring_alert_nodes_changed": {
+                  "type": "long"
+                },
+                "siem__signals": {
+                  "type": "long"
+                },
+                "siem__notifications": {
+                  "type": "long"
+                },
+                "xpack__uptime__alerts__monitorStatus": {
+                  "type": "long"
+                },
+                "xpack__uptime__alerts__tls": {
+                  "type": "long"
+                },
+                "xpack__uptime__alerts__durationAnomaly": {
+                  "type": "long"
+                },
+                "__geo-containment": {
+                  "type": "long"
+                },
+                "xpack__ml__anomaly_detection_alert": {
+                  "type": "long"
+                },
+                "xpack__ml__anomaly_detection_jobs_health": {
+                  "type": "long"
+                }
+              }
+            },
+            "license": {
+              "properties": {
+                "DYNAMIC_KEY": {
+                  "type": "long"
+                },
+                "__index-threshold": {
+                  "type": "long"
+                },
+                "__es-query": {
+                  "type": "long"
+                },
+                "transform_health": {
+                  "type": "long"
+                },
+                "apm__error_rate": {
+                  "type": "long"
+                },
+                "apm__transaction_error_rate": {
+                  "type": "long"
+                },
+                "apm__transaction_duration": {
+                  "type": "long"
+                },
+                "apm__transaction_duration_anomaly": {
+                  "type": "long"
+                },
+                "metrics__alert__threshold": {
+                  "type": "long"
+                },
+                "metrics__alert__inventory__threshold": {
+                  "type": "long"
+                },
+                "logs__alert__document__count": {
+                  "type": "long"
+                },
+                "monitoring_alert_cluster_health": {
+                  "type": "long"
+                },
+                "monitoring_alert_cpu_usage": {
+                  "type": "long"
+                },
+                "monitoring_alert_disk_usage": {
+                  "type": "long"
+                },
+                "monitoring_alert_elasticsearch_version_mismatch": {
+                  "type": "long"
+                },
+                "monitoring_alert_kibana_version_mismatch": {
+                  "type": "long"
+                },
+                "monitoring_alert_license_expiration": {
+                  "type": "long"
+                },
+                "monitoring_alert_logstash_version_mismatch": {
+                  "type": "long"
+                },
+                "monitoring_alert_nodes_changed": {
+                  "type": "long"
+                },
+                "siem__signals": {
+                  "type": "long"
+                },
+                "siem__notifications": {
+                  "type": "long"
+                },
+                "xpack__uptime__alerts__monitorStatus": {
+                  "type": "long"
+                },
+                "xpack__uptime__alerts__tls": {
+                  "type": "long"
+                },
+                "xpack__uptime__alerts__durationAnomaly": {
+                  "type": "long"
+                },
+                "__geo-containment": {
+                  "type": "long"
+                },
+                "xpack__ml__anomaly_detection_alert": {
+                  "type": "long"
+                },
+                "xpack__ml__anomaly_detection_jobs_health": {
+                  "type": "long"
+                }
+              }
+            },
+            "unknown": {
+              "properties": {
+                "DYNAMIC_KEY": {
+                  "type": "long"
+                },
+                "__index-threshold": {
+                  "type": "long"
+                },
+                "__es-query": {
+                  "type": "long"
+                },
+                "transform_health": {
+                  "type": "long"
+                },
+                "apm__error_rate": {
+                  "type": "long"
+                },
+                "apm__transaction_error_rate": {
+                  "type": "long"
+                },
+                "apm__transaction_duration": {
+                  "type": "long"
+                },
+                "apm__transaction_duration_anomaly": {
+                  "type": "long"
+                },
+                "metrics__alert__threshold": {
+                  "type": "long"
+                },
+                "metrics__alert__inventory__threshold": {
+                  "type": "long"
+                },
+                "logs__alert__document__count": {
+                  "type": "long"
+                },
+                "monitoring_alert_cluster_health": {
+                  "type": "long"
+                },
+                "monitoring_alert_cpu_usage": {
+                  "type": "long"
+                },
+                "monitoring_alert_disk_usage": {
+                  "type": "long"
+                },
+                "monitoring_alert_elasticsearch_version_mismatch": {
+                  "type": "long"
+                },
+                "monitoring_alert_kibana_version_mismatch": {
+                  "type": "long"
+                },
+                "monitoring_alert_license_expiration": {
+                  "type": "long"
+                },
+                "monitoring_alert_logstash_version_mismatch": {
+                  "type": "long"
+                },
+                "monitoring_alert_nodes_changed": {
+                  "type": "long"
+                },
+                "siem__signals": {
+                  "type": "long"
+                },
+                "siem__notifications": {
+                  "type": "long"
+                },
+                "xpack__uptime__alerts__monitorStatus": {
+                  "type": "long"
+                },
+                "xpack__uptime__alerts__tls": {
+                  "type": "long"
+                },
+                "xpack__uptime__alerts__durationAnomaly": {
+                  "type": "long"
+                },
+                "__geo-containment": {
+                  "type": "long"
+                },
+                "xpack__ml__anomaly_detection_alert": {
+                  "type": "long"
+                },
+                "xpack__ml__anomaly_detection_jobs_health": {
+                  "type": "long"
+                }
+              }
+            }
+          }
+        },
+        "avg_execution_time_per_day": {
+          "type": "long"
+        },
+        "avg_execution_time_by_type_per_day": {
+          "properties": {
+            "DYNAMIC_KEY": {
+              "type": "long"
+            },
+            "__index-threshold": {
+              "type": "long"
+            },
+            "__es-query": {
+              "type": "long"
+            },
+            "transform_health": {
+              "type": "long"
+            },
+            "apm__error_rate": {
+              "type": "long"
+            },
+            "apm__transaction_error_rate": {
+              "type": "long"
+            },
+            "apm__transaction_duration": {
+              "type": "long"
+            },
+            "apm__transaction_duration_anomaly": {
+              "type": "long"
+            },
+            "metrics__alert__threshold": {
+              "type": "long"
+            },
+            "metrics__alert__inventory__threshold": {
+              "type": "long"
+            },
+            "logs__alert__document__count": {
+              "type": "long"
+            },
+            "monitoring_alert_cluster_health": {
+              "type": "long"
+            },
+            "monitoring_alert_cpu_usage": {
+              "type": "long"
+            },
+            "monitoring_alert_disk_usage": {
+              "type": "long"
+            },
+            "monitoring_alert_elasticsearch_version_mismatch": {
+              "type": "long"
+            },
+            "monitoring_alert_kibana_version_mismatch": {
+              "type": "long"
+            },
+            "monitoring_alert_license_expiration": {
+              "type": "long"
+            },
+            "monitoring_alert_logstash_version_mismatch": {
+              "type": "long"
+            },
+            "monitoring_alert_nodes_changed": {
+              "type": "long"
+            },
+            "siem__signals": {
+              "type": "long"
+            },
+            "siem__notifications": {
+              "type": "long"
+            },
+            "xpack__uptime__alerts__monitorStatus": {
+              "type": "long"
+            },
+            "xpack__uptime__alerts__tls": {
+              "type": "long"
+            },
+            "xpack__uptime__alerts__durationAnomaly": {
+              "type": "long"
+            },
+            "__geo-containment": {
+              "type": "long"
+            },
+            "xpack__ml__anomaly_detection_alert": {
+              "type": "long"
+            },
+            "xpack__ml__anomaly_detection_jobs_health": {
+              "type": "long"
+            }
+          }
         }
       }
     },
diff --git a/x-pack/plugins/timelines/public/components/t_grid/body/index.tsx b/x-pack/plugins/timelines/public/components/t_grid/body/index.tsx
index 9e43c16fd5e6f..29766a5b8a1f5 100644
--- a/x-pack/plugins/timelines/public/components/t_grid/body/index.tsx
+++ b/x-pack/plugins/timelines/public/components/t_grid/body/index.tsx
@@ -146,7 +146,14 @@ const EuiDataGridContainer = styled.div<{ hideLastPage: boolean }>`
   }
 `;
 
-const FIELDS_WITHOUT_CELL_ACTIONS = ['@timestamp', 'signal.rule.risk_score', 'signal.reason'];
+// TODO: accept extra list of column ids without actions from callsites
+const FIELDS_WITHOUT_CELL_ACTIONS = [
+  '@timestamp',
+  'signal.rule.risk_score',
+  'signal.reason',
+  'kibana.alert.duration.us',
+  'kibana.alert.reason',
+];
 const hasCellActions = (columnId?: string) =>
   columnId && FIELDS_WITHOUT_CELL_ACTIONS.indexOf(columnId) < 0;
 const transformControlColumns = ({
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 857e97daa3515..47876265894ec 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -19243,10 +19243,6 @@
     "xpack.reporting.screenCapturePanelContent.canvasLayoutLabel": "全ページレイアウト",
     "xpack.reporting.screenCapturePanelContent.optimizeForPrintingHelpText": "複数のページを使用します。ページごとに最大2のビジュアライゼーションが表示されます",
     "xpack.reporting.screenCapturePanelContent.optimizeForPrintingLabel": "印刷用に最適化",
-    "xpack.reporting.serverConfig.autoSet.sandboxDisabled": "Chromiumサンドボックスは保護が強化されていますが、{osName} OSではサポートされていません。自動的に'{configKey}: true'を設定しています。",
-    "xpack.reporting.serverConfig.autoSet.sandboxEnabled": "Chromiumサンドボックスは保護が強化され、{osName} OSでサポートされています。自動的にChromiumサンドボックスを有効にしています。",
-    "xpack.reporting.serverConfig.osDetected": "OSは'{osName}'で実行しています",
-    "xpack.reporting.serverConfig.randomEncryptionKey": "xpack.reporting.encryptionKey のランダムキーを生成しています。再起動時にセッションが無効にならないようにするには、kibana.yml でxpack.reporting.encryptionKey を設定するか、bin/kibana-encryption-keys コマンドを使用してください。",
     "xpack.reporting.shareContextMenu.csvReportsButtonLabel": "CSV レポート",
     "xpack.reporting.shareContextMenu.pdfReportsButtonLabel": "PDF レポート",
     "xpack.reporting.shareContextMenu.pngReportsButtonLabel": "PNG レポート",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 6c860a5b2cc4d..0fd4fea956a11 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -19520,10 +19520,6 @@
     "xpack.reporting.screenCapturePanelContent.canvasLayoutLabel": "全页面布局",
     "xpack.reporting.screenCapturePanelContent.optimizeForPrintingHelpText": "使用多页，每页最多显示 2 个可视化",
     "xpack.reporting.screenCapturePanelContent.optimizeForPrintingLabel": "打印优化",
-    "xpack.reporting.serverConfig.autoSet.sandboxDisabled": "Chromium 沙盒提供附加保护层，但不受 {osName} OS 支持。自动设置“{configKey}: true”。",
-    "xpack.reporting.serverConfig.autoSet.sandboxEnabled": "Chromium 沙盒提供附加保护层，受 {osName} OS 支持。自动启用 Chromium 沙盒。",
-    "xpack.reporting.serverConfig.osDetected": "正在以下 OS 上运行：“{osName}”",
-    "xpack.reporting.serverConfig.randomEncryptionKey": "为 xpack.reporting.encryptionKey 生成随机密钥。为防止会话在重启时失效，请在 kibana.yml 中设置 xpack.reporting.encryptionKey 或使用 bin/kibana-encryption-keys 命令。",
     "xpack.reporting.shareContextMenu.csvReportsButtonLabel": "CSV 报告",
     "xpack.reporting.shareContextMenu.pdfReportsButtonLabel": "PDF 报告",
     "xpack.reporting.shareContextMenu.pngReportsButtonLabel": "PNG 报告",
diff --git a/x-pack/plugins/uptime/common/runtime_types/ping/synthetics.ts b/x-pack/plugins/uptime/common/runtime_types/ping/synthetics.ts
index 7b181ac2cf50c..040f0a83e84ab 100644
--- a/x-pack/plugins/uptime/common/runtime_types/ping/synthetics.ts
+++ b/x-pack/plugins/uptime/common/runtime_types/ping/synthetics.ts
@@ -27,6 +27,11 @@ export const JourneyStepType = t.intersection([
         lt: t.string,
       }),
     }),
+    observer: t.type({
+      geo: t.type({
+        name: t.string,
+      }),
+    }),
     synthetics: t.partial({
       error: t.partial({
         message: t.string,
diff --git a/x-pack/plugins/uptime/public/components/common/charts/__snapshots__/donut_chart.test.tsx.snap b/x-pack/plugins/uptime/public/components/common/charts/__snapshots__/donut_chart.test.tsx.snap
index c9299bf7bf3ea..4ee227c645253 100644
--- a/x-pack/plugins/uptime/public/components/common/charts/__snapshots__/donut_chart.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/common/charts/__snapshots__/donut_chart.test.tsx.snap
@@ -80,6 +80,24 @@ exports[`DonutChart component passes correct props without errors for valid prop
                 "strokeWidth": 1,
                 "visible": false,
               },
+              "lumaSteps": Array [
+                224,
+                184,
+                128,
+                96,
+                64,
+                32,
+                16,
+                8,
+                4,
+                2,
+                1,
+                0,
+                0,
+                0,
+                0,
+                0,
+              ],
               "vertical": Object {
                 "dash": Array [
                   0,
diff --git a/x-pack/plugins/uptime/public/components/overview/query_bar/use_query_bar.test.tsx b/x-pack/plugins/uptime/public/components/overview/query_bar/use_query_bar.test.tsx
index e4c57dab0ffcf..217d8cdfc4c9e 100644
--- a/x-pack/plugins/uptime/public/components/overview/query_bar/use_query_bar.test.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/query_bar/use_query_bar.test.tsx
@@ -17,7 +17,8 @@ import { UptimeUrlParams } from '../../../lib/helper/url_params';
 
 const SAMPLE_ES_FILTERS = `{"bool":{"should":[{"match_phrase":{"monitor.id":"NodeServer"}}],"minimum_should_match":1}}`;
 
-describe('useQueryBar', () => {
+// FLAKY: https://github.com/elastic/kibana/issues/112677
+describe.skip('useQueryBar', () => {
   let DEFAULT_URL_PARAMS: UptimeUrlParams;
   let wrapper: any;
   let useUrlParamsSpy: jest.SpyInstance<[URL.GetUrlParams, URL.UpdateUrlParams]>;
diff --git a/x-pack/plugins/uptime/public/components/synthetics/check_steps/step_expanded_row/step_screenshots.tsx b/x-pack/plugins/uptime/public/components/synthetics/check_steps/step_expanded_row/step_screenshots.tsx
index 54f73fb39a52a..f8776f74b780e 100644
--- a/x-pack/plugins/uptime/public/components/synthetics/check_steps/step_expanded_row/step_screenshots.tsx
+++ b/x-pack/plugins/uptime/public/components/synthetics/check_steps/step_expanded_row/step_screenshots.tsx
@@ -36,6 +36,7 @@ export const StepScreenshots = ({ step }: Props) => {
         timestamp: step['@timestamp'],
         monitorId: step.monitor.id,
         stepIndex: step.synthetics?.step?.index!,
+        location: step.observer?.geo?.name,
       });
     }
   }, [step._id, step['@timestamp']]);
diff --git a/x-pack/plugins/uptime/public/components/synthetics/check_steps/use_expanded_row.test.tsx b/x-pack/plugins/uptime/public/components/synthetics/check_steps/use_expanded_row.test.tsx
index 7aa763c15ca1f..e1f43cfebdbb2 100644
--- a/x-pack/plugins/uptime/public/components/synthetics/check_steps/use_expanded_row.test.tsx
+++ b/x-pack/plugins/uptime/public/components/synthetics/check_steps/use_expanded_row.test.tsx
@@ -228,6 +228,9 @@ const browserConsoleStep = {
   _id: 'IvT1oXwB5ds00bB_FVXP',
   observer: {
     hostname: '16Elastic',
+    geo: {
+      name: 'au-heartbeat',
+    },
   },
   agent: {
     name: '16Elastic',
diff --git a/x-pack/plugins/uptime/public/state/api/journey.ts b/x-pack/plugins/uptime/public/state/api/journey.ts
index b982da90d9dc5..05d4a9e356919 100644
--- a/x-pack/plugins/uptime/public/state/api/journey.ts
+++ b/x-pack/plugins/uptime/public/state/api/journey.ts
@@ -51,10 +51,12 @@ export async function fetchLastSuccessfulStep({
   monitorId,
   timestamp,
   stepIndex,
+  location,
 }: {
   monitorId: string;
   timestamp: string;
   stepIndex: number;
+  location?: string;
 }): Promise<JourneyStep> {
   return await apiService.get(
     `/api/uptime/synthetics/step/success/`,
@@ -62,6 +64,7 @@ export async function fetchLastSuccessfulStep({
       monitorId,
       timestamp,
       stepIndex,
+      location,
     },
     JourneyStepType
   );
diff --git a/x-pack/plugins/uptime/server/lib/lib.ts b/x-pack/plugins/uptime/server/lib/lib.ts
index 894bf743499f9..fbd0494a3ca82 100644
--- a/x-pack/plugins/uptime/server/lib/lib.ts
+++ b/x-pack/plugins/uptime/server/lib/lib.ts
@@ -59,8 +59,6 @@ export function createUptimeESClient({
   request?: KibanaRequest;
   savedObjectsClient: SavedObjectsClientContract | ISavedObjectsRepository;
 }) {
-  const { _inspect = false } = (request?.query as { _inspect: boolean }) ?? {};
-
   return {
     baseESClient: esClient,
     async search<DocumentSource extends unknown, TParams extends estypes.SearchRequest>(
@@ -101,10 +99,9 @@ export function createUptimeESClient({
             startTime: startTimeNow,
           })
         );
-      }
-
-      if (_inspect && request) {
-        debugESCall({ startTime, request, esError, operationName: 'search', params: esParams });
+        if (request) {
+          debugESCall({ startTime, request, esError, operationName: 'search', params: esParams });
+        }
       }
 
       if (esError) {
@@ -129,8 +126,9 @@ export function createUptimeESClient({
       } catch (e) {
         esError = e;
       }
+      const inspectableEsQueries = inspectableEsQueriesMap.get(request!);
 
-      if (_inspect && request) {
+      if (inspectableEsQueries && request) {
         debugESCall({ startTime, request, esError, operationName: 'count', params: esParams });
       }
 
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_last_successful_step.test.ts b/x-pack/plugins/uptime/server/lib/requests/get_last_successful_step.test.ts
new file mode 100644
index 0000000000000..63274bf64536c
--- /dev/null
+++ b/x-pack/plugins/uptime/server/lib/requests/get_last_successful_step.test.ts
@@ -0,0 +1,132 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { getLastSuccessfulStepParams } from './get_last_successful_step';
+
+describe('getLastSuccessfulStep', () => {
+  describe('getLastSuccessfulStepParams', () => {
+    it('formats ES params with location', () => {
+      const monitorId = 'my-monitor';
+      const stepIndex = 1;
+      const location = 'au-heartbeat';
+      const timestamp = '2021-10-31T19:47:52.392Z';
+      const params = getLastSuccessfulStepParams({
+        monitorId,
+        stepIndex,
+        location,
+        timestamp,
+      });
+
+      expect(params).toEqual({
+        query: {
+          bool: {
+            filter: [
+              {
+                range: {
+                  '@timestamp': {
+                    lte: '2021-10-31T19:47:52.392Z',
+                  },
+                },
+              },
+              {
+                term: {
+                  'monitor.id': monitorId,
+                },
+              },
+              {
+                term: {
+                  'synthetics.type': 'step/end',
+                },
+              },
+              {
+                term: {
+                  'synthetics.step.status': 'succeeded',
+                },
+              },
+              {
+                term: {
+                  'synthetics.step.index': stepIndex,
+                },
+              },
+              {
+                term: {
+                  'observer.geo.name': location,
+                },
+              },
+            ],
+          },
+        },
+        size: 1,
+        sort: [
+          {
+            '@timestamp': {
+              order: 'desc',
+            },
+          },
+        ],
+      });
+    });
+
+    it('formats ES params without location', () => {
+      const params = getLastSuccessfulStepParams({
+        monitorId: 'my-monitor',
+        stepIndex: 1,
+        location: undefined,
+        timestamp: '2021-10-31T19:47:52.392Z',
+      });
+
+      expect(params).toEqual({
+        query: {
+          bool: {
+            filter: [
+              {
+                range: {
+                  '@timestamp': {
+                    lte: '2021-10-31T19:47:52.392Z',
+                  },
+                },
+              },
+              {
+                term: {
+                  'monitor.id': 'my-monitor',
+                },
+              },
+              {
+                term: {
+                  'synthetics.type': 'step/end',
+                },
+              },
+              {
+                term: {
+                  'synthetics.step.status': 'succeeded',
+                },
+              },
+              {
+                term: {
+                  'synthetics.step.index': 1,
+                },
+              },
+            ],
+            must_not: {
+              exists: {
+                field: 'observer.geo.name',
+              },
+            },
+          },
+        },
+        size: 1,
+        sort: [
+          {
+            '@timestamp': {
+              order: 'desc',
+            },
+          },
+        ],
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_last_successful_step.ts b/x-pack/plugins/uptime/server/lib/requests/get_last_successful_step.ts
index e096cdaa65b86..d6862b93c8cd4 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_last_successful_step.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_last_successful_step.ts
@@ -13,13 +13,16 @@ export interface GetStepScreenshotParams {
   monitorId: string;
   timestamp: string;
   stepIndex: number;
+  location?: string;
 }
 
-export const getStepLastSuccessfulStep: UMElasticsearchQueryFn<
-  GetStepScreenshotParams,
-  JourneyStep | null
-> = async ({ uptimeEsClient, monitorId, stepIndex, timestamp }) => {
-  const lastSuccessCheckParams: estypes.SearchRequest['body'] = {
+export const getLastSuccessfulStepParams = ({
+  monitorId,
+  stepIndex,
+  timestamp,
+  location,
+}: GetStepScreenshotParams): estypes.SearchRequest['body'] => {
+  return {
     size: 1,
     sort: [
       {
@@ -58,10 +61,40 @@ export const getStepLastSuccessfulStep: UMElasticsearchQueryFn<
               'synthetics.step.index': stepIndex,
             },
           },
+          ...(location
+            ? [
+                {
+                  term: {
+                    'observer.geo.name': location,
+                  },
+                },
+              ]
+            : []),
         ],
+        ...(!location
+          ? {
+              must_not: {
+                exists: {
+                  field: 'observer.geo.name',
+                },
+              },
+            }
+          : {}),
       },
     },
   };
+};
+
+export const getStepLastSuccessfulStep: UMElasticsearchQueryFn<
+  GetStepScreenshotParams,
+  JourneyStep | null
+> = async ({ uptimeEsClient, monitorId, stepIndex, timestamp, location }) => {
+  const lastSuccessCheckParams = getLastSuccessfulStepParams({
+    monitorId,
+    stepIndex,
+    timestamp,
+    location,
+  });
 
   const { body: result } = await uptimeEsClient.search({ body: lastSuccessCheckParams });
 
diff --git a/x-pack/plugins/uptime/server/rest_api/synthetics/last_successful_step.ts b/x-pack/plugins/uptime/server/rest_api/synthetics/last_successful_step.ts
index 5d1407a8679c8..81539459172cc 100644
--- a/x-pack/plugins/uptime/server/rest_api/synthetics/last_successful_step.ts
+++ b/x-pack/plugins/uptime/server/rest_api/synthetics/last_successful_step.ts
@@ -22,16 +22,18 @@ export const createLastSuccessfulStepRoute: UMRestApiRouteFactory = (libs: UMSer
       monitorId: schema.string(),
       stepIndex: schema.number(),
       timestamp: schema.string(),
+      location: schema.maybe(schema.string()),
     }),
   },
   handler: async ({ uptimeEsClient, request, response }) => {
-    const { timestamp, monitorId, stepIndex } = request.query;
+    const { timestamp, monitorId, stepIndex, location } = request.query;
 
     const step: JourneyStep | null = await libs.requests.getStepLastSuccessfulStep({
       uptimeEsClient,
       monitorId,
       stepIndex,
       timestamp,
+      location,
     });
 
     if (step === null) {
diff --git a/x-pack/plugins/watcher/public/legacy/calc_es_interval.js b/x-pack/plugins/watcher/public/legacy/calc_es_interval.ts
similarity index 83%
rename from x-pack/plugins/watcher/public/legacy/calc_es_interval.js
rename to x-pack/plugins/watcher/public/legacy/calc_es_interval.ts
index 29f0f0f56d38d..cae88b797ea4f 100644
--- a/x-pack/plugins/watcher/public/legacy/calc_es_interval.js
+++ b/x-pack/plugins/watcher/public/legacy/calc_es_interval.ts
@@ -7,7 +7,7 @@
 
 import dateMath from '@elastic/datemath';
 
-import { parseEsInterval } from './index';
+import { parseEsInterval } from './parse_es_interval';
 
 const unitsDesc = dateMath.unitsDesc;
 const largeMax = unitsDesc.indexOf('M');
@@ -17,10 +17,9 @@ const largeMax = unitsDesc.indexOf('M');
  * compatible expression, and provide
  * associated metadata
  *
- * @param  {moment.duration} duration
- * @return {object}
+ * @param duration
  */
-export function convertDurationToNormalizedEsInterval(duration) {
+export function convertDurationToNormalizedEsInterval(duration: moment.Duration) {
   for (let i = 0; i < unitsDesc.length; i++) {
     const unit = unitsDesc[i];
     const val = duration.as(unit);
@@ -35,7 +34,7 @@ export function convertDurationToNormalizedEsInterval(duration) {
 
       return {
         value: val,
-        unit: unit,
+        unit,
         expression: val + unit,
       };
     }
@@ -49,7 +48,7 @@ export function convertDurationToNormalizedEsInterval(duration) {
   };
 }
 
-export function convertIntervalToEsInterval(interval) {
+export function convertIntervalToEsInterval(interval: string) {
   const { value, unit } = parseEsInterval(interval);
   return {
     value,
diff --git a/x-pack/test/accessibility/apps/reporting.ts b/x-pack/test/accessibility/apps/reporting.ts
index bccb650fa08ca..91356ef85972b 100644
--- a/x-pack/test/accessibility/apps/reporting.ts
+++ b/x-pack/test/accessibility/apps/reporting.ts
@@ -16,7 +16,6 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
   const supertestWithoutAuth = getService('supertestWithoutAuth');
   const reporting = getService('reporting');
-  const esArchiver = getService('esArchiver');
   const security = getService('security');
 
   describe('Reporting', () => {
@@ -33,17 +32,13 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     };
 
     before(async () => {
-      await esArchiver.load('x-pack/test/functional/es_archives/reporting/logs');
-      await esArchiver.load('x-pack/test/functional/es_archives/logstash_functional');
-
+      await reporting.initLogs();
       await createReportingUser();
       await reporting.loginReportingUser();
     });
 
     after(async () => {
-      await esArchiver.unload('x-pack/test/functional/es_archives/reporting/logs');
-      await esArchiver.unload('x-pack/test/functional/es_archives/logstash_functional');
-
+      await reporting.teardownLogs();
       await deleteReportingUser();
     });
 
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 79ddaea13dfa5..4ee61811e5f85 100644
--- a/x-pack/test/functional/apps/dashboard/reporting/download_csv.ts
+++ b/x-pack/test/functional/apps/dashboard/reporting/download_csv.ts
@@ -18,6 +18,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const log = getService('log');
   const testSubjects = getService('testSubjects');
   const kibanaServer = getService('kibanaServer');
+  const reportingAPI = getService('reporting');
   const filterBar = getService('filterBar');
   const find = getService('find');
   const retry = getService('retry');
@@ -124,9 +125,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
     describe('Field Formatters and Scripted Fields', () => {
       before(async () => {
+        await reportingAPI.initLogs();
         await esArchiver.load('x-pack/test/functional/es_archives/reporting/hugedata');
       });
       after(async () => {
+        await reportingAPI.teardownLogs();
         await esArchiver.unload('x-pack/test/functional/es_archives/reporting/hugedata');
       });
 
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 790909164b33d..4dce6bca8f67a 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
@@ -20,7 +20,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
   const retry = getService('retry');
 
-  describe('Export import saved objects between versions', function () {
+  // Failing: See https://github.com/elastic/kibana/issues/116058
+  describe.skip('Export import saved objects between versions', function () {
     before(async function () {
       await esArchiver.load('x-pack/test/functional/es_archives/logstash_functional');
       await esArchiver.load('x-pack/test/functional/es_archives/getting_started/shakespeare');
diff --git a/x-pack/test/functional/es_archives/reporting/canvas_disallowed_url/data.json.gz b/x-pack/test/functional/es_archives/reporting/canvas_disallowed_url/data.json.gz
deleted file mode 100644
index c434eee5dd8d3..0000000000000
Binary files a/x-pack/test/functional/es_archives/reporting/canvas_disallowed_url/data.json.gz and /dev/null differ
diff --git a/x-pack/test/functional/es_archives/reporting/canvas_disallowed_url/mappings.json b/x-pack/test/functional/es_archives/reporting/canvas_disallowed_url/mappings.json
deleted file mode 100644
index e67abaf2032c7..0000000000000
--- a/x-pack/test/functional/es_archives/reporting/canvas_disallowed_url/mappings.json
+++ /dev/null
@@ -1,2185 +0,0 @@
-{
-  "type": "index",
-  "value": {
-    "aliases": {
-      ".kibana": {}
-    },
-    "index": ".kibana_1",
-    "mappings": {
-      "_meta": {
-        "migrationMappingPropertyHashes": {
-          "action": "6e96ac5e648f57523879661ea72525b7",
-          "action_task_params": "a9d49f184ee89641044be0ca2950fa3a",
-          "alert": "7b44fba6773e37c806ce290ea9b7024e",
-          "apm-indices": "9bb9b2bf1fa636ed8619cbab5ce6a1dd",
-          "apm-telemetry": "3d1b76c39bfb2cc8296b024d73854724",
-          "app_search_telemetry": "3d1b76c39bfb2cc8296b024d73854724",
-          "application_usage_totals": "3d1b76c39bfb2cc8296b024d73854724",
-          "application_usage_transactional": "43b8830d5d0df85a6823d290885fc9fd",
-          "canvas-element": "7390014e1091044523666d97247392fc",
-          "canvas-workpad": "b0a1706d356228dbdcb4a17e6b9eb231",
-          "canvas-workpad-template": "ae2673f678281e2c055d764b153e9715",
-          "cases": "32aa96a6d3855ddda53010ae2048ac22",
-          "cases-comments": "c2061fb929f585df57425102fa928b4b",
-          "cases-configure": "42711cbb311976c0687853f4c1354572",
-          "cases-user-actions": "32277330ec6b721abe3b846cfd939a71",
-          "config": "c63748b75f39d0c54de12d12c1ccbc20",
-          "dashboard": "d00f614b29a80360e1190193fd333bab",
-          "endpoint:user-artifact": "4a11183eee21e6fbad864f7a30b39ad0",
-          "endpoint:user-artifact-manifest": "a0d7b04ad405eed54d76e279c3727862",
-          "epm-packages": "8f6e0b09ea0374c4ffe98c3755373cff",
-          "exception-list": "4818e7dfc3e538562c80ec34eb6f841b",
-          "exception-list-agnostic": "4818e7dfc3e538562c80ec34eb6f841b",
-          "file-upload-telemetry": "0ed4d3e1983d1217a30982630897092e",
-          "fleet-agent-actions": "e520c855577170c24481be05c3ae14ec",
-          "fleet-agent-events": "3231653fafe4ef3196fe3b32ab774bf2",
-          "fleet-agents": "034346488514b7058a79140b19ddf631",
-          "fleet-enrollment-api-keys": "28b91e20b105b6f928e2012600085d8f",
-          "graph-workspace": "cd7ba1330e6682e9cc00b78850874be1",
-          "index-pattern": "66eccb05066c5a89924f48a9e9736499",
-          "ingest-agent-policies": "9326f99c977fd2ef5ab24b6336a0675c",
-          "ingest-outputs": "8aa988c376e65443fefc26f1075e93a3",
-          "ingest-package-policies": "48e8bd97e488008e21c0b5a2367b83ad",
-          "ingest_manager_settings": "012cf278ec84579495110bb827d1ed09",
-          "kql-telemetry": "d12a98a6f19a2d273696597547e064ee",
-          "lens": "d33c68a69ff1e78c9888dedd2164ac22",
-          "lens-ui-telemetry": "509bfa5978586998e05f9e303c07a327",
-          "map": "4a05b35c3a3a58fbc72dd0202dc3487f",
-          "maps-telemetry": "5ef305b18111b77789afefbd36b66171",
-          "migrationVersion": "4a1746014a75ade3a714e1db5763276f",
-          "ml-telemetry": "257fd1d4b4fdbb9cb4b8a3b27da201e9",
-          "namespace": "2f4316de49999235636386fe51dc06c1",
-          "namespaces": "2f4316de49999235636386fe51dc06c1",
-          "query": "11aaeb7f5f7fa5bb43f25e18ce26e7d9",
-          "references": "7997cf5a56cc02bdc9c93361bde732b0",
-          "sample-data-telemetry": "7d3cfeb915303c9641c59681967ffeb4",
-          "search": "5c4b9a6effceb17ae8a0ab22d0c49767",
-          "search-telemetry": "3d1b76c39bfb2cc8296b024d73854724",
-          "siem-detection-engine-rule-actions": "6569b288c169539db10cb262bf79de18",
-          "siem-detection-engine-rule-status": "ae783f41c6937db6b7a2ef5c93a9e9b0",
-          "siem-ui-timeline": "94bc38c7a421d15fbfe8ea565370a421",
-          "siem-ui-timeline-note": "8874706eedc49059d4cf0f5094559084",
-          "siem-ui-timeline-pinned-event": "20638091112f0e14f0e443d512301c29",
-          "telemetry": "36a616f7026dfa617d6655df850fe16d",
-          "tsvb-validation-telemetry": "3a37ef6c8700ae6fc97d5c7da00e9215",
-          "type": "2f4316de49999235636386fe51dc06c1",
-          "ui-metric": "0d409297dc5ebe1e3a1da691c6ee32e3",
-          "updated_at": "00da57df13e94e9d98437d13ace4bfe0",
-          "upgrade-assistant-reindex-operation": "215107c281839ea9b3ad5f6419819763",
-          "upgrade-assistant-telemetry": "56702cec857e0a9dacfb696655b4ff7b",
-          "uptime-dynamic-settings": "fcdb453a30092f022f2642db29523d80",
-          "url": "c7f66a0df8b1b52f17c28c4adb111105",
-          "visualization": "52d7a13ad68a150c4525b292d23e12cc",
-          "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"
-            },
-            "muteAll": {
-              "type": "boolean"
-            },
-            "mutedInstanceIds": {
-              "type": "keyword"
-            },
-            "name": {
-              "fields": {
-                "keyword": {
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            },
-            "params": {
-              "enabled": false,
-              "type": "object"
-            },
-            "schedule": {
-              "properties": {
-                "interval": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "scheduledTaskId": {
-              "type": "keyword"
-            },
-            "tags": {
-              "type": "keyword"
-            },
-            "throttle": {
-              "type": "keyword"
-            },
-            "updatedBy": {
-              "type": "keyword"
-            }
-          }
-        },
-        "apm-indices": {
-          "properties": {
-            "error": {
-              "type": "keyword"
-            },
-            "metric": {
-              "type": "keyword"
-            },
-            "onboarding": {
-              "type": "keyword"
-            },
-            "sourcemap": {
-              "type": "keyword"
-            },
-            "span": {
-              "type": "keyword"
-            },
-            "transaction": {
-              "type": "keyword"
-            }
-          }
-        },
-        "apm-telemetry": {
-          "dynamic": "false",
-          "type": "object"
-        },
-        "app_search_telemetry": {
-          "dynamic": "false",
-          "type": "object"
-        },
-        "application_usage_totals": {
-          "dynamic": "false",
-          "type": "object"
-        },
-        "application_usage_transactional": {
-          "dynamic": "false",
-          "properties": {
-            "timestamp": {
-              "type": "date"
-            }
-          }
-        },
-        "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_id": {
-              "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"
-                    }
-                  }
-                }
-              }
-            },
-            "status": {
-              "type": "keyword"
-            },
-            "tags": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "keyword"
-            },
-            "updated_at": {
-              "type": "date"
-            },
-            "updated_by": {
-              "properties": {
-                "email": {
-                  "type": "keyword"
-                },
-                "full_name": {
-                  "type": "keyword"
-                },
-                "username": {
-                  "type": "keyword"
-                }
-              }
-            }
-          }
-        },
-        "cases-comments": {
-          "properties": {
-            "comment": {
-              "type": "text"
-            },
-            "created_at": {
-              "type": "date"
-            },
-            "created_by": {
-              "properties": {
-                "email": {
-                  "type": "keyword"
-                },
-                "full_name": {
-                  "type": "keyword"
-                },
-                "username": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "pushed_at": {
-              "type": "date"
-            },
-            "pushed_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-configure": {
-          "properties": {
-            "closure_type": {
-              "type": "keyword"
-            },
-            "connector_id": {
-              "type": "keyword"
-            },
-            "connector_name": {
-              "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-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"
-            }
-          }
-        },
-        "dashboard": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "hits": {
-              "type": "integer"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "type": "text"
-                }
-              }
-            },
-            "optionsJSON": {
-              "type": "text"
-            },
-            "panelsJSON": {
-              "type": "text"
-            },
-            "refreshInterval": {
-              "properties": {
-                "display": {
-                  "type": "keyword"
-                },
-                "pause": {
-                  "type": "boolean"
-                },
-                "section": {
-                  "type": "integer"
-                },
-                "value": {
-                  "type": "integer"
-                }
-              }
-            },
-            "timeFrom": {
-              "type": "keyword"
-            },
-            "timeRestore": {
-              "type": "boolean"
-            },
-            "timeTo": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            }
-          }
-        },
-        "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": {
-            "created": {
-              "index": false,
-              "type": "date"
-            },
-            "schemaVersion": {
-              "type": "keyword"
-            },
-            "semanticVersion": {
-              "index": false,
-              "type": "keyword"
-            },
-            "artifacts": {
-              "type": "nested",
-              "properties": {
-                "policyId": {
-                  "type": "keyword",
-                  "index": false
-                },
-                "artifactId": {
-                  "type": "keyword",
-                  "index": false
-                }
-              }
-            }
-          }
-        },
-        "epm-packages": {
-          "properties": {
-            "es_index_patterns": {
-              "enabled": false,
-              "type": "object"
-            },
-            "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"
-            },
-            "removable": {
-              "type": "boolean"
-            },
-            "version": {
-              "type": "keyword"
-            }
-          }
-        },
-        "exception-list": {
-          "properties": {
-            "_tags": {
-              "type": "keyword"
-            },
-            "comments": {
-              "properties": {
-                "comment": {
-                  "type": "keyword"
-                },
-                "created_at": {
-                  "type": "keyword"
-                },
-                "created_by": {
-                  "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"
-                }
-              }
-            },
-            "item_id": {
-              "type": "keyword"
-            },
-            "list_id": {
-              "type": "keyword"
-            },
-            "list_type": {
-              "type": "keyword"
-            },
-            "meta": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "tags": {
-              "type": "keyword"
-            },
-            "tie_breaker_id": {
-              "type": "keyword"
-            },
-            "type": {
-              "type": "keyword"
-            },
-            "updated_by": {
-              "type": "keyword"
-            }
-          }
-        },
-        "exception-list-agnostic": {
-          "properties": {
-            "_tags": {
-              "type": "keyword"
-            },
-            "comments": {
-              "properties": {
-                "comment": {
-                  "type": "keyword"
-                },
-                "created_at": {
-                  "type": "keyword"
-                },
-                "created_by": {
-                  "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"
-                }
-              }
-            },
-            "item_id": {
-              "type": "keyword"
-            },
-            "list_id": {
-              "type": "keyword"
-            },
-            "list_type": {
-              "type": "keyword"
-            },
-            "meta": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "tags": {
-              "type": "keyword"
-            },
-            "tie_breaker_id": {
-              "type": "keyword"
-            },
-            "type": {
-              "type": "keyword"
-            },
-            "updated_by": {
-              "type": "keyword"
-            }
-          }
-        },
-        "file-upload-telemetry": {
-          "properties": {
-            "filesUploadedTotalCount": {
-              "type": "long"
-            }
-          }
-        },
-        "fleet-agent-actions": {
-          "properties": {
-            "agent_id": {
-              "type": "keyword"
-            },
-            "created_at": {
-              "type": "date"
-            },
-            "data": {
-              "type": "binary"
-            },
-            "sent_at": {
-              "type": "date"
-            },
-            "type": {
-              "type": "keyword"
-            }
-          }
-        },
-        "fleet-agent-events": {
-          "properties": {
-            "action_id": {
-              "type": "keyword"
-            },
-            "agent_id": {
-              "type": "keyword"
-            },
-            "policy_id": {
-              "type": "keyword"
-            },
-            "data": {
-              "type": "text"
-            },
-            "message": {
-              "type": "text"
-            },
-            "payload": {
-              "type": "text"
-            },
-            "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"
-            },
-            "policy_id": {
-              "type": "keyword"
-            },
-            "policy_revision": {
-              "type": "integer"
-            },
-            "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"
-            },
-            "shared_id": {
-              "type": "keyword"
-            },
-            "type": {
-              "type": "keyword"
-            },
-            "unenrolled_at": {
-              "type": "date"
-            },
-            "unenrollment_started_at": {
-              "type": "date"
-            },
-            "updated_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"
-            },
-            "policy_id": {
-              "type": "keyword"
-            },
-            "created_at": {
-              "type": "date"
-            },
-            "expire_at": {
-              "type": "date"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "type": {
-              "type": "keyword"
-            },
-            "updated_at": {
-              "type": "date"
-            }
-          }
-        },
-        "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"
-            }
-          }
-        },
-        "ingest-agent-policies": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "is_default": {
-              "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"
-            },
-            "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": {
-            "policy_id": {
-              "type": "keyword"
-            },
-            "created_at": {
-              "type": "date"
-            },
-            "created_by": {
-              "type": "keyword"
-            },
-            "description": {
-              "type": "text"
-            },
-            "enabled": {
-              "type": "boolean"
-            },
-            "inputs": {
-              "enabled": false,
-              "properties": {
-                "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"
-                }
-              }
-            },
-            "revision": {
-              "type": "integer"
-            },
-            "updated_at": {
-              "type": "date"
-            },
-            "updated_by": {
-              "type": "keyword"
-            }
-          }
-        },
-        "ingest_manager_settings": {
-          "properties": {
-            "agent_auto_upgrade": {
-              "type": "keyword"
-            },
-            "has_seen_add_data_notice": {
-              "index": false,
-              "type": "boolean"
-            },
-            "kibana_ca_sha256": {
-              "type": "keyword"
-            },
-            "kibana_url": {
-              "type": "keyword"
-            },
-            "package_auto_upgrade": {
-              "type": "keyword"
-            }
-          }
-        },
-        "kql-telemetry": {
-          "properties": {
-            "optInCount": {
-              "type": "long"
-            },
-            "optOutCount": {
-              "type": "long"
-            }
-          }
-        },
-        "lens": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "expression": {
-              "index": false,
-              "type": "keyword"
-            },
-            "state": {
-              "type": "flattened"
-            },
-            "title": {
-              "type": "text"
-            },
-            "visualizationType": {
-              "type": "keyword"
-            }
-          }
-        },
-        "lens-ui-telemetry": {
-          "properties": {
-            "count": {
-              "type": "integer"
-            },
-            "date": {
-              "type": "date"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "type": {
-              "type": "keyword"
-            }
-          }
-        },
-        "map": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "layerListJSON": {
-              "type": "text"
-            },
-            "mapStateJSON": {
-              "type": "text"
-            },
-            "title": {
-              "type": "text"
-            },
-            "uiStateJSON": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            }
-          }
-        },
-        "maps-telemetry": {
-          "enabled": false,
-          "type": "object"
-        },
-        "migrationVersion": {
-          "dynamic": "true",
-          "properties": {
-            "canvas-workpad": {
-              "fields": {
-                "keyword": {
-                  "ignore_above": 256,
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            },
-            "config": {
-              "fields": {
-                "keyword": {
-                  "ignore_above": 256,
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            }
-          }
-        },
-        "ml-telemetry": {
-          "properties": {
-            "file_data_visualizer": {
-              "properties": {
-                "index_creation_count": {
-                  "type": "long"
-                }
-              }
-            }
-          }
-        },
-        "namespace": {
-          "type": "keyword"
-        },
-        "namespaces": {
-          "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": {
-              "index": false,
-              "type": "keyword"
-            },
-            "description": {
-              "type": "text"
-            },
-            "hits": {
-              "index": false,
-              "type": "integer"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "index": false,
-                  "type": "text"
-                }
-              }
-            },
-            "sort": {
-              "index": false,
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            }
-          }
-        },
-        "search-telemetry": {
-          "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"
-            },
-            "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"
-                }
-              }
-            },
-            "kqlMode": {
-              "type": "keyword"
-            },
-            "kqlQuery": {
-              "properties": {
-                "filterQuery": {
-                  "properties": {
-                    "kuery": {
-                      "properties": {
-                        "expression": {
-                          "type": "text"
-                        },
-                        "kind": {
-                          "type": "keyword"
-                        }
-                      }
-                    },
-                    "serializedQuery": {
-                      "type": "text"
-                    }
-                  }
-                }
-              }
-            },
-            "savedQueryId": {
-              "type": "keyword"
-            },
-            "sort": {
-              "properties": {
-                "columnId": {
-                  "type": "keyword"
-                },
-                "sortDirection": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "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"
-            }
-          }
-        },
-        "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"
-            }
-          }
-        },
-        "tsvb-validation-telemetry": {
-          "properties": {
-            "failedRequests": {
-              "type": "long"
-            }
-          }
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "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": {
-          "properties": {
-            "certAgeThreshold": {
-              "type": "long"
-            },
-            "certExpirationThreshold": {
-              "type": "long"
-            },
-            "heartbeatIndices": {
-              "type": "keyword"
-            }
-          }
-        },
-        "url": {
-          "properties": {
-            "accessCount": {
-              "type": "long"
-            },
-            "accessDate": {
-              "type": "date"
-            },
-            "createDate": {
-              "type": "date"
-            },
-            "url": {
-              "fields": {
-                "keyword": {
-                  "ignore_above": 2048,
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            }
-          }
-        },
-        "visualization": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "type": "text"
-                }
-              }
-            },
-            "savedSearchRefName": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            },
-            "uiStateJSON": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            },
-            "visState": {
-              "type": "text"
-            }
-          }
-        },
-        "workplace_search_telemetry": {
-          "dynamic": "false",
-          "type": "object"
-        }
-      }
-    },
-    "settings": {
-      "index": {
-        "auto_expand_replicas": "0-1",
-        "number_of_replicas": "0",
-        "number_of_shards": "1"
-      }
-    }
-  }
-}
diff --git a/x-pack/test/functional/es_archives/reporting/ecommerce_kibana_spaces/data.json b/x-pack/test/functional/es_archives/reporting/ecommerce_kibana_spaces/data.json
index 06543e44de56c..2a9ac3d232f59 100644
--- a/x-pack/test/functional/es_archives/reporting/ecommerce_kibana_spaces/data.json
+++ b/x-pack/test/functional/es_archives/reporting/ecommerce_kibana_spaces/data.json
@@ -21,28 +21,6 @@
   }
 }
 
-{
-  "type": "doc",
-  "value": {
-    "id": "index-pattern:aac3e500-f2c7-11ea-8250-fb138aa491e7",
-    "index": ".kibana_1",
-    "source": {
-      "index-pattern": {
-        "fields": "[{\"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\":\"category\",\"type\":\"string\",\"esTypes\":[\"text\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"count\":0,\"name\":\"category.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\":\"category\"}}},{\"count\":0,\"name\":\"currency\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"customer_birth_date\",\"type\":\"date\",\"esTypes\":[\"date\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":1,\"name\":\"customer_first_name\",\"type\":\"string\",\"esTypes\":[\"text\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"count\":0,\"name\":\"customer_first_name.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\":\"customer_first_name\"}}},{\"count\":1,\"name\":\"customer_full_name\",\"type\":\"string\",\"esTypes\":[\"text\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"count\":0,\"name\":\"customer_full_name.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\":\"customer_full_name\"}}},{\"count\":0,\"name\":\"customer_gender\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"customer_id\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"customer_last_name\",\"type\":\"string\",\"esTypes\":[\"text\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"count\":0,\"name\":\"customer_last_name.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\":\"customer_last_name\"}}},{\"count\":0,\"name\":\"customer_phone\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"day_of_week\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"day_of_week_i\",\"type\":\"number\",\"esTypes\":[\"integer\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"email\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"geoip.city_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"geoip.continent_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"geoip.country_iso_code\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"geoip.location\",\"type\":\"geo_point\",\"esTypes\":[\"geo_point\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"geoip.region_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"manufacturer\",\"type\":\"string\",\"esTypes\":[\"text\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"count\":0,\"name\":\"manufacturer.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\":\"manufacturer\"}}},{\"count\":1,\"name\":\"order_date\",\"type\":\"date\",\"esTypes\":[\"date\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"order_id\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"products._id\",\"type\":\"string\",\"esTypes\":[\"text\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"count\":0,\"name\":\"products._id.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\":\"products._id\"}}},{\"count\":0,\"name\":\"products.base_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"products.base_unit_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"products.category\",\"type\":\"string\",\"esTypes\":[\"text\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"count\":0,\"name\":\"products.category.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\":\"products.category\"}}},{\"count\":0,\"name\":\"products.created_on\",\"type\":\"date\",\"esTypes\":[\"date\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"products.discount_amount\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"products.discount_percentage\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"products.manufacturer\",\"type\":\"string\",\"esTypes\":[\"text\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"count\":0,\"name\":\"products.manufacturer.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\":\"products.manufacturer\"}}},{\"count\":0,\"name\":\"products.min_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"products.price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"products.product_id\",\"type\":\"number\",\"esTypes\":[\"long\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"products.product_name\",\"type\":\"string\",\"esTypes\":[\"text\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"count\":0,\"name\":\"products.product_name.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\":\"products.product_name\"}}},{\"count\":0,\"name\":\"products.quantity\",\"type\":\"number\",\"esTypes\":[\"integer\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"products.sku\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"products.tax_amount\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"products.taxful_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"products.taxless_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"products.unit_discount_amount\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"sku\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":1,\"name\":\"taxful_total_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":1,\"name\":\"taxless_total_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":1,\"name\":\"total_quantity\",\"type\":\"number\",\"esTypes\":[\"integer\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":1,\"name\":\"total_unique_products\",\"type\":\"number\",\"esTypes\":[\"integer\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"type\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"user\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true}]",
-        "timeFieldName": "order_date",
-        "title": "ec*"
-      },
-      "migrationVersion": {
-        "index-pattern": "7.6.0"
-      },
-      "references": [
-      ],
-      "type": "index-pattern",
-      "updated_at": "2020-09-09T18:10:54.007Z"
-    }
-  }
-}
-
 {
   "type": "doc",
   "value": {
@@ -67,28 +45,6 @@
   }
 }
 
-{
-  "type": "doc",
-  "value": {
-    "id": "config:8.0.0",
-    "index": ".kibana_1",
-    "source": {
-      "config": {
-        "buildNum": 9007199254740991,
-        "dateFormat:tz": "UTC",
-        "defaultIndex": "aac3e500-f2c7-11ea-8250-fb138aa491e7"
-      },
-      "migrationVersion": {
-        "config": "7.13.0"
-      },
-      "references": [
-      ],
-      "type": "config",
-      "updated_at": "2020-08-26T22:46:48.711Z"
-    }
-  }
-}
-
 {
   "type": "doc",
   "value": {
@@ -198,45 +154,6 @@
   }
 }
 
-{
-  "type": "doc",
-  "value": {
-    "id": "search:bbe45ae0-f2c7-11ea-8250-fb138aa491e7",
-    "index": ".kibana_1",
-    "source": {
-      "migrationVersion": {
-        "search": "7.4.0"
-      },
-      "references": [
-        {
-          "id": "aac3e500-f2c7-11ea-8250-fb138aa491e7",
-          "name": "kibanaSavedObjectMeta.searchSourceJSON.index",
-          "type": "index-pattern"
-        }
-      ],
-      "search": {
-        "columns": [
-          "category",
-          "customer_full_name",
-          "taxful_total_price",
-          "currency"
-        ],
-        "description": "",
-        "hits": 0,
-        "kibanaSavedObjectMeta": {
-          "searchSourceJSON": "{\"highlightAll\":true,\"version\":true,\"query\":{\"query\":\"\",\"language\":\"kuery\"},\"filter\":[],\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.index\"}"
-        },
-        "sort": [
-        ],
-        "title": "EC SEARCH from DEFAULT",
-        "version": 1
-      },
-      "type": "search",
-      "updated_at": "2020-09-09T18:10:58.011Z"
-    }
-  }
-}
-
 {
   "type": "doc",
   "value": {
diff --git a/x-pack/test/functional/es_archives/reporting/hugedata/data.json.gz b/x-pack/test/functional/es_archives/reporting/hugedata/data.json.gz
index e5fb8a73234e4..c35837a009133 100644
Binary files a/x-pack/test/functional/es_archives/reporting/hugedata/data.json.gz and b/x-pack/test/functional/es_archives/reporting/hugedata/data.json.gz differ
diff --git a/x-pack/test/functional/es_archives/reporting/hugedata/mappings.json b/x-pack/test/functional/es_archives/reporting/hugedata/mappings.json
deleted file mode 100644
index d1cb75c1f5150..0000000000000
--- a/x-pack/test/functional/es_archives/reporting/hugedata/mappings.json
+++ /dev/null
@@ -1,2523 +0,0 @@
-{
-  "type": "index",
-  "value": {
-    "aliases": {
-      ".kibana": {
-      }
-    },
-    "index": ".kibana_1",
-    "mappings": {
-      "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": {
-              "enabled": false,
-              "type": "object"
-            },
-            "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": {
-            "error": {
-              "type": "keyword"
-            },
-            "metric": {
-              "type": "keyword"
-            },
-            "onboarding": {
-              "type": "keyword"
-            },
-            "sourcemap": {
-              "type": "keyword"
-            },
-            "span": {
-              "type": "keyword"
-            },
-            "transaction": {
-              "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"
-            },
-            "updated_at": {
-              "type": "date"
-            },
-            "updated_by": {
-              "properties": {
-                "email": {
-                  "type": "keyword"
-                },
-                "full_name": {
-                  "type": "keyword"
-                },
-                "username": {
-                  "type": "keyword"
-                }
-              }
-            }
-          }
-        },
-        "cases-comments": {
-          "properties": {
-            "alertId": {
-              "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"
-                }
-              }
-            },
-            "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-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"
-        },
-        "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": {
-            "created": {
-              "index": false,
-              "type": "date"
-            },
-            "ids": {
-              "index": false,
-              "type": "keyword"
-            },
-            "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": {
-              "type": "keyword"
-            },
-            "os_types": {
-              "type": "keyword"
-            },
-            "tags": {
-              "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": {
-              "type": "keyword"
-            },
-            "os_types": {
-              "type": "keyword"
-            },
-            "tags": {
-              "type": "keyword"
-            },
-            "tie_breaker_id": {
-              "type": "keyword"
-            },
-            "type": {
-              "type": "keyword"
-            },
-            "updated_by": {
-              "type": "keyword"
-            },
-            "version": {
-              "type": "keyword"
-            }
-          }
-        },
-        "file-upload-telemetry": {
-          "properties": {
-            "filesUploadedTotalCount": {
-              "type": "long"
-            }
-          }
-        },
-        "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_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": {
-            "agent_auto_upgrade": {
-              "type": "keyword"
-            },
-            "has_seen_add_data_notice": {
-              "index": false,
-              "type": "boolean"
-            },
-            "kibana_ca_sha256": {
-              "type": "keyword"
-            },
-            "kibana_urls": {
-              "type": "keyword"
-            },
-            "package_auto_upgrade": {
-              "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"
-        },
-        "ml-job": {
-          "properties": {
-            "datafeed_id": {
-              "fields": {
-                "keyword": {
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            },
-            "job_id": {
-              "fields": {
-                "keyword": {
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            },
-            "type": {
-              "type": "keyword"
-            }
-          }
-        },
-        "ml-telemetry": {
-          "dynamic": "false",
-          "type": "object"
-        },
-        "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"
-            },
-            "hits": {
-              "doc_values": false,
-              "index": false,
-              "type": "integer"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "index": false,
-                  "type": "text"
-                }
-              }
-            },
-            "pre712": {
-              "type": "boolean"
-            },
-            "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"
-            },
-            "restoreState": {
-              "enabled": false,
-              "type": "object"
-            },
-            "sessionId": {
-              "type": "keyword"
-            },
-            "status": {
-              "type": "keyword"
-            },
-            "touched": {
-              "type": "date"
-            },
-            "urlGeneratorId": {
-              "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"
-            },
-            "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"
-            }
-          }
-        },
-        "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"
-            }
-          }
-        },
-        "user-action": {
-          "dynamic": "false",
-          "type": "object"
-        },
-        "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": {
-        "auto_expand_replicas": "0-1",
-        "number_of_replicas": "0",
-        "number_of_shards": "1"
-      }
-    }
-  }
-}
-
diff --git a/x-pack/test/functional/es_archives/reporting/logs/data.json.gz b/x-pack/test/functional/es_archives/reporting/logs/data.json.gz
deleted file mode 100644
index dbd8f6f8e2e76..0000000000000
Binary files a/x-pack/test/functional/es_archives/reporting/logs/data.json.gz and /dev/null differ
diff --git a/x-pack/test/functional/es_archives/reporting/logs/mappings.json b/x-pack/test/functional/es_archives/reporting/logs/mappings.json
deleted file mode 100644
index 2e1873e43ffcc..0000000000000
--- a/x-pack/test/functional/es_archives/reporting/logs/mappings.json
+++ /dev/null
@@ -1,263 +0,0 @@
-{
-  "type": "index",
-  "value": {
-    "aliases": {
-      ".kibana": {}
-    },
-    "index": ".kibana_1",
-    "mappings": {
-      "properties": {
-        "config": {
-          "dynamic": "true",
-          "properties": {
-            "buildNum": {
-              "type": "keyword"
-            }
-          }
-        },
-        "dashboard": {
-          "dynamic": "strict",
-          "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": {
-          "dynamic": "strict",
-          "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": {
-          "dynamic": "strict",
-          "properties": {
-            "fieldFormatMap": {
-              "type": "text"
-            },
-            "fields": {
-              "type": "text"
-            },
-            "intervalName": {
-              "type": "keyword"
-            },
-            "notExpandable": {
-              "type": "boolean"
-            },
-            "sourceFilters": {
-              "type": "text"
-            },
-            "timeFieldName": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            }
-          }
-        },
-        "search": {
-          "dynamic": "strict",
-          "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": {
-          "dynamic": "strict",
-          "properties": {
-            "uuid": {
-              "type": "keyword"
-            }
-          }
-        },
-        "space": {
-          "properties": {
-            "_reserved": {
-              "type": "boolean"
-            },
-            "color": {
-              "type": "keyword"
-            },
-            "description": {
-              "type": "text"
-            },
-            "initials": {
-              "type": "keyword"
-            },
-            "name": {
-              "fields": {
-                "keyword": {
-                  "ignore_above": 2048,
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            }
-          }
-        },
-        "spaceId": {
-          "type": "keyword"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "url": {
-          "dynamic": "strict",
-          "properties": {
-            "accessCount": {
-              "type": "long"
-            },
-            "accessDate": {
-              "type": "date"
-            },
-            "createDate": {
-              "type": "date"
-            },
-            "url": {
-              "fields": {
-                "keyword": {
-                  "ignore_above": 2048,
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            }
-          }
-        },
-        "visualization": {
-          "dynamic": "strict",
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "type": "text"
-                }
-              }
-            },
-            "savedSearchId": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            },
-            "uiStateJSON": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            },
-            "visState": {
-              "type": "text"
-            }
-          }
-        }
-      }
-    },
-    "settings": {
-      "index": {
-        "number_of_replicas": "1",
-        "number_of_shards": "1"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/x-pack/test/functional/es_archives/reporting/multi_index/data.json.gz b/x-pack/test/functional/es_archives/reporting/multi_index/data.json.gz
deleted file mode 100644
index bb0e05d632f54..0000000000000
Binary files a/x-pack/test/functional/es_archives/reporting/multi_index/data.json.gz and /dev/null differ
diff --git a/x-pack/test/functional/es_archives/reporting/multi_index/mappings.json b/x-pack/test/functional/es_archives/reporting/multi_index/mappings.json
deleted file mode 100644
index f28ffce8ce3ce..0000000000000
--- a/x-pack/test/functional/es_archives/reporting/multi_index/mappings.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-  "type": "index",
-  "value": {
-    "aliases": {
-    },
-    "index": "tests-001",
-    "mappings": {
-      "properties": {
-        "@date": {
-          "type": "date"
-        },
-        "ants": {
-          "type": "integer"
-        },
-        "country": {
-          "type": "keyword"
-        },
-        "name": {
-          "type": "keyword"
-        }
-      }
-    },
-    "settings": {
-      "index": {
-        "number_of_replicas": "0",
-        "number_of_shards": "1"
-      }
-    }
-  }
-}
-
-{
-  "type": "index",
-  "value": {
-    "aliases": {
-    },
-    "index": "tests-002",
-    "mappings": {
-      "properties": {
-        "@date": {
-          "type": "date"
-        },
-        "ants": {
-          "type": "integer"
-        },
-        "country": {
-          "type": "keyword"
-        },
-        "name": {
-          "type": "keyword"
-        }
-      }
-    },
-    "settings": {
-      "index": {
-        "number_of_replicas": "0",
-        "number_of_shards": "1"
-      }
-    }
-  }
-}
-
-{
-  "type": "index",
-  "value": {
-    "aliases": {
-    },
-    "index": "tests-003",
-    "mappings": {
-      "properties": {
-        "@date": {
-          "type": "date"
-        },
-        "ants": {
-          "type": "integer"
-        },
-        "country": {
-          "type": "keyword"
-        },
-        "name": {
-          "type": "keyword"
-        }
-      }
-    },
-    "settings": {
-      "index": {
-        "number_of_replicas": "0",
-        "number_of_shards": "1"
-      }
-    }
-  }
-}
diff --git a/x-pack/test/functional/es_archives/reporting/multi_index_kibana/data.json.gz b/x-pack/test/functional/es_archives/reporting/multi_index_kibana/data.json.gz
deleted file mode 100644
index a6330916d62f7..0000000000000
Binary files a/x-pack/test/functional/es_archives/reporting/multi_index_kibana/data.json.gz and /dev/null differ
diff --git a/x-pack/test/functional/es_archives/reporting/multi_index_kibana/mappings.json b/x-pack/test/functional/es_archives/reporting/multi_index_kibana/mappings.json
deleted file mode 100644
index 69c6cbc3b46b5..0000000000000
--- a/x-pack/test/functional/es_archives/reporting/multi_index_kibana/mappings.json
+++ /dev/null
@@ -1,2027 +0,0 @@
-{
-  "type": "index",
-  "value": {
-    "aliases": {
-      ".kibana": {
-      }
-    },
-    "index": ".kibana_1",
-    "mappings": {
-      "_meta": {
-        "migrationMappingPropertyHashes": {
-          "action": "6e96ac5e648f57523879661ea72525b7",
-          "action_task_params": "a9d49f184ee89641044be0ca2950fa3a",
-          "alert": "7b44fba6773e37c806ce290ea9b7024e",
-          "apm-indices": "9bb9b2bf1fa636ed8619cbab5ce6a1dd",
-          "apm-telemetry": "3525d7c22c42bc80f5e6e9cb3f2b26a2",
-          "application_usage_totals": "c897e4310c5f24b07caaff3db53ae2c1",
-          "application_usage_transactional": "965839e75f809fefe04f92dc4d99722a",
-          "canvas-element": "7390014e1091044523666d97247392fc",
-          "canvas-workpad": "b0a1706d356228dbdcb4a17e6b9eb231",
-          "cases": "32aa96a6d3855ddda53010ae2048ac22",
-          "cases-comments": "c2061fb929f585df57425102fa928b4b",
-          "cases-configure": "42711cbb311976c0687853f4c1354572",
-          "cases-user-actions": "32277330ec6b721abe3b846cfd939a71",
-          "config": "ae24d22d5986d04124cc6568f771066f",
-          "dashboard": "d00f614b29a80360e1190193fd333bab",
-          "file-upload-telemetry": "0ed4d3e1983d1217a30982630897092e",
-          "graph-workspace": "cd7ba1330e6682e9cc00b78850874be1",
-          "index-pattern": "66eccb05066c5a89924f48a9e9736499",
-          "kql-telemetry": "d12a98a6f19a2d273696597547e064ee",
-          "lens": "d33c68a69ff1e78c9888dedd2164ac22",
-          "lens-ui-telemetry": "509bfa5978586998e05f9e303c07a327",
-          "map": "4a05b35c3a3a58fbc72dd0202dc3487f",
-          "maps": "bfd39d88aadadb4be597ea984d433dbe",
-          "migrationVersion": "4a1746014a75ade3a714e1db5763276f",
-          "ml-telemetry": "257fd1d4b4fdbb9cb4b8a3b27da201e9",
-          "namespace": "2f4316de49999235636386fe51dc06c1",
-          "namespaces": "2f4316de49999235636386fe51dc06c1",
-          "query": "11aaeb7f5f7fa5bb43f25e18ce26e7d9",
-          "references": "7997cf5a56cc02bdc9c93361bde732b0",
-          "sample-data-telemetry": "7d3cfeb915303c9641c59681967ffeb4",
-          "search": "181661168bbadd1eff5902361e2a0d5c",
-          "telemetry": "36a616f7026dfa617d6655df850fe16d",
-          "tsvb-validation-telemetry": "3a37ef6c8700ae6fc97d5c7da00e9215",
-          "type": "2f4316de49999235636386fe51dc06c1",
-          "ui-metric": "0d409297dc5ebe1e3a1da691c6ee32e3",
-          "updated_at": "00da57df13e94e9d98437d13ace4bfe0",
-          "upgrade-assistant-reindex-operation": "296a89039fc4260292be36b1b005d8f2",
-          "upgrade-assistant-telemetry": "56702cec857e0a9dacfb696655b4ff7b",
-          "uptime-dynamic-settings": "fcdb453a30092f022f2642db29523d80",
-          "url": "b675c3be8d76ecf029294d51dc7ec65d",
-          "visualization": "52d7a13ad68a150c4525b292d23e12cc"
-        }
-      },
-      "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"
-            },
-            "muteAll": {
-              "type": "boolean"
-            },
-            "mutedInstanceIds": {
-              "type": "keyword"
-            },
-            "name": {
-              "fields": {
-                "keyword": {
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            },
-            "params": {
-              "enabled": false,
-              "type": "object"
-            },
-            "schedule": {
-              "properties": {
-                "interval": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "scheduledTaskId": {
-              "type": "keyword"
-            },
-            "tags": {
-              "type": "keyword"
-            },
-            "throttle": {
-              "type": "keyword"
-            },
-            "updatedBy": {
-              "type": "keyword"
-            }
-          }
-        },
-        "apm-indices": {
-          "properties": {
-            "error": {
-              "type": "keyword"
-            },
-            "metric": {
-              "type": "keyword"
-            },
-            "onboarding": {
-              "type": "keyword"
-            },
-            "sourcemap": {
-              "type": "keyword"
-            },
-            "span": {
-              "type": "keyword"
-            },
-            "transaction": {
-              "type": "keyword"
-            }
-          }
-        },
-        "apm-telemetry": {
-          "properties": {
-            "agents": {
-              "properties": {
-                "dotnet": {
-                  "properties": {
-                    "agent": {
-                      "properties": {
-                        "version": {
-                          "ignore_above": 1024,
-                          "type": "keyword"
-                        }
-                      }
-                    },
-                    "service": {
-                      "properties": {
-                        "framework": {
-                          "properties": {
-                            "composite": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "name": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "version": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            }
-                          }
-                        },
-                        "language": {
-                          "properties": {
-                            "composite": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "name": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "version": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            }
-                          }
-                        },
-                        "runtime": {
-                          "properties": {
-                            "composite": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "name": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "version": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "go": {
-                  "properties": {
-                    "agent": {
-                      "properties": {
-                        "version": {
-                          "ignore_above": 1024,
-                          "type": "keyword"
-                        }
-                      }
-                    },
-                    "service": {
-                      "properties": {
-                        "framework": {
-                          "properties": {
-                            "composite": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "name": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "version": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            }
-                          }
-                        },
-                        "language": {
-                          "properties": {
-                            "composite": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "name": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "version": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            }
-                          }
-                        },
-                        "runtime": {
-                          "properties": {
-                            "composite": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "name": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "version": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "java": {
-                  "properties": {
-                    "agent": {
-                      "properties": {
-                        "version": {
-                          "ignore_above": 1024,
-                          "type": "keyword"
-                        }
-                      }
-                    },
-                    "service": {
-                      "properties": {
-                        "framework": {
-                          "properties": {
-                            "composite": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "name": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "version": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            }
-                          }
-                        },
-                        "language": {
-                          "properties": {
-                            "composite": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "name": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "version": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            }
-                          }
-                        },
-                        "runtime": {
-                          "properties": {
-                            "composite": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "name": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "version": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "js-base": {
-                  "properties": {
-                    "agent": {
-                      "properties": {
-                        "version": {
-                          "ignore_above": 1024,
-                          "type": "keyword"
-                        }
-                      }
-                    },
-                    "service": {
-                      "properties": {
-                        "framework": {
-                          "properties": {
-                            "composite": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "name": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "version": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            }
-                          }
-                        },
-                        "language": {
-                          "properties": {
-                            "composite": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "name": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "version": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            }
-                          }
-                        },
-                        "runtime": {
-                          "properties": {
-                            "composite": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "name": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "version": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "nodejs": {
-                  "properties": {
-                    "agent": {
-                      "properties": {
-                        "version": {
-                          "ignore_above": 1024,
-                          "type": "keyword"
-                        }
-                      }
-                    },
-                    "service": {
-                      "properties": {
-                        "framework": {
-                          "properties": {
-                            "composite": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "name": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "version": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            }
-                          }
-                        },
-                        "language": {
-                          "properties": {
-                            "composite": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "name": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "version": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            }
-                          }
-                        },
-                        "runtime": {
-                          "properties": {
-                            "composite": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "name": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "version": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "python": {
-                  "properties": {
-                    "agent": {
-                      "properties": {
-                        "version": {
-                          "ignore_above": 1024,
-                          "type": "keyword"
-                        }
-                      }
-                    },
-                    "service": {
-                      "properties": {
-                        "framework": {
-                          "properties": {
-                            "composite": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "name": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "version": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            }
-                          }
-                        },
-                        "language": {
-                          "properties": {
-                            "composite": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "name": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "version": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            }
-                          }
-                        },
-                        "runtime": {
-                          "properties": {
-                            "composite": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "name": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "version": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "ruby": {
-                  "properties": {
-                    "agent": {
-                      "properties": {
-                        "version": {
-                          "ignore_above": 1024,
-                          "type": "keyword"
-                        }
-                      }
-                    },
-                    "service": {
-                      "properties": {
-                        "framework": {
-                          "properties": {
-                            "composite": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "name": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "version": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            }
-                          }
-                        },
-                        "language": {
-                          "properties": {
-                            "composite": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "name": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "version": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            }
-                          }
-                        },
-                        "runtime": {
-                          "properties": {
-                            "composite": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "name": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "version": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "rum-js": {
-                  "properties": {
-                    "agent": {
-                      "properties": {
-                        "version": {
-                          "ignore_above": 1024,
-                          "type": "keyword"
-                        }
-                      }
-                    },
-                    "service": {
-                      "properties": {
-                        "framework": {
-                          "properties": {
-                            "composite": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "name": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "version": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            }
-                          }
-                        },
-                        "language": {
-                          "properties": {
-                            "composite": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "name": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "version": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            }
-                          }
-                        },
-                        "runtime": {
-                          "properties": {
-                            "composite": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "name": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            },
-                            "version": {
-                              "ignore_above": 1024,
-                              "type": "keyword"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "cardinality": {
-              "properties": {
-                "transaction": {
-                  "properties": {
-                    "name": {
-                      "properties": {
-                        "all_agents": {
-                          "properties": {
-                            "1d": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "rum": {
-                          "properties": {
-                            "1d": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "user_agent": {
-                  "properties": {
-                    "original": {
-                      "properties": {
-                        "all_agents": {
-                          "properties": {
-                            "1d": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "rum": {
-                          "properties": {
-                            "1d": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "counts": {
-              "properties": {
-                "agent_configuration": {
-                  "properties": {
-                    "all": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "error": {
-                  "properties": {
-                    "1d": {
-                      "type": "long"
-                    },
-                    "all": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "max_error_groups_per_service": {
-                  "properties": {
-                    "1d": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "max_transaction_groups_per_service": {
-                  "properties": {
-                    "1d": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "metric": {
-                  "properties": {
-                    "1d": {
-                      "type": "long"
-                    },
-                    "all": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "onboarding": {
-                  "properties": {
-                    "1d": {
-                      "type": "long"
-                    },
-                    "all": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "services": {
-                  "properties": {
-                    "1d": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "sourcemap": {
-                  "properties": {
-                    "1d": {
-                      "type": "long"
-                    },
-                    "all": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "span": {
-                  "properties": {
-                    "1d": {
-                      "type": "long"
-                    },
-                    "all": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "traces": {
-                  "properties": {
-                    "1d": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "transaction": {
-                  "properties": {
-                    "1d": {
-                      "type": "long"
-                    },
-                    "all": {
-                      "type": "long"
-                    }
-                  }
-                }
-              }
-            },
-            "has_any_services": {
-              "type": "boolean"
-            },
-            "indices": {
-              "properties": {
-                "all": {
-                  "properties": {
-                    "total": {
-                      "properties": {
-                        "docs": {
-                          "properties": {
-                            "count": {
-                              "type": "long"
-                            }
-                          }
-                        },
-                        "store": {
-                          "properties": {
-                            "size_in_bytes": {
-                              "type": "long"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "shards": {
-                  "properties": {
-                    "total": {
-                      "type": "long"
-                    }
-                  }
-                }
-              }
-            },
-            "integrations": {
-              "properties": {
-                "ml": {
-                  "properties": {
-                    "all_jobs_count": {
-                      "type": "long"
-                    }
-                  }
-                }
-              }
-            },
-            "retainment": {
-              "properties": {
-                "error": {
-                  "properties": {
-                    "ms": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "metric": {
-                  "properties": {
-                    "ms": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "onboarding": {
-                  "properties": {
-                    "ms": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "span": {
-                  "properties": {
-                    "ms": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "transaction": {
-                  "properties": {
-                    "ms": {
-                      "type": "long"
-                    }
-                  }
-                }
-              }
-            },
-            "services_per_agent": {
-              "properties": {
-                "dotnet": {
-                  "null_value": 0,
-                  "type": "long"
-                },
-                "go": {
-                  "null_value": 0,
-                  "type": "long"
-                },
-                "java": {
-                  "null_value": 0,
-                  "type": "long"
-                },
-                "js-base": {
-                  "null_value": 0,
-                  "type": "long"
-                },
-                "nodejs": {
-                  "null_value": 0,
-                  "type": "long"
-                },
-                "python": {
-                  "null_value": 0,
-                  "type": "long"
-                },
-                "ruby": {
-                  "null_value": 0,
-                  "type": "long"
-                },
-                "rum-js": {
-                  "null_value": 0,
-                  "type": "long"
-                }
-              }
-            },
-            "tasks": {
-              "properties": {
-                "agent_configuration": {
-                  "properties": {
-                    "took": {
-                      "properties": {
-                        "ms": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                },
-                "agents": {
-                  "properties": {
-                    "took": {
-                      "properties": {
-                        "ms": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                },
-                "cardinality": {
-                  "properties": {
-                    "took": {
-                      "properties": {
-                        "ms": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                },
-                "groupings": {
-                  "properties": {
-                    "took": {
-                      "properties": {
-                        "ms": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                },
-                "indices_stats": {
-                  "properties": {
-                    "took": {
-                      "properties": {
-                        "ms": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                },
-                "integrations": {
-                  "properties": {
-                    "took": {
-                      "properties": {
-                        "ms": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                },
-                "processor_events": {
-                  "properties": {
-                    "took": {
-                      "properties": {
-                        "ms": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                },
-                "services": {
-                  "properties": {
-                    "took": {
-                      "properties": {
-                        "ms": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                },
-                "versions": {
-                  "properties": {
-                    "took": {
-                      "properties": {
-                        "ms": {
-                          "type": "long"
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "version": {
-              "properties": {
-                "apm_server": {
-                  "properties": {
-                    "major": {
-                      "type": "long"
-                    },
-                    "minor": {
-                      "type": "long"
-                    },
-                    "patch": {
-                      "type": "long"
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "application_usage_totals": {
-          "properties": {
-            "appId": {
-              "type": "keyword"
-            },
-            "minutesOnScreen": {
-              "type": "float"
-            },
-            "numberOfClicks": {
-              "type": "long"
-            }
-          }
-        },
-        "application_usage_transactional": {
-          "properties": {
-            "appId": {
-              "type": "keyword"
-            },
-            "minutesOnScreen": {
-              "type": "float"
-            },
-            "numberOfClicks": {
-              "type": "long"
-            },
-            "timestamp": {
-              "type": "date"
-            }
-          }
-        },
-        "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"
-            }
-          }
-        },
-        "cases": {
-          "properties": {
-            "closed_at": {
-              "type": "date"
-            },
-            "closed_by": {
-              "properties": {
-                "email": {
-                  "type": "keyword"
-                },
-                "full_name": {
-                  "type": "keyword"
-                },
-                "username": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "connector_id": {
-              "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"
-                    }
-                  }
-                }
-              }
-            },
-            "status": {
-              "type": "keyword"
-            },
-            "tags": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "keyword"
-            },
-            "updated_at": {
-              "type": "date"
-            },
-            "updated_by": {
-              "properties": {
-                "email": {
-                  "type": "keyword"
-                },
-                "full_name": {
-                  "type": "keyword"
-                },
-                "username": {
-                  "type": "keyword"
-                }
-              }
-            }
-          }
-        },
-        "cases-comments": {
-          "properties": {
-            "comment": {
-              "type": "text"
-            },
-            "created_at": {
-              "type": "date"
-            },
-            "created_by": {
-              "properties": {
-                "email": {
-                  "type": "keyword"
-                },
-                "full_name": {
-                  "type": "keyword"
-                },
-                "username": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "pushed_at": {
-              "type": "date"
-            },
-            "pushed_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-configure": {
-          "properties": {
-            "closure_type": {
-              "type": "keyword"
-            },
-            "connector_id": {
-              "type": "keyword"
-            },
-            "connector_name": {
-              "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-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": "true",
-          "properties": {
-            "buildNum": {
-              "type": "keyword"
-            },
-            "defaultIndex": {
-              "fields": {
-                "keyword": {
-                  "ignore_above": 256,
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            }
-          }
-        },
-        "dashboard": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "hits": {
-              "type": "integer"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "type": "text"
-                }
-              }
-            },
-            "optionsJSON": {
-              "type": "text"
-            },
-            "panelsJSON": {
-              "type": "text"
-            },
-            "refreshInterval": {
-              "properties": {
-                "display": {
-                  "type": "keyword"
-                },
-                "pause": {
-                  "type": "boolean"
-                },
-                "section": {
-                  "type": "integer"
-                },
-                "value": {
-                  "type": "integer"
-                }
-              }
-            },
-            "timeFrom": {
-              "type": "keyword"
-            },
-            "timeRestore": {
-              "type": "boolean"
-            },
-            "timeTo": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            }
-          }
-        },
-        "file-upload-telemetry": {
-          "properties": {
-            "filesUploadedTotalCount": {
-              "type": "long"
-            }
-          }
-        },
-        "graph-workspace": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "type": "text"
-                }
-              }
-            },
-            "numLinks": {
-              "type": "integer"
-            },
-            "numVertices": {
-              "type": "integer"
-            },
-            "title": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            },
-            "wsState": {
-              "type": "text"
-            }
-          }
-        },
-        "index-pattern": {
-          "properties": {
-            "fieldFormatMap": {
-              "type": "text"
-            },
-            "fields": {
-              "type": "text"
-            },
-            "intervalName": {
-              "type": "keyword"
-            },
-            "notExpandable": {
-              "type": "boolean"
-            },
-            "sourceFilters": {
-              "type": "text"
-            },
-            "timeFieldName": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            },
-            "type": {
-              "type": "keyword"
-            },
-            "typeMeta": {
-              "type": "keyword"
-            }
-          }
-        },
-        "kql-telemetry": {
-          "properties": {
-            "optInCount": {
-              "type": "long"
-            },
-            "optOutCount": {
-              "type": "long"
-            }
-          }
-        },
-        "lens": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "expression": {
-              "index": false,
-              "type": "keyword"
-            },
-            "state": {
-              "type": "flattened"
-            },
-            "title": {
-              "type": "text"
-            },
-            "visualizationType": {
-              "type": "keyword"
-            }
-          }
-        },
-        "lens-ui-telemetry": {
-          "properties": {
-            "count": {
-              "type": "integer"
-            },
-            "date": {
-              "type": "date"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "type": {
-              "type": "keyword"
-            }
-          }
-        },
-        "map": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "layerListJSON": {
-              "type": "text"
-            },
-            "mapStateJSON": {
-              "type": "text"
-            },
-            "title": {
-              "type": "text"
-            },
-            "uiStateJSON": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            }
-          }
-        },
-        "maps": {
-          "properties": {
-            "attributesPerMap": {
-              "properties": {
-                "dataSourcesCount": {
-                  "properties": {
-                    "avg": {
-                      "type": "long"
-                    },
-                    "max": {
-                      "type": "long"
-                    },
-                    "min": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "emsVectorLayersCount": {
-                  "dynamic": "true",
-                  "type": "object"
-                },
-                "layerTypesCount": {
-                  "dynamic": "true",
-                  "type": "object"
-                },
-                "layersCount": {
-                  "properties": {
-                    "avg": {
-                      "type": "long"
-                    },
-                    "max": {
-                      "type": "long"
-                    },
-                    "min": {
-                      "type": "long"
-                    }
-                  }
-                }
-              }
-            },
-            "indexPatternsWithGeoFieldCount": {
-              "type": "long"
-            },
-            "indexPatternsWithGeoPointFieldCount": {
-              "type": "long"
-            },
-            "indexPatternsWithGeoShapeFieldCount": {
-              "type": "long"
-            },
-            "mapsTotalCount": {
-              "type": "long"
-            },
-            "settings": {
-              "properties": {
-                "showMapVisualizationTypes": {
-                  "type": "boolean"
-                }
-              }
-            },
-            "timeCaptured": {
-              "type": "date"
-            }
-          }
-        },
-        "migrationVersion": {
-          "dynamic": "true",
-          "properties": {
-            "config": {
-              "fields": {
-                "keyword": {
-                  "ignore_above": 256,
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            },
-            "index-pattern": {
-              "fields": {
-                "keyword": {
-                  "ignore_above": 256,
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            }
-          }
-        },
-        "ml-telemetry": {
-          "properties": {
-            "file_data_visualizer": {
-              "properties": {
-                "index_creation_count": {
-                  "type": "long"
-                }
-              }
-            }
-          }
-        },
-        "namespace": {
-          "type": "keyword"
-        },
-        "namespaces": {
-          "type": "keyword"
-        },
-        "query": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "filters": {
-              "enabled": false,
-              "type": "object"
-            },
-            "query": {
-              "properties": {
-                "language": {
-                  "type": "keyword"
-                },
-                "query": {
-                  "index": false,
-                  "type": "keyword"
-                }
-              }
-            },
-            "timefilter": {
-              "enabled": false,
-              "type": "object"
-            },
-            "title": {
-              "type": "text"
-            }
-          }
-        },
-        "references": {
-          "properties": {
-            "id": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "type": {
-              "type": "keyword"
-            }
-          },
-          "type": "nested"
-        },
-        "sample-data-telemetry": {
-          "properties": {
-            "installCount": {
-              "type": "long"
-            },
-            "unInstallCount": {
-              "type": "long"
-            }
-          }
-        },
-        "search": {
-          "properties": {
-            "columns": {
-              "type": "keyword"
-            },
-            "description": {
-              "type": "text"
-            },
-            "hits": {
-              "type": "integer"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "type": "text"
-                }
-              }
-            },
-            "sort": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            }
-          }
-        },
-        "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"
-            }
-          }
-        },
-        "tsvb-validation-telemetry": {
-          "properties": {
-            "failedRequests": {
-              "type": "long"
-            }
-          }
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "ui-metric": {
-          "properties": {
-            "count": {
-              "type": "integer"
-            }
-          }
-        },
-        "updated_at": {
-          "type": "date"
-        },
-        "upgrade-assistant-reindex-operation": {
-          "properties": {
-            "errorMessage": {
-              "type": "keyword"
-            },
-            "indexName": {
-              "type": "keyword"
-            },
-            "lastCompletedStep": {
-              "type": "integer"
-            },
-            "locked": {
-              "type": "date"
-            },
-            "newIndexName": {
-              "type": "keyword"
-            },
-            "reindexOptions": {
-              "properties": {
-                "openAndClose": {
-                  "type": "boolean"
-                },
-                "queueSettings": {
-                  "properties": {
-                    "queuedAt": {
-                      "type": "long"
-                    },
-                    "startedAt": {
-                      "type": "long"
-                    }
-                  }
-                }
-              }
-            },
-            "reindexTaskId": {
-              "type": "keyword"
-            },
-            "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": {
-          "properties": {
-            "certAgeThreshold": {
-              "type": "long"
-            },
-            "certExpirationThreshold": {
-              "type": "long"
-            },
-            "heartbeatIndices": {
-              "type": "keyword"
-            }
-          }
-        },
-        "url": {
-          "properties": {
-            "accessCount": {
-              "type": "long"
-            },
-            "accessDate": {
-              "type": "date"
-            },
-            "createDate": {
-              "type": "date"
-            },
-            "url": {
-              "fields": {
-                "keyword": {
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            }
-          }
-        },
-        "visualization": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "type": "text"
-                }
-              }
-            },
-            "savedSearchRefName": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            },
-            "uiStateJSON": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            },
-            "visState": {
-              "type": "text"
-            }
-          }
-        }
-      }
-    },
-    "settings": {
-      "index": {
-        "auto_expand_replicas": "0-1",
-        "number_of_replicas": "0",
-        "number_of_shards": "1"
-      }
-    }
-  }
-}
diff --git a/x-pack/test/functional/es_archives/reporting/nanos/data.json b/x-pack/test/functional/es_archives/reporting/nanos/data.json
new file mode 100644
index 0000000000000..02a56e95dd1f6
--- /dev/null
+++ b/x-pack/test/functional/es_archives/reporting/nanos/data.json
@@ -0,0 +1,25 @@
+{
+  "type": "doc",
+  "value": {
+    "id": "1",
+    "index": "nanos",
+    "source": {
+      "date": "2015-01-01T12:10:30",
+      "message": "Hello 1"
+    },
+    "type": "_doc"
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "2",
+    "index": "nanos",
+    "source": {
+      "date": "2015-01-01T12:10:30.123456789Z",
+      "message": "Hello 2"
+    },
+    "type": "_doc"
+  }
+}
diff --git a/x-pack/test/functional/es_archives/reporting/nanos/data.json.gz b/x-pack/test/functional/es_archives/reporting/nanos/data.json.gz
deleted file mode 100644
index 2811c495aae2d..0000000000000
Binary files a/x-pack/test/functional/es_archives/reporting/nanos/data.json.gz and /dev/null differ
diff --git a/x-pack/test/functional/es_archives/reporting/nanos/mappings.json b/x-pack/test/functional/es_archives/reporting/nanos/mappings.json
index 216b89e4bfbcf..3db5e17b7557f 100644
--- a/x-pack/test/functional/es_archives/reporting/nanos/mappings.json
+++ b/x-pack/test/functional/es_archives/reporting/nanos/mappings.json
@@ -1,1031 +1,3 @@
-{
-  "type": "index",
-  "value": {
-    "aliases": {
-      ".kibana": {
-      }
-    },
-    "index": ".kibana_1",
-    "mappings": {
-      "_meta": {
-        "migrationMappingPropertyHashes": {
-          "action": "415a6b78886a072bc79bbf1cef25a0b3",
-          "alert": "4f896c3659aa95c75b078a96a19f5bf2",
-          "apm-telemetry": "07ee1939fa4302c62ddc052ec03fed90",
-          "canvas-element": "7390014e1091044523666d97247392fc",
-          "canvas-workpad": "b0a1706d356228dbdcb4a17e6b9eb231",
-          "config": "87aca8fdb053154f11383fce3dbf3edf",
-          "dashboard": "d00f614b29a80360e1190193fd333bab",
-          "file-upload-telemetry": "0ed4d3e1983d1217a30982630897092e",
-          "graph-workspace": "cd7ba1330e6682e9cc00b78850874be1",
-          "index-pattern": "66eccb05066c5a89924f48a9e9736499",
-          "infrastructure-ui-source": "ddc0ecb18383f6b26101a2fadb2dab0c",
-          "kql-telemetry": "d12a98a6f19a2d273696597547e064ee",
-          "maps-telemetry": "a4229f8b16a6820c6d724b7e0c1f729d",
-          "migrationVersion": "4a1746014a75ade3a714e1db5763276f",
-          "ml-telemetry": "257fd1d4b4fdbb9cb4b8a3b27da201e9",
-          "namespace": "2f4316de49999235636386fe51dc06c1",
-          "references": "7997cf5a56cc02bdc9c93361bde732b0",
-          "sample-data-telemetry": "7d3cfeb915303c9641c59681967ffeb4",
-          "search": "181661168bbadd1eff5902361e2a0d5c",
-          "server": "ec97f1c5da1a19609a60874e5af1100c",
-          "siem-ui-timeline": "1f6f0860ad7bc0dba3e42467ca40470d",
-          "siem-ui-timeline-note": "8874706eedc49059d4cf0f5094559084",
-          "siem-ui-timeline-pinned-event": "20638091112f0e14f0e443d512301c29",
-          "space": "25de8c2deec044392922989cfcf24c54",
-          "telemetry": "e1c8bc94e443aefd9458932cc0697a4d",
-          "type": "2f4316de49999235636386fe51dc06c1",
-          "ui-metric": "0d409297dc5ebe1e3a1da691c6ee32e3",
-          "updated_at": "00da57df13e94e9d98437d13ace4bfe0",
-          "upgrade-assistant-reindex-operation": "a53a20fe086b72c9a86da3cc12dad8a6",
-          "upgrade-assistant-telemetry": "56702cec857e0a9dacfb696655b4ff7b",
-          "url": "c7f66a0df8b1b52f17c28c4adb111105",
-          "visualization": "52d7a13ad68a150c4525b292d23e12cc"
-        }
-      },
-      "dynamic": "strict",
-      "properties": {
-        "action": {
-          "properties": {
-            "config": {
-              "enabled": false,
-              "type": "object"
-            },
-            "secrets": {
-              "type": "binary"
-            },
-            "actionTypeId": {
-              "type": "keyword"
-            },
-            "description": {
-              "type": "text"
-            }
-          }
-        },
-        "alert": {
-          "properties": {
-            "actions": {
-              "properties": {
-                "actionRef": {
-                  "type": "keyword"
-                },
-                "group": {
-                  "type": "keyword"
-                },
-                "params": {
-                  "enabled": false,
-                  "type": "object"
-                }
-              },
-              "type": "nested"
-            },
-            "alertTypeId": {
-              "type": "keyword"
-            },
-            "params": {
-              "enabled": false,
-              "type": "object"
-            },
-            "interval": {
-              "type": "keyword"
-            },
-            "scheduledTaskId": {
-              "type": "keyword"
-            }
-          }
-        },
-        "apm-telemetry": {
-          "properties": {
-            "has_any_services": {
-              "type": "boolean"
-            },
-            "services_per_agent": {
-              "properties": {
-                "dotnet": {
-                  "null_value": 0,
-                  "type": "long"
-                },
-                "go": {
-                  "null_value": 0,
-                  "type": "long"
-                },
-                "java": {
-                  "null_value": 0,
-                  "type": "long"
-                },
-                "js-base": {
-                  "null_value": 0,
-                  "type": "long"
-                },
-                "nodejs": {
-                  "null_value": 0,
-                  "type": "long"
-                },
-                "python": {
-                  "null_value": 0,
-                  "type": "long"
-                },
-                "ruby": {
-                  "null_value": 0,
-                  "type": "long"
-                },
-                "rum-js": {
-                  "null_value": 0,
-                  "type": "long"
-                }
-              }
-            }
-          }
-        },
-        "canvas-element": {
-          "dynamic": "false",
-          "properties": {
-            "@created": {
-              "type": "date"
-            },
-            "@timestamp": {
-              "type": "date"
-            },
-            "content": {
-              "type": "text"
-            },
-            "help": {
-              "type": "text"
-            },
-            "image": {
-              "type": "text"
-            },
-            "name": {
-              "fields": {
-                "keyword": {
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            }
-          }
-        },
-        "canvas-workpad": {
-          "dynamic": "false",
-          "properties": {
-            "@created": {
-              "type": "date"
-            },
-            "@timestamp": {
-              "type": "date"
-            },
-            "name": {
-              "fields": {
-                "keyword": {
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            }
-          }
-        },
-        "config": {
-          "dynamic": "true",
-          "properties": {
-            "buildNum": {
-              "type": "keyword"
-            },
-            "dateFormat:tz": {
-              "fields": {
-                "keyword": {
-                  "ignore_above": 256,
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            },
-            "defaultIndex": {
-              "fields": {
-                "keyword": {
-                  "ignore_above": 256,
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            },
-            "search:queryLanguage": {
-              "fields": {
-                "keyword": {
-                  "ignore_above": 256,
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            }
-          }
-        },
-        "dashboard": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "hits": {
-              "type": "integer"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "type": "text"
-                }
-              }
-            },
-            "optionsJSON": {
-              "type": "text"
-            },
-            "panelsJSON": {
-              "type": "text"
-            },
-            "refreshInterval": {
-              "properties": {
-                "display": {
-                  "type": "keyword"
-                },
-                "pause": {
-                  "type": "boolean"
-                },
-                "section": {
-                  "type": "integer"
-                },
-                "value": {
-                  "type": "integer"
-                }
-              }
-            },
-            "timeFrom": {
-              "type": "keyword"
-            },
-            "timeRestore": {
-              "type": "boolean"
-            },
-            "timeTo": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            }
-          }
-        },
-        "file-upload-telemetry": {
-          "properties": {
-            "filesUploadedTotalCount": {
-              "type": "long"
-            }
-          }
-        },
-        "graph-workspace": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "type": "text"
-                }
-              }
-            },
-            "numLinks": {
-              "type": "integer"
-            },
-            "numVertices": {
-              "type": "integer"
-            },
-            "title": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            },
-            "wsState": {
-              "type": "text"
-            }
-          }
-        },
-        "index-pattern": {
-          "properties": {
-            "fieldFormatMap": {
-              "type": "text"
-            },
-            "fields": {
-              "type": "text"
-            },
-            "intervalName": {
-              "type": "keyword"
-            },
-            "notExpandable": {
-              "type": "boolean"
-            },
-            "sourceFilters": {
-              "type": "text"
-            },
-            "timeFieldName": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            },
-            "type": {
-              "type": "keyword"
-            },
-            "typeMeta": {
-              "type": "keyword"
-            }
-          }
-        },
-        "infrastructure-ui-source": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "fields": {
-              "properties": {
-                "container": {
-                  "type": "keyword"
-                },
-                "host": {
-                  "type": "keyword"
-                },
-                "pod": {
-                  "type": "keyword"
-                },
-                "tiebreaker": {
-                  "type": "keyword"
-                },
-                "timestamp": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "logAlias": {
-              "type": "keyword"
-            },
-            "logColumns": {
-              "properties": {
-                "fieldColumn": {
-                  "properties": {
-                    "field": {
-                      "type": "keyword"
-                    },
-                    "id": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "messageColumn": {
-                  "properties": {
-                    "id": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "timestampColumn": {
-                  "properties": {
-                    "id": {
-                      "type": "keyword"
-                    }
-                  }
-                }
-              },
-              "type": "nested"
-            },
-            "metricAlias": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "text"
-            }
-          }
-        },
-        "kql-telemetry": {
-          "properties": {
-            "optInCount": {
-              "type": "long"
-            },
-            "optOutCount": {
-              "type": "long"
-            }
-          }
-        },
-        "map": {
-          "properties": {
-            "bounds": {
-              "dynamic": false,
-              "properties": {}
-            },
-            "description": {
-              "type": "text"
-            },
-            "layerListJSON": {
-              "type": "text"
-            },
-            "mapStateJSON": {
-              "type": "text"
-            },
-            "title": {
-              "type": "text"
-            },
-            "uiStateJSON": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            }
-          }
-        },
-        "maps-telemetry": {
-          "properties": {
-            "attributesPerMap": {
-              "properties": {
-                "dataSourcesCount": {
-                  "properties": {
-                    "avg": {
-                      "type": "long"
-                    },
-                    "max": {
-                      "type": "long"
-                    },
-                    "min": {
-                      "type": "long"
-                    }
-                  }
-                },
-                "emsVectorLayersCount": {
-                  "dynamic": "true",
-                  "type": "object"
-                },
-                "layerTypesCount": {
-                  "dynamic": "true",
-                  "type": "object"
-                },
-                "layersCount": {
-                  "properties": {
-                    "avg": {
-                      "type": "long"
-                    },
-                    "max": {
-                      "type": "long"
-                    },
-                    "min": {
-                      "type": "long"
-                    }
-                  }
-                }
-              }
-            },
-            "mapsTotalCount": {
-              "type": "long"
-            },
-            "timeCaptured": {
-              "type": "date"
-            }
-          }
-        },
-        "migrationVersion": {
-          "dynamic": "true",
-          "properties": {
-            "dashboard": {
-              "fields": {
-                "keyword": {
-                  "ignore_above": 256,
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            },
-            "index-pattern": {
-              "fields": {
-                "keyword": {
-                  "ignore_above": 256,
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            },
-            "search": {
-              "fields": {
-                "keyword": {
-                  "ignore_above": 256,
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            },
-            "space": {
-              "fields": {
-                "keyword": {
-                  "ignore_above": 256,
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            }
-          }
-        },
-        "ml-telemetry": {
-          "properties": {
-            "file_data_visualizer": {
-              "properties": {
-                "index_creation_count": {
-                  "type": "long"
-                }
-              }
-            }
-          }
-        },
-        "namespace": {
-          "type": "keyword"
-        },
-        "references": {
-          "properties": {
-            "id": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "type": {
-              "type": "keyword"
-            }
-          },
-          "type": "nested"
-        },
-        "sample-data-telemetry": {
-          "properties": {
-            "installCount": {
-              "type": "long"
-            },
-            "unInstallCount": {
-              "type": "long"
-            }
-          }
-        },
-        "search": {
-          "properties": {
-            "columns": {
-              "type": "keyword"
-            },
-            "description": {
-              "type": "text"
-            },
-            "hits": {
-              "type": "integer"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "type": "text"
-                }
-              }
-            },
-            "sort": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            }
-          }
-        },
-        "server": {
-          "properties": {
-            "uuid": {
-              "type": "keyword"
-            }
-          }
-        },
-        "siem-ui-timeline": {
-          "properties": {
-            "columns": {
-              "properties": {
-                "aggregatable": {
-                  "type": "boolean"
-                },
-                "category": {
-                  "type": "keyword"
-                },
-                "columnHeaderType": {
-                  "type": "keyword"
-                },
-                "description": {
-                  "type": "text"
-                },
-                "example": {
-                  "type": "text"
-                },
-                "id": {
-                  "type": "keyword"
-                },
-                "indexes": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "text"
-                },
-                "placeholder": {
-                  "type": "text"
-                },
-                "searchable": {
-                  "type": "boolean"
-                },
-                "type": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "created": {
-              "type": "date"
-            },
-            "createdBy": {
-              "type": "text"
-            },
-            "dataProviders": {
-              "properties": {
-                "and": {
-                  "properties": {
-                    "enabled": {
-                      "type": "boolean"
-                    },
-                    "excluded": {
-                      "type": "boolean"
-                    },
-                    "id": {
-                      "type": "keyword"
-                    },
-                    "kqlQuery": {
-                      "type": "text"
-                    },
-                    "name": {
-                      "type": "text"
-                    },
-                    "queryMatch": {
-                      "properties": {
-                        "displayField": {
-                          "type": "text"
-                        },
-                        "displayValue": {
-                          "type": "text"
-                        },
-                        "field": {
-                          "type": "text"
-                        },
-                        "operator": {
-                          "type": "text"
-                        },
-                        "value": {
-                          "type": "text"
-                        }
-                      }
-                    }
-                  }
-                },
-                "enabled": {
-                  "type": "boolean"
-                },
-                "excluded": {
-                  "type": "boolean"
-                },
-                "id": {
-                  "type": "keyword"
-                },
-                "kqlQuery": {
-                  "type": "text"
-                },
-                "name": {
-                  "type": "text"
-                },
-                "queryMatch": {
-                  "properties": {
-                    "displayField": {
-                      "type": "text"
-                    },
-                    "displayValue": {
-                      "type": "text"
-                    },
-                    "field": {
-                      "type": "text"
-                    },
-                    "operator": {
-                      "type": "text"
-                    },
-                    "value": {
-                      "type": "text"
-                    }
-                  }
-                }
-              }
-            },
-            "dateRange": {
-              "properties": {
-                "end": {
-                  "type": "date"
-                },
-                "start": {
-                  "type": "date"
-                }
-              }
-            },
-            "description": {
-              "type": "text"
-            },
-            "favorite": {
-              "properties": {
-                "favoriteDate": {
-                  "type": "date"
-                },
-                "fullName": {
-                  "type": "text"
-                },
-                "keySearch": {
-                  "type": "text"
-                },
-                "userName": {
-                  "type": "text"
-                }
-              }
-            },
-            "kqlMode": {
-              "type": "keyword"
-            },
-            "kqlQuery": {
-              "properties": {
-                "filterQuery": {
-                  "properties": {
-                    "kuery": {
-                      "properties": {
-                        "expression": {
-                          "type": "text"
-                        },
-                        "kind": {
-                          "type": "keyword"
-                        }
-                      }
-                    },
-                    "serializedQuery": {
-                      "type": "text"
-                    }
-                  }
-                }
-              }
-            },
-            "sort": {
-              "properties": {
-                "columnId": {
-                  "type": "keyword"
-                },
-                "sortDirection": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "title": {
-              "type": "text"
-            },
-            "updated": {
-              "type": "date"
-            },
-            "updatedBy": {
-              "type": "text"
-            }
-          }
-        },
-        "siem-ui-timeline-note": {
-          "properties": {
-            "created": {
-              "type": "date"
-            },
-            "createdBy": {
-              "type": "text"
-            },
-            "eventId": {
-              "type": "keyword"
-            },
-            "note": {
-              "type": "text"
-            },
-            "timelineId": {
-              "type": "keyword"
-            },
-            "updated": {
-              "type": "date"
-            },
-            "updatedBy": {
-              "type": "text"
-            }
-          }
-        },
-        "siem-ui-timeline-pinned-event": {
-          "properties": {
-            "created": {
-              "type": "date"
-            },
-            "createdBy": {
-              "type": "text"
-            },
-            "eventId": {
-              "type": "keyword"
-            },
-            "timelineId": {
-              "type": "keyword"
-            },
-            "updated": {
-              "type": "date"
-            },
-            "updatedBy": {
-              "type": "text"
-            }
-          }
-        },
-        "space": {
-          "properties": {
-            "_reserved": {
-              "type": "boolean"
-            },
-            "color": {
-              "type": "keyword"
-            },
-            "description": {
-              "type": "text"
-            },
-            "disabledFeatures": {
-              "type": "keyword"
-            },
-            "initials": {
-              "type": "keyword"
-            },
-            "name": {
-              "fields": {
-                "keyword": {
-                  "ignore_above": 2048,
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            }
-          }
-        },
-        "telemetry": {
-          "properties": {
-            "enabled": {
-              "type": "boolean"
-            }
-          }
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "ui-metric": {
-          "properties": {
-            "count": {
-              "type": "integer"
-            }
-          }
-        },
-        "updated_at": {
-          "type": "date"
-        },
-        "upgrade-assistant-reindex-operation": {
-          "dynamic": "true",
-          "properties": {
-            "indexName": {
-              "type": "keyword"
-            },
-            "status": {
-              "type": "integer"
-            }
-          }
-        },
-        "upgrade-assistant-telemetry": {
-          "properties": {
-            "features": {
-              "properties": {
-                "deprecation_logging": {
-                  "properties": {
-                    "enabled": {
-                      "null_value": true,
-                      "type": "boolean"
-                    }
-                  }
-                }
-              }
-            },
-            "ui_open": {
-              "properties": {
-                "cluster": {
-                  "null_value": 0,
-                  "type": "long"
-                },
-                "indices": {
-                  "null_value": 0,
-                  "type": "long"
-                },
-                "overview": {
-                  "null_value": 0,
-                  "type": "long"
-                }
-              }
-            },
-            "ui_reindex": {
-              "properties": {
-                "close": {
-                  "null_value": 0,
-                  "type": "long"
-                },
-                "open": {
-                  "null_value": 0,
-                  "type": "long"
-                },
-                "start": {
-                  "null_value": 0,
-                  "type": "long"
-                },
-                "stop": {
-                  "null_value": 0,
-                  "type": "long"
-                }
-              }
-            }
-          }
-        },
-        "url": {
-          "properties": {
-            "accessCount": {
-              "type": "long"
-            },
-            "accessDate": {
-              "type": "date"
-            },
-            "createDate": {
-              "type": "date"
-            },
-            "url": {
-              "fields": {
-                "keyword": {
-                  "ignore_above": 2048,
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            }
-          }
-        },
-        "user-action": {
-          "properties": {
-            "count": {
-              "type": "integer"
-            }
-          }
-        },
-        "visualization": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "type": "text"
-                }
-              }
-            },
-            "savedSearchRefName": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            },
-            "uiStateJSON": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            },
-            "visState": {
-              "type": "text"
-            }
-          }
-        }
-      }
-    },
-    "settings": {
-      "index": {
-        "auto_expand_replicas": "0-1",
-        "number_of_replicas": "0",
-        "number_of_shards": "1"
-      }
-    }
-  }
-}
-
 {
   "type": "index",
   "value": {
diff --git a/x-pack/test/functional/es_archives/reporting/sales/data.json.gz b/x-pack/test/functional/es_archives/reporting/sales/data.json.gz
index 9478d482abe16..4d517a0c2597c 100644
Binary files a/x-pack/test/functional/es_archives/reporting/sales/data.json.gz and b/x-pack/test/functional/es_archives/reporting/sales/data.json.gz differ
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 317b185046ce1..498aef34028fb 100644
--- a/x-pack/test/functional/es_archives/reporting/sales/mappings.json
+++ b/x-pack/test/functional/es_archives/reporting/sales/mappings.json
@@ -1,267 +1,3 @@
-{
-  "type": "index",
-  "value": {
-    "aliases": {
-      ".kibana": {}
-    },
-    "index": ".kibana_1",
-    "mappings": {
-      "properties": {
-        "config": {
-          "dynamic": "true",
-          "properties": {
-            "buildNum": {
-              "type": "keyword"
-            }
-          }
-        },
-        "dashboard": {
-          "dynamic": "strict",
-          "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": {
-          "dynamic": "strict",
-          "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": {
-          "dynamic": "strict",
-          "properties": {
-            "fieldFormatMap": {
-              "type": "text"
-            },
-            "fields": {
-              "type": "text"
-            },
-            "intervalName": {
-              "type": "keyword"
-            },
-            "notExpandable": {
-              "type": "boolean"
-            },
-            "sourceFilters": {
-              "type": "text"
-            },
-            "timeFieldName": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            }
-          }
-        },
-        "search": {
-          "dynamic": "strict",
-          "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": {
-          "dynamic": "strict",
-          "properties": {
-            "uuid": {
-              "type": "keyword"
-            }
-          }
-        },
-        "space": {
-          "properties": {
-            "_reserved": {
-              "type": "boolean"
-            },
-            "color": {
-              "type": "keyword"
-            },
-            "description": {
-              "type": "text"
-            },
-            "initials": {
-              "type": "keyword"
-            },
-            "name": {
-              "fields": {
-                "keyword": {
-                  "ignore_above": 2048,
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            }
-          }
-        },
-        "spaceId": {
-          "type": "keyword"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "url": {
-          "dynamic": "strict",
-          "properties": {
-            "accessCount": {
-              "type": "long"
-            },
-            "accessDate": {
-              "type": "date"
-            },
-            "createDate": {
-              "type": "date"
-            },
-            "url": {
-              "fields": {
-                "keyword": {
-                  "ignore_above": 2048,
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            }
-          }
-        },
-        "visualization": {
-          "dynamic": "strict",
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "type": "text"
-                }
-              }
-            },
-            "savedSearchId": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            },
-            "uiStateJSON": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            },
-            "visState": {
-              "type": "text"
-            }
-          }
-        }
-      }
-    },
-    "settings": {
-      "index": {
-        "number_of_replicas": "1",
-        "number_of_shards": "1"
-      }
-    }
-  }
-}
-
 {
   "type": "index",
   "value": {
diff --git a/x-pack/test/functional/fixtures/kbn_archiver/reporting/ecommerce.json b/x-pack/test/functional/fixtures/kbn_archiver/reporting/ecommerce.json
index c1274b4c78c90..ce308d9ec0bf3 100644
--- a/x-pack/test/functional/fixtures/kbn_archiver/reporting/ecommerce.json
+++ b/x-pack/test/functional/fixtures/kbn_archiver/reporting/ecommerce.json
@@ -712,3 +712,54 @@
   "updated_at": "2021-09-20T23:37:22.367Z",
   "version": "WzY3LDFd"
 }
+
+{
+  "attributes": {
+    "fields": "[{\"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\":\"category\",\"type\":\"string\",\"esTypes\":[\"text\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"count\":0,\"name\":\"category.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\":\"category\"}}},{\"count\":0,\"name\":\"currency\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"customer_birth_date\",\"type\":\"date\",\"esTypes\":[\"date\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":1,\"name\":\"customer_first_name\",\"type\":\"string\",\"esTypes\":[\"text\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"count\":0,\"name\":\"customer_first_name.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\":\"customer_first_name\"}}},{\"count\":1,\"name\":\"customer_full_name\",\"type\":\"string\",\"esTypes\":[\"text\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"count\":0,\"name\":\"customer_full_name.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\":\"customer_full_name\"}}},{\"count\":0,\"name\":\"customer_gender\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"customer_id\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"customer_last_name\",\"type\":\"string\",\"esTypes\":[\"text\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"count\":0,\"name\":\"customer_last_name.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\":\"customer_last_name\"}}},{\"count\":0,\"name\":\"customer_phone\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"day_of_week\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"day_of_week_i\",\"type\":\"number\",\"esTypes\":[\"integer\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"email\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"geoip.city_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"geoip.continent_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"geoip.country_iso_code\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"geoip.location\",\"type\":\"geo_point\",\"esTypes\":[\"geo_point\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"geoip.region_name\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"manufacturer\",\"type\":\"string\",\"esTypes\":[\"text\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"count\":0,\"name\":\"manufacturer.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\":\"manufacturer\"}}},{\"count\":1,\"name\":\"order_date\",\"type\":\"date\",\"esTypes\":[\"date\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"order_id\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"products._id\",\"type\":\"string\",\"esTypes\":[\"text\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"count\":0,\"name\":\"products._id.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\":\"products._id\"}}},{\"count\":0,\"name\":\"products.base_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"products.base_unit_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"products.category\",\"type\":\"string\",\"esTypes\":[\"text\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"count\":0,\"name\":\"products.category.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\":\"products.category\"}}},{\"count\":0,\"name\":\"products.created_on\",\"type\":\"date\",\"esTypes\":[\"date\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"products.discount_amount\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"products.discount_percentage\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"products.manufacturer\",\"type\":\"string\",\"esTypes\":[\"text\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"count\":0,\"name\":\"products.manufacturer.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\":\"products.manufacturer\"}}},{\"count\":0,\"name\":\"products.min_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"products.price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"products.product_id\",\"type\":\"number\",\"esTypes\":[\"long\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"products.product_name\",\"type\":\"string\",\"esTypes\":[\"text\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"count\":0,\"name\":\"products.product_name.keyword\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"multi\":{\"parent\":\"products.product_name\"}}},{\"count\":0,\"name\":\"products.quantity\",\"type\":\"number\",\"esTypes\":[\"integer\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"products.sku\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"products.tax_amount\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"products.taxful_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"products.taxless_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"products.unit_discount_amount\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"sku\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":1,\"name\":\"taxful_total_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":1,\"name\":\"taxless_total_price\",\"type\":\"number\",\"esTypes\":[\"half_float\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":1,\"name\":\"total_quantity\",\"type\":\"number\",\"esTypes\":[\"integer\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":1,\"name\":\"total_unique_products\",\"type\":\"number\",\"esTypes\":[\"integer\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"type\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"count\":0,\"name\":\"user\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true}]",
+    "timeFieldName": "order_date",
+    "title": "ec*"
+  },
+  "coreMigrationVersion": "8.0.0",
+  "id": "aac3e500-f2c7-11ea-8250-fb138aa491e7",
+  "migrationVersion": {
+    "index-pattern": "8.0.0"
+  },
+  "references": [],
+  "type": "index-pattern",
+  "updated_at": "2020-09-09T18:10:54.007Z",
+  "version": "WzIwLDJd"
+}
+
+{
+  "attributes": {
+    "columns": [
+      "category",
+      "customer_full_name",
+      "taxful_total_price",
+      "currency"
+    ],
+    "description": "",
+    "hits": 0,
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"highlightAll\":true,\"version\":true,\"query\":{\"query\":\"\",\"language\":\"kuery\"},\"filter\":[],\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.index\"}"
+    },
+    "sort": [],
+    "title": "EC SEARCH from DEFAULT",
+    "version": 1
+  },
+  "coreMigrationVersion": "8.0.0",
+  "id": "bbe45ae0-f2c7-11ea-8250-fb138aa491e7",
+  "migrationVersion": {
+    "search": "8.0.0"
+  },
+  "references": [
+    {
+      "id": "aac3e500-f2c7-11ea-8250-fb138aa491e7",
+      "name": "kibanaSavedObjectMeta.searchSourceJSON.index",
+      "type": "index-pattern"
+    }
+  ],
+  "type": "search",
+  "updated_at": "2020-09-09T18:10:58.011Z",
+  "version": "WzI4LDJd"
+}
diff --git a/x-pack/test/functional/fixtures/kbn_archiver/reporting/logs.json b/x-pack/test/functional/fixtures/kbn_archiver/reporting/logs.json
new file mode 100644
index 0000000000000..64fd4c8e5c20d
--- /dev/null
+++ b/x-pack/test/functional/fixtures/kbn_archiver/reporting/logs.json
@@ -0,0 +1,441 @@
+{
+  "attributes": {
+    "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}]",
+    "timeFieldName": "@timestamp",
+    "title": "logstash-*"
+  },
+  "coreMigrationVersion": "8.0.0",
+  "id": "logstash-*",
+  "migrationVersion": {
+    "index-pattern": "8.0.0"
+  },
+  "references": [],
+  "type": "index-pattern",
+  "version": "WzIsMl0="
+}
+
+{
+  "attributes": {
+    "columns": [
+      "clientip",
+      "extension"
+    ],
+    "description": "",
+    "hits": 0,
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"highlightAll\":true,\"version\":true,\"query\":{\"language\":\"kuery\",\"query\":\"\"},\"filter\":[{\"meta\":{\"alias\":\"datefilter🥜\",\"negate\":false,\"type\":\"range\",\"key\":\"@timestamp\",\"value\":\"Sep 20, 2015 @ 03:19:40.307 to Sep 20, 2015 @ 03:26:56.221\",\"params\":{\"gte\":\"2015-09-20T10:19:40.307Z\",\"lt\":\"2015-09-20T10:26:56.221Z\"},\"disabled\":false,\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index\"},\"range\":{\"@timestamp\":{\"gte\":\"2015-09-20T10:19:40.307Z\",\"lt\":\"2015-09-20T10:26:56.221Z\"}},\"$state\":{\"store\":\"appState\"}}],\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.index\"}"
+    },
+    "sort": [
+      [
+        "@timestamp",
+        "desc"
+      ]
+    ],
+    "title": "A Saved Search With a DATE FILTER",
+    "version": 1
+  },
+  "coreMigrationVersion": "8.0.0",
+  "id": "d7a79750-3edd-11e9-99cc-4d80163ee9e7",
+  "migrationVersion": {
+    "search": "8.0.0"
+  },
+  "references": [
+    {
+      "id": "logstash-*",
+      "name": "kibanaSavedObjectMeta.searchSourceJSON.index",
+      "type": "index-pattern"
+    },
+    {
+      "id": "logstash-*",
+      "name": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index",
+      "type": "index-pattern"
+    }
+  ],
+  "type": "search",
+  "updated_at": "2019-03-05T00:34:28.706Z",
+  "version": "WzMsMl0="
+}
+
+{
+  "attributes": {
+    "buildNum": 9007199254740991,
+    "dateFormat:tz": "UTC",
+    "defaultIndex": "89655130-5013-11e9-bce7-4dabcb8bef24",
+    "csv:quoteValues": true,
+    "csv:separator": ",",
+    "search:queryLanguage": "lucene"
+  },
+  "coreMigrationVersion": "8.0.0",
+  "id": "8.0.0",
+  "migrationVersion": {
+    "config": "8.0.0"
+  },
+  "references": [],
+  "type": "config",
+  "updated_at": "2019-07-09T21:57:57.129Z",
+  "version": "WzMsMl0="
+}
+
+{
+  "attributes": {
+    "fieldFormatMap": "{\"date\":{\"id\":\"date_nanos\"}}",
+    "fields": "[{\"name\":\"_id\",\"type\":\"string\",\"esTypes\":[\"_id\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"esTypes\":[\"_index\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"esTypes\":[\"_source\"],\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"esTypes\":[\"_type\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"date\",\"type\":\"date\",\"esTypes\":[\"date_nanos\"],\"count\":1,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"message\",\"type\":\"string\",\"esTypes\":[\"keyword\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true}]",
+    "title": "nanos"
+  },
+  "coreMigrationVersion": "8.0.0",
+  "id": "907bc200-a294-11e9-a900-ef10e0ac769e",
+  "migrationVersion": {
+    "index-pattern": "8.0.0"
+  },
+  "references": [],
+  "type": "index-pattern",
+  "updated_at": "2019-07-09T22:07:17.154Z",
+  "version": "WzQsMl0="
+}
+
+{
+  "attributes": {
+    "columns": [
+      "date",
+      "message",
+      "_id"
+    ],
+    "description": "",
+    "hits": 0,
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"highlightAll\":true,\"version\":true,\"query\":{\"query\":\"\",\"language\":\"kuery\"},\"filter\":[],\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.index\"}"
+    },
+    "sort": [
+      [
+        "date",
+        "desc"
+      ]
+    ],
+    "title": "TESTS DATE NANOS",
+    "version": 1
+  },
+  "coreMigrationVersion": "8.0.0",
+  "id": "e4035040-a295-11e9-a900-ef10e0ac769e",
+  "migrationVersion": {
+    "search": "8.0.0"
+  },
+  "references": [
+    {
+      "id": "907bc200-a294-11e9-a900-ef10e0ac769e",
+      "name": "kibanaSavedObjectMeta.searchSourceJSON.index",
+      "type": "index-pattern"
+    }
+  ],
+  "type": "search",
+  "updated_at": "2019-07-09T22:07:22.318Z",
+  "version": "WzUsMl0="
+}
+
+{
+  "id": "timeless-sales",
+  "attributes": {
+    "fields": "[{\"name\":\"@date\",\"type\":\"date\",\"count\":1,\"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\":\"metric\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"name\",\"type\":\"string\",\"count\":1,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"power\",\"type\":\"number\",\"count\":1,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"success\",\"type\":\"boolean\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true}]",
+    "title": "sales"
+  },
+  "migrationVersion": {
+    "index-pattern": "6.5.0"
+  },
+  "references": [
+  ],
+  "type": "index-pattern",
+  "updated_at": "2019-03-05T22:52:35.474Z"
+}
+
+{
+  "id": "71e3ee20-3f99-11e9-b8ee-6b9604f2f877",
+  "migrationVersion": {
+    "search": "7.0.0"
+  },
+  "references": [
+    {
+      "id": "timeless-sales",
+      "name": "kibanaSavedObjectMeta.searchSourceJSON.index",
+      "type": "index-pattern"
+    },
+    {
+      "id": "timeless-sales",
+      "name": "kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index",
+      "type": "index-pattern"
+    }
+  ],
+  "attributes": {
+    "columns": [
+      "name",
+      "power"
+    ],
+    "description": "",
+    "hits": 0,
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"highlightAll\":true,\"version\":true,\"query\":{\"query\":\"\",\"language\":\"kuery\"},\"filter\":[{\"$state\":{\"store\":\"appState\"},\"meta\":{\"alias\":null,\"disabled\":false,\"key\":\"power\",\"negate\":false,\"params\":{\"gte\":1,\"lt\":null},\"type\":\"range\",\"value\":\"1 to \",\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index\"},\"range\":{\"power\":{\"gte\":1,\"lt\":null}}}],\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.index\"}"
+    },
+    "sort": [[
+      "power",
+      "asc"
+    ]],
+    "title": "SALE POWER",
+    "version": 1
+  },
+  "type": "search",
+  "updated_at": "2019-03-05T22:53:08.481Z"
+}
+
+{
+  "attributes": {
+    "state": {
+      "datasourceStates": {
+        "indexpattern": {
+          "layers": {
+            "0385075d-0f3b-4a12-b3c0-68a95781d48d": {
+              "columnOrder": [
+                "03195b79-6315-40f7-b513-5222330367d7",
+                "2cb8226c-bfe5-4505-9c66-9f99ff6b5822"
+              ],
+              "columns": {
+                "03195b79-6315-40f7-b513-5222330367d7": {
+                  "dataType": "date",
+                  "isBucketed": true,
+                  "label": "date",
+                  "operationType": "date_histogram",
+                  "params": {
+                    "interval": "auto"
+                  },
+                  "scale": "interval",
+                  "sourceField": "date"
+                },
+                "2cb8226c-bfe5-4505-9c66-9f99ff6b5822": {
+                  "dataType": "number",
+                  "isBucketed": false,
+                  "label": "Count of records",
+                  "operationType": "count",
+                  "scale": "ratio",
+                  "sourceField": "Records"
+                }
+              },
+              "incompleteColumns": {}
+            }
+          }
+        }
+      },
+      "filters": [],
+      "query": {
+        "language": "kuery",
+        "query": ""
+      },
+      "visualization": {
+        "layers": [
+          {
+            "accessors": [
+              "2cb8226c-bfe5-4505-9c66-9f99ff6b5822"
+            ],
+            "layerId": "0385075d-0f3b-4a12-b3c0-68a95781d48d",
+            "layerType": "data",
+            "position": "top",
+            "seriesType": "bar_stacked",
+            "showGridlines": false,
+            "xAccessor": "03195b79-6315-40f7-b513-5222330367d7"
+          }
+        ],
+        "legend": {
+          "isVisible": true,
+          "position": "right"
+        },
+        "preferredSeriesType": "bar_stacked",
+        "title": "Empty XY chart",
+        "valueLabels": "hide"
+      }
+    },
+    "title": "distogram",
+    "visualizationType": "lnsXY"
+  },
+  "coreMigrationVersion": "8.0.0",
+  "id": "4b498150-6821-11eb-9375-4bd700f7d8d4",
+  "migrationVersion": {
+    "lens": "8.0.0"
+  },
+  "references": [],
+  "type": "lens",
+  "updated_at": "2021-02-06T02:16:17.129Z",
+  "version": "WzgsMl0="
+}
+
+{
+  "attributes": {
+    "fieldAttrs": "{\"_id\":{\"count\":1},\"gender\":{\"count\":1},\"name\":{\"count\":1},\"value\":{\"count\":1},\"year\":{\"count\":1},\"years_ago\":{\"count\":1},\"date_informal\":{\"count\":1}}",
+    "fieldFormatMap": "{\"years_ago\":{\"id\":\"number\",\"params\":{\"pattern\":\"0,0.00000000000000000000\"}},\"year\":{\"id\":\"number\",\"params\":{\"pattern\":\"0\"}},\"date_informal\":{\"id\":\"date\",\"params\":{\"parsedUrl\":{\"origin\":\"http://localhost:5620\",\"pathname\":\"/app/dashboards\",\"basePath\":\"\"},\"pattern\":\"MMM Do YY\"}}}",
+    "fields": "[{\"count\":1,\"script\":\"2019 - doc['year'].value\",\"lang\":\"painless\",\"name\":\"years_ago\",\"type\":\"number\",\"scripted\":true,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"count\":1,\"script\":\"doc['date'].value\",\"lang\":\"painless\",\"name\":\"date_informal\",\"type\":\"date\",\"scripted\":true,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false}]",
+    "runtimeFieldMap": "{}",
+    "timeFieldName": "date",
+    "title": "babynames"
+  },
+  "coreMigrationVersion": "8.0.0",
+  "id": "89655130-5013-11e9-bce7-4dabcb8bef24",
+  "migrationVersion": {
+    "index-pattern": "8.0.0"
+  },
+  "references": [],
+  "type": "index-pattern",
+  "updated_at": "2021-02-06T02:15:25.565Z",
+  "version": "WzcsMl0="
+}
+
+{
+  "attributes": {
+    "columns": [
+      "_id",
+      "name",
+      "gender",
+      "value",
+      "year",
+      "years_ago",
+      "date_informal"
+    ],
+    "description": "",
+    "hits": 0,
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"highlightAll\":true,\"version\":true,\"sort\":[{\"date\":\"desc\"}],\"query\":{\"query\":\"\",\"language\":\"lucene\"},\"fieldsFromSource\":[\"_id\",\"_index\",\"_score\",\"_source\",\"_type\",\"date\",\"gender\",\"name\",\"percent\",\"value\",\"year\",\"years_ago\",\"date_informal\"],\"filter\":[],\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.index\"}"
+    },
+    "sort": [
+      [
+        "date",
+        "desc"
+      ]
+    ],
+    "title": "namessearch",
+    "version": 1
+  },
+  "coreMigrationVersion": "8.0.0",
+  "id": "cdb908f0-6820-11eb-9375-4bd700f7d8d4",
+  "migrationVersion": {
+    "search": "8.0.0"
+  },
+  "references": [
+    {
+      "id": "89655130-5013-11e9-bce7-4dabcb8bef24",
+      "name": "kibanaSavedObjectMeta.searchSourceJSON.index",
+      "type": "index-pattern"
+    }
+  ],
+  "type": "search",
+  "updated_at": "2021-02-06T02:15:31.253Z",
+  "version": "WzYsMl0="
+}
+
+{
+  "attributes": {
+    "description": "",
+    "hits": 0,
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"query\":{\"language\":\"kuery\",\"query\":\"\"},\"filter\":[]}"
+    },
+    "optionsJSON": "{\"hidePanelTitles\":false,\"useMargins\":true}",
+    "panelsJSON": "[{\"version\":\"7.11.0\",\"type\":\"search\",\"gridData\":{\"x\":0,\"y\":0,\"w\":48,\"h\":13,\"i\":\"56f914c9-9597-4781-bfc6-229d40b382c7\"},\"panelIndex\":\"56f914c9-9597-4781-bfc6-229d40b382c7\",\"embeddableConfig\":{\"enhancements\":{}},\"panelRefName\":\"panel_56f914c9-9597-4781-bfc6-229d40b382c7\"},{\"version\":\"7.11.0\",\"type\":\"lens\",\"gridData\":{\"x\":0,\"y\":13,\"w\":48,\"h\":14,\"i\":\"f3ea512f-e441-4206-8aa7-000b1418ea2b\"},\"panelIndex\":\"f3ea512f-e441-4206-8aa7-000b1418ea2b\",\"embeddableConfig\":{\"enhancements\":{}},\"panelRefName\":\"panel_f3ea512f-e441-4206-8aa7-000b1418ea2b\"}]",
+    "timeRestore": false,
+    "title": "names dashboard",
+    "version": 1
+  },
+  "coreMigrationVersion": "8.0.0",
+  "id": "52af6d10-6821-11eb-9375-4bd700f7d8d4",
+  "migrationVersion": {
+    "dashboard": "8.0.0"
+  },
+  "references": [
+    {
+      "id": "cdb908f0-6820-11eb-9375-4bd700f7d8d4",
+      "name": "56f914c9-9597-4781-bfc6-229d40b382c7:panel_56f914c9-9597-4781-bfc6-229d40b382c7",
+      "type": "search"
+    },
+    {
+      "id": "4b498150-6821-11eb-9375-4bd700f7d8d4",
+      "name": "f3ea512f-e441-4206-8aa7-000b1418ea2b:panel_f3ea512f-e441-4206-8aa7-000b1418ea2b",
+      "type": "lens"
+    }
+  ],
+  "type": "dashboard",
+  "updated_at": "2021-02-06T02:16:29.540Z",
+  "version": "WzksMl0="
+}
+
+{
+  "attributes": {
+    "@created": "2020-07-16T20:33:21.826Z",
+    "@timestamp": "2020-07-16T20:34:01.093Z",
+    "assets": {},
+    "colors": [
+      "#37988d",
+      "#c19628",
+      "#b83c6f",
+      "#3f9939",
+      "#1785b0",
+      "#ca5f35",
+      "#45bdb0",
+      "#f2bc33",
+      "#e74b8b",
+      "#4fbf48",
+      "#1ea6dc",
+      "#fd7643",
+      "#72cec3",
+      "#f5cc5d",
+      "#ec77a8",
+      "#7acf74",
+      "#4cbce4",
+      "#fd986f",
+      "#a1ded7",
+      "#f8dd91",
+      "#f2a4c5",
+      "#a6dfa2",
+      "#86d2ed",
+      "#fdba9f",
+      "#000000",
+      "#444444",
+      "#777777",
+      "#BBBBBB",
+      "#FFFFFF",
+      "rgba(255,255,255,0)"
+    ],
+    "css": ".canvasPage {\n\n}",
+    "height": 720,
+    "isWriteable": true,
+    "name": "Workpad of Death",
+    "page": 0,
+    "pages": [
+      {
+        "elements": [
+          {
+            "expression": "image \n  dataurl=\"https://via.placeholder.com/728x90.png?text=test+external+image\" mode=\"contain\"\n| render",
+            "id": "element-4612f502-7880-418b-8107-a629e9b842bc",
+            "position": {
+              "angle": 0,
+              "height": 300,
+              "left": 20,
+              "parent": null,
+              "top": 20,
+              "width": 500
+            }
+          }
+        ],
+        "groups": [],
+        "id": "page-28d24ed2-c162-408c-92b3-978d7433aa1d",
+        "style": {
+          "background": "#FFF"
+        },
+        "transition": {}
+      }
+    ],
+    "variables": [],
+    "width": 1080
+  },
+  "coreMigrationVersion": "8.1.0",
+  "id": "workpad-e7464259-0b75-4b8c-81c8-8422b15ff201",
+  "migrationVersion": {
+    "canvas-workpad": "8.0.0"
+  },
+  "references": [],
+  "type": "canvas-workpad",
+  "updated_at": "2020-07-16T20:34:01.098Z",
+  "version": "WzIsMl0="
+}
diff --git a/x-pack/test/functional/services/observability/alerts/common.ts b/x-pack/test/functional/services/observability/alerts/common.ts
index f47d17039b5ae..7e29b94c85fa3 100644
--- a/x-pack/test/functional/services/observability/alerts/common.ts
+++ b/x-pack/test/functional/services/observability/alerts/common.ts
@@ -16,7 +16,7 @@ const DATE_WITH_DATA = {
 };
 
 const ALERTS_FLYOUT_SELECTOR = 'alertsFlyout';
-const COPY_TO_CLIPBOARD_BUTTON_SELECTOR = 'copy-to-clipboard';
+const FILTER_FOR_VALUE_BUTTON_SELECTOR = 'filter-for-value';
 const ALERTS_TABLE_CONTAINER_SELECTOR = 'events-viewer-panel';
 const ACTION_COLUMN_INDEX = 1;
 
@@ -149,16 +149,12 @@ export function ObservabilityAlertsCommonProvider({
 
   // Cell actions
 
-  const copyToClipboardButtonExists = async () => {
-    return await testSubjects.exists(COPY_TO_CLIPBOARD_BUTTON_SELECTOR);
-  };
-
-  const getCopyToClipboardButton = async () => {
-    return await testSubjects.find(COPY_TO_CLIPBOARD_BUTTON_SELECTOR);
+  const filterForValueButtonExists = async () => {
+    return await testSubjects.exists(FILTER_FOR_VALUE_BUTTON_SELECTOR);
   };
 
   const getFilterForValueButton = async () => {
-    return await testSubjects.find('filter-for-value');
+    return await testSubjects.find(FILTER_FOR_VALUE_BUTTON_SELECTOR);
   };
 
   const openActionsMenuForRow = async (rowIndex: number) => {
@@ -216,15 +212,14 @@ export function ObservabilityAlertsCommonProvider({
     getQueryBar,
     clearQueryBar,
     closeAlertsFlyout,
+    filterForValueButtonExists,
     getAlertsFlyout,
     getAlertsFlyoutDescriptionListDescriptions,
     getAlertsFlyoutDescriptionListTitles,
     getAlertsFlyoutOrFail,
     getAlertsFlyoutTitle,
     getAlertsFlyoutViewInAppButtonOrFail,
-    getCopyToClipboardButton,
     getFilterForValueButton,
-    copyToClipboardButtonExists,
     getNoDataPageOrFail,
     getNoDataStateOrFail,
     getTableCells,
diff --git a/x-pack/test/observability_functional/apps/observability/alerts/index.ts b/x-pack/test/observability_functional/apps/observability/alerts/index.ts
index 112c24f7c3a88..216a9736fbe87 100644
--- a/x-pack/test/observability_functional/apps/observability/alerts/index.ts
+++ b/x-pack/test/observability_functional/apps/observability/alerts/index.ts
@@ -189,19 +189,15 @@ export default ({ getService }: FtrProviderContext) => {
             await alertStatusCell.moveMouseTo();
             await retry.waitFor(
               'cell actions visible',
-              async () => await observability.alerts.common.copyToClipboardButtonExists()
+              async () => await observability.alerts.common.filterForValueButtonExists()
             );
           });
         });
 
         afterEach(async () => {
           await observability.alerts.common.clearQueryBar();
-        });
-
-        it('Copy button works', async () => {
-          // NOTE: We don't have access to the clipboard in a headless environment,
-          // so we'll just check the button is clickable in the functional tests.
-          await (await observability.alerts.common.getCopyToClipboardButton()).click();
+          // Reset the query bar by hiding the dropdown
+          await observability.alerts.common.submitQuery('');
         });
 
         it('Filter for value works', async () => {
diff --git a/x-pack/test/reporting_api_integration/reporting_and_security/__snapshots__/download_csv_dashboard.snap b/x-pack/test/reporting_api_integration/reporting_and_security/__snapshots__/download_csv_dashboard.snap
index 806fa16f56921..e54f173bbd04c 100644
--- a/x-pack/test/reporting_api_integration/reporting_and_security/__snapshots__/download_csv_dashboard.snap
+++ b/x-pack/test/reporting_api_integration/reporting_and_security/__snapshots__/download_csv_dashboard.snap
@@ -1,68 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Reporting APIs CSV Generation from SearchSource Exports CSV with all fields when using defaults 1`] = `
-"_id,_index,_score,_type,category,category.keyword,currency,customer_first_name,customer_first_name.keyword,customer_full_name,customer_full_name.keyword,customer_gender,customer_id,customer_last_name,customer_last_name.keyword,customer_phone,day_of_week,day_of_week_i,email,geoip.city_name,geoip.continent_name,geoip.country_iso_code,geoip.location,geoip.region_name,manufacturer,manufacturer.keyword,order_date,order_id,products._id,products._id.keyword,products.base_price,products.base_unit_price,products.category,products.category.keyword,products.created_on,products.discount_amount,products.discount_percentage,products.manufacturer,products.manufacturer.keyword,products.min_price,products.price,products.product_id,products.product_name,products.product_name.keyword,products.quantity,products.sku,products.tax_amount,products.taxful_price,products.taxless_price,products.unit_discount_amount,sku,taxful_total_price,taxless_total_price,total_quantity,total_unique_products,type,user
-9AMtOW0BH63Xcmy432DJ,ecommerce,-,-,Men's Clothing,Men's Clothing,EUR,Boris,Boris,Boris Bradley,Boris Bradley,MALE,36,Bradley,Bradley,(empty),Wednesday,2,boris@bradley-family.zzz,-,Europe,GB,{
-  \\"coordinates\\": [
-    -0.1,
-    51.5
-  ],
-  \\"type\\": \\"Point\\"
-},-,Microlutions, Elitelligence,Microlutions, Elitelligence,Jun 25, 2019 @ 00:00:00.000,568397,sold_product_568397_24419, sold_product_568397_20207,sold_product_568397_24419, sold_product_568397_20207,33, 28.984,33, 28.984,Men's Clothing, Men's Clothing,Men's Clothing, Men's Clothing,Dec 14, 2016 @ 00:00:00.000, Dec 14, 2016 @ 00:00:00.000,0, 0,0, 0,Microlutions, Elitelligence,Microlutions, Elitelligence,17.484, 13.922,33, 28.984,24,419, 20,207,Cargo trousers - oliv, Trousers - black,Cargo trousers - oliv, Trousers - black,1, 1,ZO0112101121, ZO0530405304,0, 0,33, 28.984,33, 28.984,0, 0,ZO0112101121, ZO0530405304,61.969,61.969,2,2,order,boris
-9QMtOW0BH63Xcmy432DJ,ecommerce,-,-,Men's Clothing,Men's Clothing,EUR,Oliver,Oliver,Oliver Hubbard,Oliver Hubbard,MALE,7,Hubbard,Hubbard,(empty),Wednesday,2,oliver@hubbard-family.zzz,-,Europe,GB,{
-  \\"coordinates\\": [
-    -0.1,
-    51.5
-  ],
-  \\"type\\": \\"Point\\"
-},-,Spritechnologies, Microlutions,Spritechnologies, Microlutions,Jun 25, 2019 @ 00:00:00.000,568044,sold_product_568044_12799, sold_product_568044_18008,sold_product_568044_12799, sold_product_568044_18008,14.992, 16.984,14.992, 16.984,Men's Clothing, Men's Clothing,Men's Clothing, Men's Clothing,Dec 14, 2016 @ 00:00:00.000, Dec 14, 2016 @ 00:00:00.000,0, 0,0, 0,Spritechnologies, Microlutions,Spritechnologies, Microlutions,6.898, 8.828,14.992, 16.984,12,799, 18,008,Undershirt - dark grey multicolor, Long sleeved top - purple,Undershirt - dark grey multicolor, Long sleeved top - purple,1, 1,ZO0630406304, ZO0120201202,0, 0,14.992, 16.984,14.992, 16.984,0, 0,ZO0630406304, ZO0120201202,31.984,31.984,2,2,order,oliver
-OAMtOW0BH63Xcmy432HJ,ecommerce,-,-,Women's Accessories,Women's Accessories,EUR,Betty,Betty,Betty Reese,Betty Reese,FEMALE,44,Reese,Reese,(empty),Wednesday,2,betty@reese-family.zzz,New York,North America,US,{
-  \\"coordinates\\": [
-    -74,
-    40.7
-  ],
-  \\"type\\": \\"Point\\"
-},New York,Pyramidustries,Pyramidustries,Jun 25, 2019 @ 00:00:00.000,568229,sold_product_568229_24991, sold_product_568229_12039,sold_product_568229_24991, sold_product_568229_12039,11.992, 10.992,11.992, 10.992,Women's Accessories, Women's Accessories,Women's Accessories, Women's Accessories,Dec 14, 2016 @ 00:00:00.000, Dec 14, 2016 @ 00:00:00.000,0, 0,0, 0,Pyramidustries, Pyramidustries,Pyramidustries, Pyramidustries,6.352, 5.82,11.992, 10.992,24,991, 12,039,Scarf - rose/white, Scarf - nude/black/turquoise,Scarf - rose/white, Scarf - nude/black/turquoise,1, 1,ZO0192201922, ZO0192801928,0, 0,11.992, 10.992,11.992, 10.992,0, 0,ZO0192201922, ZO0192801928,22.984,22.984,2,2,order,betty
-OQMtOW0BH63Xcmy432HJ,ecommerce,-,-,Men's Clothing, Men's Accessories,Men's Clothing, Men's Accessories,EUR,Recip,Recip,Recip Salazar,Recip Salazar,MALE,10,Salazar,Salazar,(empty),Wednesday,2,recip@salazar-family.zzz,Istanbul,Asia,TR,{
-  \\"coordinates\\": [
-    29,
-    41
-  ],
-  \\"type\\": \\"Point\\"
-},Istanbul,Elitelligence,Elitelligence,Jun 25, 2019 @ 00:00:00.000,568292,sold_product_568292_23627, sold_product_568292_11149,sold_product_568292_23627, sold_product_568292_11149,24.984, 10.992,24.984, 10.992,Men's Clothing, Men's Accessories,Men's Clothing, Men's Accessories,Dec 14, 2016 @ 00:00:00.000, Dec 14, 2016 @ 00:00:00.000,0, 0,0, 0,Elitelligence, Elitelligence,Elitelligence, Elitelligence,12.492, 5.059,24.984, 10.992,23,627, 11,149,Slim fit jeans - grey, Sunglasses - black,Slim fit jeans - grey, Sunglasses - black,1, 1,ZO0534205342, ZO0599605996,0, 0,24.984, 10.992,24.984, 10.992,0, 0,ZO0534205342, ZO0599605996,35.969,35.969,2,2,order,recip
-jwMtOW0BH63Xcmy432HJ,ecommerce,-,-,Men's Clothing,Men's Clothing,EUR,Jackson,Jackson,Jackson Harper,Jackson Harper,MALE,13,Harper,Harper,(empty),Wednesday,2,jackson@harper-family.zzz,Los Angeles,North America,US,{
-  \\"coordinates\\": [
-    -118.2,
-    34.1
-  ],
-  \\"type\\": \\"Point\\"
-},California,Low Tide Media, Oceanavigations,Low Tide Media, Oceanavigations,Jun 25, 2019 @ 00:00:00.000,568386,sold_product_568386_11959, sold_product_568386_2774,sold_product_568386_11959, sold_product_568386_2774,24.984, 85,24.984, 85,Men's Clothing, Men's Clothing,Men's Clothing, Men's Clothing,Dec 14, 2016 @ 00:00:00.000, Dec 14, 2016 @ 00:00:00.000,0, 0,0, 0,Low Tide Media, Oceanavigations,Low Tide Media, Oceanavigations,12.742, 45.875,24.984, 85,11,959, 2,774,SLIM FIT - Formal shirt - lila, Classic coat - black,SLIM FIT - Formal shirt - lila, Classic coat - black,1, 1,ZO0422404224, ZO0291702917,0, 0,24.984, 85,24.984, 85,0, 0,ZO0422404224, ZO0291702917,110,110,2,2,order,jackson
-"
-`;
-
-exports[`Reporting APIs CSV Generation from SearchSource Exports CSV with almost all fields when using fieldsFromSource 1`] = `
-"_id,_index,_score,_type,category,currency,customer_first_name,customer_full_name,customer_gender,customer_id,customer_last_name,customer_phone,day_of_week,day_of_week_i,email,geoip,manufacturer,order_date,order_id,products,products.created_on,sku,taxful_total_price,taxless_total_price,total_quantity,total_unique_products,type,user
-9AMtOW0BH63Xcmy432DJ,ecommerce,-,-,Men's Clothing,EUR,Boris,Boris Bradley,MALE,36,Bradley,-,Wednesday,2,boris@bradley-family.zzz,{\\"continent_name\\":\\"Europe\\",\\"country_iso_code\\":\\"GB\\",\\"location\\":{\\"lat\\":51.5,\\"lon\\":-0.1}},Microlutions, Elitelligence,Jun 25, 2019 @ 00:00:00.000,568397,{\\"_id\\":\\"sold_product_568397_24419\\",\\"base_price\\":32.99,\\"base_unit_price\\":32.99,\\"category\\":\\"Men's Clothing\\",\\"created_on\\":\\"2016-12-14T00:00:00+00:00\\",\\"discount_amount\\":0,\\"discount_percentage\\":0,\\"manufacturer\\":\\"Microlutions\\",\\"min_price\\":17.48,\\"price\\":32.99,\\"product_id\\":24419,\\"product_name\\":\\"Cargo trousers - oliv\\",\\"quantity\\":1,\\"sku\\":\\"ZO0112101121\\",\\"tax_amount\\":0,\\"taxful_price\\":32.99,\\"taxless_price\\":32.99,\\"unit_discount_amount\\":0}, {\\"_id\\":\\"sold_product_568397_20207\\",\\"base_price\\":28.99,\\"base_unit_price\\":28.99,\\"category\\":\\"Men's Clothing\\",\\"created_on\\":\\"2016-12-14T00:00:00+00:00\\",\\"discount_amount\\":0,\\"discount_percentage\\":0,\\"manufacturer\\":\\"Elitelligence\\",\\"min_price\\":13.92,\\"price\\":28.99,\\"product_id\\":20207,\\"product_name\\":\\"Trousers - black\\",\\"quantity\\":1,\\"sku\\":\\"ZO0530405304\\",\\"tax_amount\\":0,\\"taxful_price\\":28.99,\\"taxless_price\\":28.99,\\"unit_discount_amount\\":0},Dec 14, 2016 @ 00:00:00.000, Dec 14, 2016 @ 00:00:00.000,ZO0112101121, ZO0530405304,61.98,61.98,2,2,order,boris
-9QMtOW0BH63Xcmy432DJ,ecommerce,-,-,Men's Clothing,EUR,Oliver,Oliver Hubbard,MALE,7,Hubbard,-,Wednesday,2,oliver@hubbard-family.zzz,{\\"continent_name\\":\\"Europe\\",\\"country_iso_code\\":\\"GB\\",\\"location\\":{\\"lat\\":51.5,\\"lon\\":-0.1}},Spritechnologies, Microlutions,Jun 25, 2019 @ 00:00:00.000,568044,{\\"_id\\":\\"sold_product_568044_12799\\",\\"base_price\\":14.99,\\"base_unit_price\\":14.99,\\"category\\":\\"Men's Clothing\\",\\"created_on\\":\\"2016-12-14T00:00:00+00:00\\",\\"discount_amount\\":0,\\"discount_percentage\\":0,\\"manufacturer\\":\\"Spritechnologies\\",\\"min_price\\":6.9,\\"price\\":14.99,\\"product_id\\":12799,\\"product_name\\":\\"Undershirt - dark grey multicolor\\",\\"quantity\\":1,\\"sku\\":\\"ZO0630406304\\",\\"tax_amount\\":0,\\"taxful_price\\":14.99,\\"taxless_price\\":14.99,\\"unit_discount_amount\\":0}, {\\"_id\\":\\"sold_product_568044_18008\\",\\"base_price\\":16.99,\\"base_unit_price\\":16.99,\\"category\\":\\"Men's Clothing\\",\\"created_on\\":\\"2016-12-14T00:00:00+00:00\\",\\"discount_amount\\":0,\\"discount_percentage\\":0,\\"manufacturer\\":\\"Microlutions\\",\\"min_price\\":8.83,\\"price\\":16.99,\\"product_id\\":18008,\\"product_name\\":\\"Long sleeved top - purple\\",\\"quantity\\":1,\\"sku\\":\\"ZO0120201202\\",\\"tax_amount\\":0,\\"taxful_price\\":16.99,\\"taxless_price\\":16.99,\\"unit_discount_amount\\":0},Dec 14, 2016 @ 00:00:00.000, Dec 14, 2016 @ 00:00:00.000,ZO0630406304, ZO0120201202,31.98,31.98,2,2,order,oliver
-OAMtOW0BH63Xcmy432HJ,ecommerce,-,-,Women's Accessories,EUR,Betty,Betty Reese,FEMALE,44,Reese,-,Wednesday,2,betty@reese-family.zzz,{\\"city_name\\":\\"New York\\",\\"continent_name\\":\\"North America\\",\\"country_iso_code\\":\\"US\\",\\"location\\":{\\"lat\\":40.7,\\"lon\\":-74},\\"region_name\\":\\"New York\\"},Pyramidustries,Jun 25, 2019 @ 00:00:00.000,568229,{\\"_id\\":\\"sold_product_568229_24991\\",\\"base_price\\":11.99,\\"base_unit_price\\":11.99,\\"category\\":\\"Women's Accessories\\",\\"created_on\\":\\"2016-12-14T00:00:00+00:00\\",\\"discount_amount\\":0,\\"discount_percentage\\":0,\\"manufacturer\\":\\"Pyramidustries\\",\\"min_price\\":6.35,\\"price\\":11.99,\\"product_id\\":24991,\\"product_name\\":\\"Scarf - rose/white\\",\\"quantity\\":1,\\"sku\\":\\"ZO0192201922\\",\\"tax_amount\\":0,\\"taxful_price\\":11.99,\\"taxless_price\\":11.99,\\"unit_discount_amount\\":0}, {\\"_id\\":\\"sold_product_568229_12039\\",\\"base_price\\":10.99,\\"base_unit_price\\":10.99,\\"category\\":\\"Women's Accessories\\",\\"created_on\\":\\"2016-12-14T00:00:00+00:00\\",\\"discount_amount\\":0,\\"discount_percentage\\":0,\\"manufacturer\\":\\"Pyramidustries\\",\\"min_price\\":5.82,\\"price\\":10.99,\\"product_id\\":12039,\\"product_name\\":\\"Scarf - nude/black/turquoise\\",\\"quantity\\":1,\\"sku\\":\\"ZO0192801928\\",\\"tax_amount\\":0,\\"taxful_price\\":10.99,\\"taxless_price\\":10.99,\\"unit_discount_amount\\":0},Dec 14, 2016 @ 00:00:00.000, Dec 14, 2016 @ 00:00:00.000,ZO0192201922, ZO0192801928,22.98,22.98,2,2,order,betty
-OQMtOW0BH63Xcmy432HJ,ecommerce,-,-,Men's Clothing, Men's Accessories,EUR,Recip,Recip Salazar,MALE,10,Salazar,-,Wednesday,2,recip@salazar-family.zzz,{\\"city_name\\":\\"Istanbul\\",\\"continent_name\\":\\"Asia\\",\\"country_iso_code\\":\\"TR\\",\\"location\\":{\\"lat\\":41,\\"lon\\":29},\\"region_name\\":\\"Istanbul\\"},Elitelligence,Jun 25, 2019 @ 00:00:00.000,568292,{\\"_id\\":\\"sold_product_568292_23627\\",\\"base_price\\":24.99,\\"base_unit_price\\":24.99,\\"category\\":\\"Men's Clothing\\",\\"created_on\\":\\"2016-12-14T00:00:00+00:00\\",\\"discount_amount\\":0,\\"discount_percentage\\":0,\\"manufacturer\\":\\"Elitelligence\\",\\"min_price\\":12.49,\\"price\\":24.99,\\"product_id\\":23627,\\"product_name\\":\\"Slim fit jeans - grey\\",\\"quantity\\":1,\\"sku\\":\\"ZO0534205342\\",\\"tax_amount\\":0,\\"taxful_price\\":24.99,\\"taxless_price\\":24.99,\\"unit_discount_amount\\":0}, {\\"_id\\":\\"sold_product_568292_11149\\",\\"base_price\\":10.99,\\"base_unit_price\\":10.99,\\"category\\":\\"Men's Accessories\\",\\"created_on\\":\\"2016-12-14T00:00:00+00:00\\",\\"discount_amount\\":0,\\"discount_percentage\\":0,\\"manufacturer\\":\\"Elitelligence\\",\\"min_price\\":5.06,\\"price\\":10.99,\\"product_id\\":11149,\\"product_name\\":\\"Sunglasses - black\\",\\"quantity\\":1,\\"sku\\":\\"ZO0599605996\\",\\"tax_amount\\":0,\\"taxful_price\\":10.99,\\"taxless_price\\":10.99,\\"unit_discount_amount\\":0},Dec 14, 2016 @ 00:00:00.000, Dec 14, 2016 @ 00:00:00.000,ZO0534205342, ZO0599605996,35.98,35.98,2,2,order,recip
-"
-`;
-
-exports[`Reporting APIs CSV Generation from SearchSource date formatting Formatted date_nanos data, UTC timezone 1`] = `
-"date,message
-\\"Jan 1, 2015 @ 12:10:30.123456789\\",\\"Hello 2\\"
-\\"Jan 1, 2015 @ 12:10:30.000000000\\",\\"Hello 1\\"
-"
-`;
-
-exports[`Reporting APIs CSV Generation from SearchSource date formatting Formatted date_nanos data, custom timezone (New York) 1`] = `
-"date,message
-\\"Jan 1, 2015 @ 07:10:30.123456789\\",\\"Hello 2\\"
-\\"Jan 1, 2015 @ 07:10:30.000000000\\",\\"Hello 1\\"
-"
-`;
-
 exports[`Reporting APIs CSV Generation from SearchSource date formatting With filters and timebased data, default to UTC 1`] = `
 "\\"@timestamp\\",clientip,extension
 \\"Sep 20, 2015 @ 10:26:48.725\\",\\"74.214.76.90\\",jpg
@@ -191,6 +128,20 @@ exports[`Reporting APIs CSV Generation from SearchSource date formatting With fi
 "
 `;
 
+exports[`Reporting APIs CSV Generation from SearchSource nanosecond formatting Formatted date_nanos data, UTC timezone 1`] = `
+"date,message
+\\"Jan 1, 2015 @ 12:10:30.123456789\\",\\"Hello 2\\"
+\\"Jan 1, 2015 @ 12:10:30.000000000\\",\\"Hello 1\\"
+"
+`;
+
+exports[`Reporting APIs CSV Generation from SearchSource nanosecond formatting Formatted date_nanos data, custom timezone (New York) 1`] = `
+"date,message
+\\"Jan 1, 2015 @ 07:10:30.123456789\\",\\"Hello 2\\"
+\\"Jan 1, 2015 @ 07:10:30.000000000\\",\\"Hello 1\\"
+"
+`;
+
 exports[`Reporting APIs CSV Generation from SearchSource non-timebased Handle _id and _index columns 1`] = `
 "date,message,\\"_id\\",\\"_index\\"
 \\"Jan 1, 2015 @ 12:10:30.123456789\\",\\"Hello 2\\",2,nanos
@@ -215,6 +166,55 @@ exports[`Reporting APIs CSV Generation from SearchSource non-timebased With filt
 "
 `;
 
+exports[`Reporting APIs CSV Generation from SearchSource unquoted values Exports CSV with all fields when using defaults 1`] = `
+"_id,_index,_score,_type,category,category.keyword,currency,customer_first_name,customer_first_name.keyword,customer_full_name,customer_full_name.keyword,customer_gender,customer_id,customer_last_name,customer_last_name.keyword,customer_phone,day_of_week,day_of_week_i,email,geoip.city_name,geoip.continent_name,geoip.country_iso_code,geoip.location,geoip.region_name,manufacturer,manufacturer.keyword,order_date,order_id,products._id,products._id.keyword,products.base_price,products.base_unit_price,products.category,products.category.keyword,products.created_on,products.discount_amount,products.discount_percentage,products.manufacturer,products.manufacturer.keyword,products.min_price,products.price,products.product_id,products.product_name,products.product_name.keyword,products.quantity,products.sku,products.tax_amount,products.taxful_price,products.taxless_price,products.unit_discount_amount,sku,taxful_total_price,taxless_total_price,total_quantity,total_unique_products,type,user
+9AMtOW0BH63Xcmy432DJ,ecommerce,-,-,Men's Clothing,Men's Clothing,EUR,Boris,Boris,Boris Bradley,Boris Bradley,MALE,36,Bradley,Bradley,(empty),Wednesday,2,boris@bradley-family.zzz,-,Europe,GB,{
+  \\"coordinates\\": [
+    -0.1,
+    51.5
+  ],
+  \\"type\\": \\"Point\\"
+},-,Microlutions, Elitelligence,Microlutions, Elitelligence,Jun 25, 2019 @ 00:00:00.000,568397,sold_product_568397_24419, sold_product_568397_20207,sold_product_568397_24419, sold_product_568397_20207,33, 28.984,33, 28.984,Men's Clothing, Men's Clothing,Men's Clothing, Men's Clothing,Dec 14, 2016 @ 00:00:00.000, Dec 14, 2016 @ 00:00:00.000,0, 0,0, 0,Microlutions, Elitelligence,Microlutions, Elitelligence,17.484, 13.922,33, 28.984,24,419, 20,207,Cargo trousers - oliv, Trousers - black,Cargo trousers - oliv, Trousers - black,1, 1,ZO0112101121, ZO0530405304,0, 0,33, 28.984,33, 28.984,0, 0,ZO0112101121, ZO0530405304,61.969,61.969,2,2,order,boris
+9QMtOW0BH63Xcmy432DJ,ecommerce,-,-,Men's Clothing,Men's Clothing,EUR,Oliver,Oliver,Oliver Hubbard,Oliver Hubbard,MALE,7,Hubbard,Hubbard,(empty),Wednesday,2,oliver@hubbard-family.zzz,-,Europe,GB,{
+  \\"coordinates\\": [
+    -0.1,
+    51.5
+  ],
+  \\"type\\": \\"Point\\"
+},-,Spritechnologies, Microlutions,Spritechnologies, Microlutions,Jun 25, 2019 @ 00:00:00.000,568044,sold_product_568044_12799, sold_product_568044_18008,sold_product_568044_12799, sold_product_568044_18008,14.992, 16.984,14.992, 16.984,Men's Clothing, Men's Clothing,Men's Clothing, Men's Clothing,Dec 14, 2016 @ 00:00:00.000, Dec 14, 2016 @ 00:00:00.000,0, 0,0, 0,Spritechnologies, Microlutions,Spritechnologies, Microlutions,6.898, 8.828,14.992, 16.984,12,799, 18,008,Undershirt - dark grey multicolor, Long sleeved top - purple,Undershirt - dark grey multicolor, Long sleeved top - purple,1, 1,ZO0630406304, ZO0120201202,0, 0,14.992, 16.984,14.992, 16.984,0, 0,ZO0630406304, ZO0120201202,31.984,31.984,2,2,order,oliver
+OAMtOW0BH63Xcmy432HJ,ecommerce,-,-,Women's Accessories,Women's Accessories,EUR,Betty,Betty,Betty Reese,Betty Reese,FEMALE,44,Reese,Reese,(empty),Wednesday,2,betty@reese-family.zzz,New York,North America,US,{
+  \\"coordinates\\": [
+    -74,
+    40.7
+  ],
+  \\"type\\": \\"Point\\"
+},New York,Pyramidustries,Pyramidustries,Jun 25, 2019 @ 00:00:00.000,568229,sold_product_568229_24991, sold_product_568229_12039,sold_product_568229_24991, sold_product_568229_12039,11.992, 10.992,11.992, 10.992,Women's Accessories, Women's Accessories,Women's Accessories, Women's Accessories,Dec 14, 2016 @ 00:00:00.000, Dec 14, 2016 @ 00:00:00.000,0, 0,0, 0,Pyramidustries, Pyramidustries,Pyramidustries, Pyramidustries,6.352, 5.82,11.992, 10.992,24,991, 12,039,Scarf - rose/white, Scarf - nude/black/turquoise,Scarf - rose/white, Scarf - nude/black/turquoise,1, 1,ZO0192201922, ZO0192801928,0, 0,11.992, 10.992,11.992, 10.992,0, 0,ZO0192201922, ZO0192801928,22.984,22.984,2,2,order,betty
+OQMtOW0BH63Xcmy432HJ,ecommerce,-,-,Men's Clothing, Men's Accessories,Men's Clothing, Men's Accessories,EUR,Recip,Recip,Recip Salazar,Recip Salazar,MALE,10,Salazar,Salazar,(empty),Wednesday,2,recip@salazar-family.zzz,Istanbul,Asia,TR,{
+  \\"coordinates\\": [
+    29,
+    41
+  ],
+  \\"type\\": \\"Point\\"
+},Istanbul,Elitelligence,Elitelligence,Jun 25, 2019 @ 00:00:00.000,568292,sold_product_568292_23627, sold_product_568292_11149,sold_product_568292_23627, sold_product_568292_11149,24.984, 10.992,24.984, 10.992,Men's Clothing, Men's Accessories,Men's Clothing, Men's Accessories,Dec 14, 2016 @ 00:00:00.000, Dec 14, 2016 @ 00:00:00.000,0, 0,0, 0,Elitelligence, Elitelligence,Elitelligence, Elitelligence,12.492, 5.059,24.984, 10.992,23,627, 11,149,Slim fit jeans - grey, Sunglasses - black,Slim fit jeans - grey, Sunglasses - black,1, 1,ZO0534205342, ZO0599605996,0, 0,24.984, 10.992,24.984, 10.992,0, 0,ZO0534205342, ZO0599605996,35.969,35.969,2,2,order,recip
+jwMtOW0BH63Xcmy432HJ,ecommerce,-,-,Men's Clothing,Men's Clothing,EUR,Jackson,Jackson,Jackson Harper,Jackson Harper,MALE,13,Harper,Harper,(empty),Wednesday,2,jackson@harper-family.zzz,Los Angeles,North America,US,{
+  \\"coordinates\\": [
+    -118.2,
+    34.1
+  ],
+  \\"type\\": \\"Point\\"
+},California,Low Tide Media, Oceanavigations,Low Tide Media, Oceanavigations,Jun 25, 2019 @ 00:00:00.000,568386,sold_product_568386_11959, sold_product_568386_2774,sold_product_568386_11959, sold_product_568386_2774,24.984, 85,24.984, 85,Men's Clothing, Men's Clothing,Men's Clothing, Men's Clothing,Dec 14, 2016 @ 00:00:00.000, Dec 14, 2016 @ 00:00:00.000,0, 0,0, 0,Low Tide Media, Oceanavigations,Low Tide Media, Oceanavigations,12.742, 45.875,24.984, 85,11,959, 2,774,SLIM FIT - Formal shirt - lila, Classic coat - black,SLIM FIT - Formal shirt - lila, Classic coat - black,1, 1,ZO0422404224, ZO0291702917,0, 0,24.984, 85,24.984, 85,0, 0,ZO0422404224, ZO0291702917,110,110,2,2,order,jackson
+"
+`;
+
+exports[`Reporting APIs CSV Generation from SearchSource unquoted values Exports CSV with almost all fields when using fieldsFromSource 1`] = `
+"_id,_index,_score,_type,category,currency,customer_first_name,customer_full_name,customer_gender,customer_id,customer_last_name,customer_phone,day_of_week,day_of_week_i,email,geoip,manufacturer,order_date,order_id,products,products.created_on,sku,taxful_total_price,taxless_total_price,total_quantity,total_unique_products,type,user
+9AMtOW0BH63Xcmy432DJ,ecommerce,-,-,Men's Clothing,EUR,Boris,Boris Bradley,MALE,36,Bradley,-,Wednesday,2,boris@bradley-family.zzz,{\\"continent_name\\":\\"Europe\\",\\"country_iso_code\\":\\"GB\\",\\"location\\":{\\"lat\\":51.5,\\"lon\\":-0.1}},Microlutions, Elitelligence,Jun 25, 2019 @ 00:00:00.000,568397,{\\"_id\\":\\"sold_product_568397_24419\\",\\"base_price\\":32.99,\\"base_unit_price\\":32.99,\\"category\\":\\"Men's Clothing\\",\\"created_on\\":\\"2016-12-14T00:00:00+00:00\\",\\"discount_amount\\":0,\\"discount_percentage\\":0,\\"manufacturer\\":\\"Microlutions\\",\\"min_price\\":17.48,\\"price\\":32.99,\\"product_id\\":24419,\\"product_name\\":\\"Cargo trousers - oliv\\",\\"quantity\\":1,\\"sku\\":\\"ZO0112101121\\",\\"tax_amount\\":0,\\"taxful_price\\":32.99,\\"taxless_price\\":32.99,\\"unit_discount_amount\\":0}, {\\"_id\\":\\"sold_product_568397_20207\\",\\"base_price\\":28.99,\\"base_unit_price\\":28.99,\\"category\\":\\"Men's Clothing\\",\\"created_on\\":\\"2016-12-14T00:00:00+00:00\\",\\"discount_amount\\":0,\\"discount_percentage\\":0,\\"manufacturer\\":\\"Elitelligence\\",\\"min_price\\":13.92,\\"price\\":28.99,\\"product_id\\":20207,\\"product_name\\":\\"Trousers - black\\",\\"quantity\\":1,\\"sku\\":\\"ZO0530405304\\",\\"tax_amount\\":0,\\"taxful_price\\":28.99,\\"taxless_price\\":28.99,\\"unit_discount_amount\\":0},Dec 14, 2016 @ 00:00:00.000, Dec 14, 2016 @ 00:00:00.000,ZO0112101121, ZO0530405304,61.98,61.98,2,2,order,boris
+9QMtOW0BH63Xcmy432DJ,ecommerce,-,-,Men's Clothing,EUR,Oliver,Oliver Hubbard,MALE,7,Hubbard,-,Wednesday,2,oliver@hubbard-family.zzz,{\\"continent_name\\":\\"Europe\\",\\"country_iso_code\\":\\"GB\\",\\"location\\":{\\"lat\\":51.5,\\"lon\\":-0.1}},Spritechnologies, Microlutions,Jun 25, 2019 @ 00:00:00.000,568044,{\\"_id\\":\\"sold_product_568044_12799\\",\\"base_price\\":14.99,\\"base_unit_price\\":14.99,\\"category\\":\\"Men's Clothing\\",\\"created_on\\":\\"2016-12-14T00:00:00+00:00\\",\\"discount_amount\\":0,\\"discount_percentage\\":0,\\"manufacturer\\":\\"Spritechnologies\\",\\"min_price\\":6.9,\\"price\\":14.99,\\"product_id\\":12799,\\"product_name\\":\\"Undershirt - dark grey multicolor\\",\\"quantity\\":1,\\"sku\\":\\"ZO0630406304\\",\\"tax_amount\\":0,\\"taxful_price\\":14.99,\\"taxless_price\\":14.99,\\"unit_discount_amount\\":0}, {\\"_id\\":\\"sold_product_568044_18008\\",\\"base_price\\":16.99,\\"base_unit_price\\":16.99,\\"category\\":\\"Men's Clothing\\",\\"created_on\\":\\"2016-12-14T00:00:00+00:00\\",\\"discount_amount\\":0,\\"discount_percentage\\":0,\\"manufacturer\\":\\"Microlutions\\",\\"min_price\\":8.83,\\"price\\":16.99,\\"product_id\\":18008,\\"product_name\\":\\"Long sleeved top - purple\\",\\"quantity\\":1,\\"sku\\":\\"ZO0120201202\\",\\"tax_amount\\":0,\\"taxful_price\\":16.99,\\"taxless_price\\":16.99,\\"unit_discount_amount\\":0},Dec 14, 2016 @ 00:00:00.000, Dec 14, 2016 @ 00:00:00.000,ZO0630406304, ZO0120201202,31.98,31.98,2,2,order,oliver
+OAMtOW0BH63Xcmy432HJ,ecommerce,-,-,Women's Accessories,EUR,Betty,Betty Reese,FEMALE,44,Reese,-,Wednesday,2,betty@reese-family.zzz,{\\"city_name\\":\\"New York\\",\\"continent_name\\":\\"North America\\",\\"country_iso_code\\":\\"US\\",\\"location\\":{\\"lat\\":40.7,\\"lon\\":-74},\\"region_name\\":\\"New York\\"},Pyramidustries,Jun 25, 2019 @ 00:00:00.000,568229,{\\"_id\\":\\"sold_product_568229_24991\\",\\"base_price\\":11.99,\\"base_unit_price\\":11.99,\\"category\\":\\"Women's Accessories\\",\\"created_on\\":\\"2016-12-14T00:00:00+00:00\\",\\"discount_amount\\":0,\\"discount_percentage\\":0,\\"manufacturer\\":\\"Pyramidustries\\",\\"min_price\\":6.35,\\"price\\":11.99,\\"product_id\\":24991,\\"product_name\\":\\"Scarf - rose/white\\",\\"quantity\\":1,\\"sku\\":\\"ZO0192201922\\",\\"tax_amount\\":0,\\"taxful_price\\":11.99,\\"taxless_price\\":11.99,\\"unit_discount_amount\\":0}, {\\"_id\\":\\"sold_product_568229_12039\\",\\"base_price\\":10.99,\\"base_unit_price\\":10.99,\\"category\\":\\"Women's Accessories\\",\\"created_on\\":\\"2016-12-14T00:00:00+00:00\\",\\"discount_amount\\":0,\\"discount_percentage\\":0,\\"manufacturer\\":\\"Pyramidustries\\",\\"min_price\\":5.82,\\"price\\":10.99,\\"product_id\\":12039,\\"product_name\\":\\"Scarf - nude/black/turquoise\\",\\"quantity\\":1,\\"sku\\":\\"ZO0192801928\\",\\"tax_amount\\":0,\\"taxful_price\\":10.99,\\"taxless_price\\":10.99,\\"unit_discount_amount\\":0},Dec 14, 2016 @ 00:00:00.000, Dec 14, 2016 @ 00:00:00.000,ZO0192201922, ZO0192801928,22.98,22.98,2,2,order,betty
+OQMtOW0BH63Xcmy432HJ,ecommerce,-,-,Men's Clothing, Men's Accessories,EUR,Recip,Recip Salazar,MALE,10,Salazar,-,Wednesday,2,recip@salazar-family.zzz,{\\"city_name\\":\\"Istanbul\\",\\"continent_name\\":\\"Asia\\",\\"country_iso_code\\":\\"TR\\",\\"location\\":{\\"lat\\":41,\\"lon\\":29},\\"region_name\\":\\"Istanbul\\"},Elitelligence,Jun 25, 2019 @ 00:00:00.000,568292,{\\"_id\\":\\"sold_product_568292_23627\\",\\"base_price\\":24.99,\\"base_unit_price\\":24.99,\\"category\\":\\"Men's Clothing\\",\\"created_on\\":\\"2016-12-14T00:00:00+00:00\\",\\"discount_amount\\":0,\\"discount_percentage\\":0,\\"manufacturer\\":\\"Elitelligence\\",\\"min_price\\":12.49,\\"price\\":24.99,\\"product_id\\":23627,\\"product_name\\":\\"Slim fit jeans - grey\\",\\"quantity\\":1,\\"sku\\":\\"ZO0534205342\\",\\"tax_amount\\":0,\\"taxful_price\\":24.99,\\"taxless_price\\":24.99,\\"unit_discount_amount\\":0}, {\\"_id\\":\\"sold_product_568292_11149\\",\\"base_price\\":10.99,\\"base_unit_price\\":10.99,\\"category\\":\\"Men's Accessories\\",\\"created_on\\":\\"2016-12-14T00:00:00+00:00\\",\\"discount_amount\\":0,\\"discount_percentage\\":0,\\"manufacturer\\":\\"Elitelligence\\",\\"min_price\\":5.06,\\"price\\":10.99,\\"product_id\\":11149,\\"product_name\\":\\"Sunglasses - black\\",\\"quantity\\":1,\\"sku\\":\\"ZO0599605996\\",\\"tax_amount\\":0,\\"taxful_price\\":10.99,\\"taxless_price\\":10.99,\\"unit_discount_amount\\":0},Dec 14, 2016 @ 00:00:00.000, Dec 14, 2016 @ 00:00:00.000,ZO0534205342, ZO0599605996,35.98,35.98,2,2,order,recip
+"
+`;
+
 exports[`Reporting APIs CSV Generation from SearchSource validation Searches large amount of data, stops at Max Size Reached 1`] = `
 "\\"_id\\",\\"_index\\",\\"_score\\",\\"_type\\",category,\\"category.keyword\\",currency,\\"customer_first_name\\",\\"customer_first_name.keyword\\",\\"customer_full_name\\",\\"customer_full_name.keyword\\",\\"customer_gender\\",\\"customer_id\\",\\"customer_last_name\\",\\"customer_last_name.keyword\\",\\"customer_phone\\",\\"day_of_week\\",\\"day_of_week_i\\",email,\\"geoip.city_name\\",\\"geoip.continent_name\\",\\"geoip.country_iso_code\\",\\"geoip.location\\",\\"geoip.region_name\\",manufacturer,\\"manufacturer.keyword\\",\\"order_date\\",\\"order_id\\",\\"products._id\\",\\"products._id.keyword\\",\\"products.base_price\\",\\"products.base_unit_price\\",\\"products.category\\",\\"products.category.keyword\\",\\"products.created_on\\",\\"products.discount_amount\\",\\"products.discount_percentage\\",\\"products.manufacturer\\",\\"products.manufacturer.keyword\\",\\"products.min_price\\",\\"products.price\\",\\"products.product_id\\",\\"products.product_name\\",\\"products.product_name.keyword\\",\\"products.quantity\\",\\"products.sku\\",\\"products.tax_amount\\",\\"products.taxful_price\\",\\"products.taxless_price\\",\\"products.unit_discount_amount\\",sku,\\"taxful_total_price\\",\\"taxless_total_price\\",\\"total_quantity\\",\\"total_unique_products\\",type,user
 3AMtOW0BH63Xcmy432DJ,ecommerce,\\"-\\",\\"-\\",\\"Men's Shoes, Men's Clothing, Women's Accessories, Men's Accessories\\",\\"Men's Shoes, Men's Clothing, Women's Accessories, Men's Accessories\\",EUR,\\"Sultan Al\\",\\"Sultan Al\\",\\"Sultan Al Boone\\",\\"Sultan Al Boone\\",MALE,19,Boone,Boone,\\"(empty)\\",Saturday,5,\\"sultan al@boone-family.zzz\\",\\"Abu Dhabi\\",Asia,AE,\\"{
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 3515602342db5..9e99f5886894e 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
@@ -38,171 +38,173 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('CSV Generation from SearchSource', () => {
     before(async () => {
+      await reportingAPI.initEcommerce();
+      await reportingAPI.initLogs();
       await kibanaServer.uiSettings.update({
-        'csv:quoteValues': false,
+        'csv:quoteValues': true,
         'dateFormat:tz': 'UTC',
-        defaultIndex: 'logstash-*',
       });
-      await reportingAPI.initEcommerce();
     });
+
     after(async () => {
       await reportingAPI.teardownEcommerce();
+      await reportingAPI.teardownLogs();
       await reportingAPI.deleteAllReports();
     });
 
-    it('Exports CSV with almost all fields when using fieldsFromSource', async () => {
-      const {
-        status: resStatus,
-        text: resText,
-        type: resType,
-      } = (await generateAPI.getCSVFromSearchSource(
-        getMockJobParams({
-          searchSource: {
-            query: { query: '', language: 'kuery' },
-            index: '5193f870-d861-11e9-a311-0fa548c5f953',
-            sort: [{ order_date: 'desc' }],
-            fieldsFromSource: [
-              '_id',
-              '_index',
-              '_score',
-              '_source',
-              '_type',
-              'category',
-              'category.keyword',
-              'currency',
-              'customer_birth_date',
-              'customer_first_name',
-              'customer_first_name.keyword',
-              'customer_full_name',
-              'customer_full_name.keyword',
-              'customer_gender',
-              'customer_id',
-              'customer_last_name',
-              'customer_last_name.keyword',
-              'customer_phone',
-              'day_of_week',
-              'day_of_week_i',
-              'email',
-              'geoip.city_name',
-              'geoip.continent_name',
-              'geoip.country_iso_code',
-              'geoip.location',
-              'geoip.region_name',
-              'manufacturer',
-              'manufacturer.keyword',
-              'order_date',
-              'order_id',
-              'products._id',
-              'products._id.keyword',
-              'products.base_price',
-              'products.base_unit_price',
-              'products.category',
-              'products.category.keyword',
-              'products.created_on',
-              'products.discount_amount',
-              'products.discount_percentage',
-              'products.manufacturer',
-              'products.manufacturer.keyword',
-              'products.min_price',
-              'products.price',
-              'products.product_id',
-              'products.product_name',
-              'products.product_name.keyword',
-              'products.quantity',
-              'products.sku',
-              'products.tax_amount',
-              'products.taxful_price',
-              'products.taxless_price',
-              'products.unit_discount_amount',
-              'sku',
-              'taxful_total_price',
-              'taxless_total_price',
-              'total_quantity',
-              'total_unique_products',
-              'type',
-              'user',
-            ],
-            filter: [],
-            parent: {
-              query: { language: 'kuery', query: '' },
+    describe('unquoted values', () => {
+      before(async () => {
+        await kibanaServer.uiSettings.update({ 'csv:quoteValues': false });
+      });
+
+      after(async () => {
+        await kibanaServer.uiSettings.update({ 'csv:quoteValues': true });
+      });
+
+      it('Exports CSV with almost all fields when using fieldsFromSource', async () => {
+        const {
+          status: resStatus,
+          text: resText,
+          type: resType,
+        } = (await generateAPI.getCSVFromSearchSource(
+          getMockJobParams({
+            searchSource: {
+              query: { query: '', language: 'kuery' },
+              index: '5193f870-d861-11e9-a311-0fa548c5f953',
+              sort: [{ order_date: 'desc' }],
+              fieldsFromSource: [
+                '_id',
+                '_index',
+                '_score',
+                '_source',
+                '_type',
+                'category',
+                'category.keyword',
+                'currency',
+                'customer_birth_date',
+                'customer_first_name',
+                'customer_first_name.keyword',
+                'customer_full_name',
+                'customer_full_name.keyword',
+                'customer_gender',
+                'customer_id',
+                'customer_last_name',
+                'customer_last_name.keyword',
+                'customer_phone',
+                'day_of_week',
+                'day_of_week_i',
+                'email',
+                'geoip.city_name',
+                'geoip.continent_name',
+                'geoip.country_iso_code',
+                'geoip.location',
+                'geoip.region_name',
+                'manufacturer',
+                'manufacturer.keyword',
+                'order_date',
+                'order_id',
+                'products._id',
+                'products._id.keyword',
+                'products.base_price',
+                'products.base_unit_price',
+                'products.category',
+                'products.category.keyword',
+                'products.created_on',
+                'products.discount_amount',
+                'products.discount_percentage',
+                'products.manufacturer',
+                'products.manufacturer.keyword',
+                'products.min_price',
+                'products.price',
+                'products.product_id',
+                'products.product_name',
+                'products.product_name.keyword',
+                'products.quantity',
+                'products.sku',
+                'products.tax_amount',
+                'products.taxful_price',
+                'products.taxless_price',
+                'products.unit_discount_amount',
+                'sku',
+                'taxful_total_price',
+                'taxless_total_price',
+                'total_quantity',
+                'total_unique_products',
+                'type',
+                'user',
+              ],
               filter: [],
               parent: {
-                filter: [
-                  {
-                    meta: { index: '5193f870-d861-11e9-a311-0fa548c5f953', params: {} },
-                    range: {
-                      order_date: {
-                        gte: fromTime,
-                        lte: toTime,
-                        format: 'strict_date_optional_time',
+                query: { language: 'kuery', query: '' },
+                filter: [],
+                parent: {
+                  filter: [
+                    {
+                      meta: { index: '5193f870-d861-11e9-a311-0fa548c5f953', params: {} },
+                      range: {
+                        order_date: {
+                          gte: fromTime,
+                          lte: toTime,
+                          format: 'strict_date_optional_time',
+                        },
                       },
                     },
-                  },
-                ],
+                  ],
+                },
               },
             },
-          },
-          browserTimezone: 'UTC',
-          title: 'testfooyu78yt90-',
-        })
-      )) as supertest.Response;
-      expect(resStatus).to.eql(200);
-      expect(resType).to.eql('text/csv');
-      expectSnapshot(resText).toMatch();
-    });
+            browserTimezone: 'UTC',
+            title: 'testfooyu78yt90-',
+          })
+        )) as supertest.Response;
+        expect(resStatus).to.eql(200);
+        expect(resType).to.eql('text/csv');
+        expectSnapshot(resText).toMatch();
+      });
 
-    it('Exports CSV with all fields when using defaults', async () => {
-      const {
-        status: resStatus,
-        text: resText,
-        type: resType,
-      } = await generateAPI.getCSVFromSearchSource(
-        getMockJobParams({
-          searchSource: {
-            query: { query: '', language: 'kuery' },
-            index: '5193f870-d861-11e9-a311-0fa548c5f953',
-            sort: [{ order_date: 'desc' }],
-            fields: ['*'],
-            filter: [],
-            parent: {
-              query: { language: 'kuery', query: '' },
+      it('Exports CSV with all fields when using defaults', async () => {
+        const {
+          status: resStatus,
+          text: resText,
+          type: resType,
+        } = await generateAPI.getCSVFromSearchSource(
+          getMockJobParams({
+            searchSource: {
+              query: { query: '', language: 'kuery' },
+              index: '5193f870-d861-11e9-a311-0fa548c5f953',
+              sort: [{ order_date: 'desc' }],
+              fields: ['*'],
               filter: [],
               parent: {
-                filter: [
-                  {
-                    meta: { index: '5193f870-d861-11e9-a311-0fa548c5f953', params: {} },
-                    range: {
-                      order_date: {
-                        gte: fromTime,
-                        lte: toTime,
-                        format: 'strict_date_optional_time',
+                query: { language: 'kuery', query: '' },
+                filter: [],
+                parent: {
+                  filter: [
+                    {
+                      meta: { index: '5193f870-d861-11e9-a311-0fa548c5f953', params: {} },
+                      range: {
+                        order_date: {
+                          gte: fromTime,
+                          lte: toTime,
+                          format: 'strict_date_optional_time',
+                        },
                       },
                     },
-                  },
-                ],
+                  ],
+                },
               },
             },
-          },
-          browserTimezone: 'UTC',
-          title: 'testfooyu78yt90-',
-        })
-      );
-      expect(resStatus).to.eql(200);
-      expect(resType).to.eql('text/csv');
-      expectSnapshot(resText).toMatch();
+            browserTimezone: 'UTC',
+            title: 'testfooyu78yt90-',
+          })
+        );
+        expect(resStatus).to.eql(200);
+        expect(resType).to.eql('text/csv');
+        expectSnapshot(resText).toMatch();
+      });
     });
 
     describe('date formatting', () => {
-      before(async () => {
-        // load test data that contains a saved search and documents
-        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('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 () => {
         const res = (await generateAPI.getCSVFromSearchSource(
           getMockJobParams({
@@ -277,10 +279,18 @@ export default function ({ getService }: FtrProviderContext) {
         expect(resType).to.eql('text/csv');
         expectSnapshot(resText).toMatch();
       });
+    });
 
-      it('Formatted date_nanos data, UTC timezone', async () => {
+    describe('nanosecond formatting', () => {
+      before(async () => {
         await esArchiver.load('x-pack/test/functional/es_archives/reporting/nanos');
+      });
 
+      after(async () => {
+        await esArchiver.unload('x-pack/test/functional/es_archives/reporting/nanos');
+      });
+
+      it('Formatted date_nanos data, UTC timezone', async () => {
         const res = await generateAPI.getCSVFromSearchSource(
           getMockJobParams({
             searchSource: {
@@ -298,13 +308,9 @@ export default function ({ getService }: FtrProviderContext) {
         expect(resStatus).to.eql(200);
         expect(resType).to.eql('text/csv');
         expectSnapshot(resText).toMatch();
-
-        await esArchiver.unload('x-pack/test/functional/es_archives/reporting/nanos');
       });
 
       it('Formatted date_nanos data, custom timezone (New York)', async () => {
-        await esArchiver.load('x-pack/test/functional/es_archives/reporting/nanos');
-
         const res = await generateAPI.getCSVFromSearchSource(
           getMockJobParams({
             browserTimezone: 'America/New_York',
@@ -323,8 +329,6 @@ export default function ({ getService }: FtrProviderContext) {
         expect(resStatus).to.eql(200);
         expect(resType).to.eql('text/csv');
         expectSnapshot(resText).toMatch();
-
-        await esArchiver.unload('x-pack/test/functional/es_archives/reporting/nanos');
       });
     });
 
@@ -354,7 +358,6 @@ export default function ({ getService }: FtrProviderContext) {
       });
 
       it('With filters and non-timebased data', async () => {
-        // load test data that contains a saved search and documents
         await esArchiver.load('x-pack/test/functional/es_archives/reporting/sales');
 
         const {
@@ -405,8 +408,6 @@ export default function ({ getService }: FtrProviderContext) {
 
       // NOTE: this test requires having the test server run with `xpack.reporting.csv.maxSizeBytes=6000`
       it(`Searches large amount of data, stops at Max Size Reached`, async () => {
-        await reportingAPI.initEcommerce();
-
         const {
           status: resStatus,
           text: resText,
@@ -447,8 +448,6 @@ export default function ({ getService }: FtrProviderContext) {
         expect(resStatus).to.eql(200);
         expect(resType).to.eql('text/csv');
         expectSnapshot(resText).toMatch();
-
-        await reportingAPI.teardownEcommerce();
       });
     });
   });
diff --git a/x-pack/test/reporting_api_integration/reporting_and_security/generate_csv_discover_deprecated.ts b/x-pack/test/reporting_api_integration/reporting_and_security/generate_csv_discover_deprecated.ts
index 9e3ddfaf57b39..bd662fb391f15 100644
--- a/x-pack/test/reporting_api_integration/reporting_and_security/generate_csv_discover_deprecated.ts
+++ b/x-pack/test/reporting_api_integration/reporting_and_security/generate_csv_discover_deprecated.ts
@@ -12,7 +12,6 @@ import { JOB_PARAMS_RISON_CSV_DEPRECATED } from '../services/fixtures';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({ getService }: FtrProviderContext) {
-  const esArchiver = getService('esArchiver');
   const supertestSvc = getService('supertest');
   const reportingAPI = getService('reportingAPI');
 
@@ -32,13 +31,11 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('Generation from Legacy Job Params', () => {
     before(async () => {
-      await esArchiver.load('x-pack/test/functional/es_archives/reporting/logs');
-      await esArchiver.load('x-pack/test/functional/es_archives/logstash_functional');
+      await reportingAPI.initLogs();
     });
 
     after(async () => {
-      await esArchiver.unload('x-pack/test/functional/es_archives/reporting/logs');
-      await esArchiver.unload('x-pack/test/functional/es_archives/logstash_functional');
+      await reportingAPI.teardownLogs();
       await reportingAPI.deleteAllReports();
     });
 
diff --git a/x-pack/test/reporting_api_integration/reporting_and_security/ilm_migration_apis.ts b/x-pack/test/reporting_api_integration/reporting_and_security/ilm_migration_apis.ts
index 6a2139a70dde5..af6afe99e8c9d 100644
--- a/x-pack/test/reporting_api_integration/reporting_and_security/ilm_migration_apis.ts
+++ b/x-pack/test/reporting_api_integration/reporting_and_security/ilm_migration_apis.ts
@@ -13,7 +13,6 @@ import { ILM_POLICY_NAME } from '../../../plugins/reporting/common/constants';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({ getService }: FtrProviderContext) {
-  const esArchiver = getService('esArchiver');
   const es = getService('es');
   const supertest = getService('supertest');
   const supertestWithoutAuth = getService('supertestWithoutAuth');
@@ -22,14 +21,12 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('ILM policy migration APIs', () => {
     before(async () => {
-      await esArchiver.load('x-pack/test/functional/es_archives/reporting/logs');
-      await esArchiver.load('x-pack/test/functional/es_archives/logstash_functional');
+      await reportingAPI.initLogs();
       await reportingAPI.migrateReportingIndices(); // ensure that the ILM policy exists for the first test
     });
 
     after(async () => {
-      await esArchiver.unload('x-pack/test/functional/es_archives/reporting/logs');
-      await esArchiver.unload('x-pack/test/functional/es_archives/logstash_functional');
+      await reportingAPI.teardownLogs();
     });
 
     afterEach(async () => {
diff --git a/x-pack/test/reporting_api_integration/reporting_and_security/index.ts b/x-pack/test/reporting_api_integration/reporting_and_security/index.ts
index f6654ff5a6b1d..6ea6de3482501 100644
--- a/x-pack/test/reporting_api_integration/reporting_and_security/index.ts
+++ b/x-pack/test/reporting_api_integration/reporting_and_security/index.ts
@@ -14,6 +14,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
 
     before(async () => {
       const reportingAPI = getService('reportingAPI');
+      await reportingAPI.logTaskManagerHealth();
       await reportingAPI.createDataAnalystRole();
       await reportingAPI.createTestReportingUserRole();
       await reportingAPI.createDataAnalyst();
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 f097208658467..842cfbcf7c1e1 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
@@ -10,11 +10,9 @@ import { FtrProviderContext } from '../ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
 export default function ({ getService }: FtrProviderContext) {
-  const esArchiver = getService('esArchiver');
   const reportingAPI = getService('reportingAPI');
   const retry = getService('retry');
   const supertest = getService('supertest');
-  const archive = 'x-pack/test/functional/es_archives/reporting/canvas_disallowed_url';
 
   /*
    * The Reporting API Functional Test config implements a network policy that
@@ -22,11 +20,11 @@ export default function ({ getService }: FtrProviderContext) {
    */
   describe('Network Policy', () => {
     before(async () => {
-      await esArchiver.load(archive); // includes a canvas worksheet with an offending image URL
+      await reportingAPI.initLogs(); // includes a canvas worksheet with an offending image URL
     });
 
     after(async () => {
-      await esArchiver.unload(archive);
+      await reportingAPI.teardownLogs();
     });
 
     it('should fail job when page voilates the network policy', async () => {
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 e61195e2f95c8..e1ca664122c76 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
@@ -38,18 +38,19 @@ export default function ({ getService }: FtrProviderContext) {
     );
   };
 
+  const spacesSharedObjectsArchive =
+    'x-pack/test/functional/es_archives/reporting/ecommerce_kibana_spaces';
+
   describe('Exports and Spaces', () => {
     before(async () => {
-      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
+      await esArchiver.load(spacesSharedObjectsArchive); // multiple spaces with different config settings
+      await reportingAPI.initEcommerce();
     });
 
     after(async () => {
-      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.teardownEcommerce();
       await reportingAPI.deleteAllReports();
+      await esArchiver.unload(spacesSharedObjectsArchive);
     });
 
     describe('CSV saved search export', () => {
diff --git a/x-pack/test/reporting_api_integration/reporting_without_security/index.ts b/x-pack/test/reporting_api_integration/reporting_without_security/index.ts
index 81ca3e05e4dd0..258ae814f5789 100644
--- a/x-pack/test/reporting_api_integration/reporting_without_security/index.ts
+++ b/x-pack/test/reporting_api_integration/reporting_without_security/index.ts
@@ -8,8 +8,12 @@
 import { FtrProviderContext } from '../ftr_provider_context';
 
 // eslint-disable-next-line import/no-default-export
-export default function ({ loadTestFile }: FtrProviderContext) {
+export default function ({ loadTestFile, getService }: FtrProviderContext) {
   describe('Reporting API Integration Tests with Security disabled', function () {
+    before(async () => {
+      const reportingAPI = getService('reportingAPI');
+      await reportingAPI.logTaskManagerHealth();
+    });
     this.tags('ciGroup13');
     loadTestFile(require.resolve('./job_apis_csv'));
     loadTestFile(require.resolve('./job_apis_csv_deprecated'));
diff --git a/x-pack/test/reporting_api_integration/reporting_without_security/job_apis_csv.ts b/x-pack/test/reporting_api_integration/reporting_without_security/job_apis_csv.ts
index 06f3756593d76..e1935c2617f41 100644
--- a/x-pack/test/reporting_api_integration/reporting_without_security/job_apis_csv.ts
+++ b/x-pack/test/reporting_api_integration/reporting_without_security/job_apis_csv.ts
@@ -49,12 +49,12 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('Job Listing APIs', () => {
     before(async () => {
-      await esArchiver.load('x-pack/test/functional/es_archives/reporting/logs');
+      await reportingAPI.initLogs();
       await esArchiver.load('x-pack/test/functional/es_archives/logstash_functional');
     });
 
     after(async () => {
-      await esArchiver.unload('x-pack/test/functional/es_archives/reporting/logs');
+      await reportingAPI.teardownLogs();
       await esArchiver.unload('x-pack/test/functional/es_archives/logstash_functional');
     });
 
diff --git a/x-pack/test/reporting_api_integration/reporting_without_security/job_apis_csv_deprecated.ts b/x-pack/test/reporting_api_integration/reporting_without_security/job_apis_csv_deprecated.ts
index 6ff8946d48c5b..5cd6065352649 100644
--- a/x-pack/test/reporting_api_integration/reporting_without_security/job_apis_csv_deprecated.ts
+++ b/x-pack/test/reporting_api_integration/reporting_without_security/job_apis_csv_deprecated.ts
@@ -27,19 +27,16 @@ const parseApiJSON = (apiResponseText: string): { job: ReportApiJSON; path: stri
 
 // eslint-disable-next-line import/no-default-export
 export default function ({ getService }: FtrProviderContext) {
-  const esArchiver = getService('esArchiver');
   const supertestNoAuth = getService('supertestWithoutAuth');
   const reportingAPI = getService('reportingAPI');
 
   describe('Job Listing APIs: Deprecated CSV Export', () => {
     before(async () => {
-      await esArchiver.load('x-pack/test/functional/es_archives/reporting/logs');
-      await esArchiver.load('x-pack/test/functional/es_archives/logstash_functional');
+      await reportingAPI.initLogs();
     });
 
     after(async () => {
-      await esArchiver.unload('x-pack/test/functional/es_archives/reporting/logs');
-      await esArchiver.unload('x-pack/test/functional/es_archives/logstash_functional');
+      await reportingAPI.teardownLogs();
     });
 
     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 e39a3e2e5954b..6af60018d01da 100644
--- a/x-pack/test/reporting_api_integration/services/scenarios.ts
+++ b/x-pack/test/reporting_api_integration/services/scenarios.ts
@@ -29,13 +29,29 @@ export function createScenarios({ getService }: Pick<FtrProviderContext, 'getSer
   const kibanaServer = getService('kibanaServer');
   const supertestWithoutAuth = getService('supertestWithoutAuth');
   const retry = getService('retry');
+
   const ecommerceSOPath = 'x-pack/test/functional/fixtures/kbn_archiver/reporting/ecommerce.json';
+  const logsSOPath = 'x-pack/test/functional/fixtures/kbn_archiver/reporting/logs';
 
   const DATA_ANALYST_USERNAME = 'data_analyst';
   const DATA_ANALYST_PASSWORD = 'data_analyst-password';
   const REPORTING_USER_USERNAME = 'reporting_user';
   const REPORTING_USER_PASSWORD = 'reporting_user-password';
 
+  const logTaskManagerHealth = async () => {
+    // Check task manager health for analyzing test failures. See https://github.com/elastic/kibana/issues/114946
+    const tmHealth = await supertest.get(`/api/task_manager/_health`);
+    const driftValues = tmHealth.body?.stats?.runtime?.value;
+
+    log.info(`Task Manager status: "${tmHealth.body?.status}"`);
+    log.info(`Task Manager overall drift rankings: "${JSON.stringify(driftValues?.drift)}"`);
+    log.info(
+      `Task Manager drift rankings for "report:execute": "${JSON.stringify(
+        driftValues?.drift_by_type?.['report:execute']
+      )}"`
+    );
+  };
+
   const initEcommerce = async () => {
     await esArchiver.load('x-pack/test/functional/es_archives/reporting/ecommerce');
     await kibanaServer.importExport.load(ecommerceSOPath);
@@ -46,6 +62,15 @@ export function createScenarios({ getService }: Pick<FtrProviderContext, 'getSer
     await deleteAllReports();
   };
 
+  const initLogs = async () => {
+    await esArchiver.load('x-pack/test/functional/es_archives/logstash_functional');
+    await kibanaServer.importExport.load(logsSOPath);
+  };
+  const teardownLogs = async () => {
+    await kibanaServer.importExport.unload(logsSOPath);
+    await esArchiver.unload('x-pack/test/functional/es_archives/logstash_functional');
+  };
+
   const createDataAnalystRole = async () => {
     await security.role.create('data_analyst', {
       metadata: {},
@@ -132,7 +157,11 @@ export function createScenarios({ getService }: Pick<FtrProviderContext, 'getSer
       .set('kbn-xsrf', 'xxx')
       .send({ jobParams });
   };
-  const generateCsv = async (job: JobParamsCSV, username = 'elastic', password = 'changeme') => {
+  const generateCsv = async (
+    job: JobParamsCSV,
+    username = 'elastic',
+    password = process.env.TEST_KIBANA_PASS || 'changeme'
+  ) => {
     const jobParams = rison.encode(job as object as RisonValue);
     return await supertestWithoutAuth
       .post(`/api/reporting/generate/csv_searchsource`)
@@ -201,8 +230,11 @@ export function createScenarios({ getService }: Pick<FtrProviderContext, 'getSer
   };
 
   return {
+    logTaskManagerHealth,
     initEcommerce,
     teardownEcommerce,
+    initLogs,
+    teardownLogs,
     DATA_ANALYST_USERNAME,
     DATA_ANALYST_PASSWORD,
     REPORTING_USER_USERNAME,
diff --git a/x-pack/test/reporting_functional/reporting_and_deprecated_security/index.ts b/x-pack/test/reporting_functional/reporting_and_deprecated_security/index.ts
index 22f12d43d25d2..a59939deeae0b 100644
--- a/x-pack/test/reporting_functional/reporting_and_deprecated_security/index.ts
+++ b/x-pack/test/reporting_functional/reporting_and_deprecated_security/index.ts
@@ -46,6 +46,8 @@ export default function (context: FtrProviderContext) {
     this.tags('ciGroup2');
 
     before(async () => {
+      const reportingAPI = context.getService('reportingAPI');
+      await reportingAPI.logTaskManagerHealth();
       await createDataAnalystRole();
       await createDataAnalyst();
       await createReportingUser();
diff --git a/x-pack/test/reporting_functional/reporting_and_security/index.ts b/x-pack/test/reporting_functional/reporting_and_security/index.ts
index be0e76a28bd0b..22057c9be77dc 100644
--- a/x-pack/test/reporting_functional/reporting_and_security/index.ts
+++ b/x-pack/test/reporting_functional/reporting_and_security/index.ts
@@ -14,6 +14,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
 
     before(async () => {
       const reportingFunctional = getService('reportingFunctional');
+      await reportingFunctional.logTaskManagerHealth();
       await reportingFunctional.createDataAnalystRole();
       await reportingFunctional.createDataAnalyst();
       await reportingFunctional.createTestReportingUserRole();
diff --git a/x-pack/test/reporting_functional/reporting_without_security/index.ts b/x-pack/test/reporting_functional/reporting_without_security/index.ts
index d1801b7e3e2e6..fecc0e97daac0 100644
--- a/x-pack/test/reporting_functional/reporting_without_security/index.ts
+++ b/x-pack/test/reporting_functional/reporting_without_security/index.ts
@@ -11,6 +11,12 @@ import { FtrProviderContext } from '../ftr_provider_context';
 export default function ({ loadTestFile, getService }: FtrProviderContext) {
   describe('Reporting Functional Tests with Security disabled', function () {
     this.tags('ciGroup2');
+
+    before(async () => {
+      const reportingAPI = getService('reportingAPI');
+      await reportingAPI.logTaskManagerHealth();
+    });
+
     loadTestFile(require.resolve('./management'));
   });
 }
diff --git a/yarn.lock b/yarn.lock
index 1e99d54dcf423..0b3e852ff0d9b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2337,10 +2337,10 @@
   dependencies:
     object-hash "^1.3.0"
 
-"@elastic/charts@38.1.0":
-  version "38.1.0"
-  resolved "https://registry.yarnpkg.com/@elastic/charts/-/charts-38.1.0.tgz#52146564c0e399da2267c10ec4536c33e50969e4"
-  integrity sha512-u2hQ8+daCvqapKQiFqN8QHWTz3OXby5Xf/ta1Dv59KTDTFIinCZD/M8PyD3MapbKx4b67hL7UxbErqr4rZ8jeA==
+"@elastic/charts@38.1.3":
+  version "38.1.3"
+  resolved "https://registry.yarnpkg.com/@elastic/charts/-/charts-38.1.3.tgz#0bf27021c54176e87d38269613205f3d6219da96"
+  integrity sha512-p6bJQWmfJ5SLkcgAoAMB3eTah/2a3/r3uo3ZskEN/xdPiqU8P+GANF8+6F4dWNfejbrpSUyCUldl7S4nWFGg3Q==
   dependencies:
     "@popperjs/core" "^2.4.0"
     chroma-js "^2.1.0"