diff --git a/.buildkite/ftr_security_serverless_configs.yml b/.buildkite/ftr_security_serverless_configs.yml
index 6b1c222382687..89550c59e6bb8 100644
--- a/.buildkite/ftr_security_serverless_configs.yml
+++ b/.buildkite/ftr_security_serverless_configs.yml
@@ -11,7 +11,6 @@ disabled:
   - x-pack/test/osquery_cypress/serverless_cli_config.ts
   - x-pack/test/security_solution_cypress/serverless_config.ts
 
-
   # Playwright
   - x-pack/test/security_solution_playwright/serverless_config.ts
 
@@ -93,6 +92,9 @@ enabled:
   - x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/basic_license_essentials_tier/configs/serverless.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/entity_analytics/entity_store/trial_license_complete_tier/configs/serverless.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/exception_lists_items/trial_license_complete_tier/configs/serverless.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/configs/serverless.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/configs/serverless.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/configs/serverless.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/lists_items/trial_license_complete_tier/configs/serverless.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/explore/hosts/trial_license_complete_tier/configs/serverless.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/explore/network/trial_license_complete_tier/configs/serverless.config.ts
diff --git a/.buildkite/pipelines/chrome_forward_testing.yml b/.buildkite/pipelines/chrome_forward_testing.yml
index eb80625a73d77..965f910e8e07e 100644
--- a/.buildkite/pipelines/chrome_forward_testing.yml
+++ b/.buildkite/pipelines/chrome_forward_testing.yml
@@ -20,9 +20,9 @@ steps:
   - wait
 
   - command: .buildkite/scripts/steps/build_kibana.sh
-    label: Build Kibana Distribution and Plugins
+    label: Build Kibana Distribution
     agents:
-      machineType: n2-standard-16
+      machineType: n2-standard-8
       preemptible: true
     key: build
     timeout_in_minutes: 60
diff --git a/.buildkite/pipelines/es_serverless/verify_es_serverless_image.yml b/.buildkite/pipelines/es_serverless/verify_es_serverless_image.yml
index fa8162ca93c0e..3058293bae793 100644
--- a/.buildkite/pipelines/es_serverless/verify_es_serverless_image.yml
+++ b/.buildkite/pipelines/es_serverless/verify_es_serverless_image.yml
@@ -31,13 +31,13 @@ steps:
           provider: gcp
           machineType: n2-standard-2
 
-      - label: "Build Kibana Distribution and Plugins"
+      - label: "Build Kibana Distribution"
         command: .buildkite/scripts/steps/build_kibana.sh
         agents:
           image: family/kibana-ubuntu-2004
           imageProject: elastic-images-prod
           provider: gcp
-          machineType: n2-standard-16
+          machineType: n2-standard-8
         key: build
         if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
         depends_on: pre-build
diff --git a/.buildkite/pipelines/es_snapshots/verify.yml b/.buildkite/pipelines/es_snapshots/verify.yml
index d91af527c8266..e8c9899e9aed7 100755
--- a/.buildkite/pipelines/es_snapshots/verify.yml
+++ b/.buildkite/pipelines/es_snapshots/verify.yml
@@ -23,12 +23,12 @@ steps:
   - wait
 
   - command: .buildkite/scripts/steps/build_kibana.sh
-    label: Build Kibana Distribution and Plugins
+    label: Build Kibana Distribution
     agents:
       image: family/kibana-ubuntu-2004
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-16
+      machineType: n2-standard-8
       preemptible: true
     key: build
     if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
diff --git a/.buildkite/pipelines/fips.yml b/.buildkite/pipelines/fips.yml
index 09ae10496456f..f4a5b3623bbcc 100644
--- a/.buildkite/pipelines/fips.yml
+++ b/.buildkite/pipelines/fips.yml
@@ -17,9 +17,9 @@ steps:
   - wait
 
   - command: .buildkite/scripts/steps/build_kibana.sh
-    label: Build Kibana Distribution and Plugins
+    label: Build Kibana Distribution
     agents:
-      machineType: n2-standard-16
+      machineType: n2-standard-8
       preemptible: true
     key: build
     if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
diff --git a/.buildkite/pipelines/flaky_tests/pipeline.ts b/.buildkite/pipelines/flaky_tests/pipeline.ts
index ec1b4994beae3..0d6c3b5c40f7d 100644
--- a/.buildkite/pipelines/flaky_tests/pipeline.ts
+++ b/.buildkite/pipelines/flaky_tests/pipeline.ts
@@ -122,7 +122,7 @@ const pipeline = {
 
 steps.push({
   command: '.buildkite/scripts/steps/build_kibana.sh',
-  label: 'Build Kibana Distribution and Plugins',
+  label: 'Build Kibana Distribution',
   agents: expandAgentQueue('c2-8'),
   key: 'build',
   if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''",
diff --git a/.buildkite/pipelines/on_merge.yml b/.buildkite/pipelines/on_merge.yml
index 65c7f0095f063..e5d28465b2dc3 100644
--- a/.buildkite/pipelines/on_merge.yml
+++ b/.buildkite/pipelines/on_merge.yml
@@ -17,12 +17,12 @@ steps:
   - wait
 
   - command: .buildkite/scripts/steps/on_merge_build_and_metrics.sh
-    label: Build Kibana Distribution and Plugins
+    label: Build Kibana Distribution
     agents:
       image: family/kibana-ubuntu-2004
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-16
+      machineType: n2-standard-8
       preemptible: true
     key: build
     timeout_in_minutes: 60
diff --git a/.buildkite/pipelines/on_merge_unsupported_ftrs.yml b/.buildkite/pipelines/on_merge_unsupported_ftrs.yml
index cf1a523be5a32..a7800fcc92dce 100644
--- a/.buildkite/pipelines/on_merge_unsupported_ftrs.yml
+++ b/.buildkite/pipelines/on_merge_unsupported_ftrs.yml
@@ -13,12 +13,12 @@ steps:
           limit: 1
 
   - command: .buildkite/scripts/steps/build_kibana.sh
-    label: Build Kibana Distribution and Plugins
+    label: Build Kibana Distribution
     agents:
       image: family/kibana-ubuntu-2004
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-16
+      machineType: n2-standard-8
       preemptible: true
     key: build
     if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
diff --git a/.buildkite/pipelines/performance/daily.yml b/.buildkite/pipelines/performance/daily.yml
index bbbdde955df76..1eeb044304d22 100644
--- a/.buildkite/pipelines/performance/daily.yml
+++ b/.buildkite/pipelines/performance/daily.yml
@@ -9,13 +9,13 @@ steps:
 
   - wait
 
-  - label: '🧑‍🏭 Build Kibana Distribution and Plugins'
+  - label: '🧑‍🏭 Build Kibana Distribution'
     command: .buildkite/scripts/steps/build_kibana.sh
     agents:
       image: family/kibana-ubuntu-2004
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: c2-standard-16
+      machineType: n2-standard-8
     key: build
     if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
 
diff --git a/.buildkite/pipelines/performance/data_set_extraction_daily.yml b/.buildkite/pipelines/performance/data_set_extraction_daily.yml
index bb2c33f7a2d33..dcb7355318960 100644
--- a/.buildkite/pipelines/performance/data_set_extraction_daily.yml
+++ b/.buildkite/pipelines/performance/data_set_extraction_daily.yml
@@ -10,13 +10,13 @@ steps:
 
   - wait
 
-  - label: ':building_construction: Build Kibana Distribution and Plugins'
+  - label: ':building_construction: Build Kibana Distribution '
     command: .buildkite/scripts/steps/build_kibana.sh
     agents:
       image: family/kibana-ubuntu-2004
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: c2-standard-16
+      machineType: n2-standard-8
     key: build
     if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
 
diff --git a/.buildkite/pipelines/pull_request/base.yml b/.buildkite/pipelines/pull_request/base.yml
index e7b593f464b54..f56159882b2af 100644
--- a/.buildkite/pipelines/pull_request/base.yml
+++ b/.buildkite/pipelines/pull_request/base.yml
@@ -8,9 +8,9 @@ steps:
   - wait
 
   - command: .buildkite/scripts/steps/build_kibana.sh
-    label: Build Kibana Distribution and Plugins
+    label: Build Kibana Distribution
     agents:
-      machineType: n2-standard-16
+      machineType: n2-standard-8
       preemptible: true
     key: build
     if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
diff --git a/.buildkite/pipelines/scalability/api_capacity_testing_daily.yml b/.buildkite/pipelines/scalability/api_capacity_testing_daily.yml
index 785726bf95174..909329234c328 100644
--- a/.buildkite/pipelines/scalability/api_capacity_testing_daily.yml
+++ b/.buildkite/pipelines/scalability/api_capacity_testing_daily.yml
@@ -9,13 +9,13 @@ steps:
 
   - wait
 
-  - label: 'Build Kibana Distribution and Plugins'
+  - label: 'Build Kibana Distribution'
     command: .buildkite/scripts/steps/build_kibana.sh
     agents:
       image: family/kibana-ubuntu-2004
       imageProject: elastic-images-prod
       provider: gcp
-      machineType: n2-standard-16
+      machineType: n2-standard-8
       preemptible: true
     key: build
     if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
diff --git a/.buildkite/pipelines/security_solution_quality_gate/mki_periodic/mki_periodic_detection_engine.yml b/.buildkite/pipelines/security_solution_quality_gate/mki_periodic/mki_periodic_detection_engine.yml
index 56b1904925f04..2f6e329524c5d 100644
--- a/.buildkite/pipelines/security_solution_quality_gate/mki_periodic/mki_periodic_detection_engine.yml
+++ b/.buildkite/pipelines/security_solution_quality_gate/mki_periodic/mki_periodic_detection_engine.yml
@@ -50,6 +50,51 @@ steps:
             - exit_status: '1'
               limit: 2
 
+      - label: Running exception_lists:auth:lists:qa:serverless
+        command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh exception_lists:auth:lists:qa:serverless
+        key: exception_lists:auth:lists:qa:serverless
+        agents:
+          image: family/kibana-ubuntu-2004
+          imageProject: elastic-images-prod
+          provider: gcp
+          machineType: n2-standard-4
+          preemptible: true
+        timeout_in_minutes: 120
+        retry:
+          automatic:
+            - exit_status: '1'
+              limit: 2
+
+      - label: Running exception_lists:auth:common:qa:serverless
+        command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh exception_lists:auth:common:qa:serverless
+        key: exception_lists:auth:common:qa:serverless
+        agents:
+          image: family/kibana-ubuntu-2004
+          imageProject: elastic-images-prod
+          provider: gcp
+          machineType: n2-standard-4
+          preemptible: true
+        timeout_in_minutes: 120
+        retry:
+          automatic:
+            - exit_status: '1'
+              limit: 2
+
+      - label: Running exception_lists:auth:items:qa:serverless
+        command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh exception_lists:auth:items:qa:serverless
+        key: exception_lists:auth:items:qa:serverless
+        agents:
+          image: family/kibana-ubuntu-2004
+          imageProject: elastic-images-prod
+          provider: gcp
+          machineType: n2-standard-4
+          preemptible: true
+        timeout_in_minutes: 120
+        retry:
+          automatic:
+            - exit_status: '1'
+              limit: 2
+
       - label: Running lists_items:qa:serverless
         command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh lists_items:qa:serverless
         key: lists_items:qa:serverless
diff --git a/.buildkite/pipelines/security_solution_quality_gate/mki_quality_gate/mki_quality_gate_detection_engine.yml b/.buildkite/pipelines/security_solution_quality_gate/mki_quality_gate/mki_quality_gate_detection_engine.yml
index 023099dd99392..de98c0ffffd3f 100644
--- a/.buildkite/pipelines/security_solution_quality_gate/mki_quality_gate/mki_quality_gate_detection_engine.yml
+++ b/.buildkite/pipelines/security_solution_quality_gate/mki_quality_gate/mki_quality_gate_detection_engine.yml
@@ -1,12 +1,12 @@
 steps:
-  - group: "Cypress MKI - Detection Engine"
+  - group: 'Cypress MKI - Detection Engine'
     key: cypress_test_detections_engine
     steps:
       - command: .buildkite/scripts/pipelines/security_solution_quality_gate/security_solution_cypress/mki_security_solution_cypress.sh cypress:run:qa:serverless:detection_engine
-        label: "Cypress MKI - Detection Engine"
+        label: 'Cypress MKI - Detection Engine'
         key: test_detection_engine
         env:
-          BK_TEST_SUITE_KEY: "serverless-cypress-detection-engine"
+          BK_TEST_SUITE_KEY: 'serverless-cypress-detection-engine'
         agents:
           image: family/kibana-ubuntu-2004
           imageProject: elastic-images-prod
@@ -17,10 +17,10 @@ steps:
         parallelism: 1
 
       - command: .buildkite/scripts/pipelines/security_solution_quality_gate/security_solution_cypress/mki_security_solution_cypress.sh cypress:run:qa:serverless:detection_engine:exceptions
-        label: "Cypress MKI - Detection Engine - Exceptions"
+        label: 'Cypress MKI - Detection Engine - Exceptions'
         key: test_detection_engine_exceptions
         env:
-          BK_TEST_SUITE_KEY: "serverless-cypress-detection-engine"
+          BK_TEST_SUITE_KEY: 'serverless-cypress-detection-engine'
         agents:
           image: family/kibana-ubuntu-2004
           imageProject: elastic-images-prod
@@ -30,7 +30,7 @@ steps:
         timeout_in_minutes: 300
         parallelism: 1
 
-  - group: "API MKI - Detection Engine"
+  - group: 'API MKI - Detection Engine'
     key: api_test_detections_engine
     steps:
       - label: Running exception_lists_items:qa:serverless:release
@@ -44,7 +44,49 @@ steps:
         timeout_in_minutes: 120
         retry:
           automatic:
-            - exit_status: "1"
+            - exit_status: '1'
+              limit: 2
+
+      - label: Running exception_lists:auth:lists:qa:serverless:release
+        command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh exception_lists:auth:lists:qa:serverless:release
+        key: exception_lists:auth:lists:qa:serverless:release
+        agents:
+          image: family/kibana-ubuntu-2004
+          imageProject: elastic-images-prod
+          provider: gcp
+          machineType: n2-standard-4
+        timeout_in_minutes: 120
+        retry:
+          automatic:
+            - exit_status: '1'
+              limit: 2
+
+       - label: Running exception_lists:common:lists:qa:serverless:release
+        command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh exception_lists:common:lists:qa:serverless:release
+        key: exception_lists:common:lists:qa:serverless:release
+        agents:
+          image: family/kibana-ubuntu-2004
+          imageProject: elastic-images-prod
+          provider: gcp
+          machineType: n2-standard-4
+        timeout_in_minutes: 120
+        retry:
+          automatic:
+            - exit_status: '1'
+              limit: 2
+
+       - label: Running exception_lists:items:lists:qa:serverless:release
+        command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh exception_lists:items:lists:qa:serverless:release
+        key: exception_lists:items:lists:qa:serverless:release
+        agents:
+          image: family/kibana-ubuntu-2004
+          imageProject: elastic-images-prod
+          provider: gcp
+          machineType: n2-standard-4
+        timeout_in_minutes: 120
+        retry:
+          automatic:
+            - exit_status: '1'
               limit: 2
 
       - label: Running lists_items:qa:serverless:release
@@ -58,7 +100,7 @@ steps:
         timeout_in_minutes: 120
         retry:
           automatic:
-            - exit_status: "1"
+            - exit_status: '1'
               limit: 2
 
       - label: Running user_roles:qa:serverless:release
@@ -72,7 +114,7 @@ steps:
         timeout_in_minutes: 120
         retry:
           automatic:
-            - exit_status: "1"
+            - exit_status: '1'
               limit: 2
 
       - label: Running telemetry:qa:serverless:release
@@ -86,7 +128,7 @@ steps:
         timeout_in_minutes: 120
         retry:
           automatic:
-            - exit_status: "1"
+            - exit_status: '1'
               limit: 2
 
       - label: Running exception_workflows:essentials:qa:serverless:release
@@ -100,7 +142,7 @@ steps:
         timeout_in_minutes: 120
         retry:
           automatic:
-            - exit_status: "1"
+            - exit_status: '1'
               limit: 2
 
       - label: Running exception_operators_date_types:essentials:qa:serverless:release
@@ -156,7 +198,7 @@ steps:
         timeout_in_minutes: 120
         retry:
           automatic:
-            - exit_status: "1"
+            - exit_status: '1'
               limit: 2
 
       - label: Running exception_operators_keyword:essentials:qa:serverless:release
@@ -170,7 +212,7 @@ steps:
         timeout_in_minutes: 120
         retry:
           automatic:
-            - exit_status: "1"
+            - exit_status: '1'
               limit: 2
 
       - label: Running exception_operators_ips:essentials:qa:serverless:release
@@ -184,7 +226,7 @@ steps:
         timeout_in_minutes: 120
         retry:
           automatic:
-            - exit_status: "1"
+            - exit_status: '1'
               limit: 2
 
       - label: Running exception_operators_long:essentials:qa:serverless:release
@@ -198,7 +240,7 @@ steps:
         timeout_in_minutes: 120
         retry:
           automatic:
-            - exit_status: "1"
+            - exit_status: '1'
               limit: 2
 
       - label: Running exception_operators_text:essentials:qa:serverless:release
@@ -212,7 +254,7 @@ steps:
         timeout_in_minutes: 120
         retry:
           automatic:
-            - exit_status: "1"
+            - exit_status: '1'
               limit: 2
 
       - label: Running actions:qa:serverless:release
@@ -226,7 +268,7 @@ steps:
         timeout_in_minutes: 120
         retry:
           automatic:
-            - exit_status: "1"
+            - exit_status: '1'
               limit: 2
 
       - label: Running alerts:qa:serverless:release
@@ -240,7 +282,7 @@ steps:
         timeout_in_minutes: 120
         retry:
           automatic:
-            - exit_status: "1"
+            - exit_status: '1'
               limit: 2
 
       - label: Running alerts:essentials:qa:serverless:release
@@ -254,7 +296,7 @@ steps:
         timeout_in_minutes: 120
         retry:
           automatic:
-            - exit_status: "1"
+            - exit_status: '1'
               limit: 2
 
       - label: Running rule_execution_logic:eql:qa:serverless:release
@@ -366,5 +408,5 @@ steps:
         timeout_in_minutes: 120
         retry:
           automatic:
-            - exit_status: "1"
+            - exit_status: '1'
               limit: 2
diff --git a/.buildkite/scripts/build_kibana_plugins.sh b/.buildkite/scripts/build_kibana_plugins.sh
deleted file mode 100755
index 4e566008b3351..0000000000000
--- a/.buildkite/scripts/build_kibana_plugins.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-echo "--- Build Platform Plugins"
-THREADS=$(grep -c ^processor /proc/cpuinfo)
-node scripts/build_kibana_platform_plugins --examples --test-plugins --workers "$THREADS" --no-inspect-workers --no-progress
diff --git a/.buildkite/scripts/download_build_artifacts.sh b/.buildkite/scripts/download_build_artifacts.sh
index 1b52e82c2d66b..497efa181018e 100755
--- a/.buildkite/scripts/download_build_artifacts.sh
+++ b/.buildkite/scripts/download_build_artifacts.sh
@@ -6,12 +6,11 @@ source "$(dirname "$0")/common/util.sh"
 
 if [[ "${KIBANA_BUILD_ID:-}" != "false" ]]; then
   if [[ ! -d "$KIBANA_BUILD_LOCATION/bin" ]]; then
-    echo '--- Downloading Distribution and Plugin artifacts'
+    echo '--- Downloading Distribution'
 
     cd "$WORKSPACE"
 
     download_artifact kibana-default.tar.gz . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
-    download_artifact kibana-default-plugins.tar.gz . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
 
     mkdir -p "$KIBANA_BUILD_LOCATION"
     tar -xzf kibana-default.tar.gz -C "$KIBANA_BUILD_LOCATION" --strip=1
@@ -24,7 +23,5 @@ if [[ "${KIBANA_BUILD_ID:-}" != "false" ]]; then
     fi
 
     cd "$KIBANA_DIR"
-
-    tar -xzf ../kibana-default-plugins.tar.gz
   fi
 fi
diff --git a/.buildkite/scripts/post_build_kibana.sh b/.buildkite/scripts/post_build_kibana.sh
index 2da629e29c158..f6af5b3c20e83 100755
--- a/.buildkite/scripts/post_build_kibana.sh
+++ b/.buildkite/scripts/post_build_kibana.sh
@@ -9,7 +9,7 @@ if [[ ! "${DISABLE_CI_STATS_SHIPPING:-}" ]]; then
       "--metrics" "build/kibana/node_modules/@kbn/ui-shared-deps-src/shared_built_assets/metrics.json"
   )
 
-  if [ "$BUILDKITE_PIPELINE_SLUG" == "kibana-on-merge" ]; then
+  if [[ "$BUILDKITE_PIPELINE_SLUG" == "kibana-on-merge" ]] || [[ "$BUILDKITE_PIPELINE_SLUG" == "kibana-pull-request" ]]; then
     cmd+=("--validate")
   fi
 
diff --git a/.buildkite/scripts/post_build_kibana_plugins.sh b/.buildkite/scripts/post_build_kibana_plugins.sh
deleted file mode 100755
index 288fd262cafa9..0000000000000
--- a/.buildkite/scripts/post_build_kibana_plugins.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-echo "--- Archive built plugins"
-shopt -s globstar
-tar -zcf \
-  target/kibana-default-plugins.tar.gz \
-  x-pack/plugins/**/target/public \
-  x-pack/test/**/target/public \
-  examples/**/target/public \
-  x-pack/examples/**/target/public \
-  test/**/target/public
diff --git a/.buildkite/scripts/steps/build_kibana.sh b/.buildkite/scripts/steps/build_kibana.sh
index bf4a9ff243d02..4bad332dd073f 100755
--- a/.buildkite/scripts/steps/build_kibana.sh
+++ b/.buildkite/scripts/steps/build_kibana.sh
@@ -4,6 +4,4 @@ set -euo pipefail
 
 .buildkite/scripts/bootstrap.sh
 .buildkite/scripts/build_kibana.sh
-.buildkite/scripts/build_kibana_plugins.sh
-.buildkite/scripts/post_build_kibana_plugins.sh
 .buildkite/scripts/post_build_kibana.sh
diff --git a/.buildkite/scripts/steps/functional/defend_workflows_burn.sh b/.buildkite/scripts/steps/functional/defend_workflows_burn.sh
index 6a97ba4e82b33..44d87ba4a6635 100644
--- a/.buildkite/scripts/steps/functional/defend_workflows_burn.sh
+++ b/.buildkite/scripts/steps/functional/defend_workflows_burn.sh
@@ -4,10 +4,7 @@ set -euo pipefail
 
 source .buildkite/scripts/steps/functional/common.sh
 
-.buildkite/scripts/bootstrap.sh
-.buildkite/scripts/copy_es_snapshot_cache.sh
-node scripts/build_kibana_platform_plugins.js
-
+export KIBANA_INSTALL_DIR=${KIBANA_BUILD_LOCATION}
 export JOB=kibana-defend-workflows-cypress
 
 buildkite-agent meta-data set "${BUILDKITE_JOB_ID}_is_test_execution_step" 'false'
diff --git a/.buildkite/scripts/steps/functional/defend_workflows_serverless_burn.sh b/.buildkite/scripts/steps/functional/defend_workflows_serverless_burn.sh
index 4bebee15953e6..a092ffbd4186b 100644
--- a/.buildkite/scripts/steps/functional/defend_workflows_serverless_burn.sh
+++ b/.buildkite/scripts/steps/functional/defend_workflows_serverless_burn.sh
@@ -4,10 +4,7 @@ set -euo pipefail
 
 source .buildkite/scripts/steps/functional/common.sh
 
-.buildkite/scripts/bootstrap.sh
-.buildkite/scripts/copy_es_snapshot_cache.sh
-node scripts/build_kibana_platform_plugins.js
-
+export KIBANA_INSTALL_DIR=${KIBANA_BUILD_LOCATION}
 export JOB=kibana-defend-workflows-serverless-cypress
 
 buildkite-agent meta-data set "${BUILDKITE_JOB_ID}_is_test_execution_step" 'false'
diff --git a/.buildkite/scripts/steps/on_merge_build_and_metrics.sh b/.buildkite/scripts/steps/on_merge_build_and_metrics.sh
index fb05bb99b0c54..1f1e492f87bec 100755
--- a/.buildkite/scripts/steps/on_merge_build_and_metrics.sh
+++ b/.buildkite/scripts/steps/on_merge_build_and_metrics.sh
@@ -4,7 +4,5 @@ set -euo pipefail
 
 .buildkite/scripts/bootstrap.sh
 .buildkite/scripts/build_kibana.sh
-.buildkite/scripts/build_kibana_plugins.sh
-.buildkite/scripts/post_build_kibana_plugins.sh
 .buildkite/scripts/post_build_kibana.sh
 .buildkite/scripts/saved_object_field_metrics.sh
diff --git a/.eslintrc.js b/.eslintrc.js
index f751c9692c996..730c9599f23f9 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1992,43 +1992,23 @@ module.exports = {
     },
     {
       files: [
-        'packages/kbn-reporting/common/**', // TODO @elastic/appex-sharedux - A package depending on a plugin: @kbn/screenshotting-plugin, can we move theser interfaces to a platform/shared package?
-        'packages/kbn-reporting/export_types/pdf_common/**', // TODO @elastic/appex-sharedux - A package depending on a plugin: @kbn/screenshotting-plugin, can we move theser interfaces to a platform/shared package?
-        'packages/kbn-reporting/export_types/pdf/**', // TODO @elastic/appex-sharedux - A package depending on a plugin: @kbn/screenshotting-plugin, can we move theser interfaces to a platform/shared package?
-        'packages/kbn-reporting/export_types/png_common/**', // TODO @elastic/appex-sharedux - A package depending on a plugin: @kbn/screenshotting-plugin, can we move theser interfaces to a platform/shared package?
-        'packages/kbn-reporting/export_types/png/**', // TODO @elastic/appex-sharedux - A package depending on a plugin: @kbn/screenshotting-plugin, can we move theser interfaces to a platform/shared package?
-        'packages/kbn-reporting/public/**', // TODO @elastic/appex-sharedux - A package depending on a plugin: @kbn/screenshotting-plugin, can we move theser interfaces to a platform/shared package?
-        'packages/kbn-reporting/server/**', // TODO @elastic/appex-sharedux - A package depending on a plugin: @kbn/screenshotting-plugin, can we move theser interfaces to a platform/shared package?
-        'packages/shared-ux/page/analytics_no_data/types/**',
-        'scripts/create_observability_rules.js', // TODO - is importing "@kbn/observability-alerting-test-data" (observability/private)
-        'src/cli_setup/**', // TODO @kibana/operations - is importing "@kbn/interactive-setup-plugin" (platform/private)
-        'src/dev/build/tasks/install_chromium.ts', // TODO @kibana/operations - is importing "@kbn/screenshotting-plugin" (platform/private)
-        'src/plugins/ai_assistant_management/selection/**',
-        'src/plugins/dashboard/**',
-        'src/plugins/discover/**',
-        'test/**',
-        'x-pack/examples/exploratory_view_example/**',
-        'x-pack/examples/screenshotting_example/**',
-        'x-pack/examples/ui_actions_enhanced_examples/**',
-        'x-pack/packages/security-solution/data_table/**',
-        'x-pack/plugins/aiops/**',
-        'x-pack/plugins/data_quality/**',
-        'x-pack/plugins/ingest_pipelines/**',
-        'x-pack/plugins/ml/**',
-        'x-pack/plugins/monitoring/**',
-        'x-pack/plugins/observability_solution/infra/**',
-        'x-pack/plugins/observability_solution/inventory/**',
-        'x-pack/plugins/observability_solution/investigate_app/**',
-        'x-pack/plugins/observability_solution/investigate/**',
+        // logsShared depends on o11y/private plugins, but platform plugins depend on it
         'x-pack/plugins/observability_solution/logs_shared/**',
-        'x-pack/plugins/observability_solution/metrics_data_access/**',
-        'x-pack/plugins/observability_solution/observability_ai_assistant_app/**',
-        'x-pack/plugins/observability_solution/observability_ai_assistant_management/**',
-        'x-pack/plugins/observability_solution/observability/**',
-        'x-pack/plugins/observability_solution/slo/**',
-        'x-pack/plugins/observability_solution/synthetics/e2e/**',
+
+        // this plugin depends on visTypeTimeseries plugin (for TSVB viz) which is platform/private ATM
+        'x-pack/plugins/observability_solution/infra/**',
+
+        // TODO @kibana/operations
+        'scripts/create_observability_rules.js', // is importing "@kbn/observability-alerting-test-data" (observability/private)
+        'src/cli_setup/**', // is importing "@kbn/interactive-setup-plugin" (platform/private)
+        'src/dev/build/tasks/install_chromium.ts', // is importing "@kbn/screenshotting-plugin" (platform/private)
+
+        // @kbn/osquery-plugin could be categorised as Security, but @kbn/infra-plugin (observability) depends on it!
         'x-pack/plugins/osquery/**',
-        'x-pack/plugins/search_assistant/**',
+
+        // For now, we keep the exception to let tests depend on anythying.
+        // Ideally, we need to classify the solution specific ones to reduce CI times
+        'test/**',
         'x-pack/test_serverless/**',
         'x-pack/test/**',
         'x-pack/test/plugin_functional/plugins/resolver_test/**',
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 43a315646772d..6dc2aa32a79a9 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -5,126 +5,61 @@
 ## `node scripts/generate codeowners`.
 ####
 
-x-pack/test/alerting_api_integration/common/plugins/aad @elastic/response-ops
-x-pack/plugins/actions @elastic/response-ops
-x-pack/test/alerting_api_integration/common/plugins/actions_simulators @elastic/response-ops
-packages/kbn-actions-types @elastic/response-ops
-src/plugins/advanced_settings @elastic/appex-sharedux @elastic/kibana-management
-x-pack/packages/kbn-ai-assistant @elastic/search-kibana
-x-pack/packages/kbn-ai-assistant-common @elastic/search-kibana
-src/plugins/ai_assistant_management/selection @elastic/obs-knowledge-team
-x-pack/packages/ml/aiops_change_point_detection @elastic/ml-ui
-x-pack/packages/ml/aiops_common @elastic/ml-ui
-x-pack/packages/ml/aiops_components @elastic/ml-ui
-x-pack/packages/ml/aiops_log_pattern_analysis @elastic/ml-ui
-x-pack/packages/ml/aiops_log_rate_analysis @elastic/ml-ui
-x-pack/plugins/aiops @elastic/ml-ui
-x-pack/packages/ml/aiops_test_utils @elastic/ml-ui
-x-pack/test/alerting_api_integration/packages/helpers @elastic/response-ops
-x-pack/test/alerting_api_integration/common/plugins/alerts @elastic/response-ops
-x-pack/packages/kbn-alerting-comparators @elastic/response-ops
-x-pack/examples/alerting_example @elastic/response-ops
-x-pack/test/functional_with_es_ssl/plugins/alerts @elastic/response-ops
-x-pack/plugins/alerting @elastic/response-ops
-x-pack/packages/kbn-alerting-state-types @elastic/response-ops
-packages/kbn-alerting-types @elastic/response-ops
-packages/kbn-alerts-as-data-utils @elastic/response-ops
-packages/kbn-alerts-grouping @elastic/response-ops
-x-pack/test/alerting_api_integration/common/plugins/alerts_restricted @elastic/response-ops
-packages/kbn-alerts-ui-shared @elastic/response-ops
-packages/kbn-ambient-common-types @elastic/kibana-operations
-packages/kbn-ambient-ftr-types @elastic/kibana-operations @elastic/appex-qa
-packages/kbn-ambient-storybook-types @elastic/kibana-operations
-packages/kbn-ambient-ui-types @elastic/kibana-operations
-packages/kbn-analytics @elastic/kibana-core
-packages/analytics/utils/analytics_collection_utils @elastic/kibana-core
-test/analytics/plugins/analytics_ftr_helpers @elastic/kibana-core
-test/analytics/plugins/analytics_plugin_a @elastic/kibana-core
-packages/kbn-apm-config-loader @elastic/kibana-core @vigneshshanmugam
-x-pack/plugins/observability_solution/apm_data_access @elastic/obs-knowledge-team @elastic/obs-ux-infra_services-team
-packages/kbn-apm-data-view @elastic/obs-ux-infra_services-team
-x-pack/plugins/observability_solution/apm/ftr_e2e @elastic/obs-ux-infra_services-team
-x-pack/plugins/observability_solution/apm @elastic/obs-ux-infra_services-team
-packages/kbn-apm-synthtrace @elastic/obs-ux-infra_services-team @elastic/obs-ux-logs-team
-packages/kbn-apm-synthtrace-client @elastic/obs-ux-infra_services-team @elastic/obs-ux-logs-team
-packages/kbn-apm-types @elastic/obs-ux-infra_services-team
-packages/kbn-apm-utils @elastic/obs-ux-infra_services-team
-test/plugin_functional/plugins/app_link_test @elastic/kibana-core
-x-pack/test/usage_collection/plugins/application_usage_test @elastic/kibana-core
-x-pack/test/security_api_integration/plugins/audit_log @elastic/kibana-security
-packages/kbn-avc-banner @elastic/security-defend-workflows
-packages/kbn-axe-config @elastic/kibana-qa
-packages/kbn-babel-preset @elastic/kibana-operations
-packages/kbn-babel-register @elastic/kibana-operations
-packages/kbn-babel-transform @elastic/kibana-operations
-x-pack/plugins/banners @elastic/appex-sharedux
-packages/kbn-bazel-runner @elastic/kibana-operations
-packages/kbn-bfetch-error @elastic/appex-sharedux
 examples/bfetch_explorer @elastic/appex-sharedux
-src/plugins/bfetch @elastic/appex-sharedux
-packages/kbn-calculate-auto @elastic/obs-ux-management-team
-packages/kbn-calculate-width-from-char-count @elastic/kibana-visualizations
-x-pack/plugins/canvas @elastic/kibana-presentation
-packages/kbn-capture-oas-snapshot-cli @elastic/kibana-core
-x-pack/test/cases_api_integration/common/plugins/cases @elastic/response-ops
-packages/kbn-cases-components @elastic/response-ops
-x-pack/plugins/cases @elastic/response-ops
-packages/kbn-cbor @elastic/kibana-operations
-packages/kbn-cell-actions @elastic/security-threat-hunting-explore
-src/plugins/chart_expressions/common @elastic/kibana-visualizations
-packages/kbn-chart-icons @elastic/kibana-visualizations
-src/plugins/charts @elastic/kibana-visualizations
-packages/kbn-check-mappings-update-cli @elastic/kibana-core
-packages/kbn-check-prod-native-modules-cli @elastic/kibana-operations
-packages/kbn-ci-stats-core @elastic/kibana-operations
-packages/kbn-ci-stats-performance-metrics @elastic/kibana-operations
-packages/kbn-ci-stats-reporter @elastic/kibana-operations
-packages/kbn-ci-stats-shipper-cli @elastic/kibana-operations
-packages/kbn-cli-dev-mode @elastic/kibana-operations
+examples/content_management_examples @elastic/appex-sharedux
+examples/controls_example @elastic/kibana-presentation
+examples/data_view_field_editor_example @elastic/kibana-data-discovery
+examples/developer_examples @elastic/appex-sharedux
+examples/discover_customization_examples @elastic/kibana-data-discovery
+examples/embeddable_examples @elastic/kibana-presentation
+examples/error_boundary @elastic/appex-sharedux
+examples/eso_model_version_example @elastic/kibana-security
+examples/esql_ast_inspector @elastic/kibana-esql
+examples/esql_validation_example @elastic/kibana-esql
+examples/expressions_explorer @elastic/kibana-visualizations
+examples/feature_control_examples @elastic/kibana-security
+examples/feature_flags_example @elastic/kibana-core
+examples/field_formats_example @elastic/kibana-data-discovery
+examples/files_example @elastic/appex-sharedux
+examples/grid_example @elastic/kibana-presentation
+examples/guided_onboarding_example @elastic/appex-sharedux
+examples/hello_world @elastic/kibana-core
+examples/locator_examples @elastic/appex-sharedux
+examples/locator_explorer @elastic/appex-sharedux
+examples/partial_results_example @elastic/kibana-data-discovery
+examples/portable_dashboards_example @elastic/kibana-presentation
+examples/preboot_example @elastic/kibana-security @elastic/kibana-core
+examples/resizable_layout_examples @elastic/kibana-data-discovery
+examples/response_stream @elastic/ml-ui
+examples/routing_example @elastic/kibana-core
+examples/screenshot_mode_example @elastic/appex-sharedux
+examples/search_examples @elastic/kibana-data-discovery
+examples/share_examples @elastic/appex-sharedux
+examples/state_containers_examples @elastic/appex-sharedux
+examples/ui_action_examples @elastic/appex-sharedux
+examples/ui_actions_explorer @elastic/appex-sharedux
+examples/unified_doc_viewer @elastic/kibana-core
+examples/unified_field_list_examples @elastic/kibana-data-discovery
+examples/user_profile_examples @elastic/kibana-security
+examples/v8_profiler_examples @elastic/response-ops
+packages/analytics/utils/analytics_collection_utils @elastic/kibana-core
 packages/cloud @elastic/kibana-core
-x-pack/plugins/cloud_integrations/cloud_chat @elastic/kibana-core
-x-pack/plugins/cloud_integrations/cloud_data_migration @elastic/kibana-management
-x-pack/plugins/cloud_defend @elastic/kibana-cloud-security-posture
-x-pack/plugins/cloud_integrations/cloud_experiments @elastic/kibana-core
-x-pack/plugins/cloud_integrations/cloud_full_story @elastic/kibana-core
-x-pack/test/cloud_integration/plugins/saml_provider @elastic/kibana-core
-x-pack/plugins/cloud_integrations/cloud_links @elastic/kibana-core
-x-pack/plugins/cloud @elastic/kibana-core
-x-pack/packages/kbn-cloud-security-posture/public @elastic/kibana-cloud-security-posture
-x-pack/packages/kbn-cloud-security-posture/common @elastic/kibana-cloud-security-posture
-x-pack/packages/kbn-cloud-security-posture/graph @elastic/kibana-cloud-security-posture
-x-pack/plugins/cloud_security_posture @elastic/kibana-cloud-security-posture
-packages/shared-ux/code_editor/impl @elastic/appex-sharedux
-packages/shared-ux/code_editor/mocks @elastic/appex-sharedux
-packages/kbn-code-owners @elastic/appex-qa
-packages/kbn-coloring @elastic/kibana-visualizations
-packages/kbn-config @elastic/kibana-core
-packages/kbn-config-mocks @elastic/kibana-core
-packages/kbn-config-schema @elastic/kibana-core
-src/plugins/console @elastic/kibana-management
 packages/content-management/content_editor @elastic/appex-sharedux
 packages/content-management/content_insights/content_insights_public @elastic/appex-sharedux
 packages/content-management/content_insights/content_insights_server @elastic/appex-sharedux
-examples/content_management_examples @elastic/appex-sharedux
 packages/content-management/favorites/favorites_public @elastic/appex-sharedux
 packages/content-management/favorites/favorites_server @elastic/appex-sharedux
-src/plugins/content_management @elastic/appex-sharedux
 packages/content-management/tabbed_table_list_view @elastic/appex-sharedux
 packages/content-management/table_list_view @elastic/appex-sharedux
 packages/content-management/table_list_view_common @elastic/appex-sharedux
 packages/content-management/table_list_view_table @elastic/appex-sharedux
 packages/content-management/user_profiles @elastic/appex-sharedux
-packages/kbn-content-management-utils @elastic/kibana-data-discovery
-examples/controls_example @elastic/kibana-presentation
-src/plugins/controls @elastic/kibana-presentation
-src/core @elastic/kibana-core
 packages/core/analytics/core-analytics-browser @elastic/kibana-core
 packages/core/analytics/core-analytics-browser-internal @elastic/kibana-core
 packages/core/analytics/core-analytics-browser-mocks @elastic/kibana-core
 packages/core/analytics/core-analytics-server @elastic/kibana-core
 packages/core/analytics/core-analytics-server-internal @elastic/kibana-core
 packages/core/analytics/core-analytics-server-mocks @elastic/kibana-core
-test/plugin_functional/plugins/core_app_status @elastic/kibana-core
 packages/core/application/core-application-browser @elastic/kibana-core
 packages/core/application/core-application-browser-internal @elastic/kibana-core
 packages/core/application/core-application-browser-mocks @elastic/kibana-core
@@ -191,14 +126,12 @@ packages/core/feature-flags/core-feature-flags-browser-mocks @elastic/kibana-cor
 packages/core/feature-flags/core-feature-flags-server @elastic/kibana-core
 packages/core/feature-flags/core-feature-flags-server-internal @elastic/kibana-core
 packages/core/feature-flags/core-feature-flags-server-mocks @elastic/kibana-core
-test/plugin_functional/plugins/core_history_block @elastic/kibana-core
 packages/core/http/core-http-browser @elastic/kibana-core
 packages/core/http/core-http-browser-internal @elastic/kibana-core
 packages/core/http/core-http-browser-mocks @elastic/kibana-core
 packages/core/http/core-http-common @elastic/kibana-core
 packages/core/http/core-http-context-server-internal @elastic/kibana-core
 packages/core/http/core-http-context-server-mocks @elastic/kibana-core
-test/plugin_functional/plugins/core_http @elastic/kibana-core
 packages/core/http/core-http-request-handler-context-server @elastic/kibana-core
 packages/core/http/core-http-request-handler-context-server-internal @elastic/kibana-core
 packages/core/http/core-http-resources-server @elastic/kibana-core
@@ -248,19 +181,6 @@ packages/core/notifications/core-notifications-browser-mocks @elastic/kibana-cor
 packages/core/overlays/core-overlays-browser @elastic/kibana-core
 packages/core/overlays/core-overlays-browser-internal @elastic/kibana-core
 packages/core/overlays/core-overlays-browser-mocks @elastic/kibana-core
-test/plugin_functional/plugins/core_plugin_a @elastic/kibana-core
-test/plugin_functional/plugins/core_plugin_appleave @elastic/kibana-core
-test/plugin_functional/plugins/core_plugin_b @elastic/kibana-core
-test/plugin_functional/plugins/core_plugin_chromeless @elastic/kibana-core
-test/plugin_functional/plugins/core_plugin_deep_links @elastic/kibana-core
-test/plugin_functional/plugins/core_plugin_deprecations @elastic/kibana-core
-test/plugin_functional/plugins/core_dynamic_resolving_a @elastic/kibana-core
-test/plugin_functional/plugins/core_dynamic_resolving_b @elastic/kibana-core
-test/plugin_functional/plugins/core_plugin_execution_context @elastic/kibana-core
-test/plugin_functional/plugins/core_plugin_helpmenu @elastic/kibana-core
-test/node_roles_functional/plugins/core_plugin_initializer_context @elastic/kibana-core
-test/plugin_functional/plugins/core_plugin_route_timeouts @elastic/kibana-core
-test/plugin_functional/plugins/core_plugin_static_assets @elastic/kibana-core
 packages/core/plugins/core-plugins-base-server-internal @elastic/kibana-core
 packages/core/plugins/core-plugins-browser @elastic/kibana-core
 packages/core/plugins/core-plugins-browser-internal @elastic/kibana-core
@@ -273,7 +193,6 @@ packages/core/plugins/core-plugins-server-mocks @elastic/kibana-core
 packages/core/preboot/core-preboot-server @elastic/kibana-core
 packages/core/preboot/core-preboot-server-internal @elastic/kibana-core
 packages/core/preboot/core-preboot-server-mocks @elastic/kibana-core
-test/plugin_functional/plugins/core_provider_plugin @elastic/kibana-core
 packages/core/rendering/core-rendering-browser-internal @elastic/kibana-core
 packages/core/rendering/core-rendering-browser-mocks @elastic/kibana-core
 packages/core/rendering/core-rendering-server-internal @elastic/kibana-core
@@ -340,32 +259,6 @@ packages/core/user-profile/core-user-profile-server-mocks @elastic/kibana-core
 packages/core/user-settings/core-user-settings-server @elastic/kibana-security
 packages/core/user-settings/core-user-settings-server-internal @elastic/kibana-security
 packages/core/user-settings/core-user-settings-server-mocks @elastic/kibana-security
-x-pack/plugins/cross_cluster_replication @elastic/kibana-management
-packages/kbn-crypto @elastic/kibana-security
-packages/kbn-crypto-browser @elastic/kibana-core
-x-pack/plugins/custom_branding @elastic/appex-sharedux
-packages/kbn-custom-icons @elastic/obs-ux-logs-team
-packages/kbn-custom-integrations @elastic/obs-ux-logs-team
-src/plugins/custom_integrations @elastic/fleet
-packages/kbn-cypress-config @elastic/kibana-operations
-x-pack/plugins/dashboard_enhanced @elastic/kibana-presentation
-src/plugins/dashboard @elastic/kibana-presentation
-x-pack/packages/kbn-data-forge @elastic/obs-ux-management-team
-src/plugins/data @elastic/kibana-visualizations @elastic/kibana-data-discovery
-x-pack/plugins/data_quality @elastic/obs-ux-logs-team
-test/plugin_functional/plugins/data_search @elastic/kibana-data-discovery
-packages/kbn-data-service @elastic/kibana-visualizations @elastic/kibana-data-discovery
-packages/kbn-data-stream-adapter @elastic/security-threat-hunting-explore
-x-pack/plugins/data_usage @elastic/obs-ai-assistant @elastic/security-solution
-src/plugins/data_view_editor @elastic/kibana-data-discovery
-examples/data_view_field_editor_example @elastic/kibana-data-discovery
-src/plugins/data_view_field_editor @elastic/kibana-data-discovery
-src/plugins/data_view_management @elastic/kibana-data-discovery
-packages/kbn-data-view-utils @elastic/kibana-data-discovery
-src/plugins/data_views @elastic/kibana-data-discovery
-x-pack/plugins/data_visualizer @elastic/ml-ui
-x-pack/plugins/observability_solution/dataset_quality @elastic/obs-ux-logs-team
-packages/kbn-datemath @elastic/kibana-data-discovery
 packages/deeplinks/analytics @elastic/kibana-data-discovery @elastic/kibana-presentation @elastic/kibana-visualizations
 packages/deeplinks/devtools @elastic/kibana-management
 packages/deeplinks/fleet @elastic/fleet
@@ -379,167 +272,115 @@ packages/default-nav/analytics @elastic/kibana-data-discovery @elastic/kibana-pr
 packages/default-nav/devtools @elastic/kibana-management
 packages/default-nav/management @elastic/kibana-management
 packages/default-nav/ml @elastic/ml-ui
+packages/home/sample_data_card @elastic/appex-sharedux
+packages/home/sample_data_tab @elastic/appex-sharedux
+packages/home/sample_data_types @elastic/appex-sharedux
+packages/kbn-actions-types @elastic/response-ops
+packages/kbn-alerting-types @elastic/response-ops
+packages/kbn-alerts-as-data-utils @elastic/response-ops
+packages/kbn-alerts-grouping @elastic/response-ops
+packages/kbn-alerts-ui-shared @elastic/response-ops
+packages/kbn-ambient-common-types @elastic/kibana-operations
+packages/kbn-ambient-ftr-types @elastic/kibana-operations @elastic/appex-qa
+packages/kbn-ambient-storybook-types @elastic/kibana-operations
+packages/kbn-ambient-ui-types @elastic/kibana-operations
+packages/kbn-analytics @elastic/kibana-core
+packages/kbn-apm-config-loader @elastic/kibana-core @vigneshshanmugam
+packages/kbn-apm-data-view @elastic/obs-ux-infra_services-team
+packages/kbn-apm-synthtrace @elastic/obs-ux-infra_services-team @elastic/obs-ux-logs-team
+packages/kbn-apm-synthtrace-client @elastic/obs-ux-infra_services-team @elastic/obs-ux-logs-team
+packages/kbn-apm-types @elastic/obs-ux-infra_services-team
+packages/kbn-apm-utils @elastic/obs-ux-infra_services-team
+packages/kbn-avc-banner @elastic/security-defend-workflows
+packages/kbn-axe-config @elastic/kibana-qa
+packages/kbn-babel-preset @elastic/kibana-operations
+packages/kbn-babel-register @elastic/kibana-operations
+packages/kbn-babel-transform @elastic/kibana-operations
+packages/kbn-bazel-runner @elastic/kibana-operations
+packages/kbn-bfetch-error @elastic/appex-sharedux
+packages/kbn-calculate-auto @elastic/obs-ux-management-team
+packages/kbn-calculate-width-from-char-count @elastic/kibana-visualizations
+packages/kbn-capture-oas-snapshot-cli @elastic/kibana-core
+packages/kbn-cases-components @elastic/response-ops
+packages/kbn-cbor @elastic/kibana-operations
+packages/kbn-cell-actions @elastic/security-threat-hunting-explore
+packages/kbn-chart-icons @elastic/kibana-visualizations
+packages/kbn-check-mappings-update-cli @elastic/kibana-core
+packages/kbn-check-prod-native-modules-cli @elastic/kibana-operations
+packages/kbn-ci-stats-core @elastic/kibana-operations
+packages/kbn-ci-stats-performance-metrics @elastic/kibana-operations
+packages/kbn-ci-stats-reporter @elastic/kibana-operations
+packages/kbn-ci-stats-shipper-cli @elastic/kibana-operations
+packages/kbn-cli-dev-mode @elastic/kibana-operations
+packages/kbn-code-owners @elastic/appex-qa
+packages/kbn-coloring @elastic/kibana-visualizations
+packages/kbn-config @elastic/kibana-core
+packages/kbn-config-mocks @elastic/kibana-core
+packages/kbn-config-schema @elastic/kibana-core
+packages/kbn-content-management-utils @elastic/kibana-data-discovery
+packages/kbn-crypto @elastic/kibana-security
+packages/kbn-crypto-browser @elastic/kibana-core
+packages/kbn-custom-icons @elastic/obs-ux-logs-team
+packages/kbn-custom-integrations @elastic/obs-ux-logs-team
+packages/kbn-cypress-config @elastic/kibana-operations
+packages/kbn-data-service @elastic/kibana-visualizations @elastic/kibana-data-discovery
+packages/kbn-data-stream-adapter @elastic/security-threat-hunting-explore
+packages/kbn-data-view-utils @elastic/kibana-data-discovery
+packages/kbn-datemath @elastic/kibana-data-discovery
 packages/kbn-dev-cli-errors @elastic/kibana-operations
 packages/kbn-dev-cli-runner @elastic/kibana-operations
 packages/kbn-dev-proc-runner @elastic/kibana-operations
-src/plugins/dev_tools @elastic/kibana-management
 packages/kbn-dev-utils @elastic/kibana-operations
-examples/developer_examples @elastic/appex-sharedux
 packages/kbn-discover-contextual-components @elastic/obs-ux-logs-team @elastic/kibana-data-discovery
-examples/discover_customization_examples @elastic/kibana-data-discovery
-x-pack/plugins/discover_enhanced @elastic/kibana-data-discovery
-src/plugins/discover @elastic/kibana-data-discovery
-src/plugins/discover_shared @elastic/kibana-data-discovery @elastic/obs-ux-logs-team
 packages/kbn-discover-utils @elastic/kibana-data-discovery
 packages/kbn-doc-links @elastic/docs
 packages/kbn-docs-utils @elastic/kibana-operations
 packages/kbn-dom-drag-drop @elastic/kibana-visualizations @elastic/kibana-data-discovery
 packages/kbn-ebt-tools @elastic/kibana-core
-x-pack/packages/security-solution/ecs_data_quality_dashboard @elastic/security-threat-hunting-explore
-x-pack/plugins/ecs_data_quality_dashboard @elastic/security-threat-hunting-explore
 packages/kbn-elastic-agent-utils @elastic/obs-ux-logs-team
-x-pack/packages/kbn-elastic-assistant @elastic/security-generative-ai
-x-pack/packages/kbn-elastic-assistant-common @elastic/security-generative-ai
-x-pack/plugins/elastic_assistant @elastic/security-generative-ai
-test/plugin_functional/plugins/elasticsearch_client_plugin @elastic/kibana-core
-x-pack/test/plugin_api_integration/plugins/elasticsearch_client @elastic/kibana-core
-x-pack/plugins/embeddable_enhanced @elastic/kibana-presentation
-examples/embeddable_examples @elastic/kibana-presentation
-src/plugins/embeddable @elastic/kibana-presentation
-x-pack/examples/embedded_lens_example @elastic/kibana-visualizations
-x-pack/plugins/encrypted_saved_objects @elastic/kibana-security
-x-pack/plugins/enterprise_search @elastic/search-kibana
-x-pack/plugins/observability_solution/entities_data_access @elastic/obs-entities
-x-pack/packages/kbn-entities-schema @elastic/obs-entities
-x-pack/test/api_integration/apis/entity_manager/fixture_plugin @elastic/obs-entities
-x-pack/plugins/entity_manager @elastic/obs-entities
-examples/error_boundary @elastic/appex-sharedux
 packages/kbn-es @elastic/kibana-operations
 packages/kbn-es-archiver @elastic/kibana-operations @elastic/appex-qa
 packages/kbn-es-errors @elastic/kibana-core
 packages/kbn-es-query @elastic/kibana-data-discovery
 packages/kbn-es-types @elastic/kibana-core @elastic/obs-knowledge-team
-src/plugins/es_ui_shared @elastic/kibana-management
 packages/kbn-eslint-config @elastic/kibana-operations
 packages/kbn-eslint-plugin-disable @elastic/kibana-operations
 packages/kbn-eslint-plugin-eslint @elastic/kibana-operations
 packages/kbn-eslint-plugin-i18n @elastic/obs-knowledge-team @elastic/kibana-operations
 packages/kbn-eslint-plugin-imports @elastic/kibana-operations
 packages/kbn-eslint-plugin-telemetry @elastic/obs-knowledge-team
-examples/eso_model_version_example @elastic/kibana-security
-x-pack/test/encrypted_saved_objects_api_integration/plugins/api_consumer_plugin @elastic/kibana-security
-src/plugins/esql @elastic/kibana-esql
 packages/kbn-esql-ast @elastic/kibana-esql
-examples/esql_ast_inspector @elastic/kibana-esql
-src/plugins/esql_datagrid @elastic/kibana-esql
 packages/kbn-esql-editor @elastic/kibana-esql
 packages/kbn-esql-utils @elastic/kibana-esql
 packages/kbn-esql-validation-autocomplete @elastic/kibana-esql
-examples/esql_validation_example @elastic/kibana-esql
-test/plugin_functional/plugins/eui_provider_dev_warning @elastic/appex-sharedux
 packages/kbn-event-annotation-common @elastic/kibana-visualizations
 packages/kbn-event-annotation-components @elastic/kibana-visualizations
-src/plugins/event_annotation_listing @elastic/kibana-visualizations
-src/plugins/event_annotation @elastic/kibana-visualizations
-x-pack/test/plugin_api_integration/plugins/event_log @elastic/response-ops
-x-pack/plugins/event_log @elastic/response-ops
 packages/kbn-expandable-flyout @elastic/security-threat-hunting-investigations
 packages/kbn-expect @elastic/kibana-operations @elastic/appex-qa
-x-pack/examples/exploratory_view_example @elastic/obs-ux-infra_services-team
-x-pack/plugins/observability_solution/exploratory_view @elastic/obs-ux-management-team
-src/plugins/expression_error @elastic/kibana-presentation
-src/plugins/chart_expressions/expression_gauge @elastic/kibana-visualizations
-src/plugins/chart_expressions/expression_heatmap @elastic/kibana-visualizations
-src/plugins/expression_image @elastic/kibana-presentation
-src/plugins/chart_expressions/expression_legacy_metric @elastic/kibana-visualizations
-src/plugins/expression_metric @elastic/kibana-presentation
-src/plugins/chart_expressions/expression_metric @elastic/kibana-visualizations
-src/plugins/chart_expressions/expression_partition_vis @elastic/kibana-visualizations
-src/plugins/expression_repeat_image @elastic/kibana-presentation
-src/plugins/expression_reveal_image @elastic/kibana-presentation
-src/plugins/expression_shape @elastic/kibana-presentation
-src/plugins/chart_expressions/expression_tagcloud @elastic/kibana-visualizations
-src/plugins/chart_expressions/expression_xy @elastic/kibana-visualizations
-examples/expressions_explorer @elastic/kibana-visualizations
-src/plugins/expressions @elastic/kibana-visualizations
 packages/kbn-failed-test-reporter-cli @elastic/kibana-operations @elastic/appex-qa
-examples/feature_control_examples @elastic/kibana-security
-examples/feature_flags_example @elastic/kibana-core
-x-pack/test/plugin_api_integration/plugins/feature_usage_test @elastic/kibana-security
-x-pack/plugins/features @elastic/kibana-core
-x-pack/test/security_api_integration/plugins/features_provider @elastic/kibana-security
-x-pack/test/functional_execution_context/plugins/alerts @elastic/kibana-core
-examples/field_formats_example @elastic/kibana-data-discovery
-src/plugins/field_formats @elastic/kibana-data-discovery
 packages/kbn-field-types @elastic/kibana-data-discovery
 packages/kbn-field-utils @elastic/kibana-data-discovery
-x-pack/plugins/fields_metadata @elastic/obs-ux-logs-team
-x-pack/plugins/file_upload @elastic/kibana-presentation @elastic/ml-ui
-examples/files_example @elastic/appex-sharedux
-src/plugins/files_management @elastic/appex-sharedux
-src/plugins/files @elastic/appex-sharedux
 packages/kbn-find-used-node-modules @elastic/kibana-operations
-x-pack/plugins/fleet @elastic/fleet
 packages/kbn-flot-charts @elastic/kibana-presentation @elastic/stack-monitoring
-x-pack/test/ui_capabilities/common/plugins/foo_plugin @elastic/kibana-security
 packages/kbn-formatters @elastic/obs-ux-logs-team
-src/plugins/ftr_apis @elastic/kibana-core
 packages/kbn-ftr-common-functional-services @elastic/kibana-operations @elastic/appex-qa
 packages/kbn-ftr-common-functional-ui-services @elastic/appex-qa
 packages/kbn-ftr-screenshot-filename @elastic/kibana-operations @elastic/appex-qa
-x-pack/test/functional_with_es_ssl/plugins/cases @elastic/response-ops
-x-pack/examples/gen_ai_streaming_response_example @elastic/response-ops
 packages/kbn-generate @elastic/kibana-operations
 packages/kbn-generate-console-definitions @elastic/kibana-management
 packages/kbn-generate-csv @elastic/appex-sharedux
 packages/kbn-get-repo-files @elastic/kibana-operations
-x-pack/plugins/global_search_bar @elastic/appex-sharedux
-x-pack/plugins/global_search @elastic/appex-sharedux
-x-pack/plugins/global_search_providers @elastic/appex-sharedux
-x-pack/test/plugin_functional/plugins/global_search_test @elastic/kibana-core
-x-pack/plugins/graph @elastic/kibana-visualizations
-examples/grid_example @elastic/kibana-presentation
 packages/kbn-grid-layout @elastic/kibana-presentation
-x-pack/plugins/grokdebugger @elastic/kibana-management
 packages/kbn-grouping @elastic/response-ops
 packages/kbn-guided-onboarding @elastic/appex-sharedux
-examples/guided_onboarding_example @elastic/appex-sharedux
-src/plugins/guided_onboarding @elastic/appex-sharedux
 packages/kbn-handlebars @elastic/kibana-security
 packages/kbn-hapi-mocks @elastic/kibana-core
-test/plugin_functional/plugins/hardening @elastic/kibana-security
 packages/kbn-health-gateway-server @elastic/kibana-core
-examples/hello_world @elastic/kibana-core
-src/plugins/home @elastic/kibana-core
-packages/home/sample_data_card @elastic/appex-sharedux
-packages/home/sample_data_tab @elastic/appex-sharedux
-packages/home/sample_data_types @elastic/appex-sharedux
 packages/kbn-i18n @elastic/kibana-core
 packages/kbn-i18n-react @elastic/kibana-core
-x-pack/test/functional_embedded/plugins/iframe_embedded @elastic/kibana-core
-src/plugins/image_embeddable @elastic/appex-sharedux
 packages/kbn-import-locator @elastic/kibana-operations
 packages/kbn-import-resolver @elastic/kibana-operations
-x-pack/plugins/index_lifecycle_management @elastic/kibana-management
-x-pack/plugins/index_management @elastic/kibana-management
-x-pack/packages/index-management/index_management_shared_types @elastic/kibana-management
-test/plugin_functional/plugins/index_patterns @elastic/kibana-data-discovery
-x-pack/packages/ml/inference_integration_flyout @elastic/ml-ui
-x-pack/packages/ai-infra/inference-common @elastic/appex-ai-infra
-x-pack/plugins/inference @elastic/appex-ai-infra
-x-pack/packages/kbn-infra-forge @elastic/obs-ux-management-team
-x-pack/plugins/observability_solution/infra @elastic/obs-ux-logs-team @elastic/obs-ux-infra_services-team
-x-pack/plugins/ingest_pipelines @elastic/kibana-management
-src/plugins/input_control_vis @elastic/kibana-presentation
-src/plugins/inspector @elastic/kibana-presentation
-x-pack/plugins/integration_assistant @elastic/security-scalability
-src/plugins/interactive_setup @elastic/kibana-security
-test/interactive_setup_api_integration/plugins/test_endpoints @elastic/kibana-security
 packages/kbn-interpreter @elastic/kibana-visualizations
-x-pack/plugins/observability_solution/inventory/e2e @elastic/obs-ux-infra_services-team
-x-pack/plugins/observability_solution/inventory @elastic/obs-ux-infra_services-team
-x-pack/plugins/observability_solution/investigate_app @elastic/obs-ux-management-team
-x-pack/plugins/observability_solution/investigate @elastic/obs-ux-management-team
 packages/kbn-investigation-shared @elastic/obs-ux-management-team
 packages/kbn-io-ts-utils @elastic/obs-knowledge-team
 packages/kbn-ipynb @elastic/search-kibana
@@ -547,137 +388,42 @@ packages/kbn-item-buffer @elastic/appex-sharedux
 packages/kbn-jest-serializers @elastic/kibana-operations
 packages/kbn-journeys @elastic/kibana-operations @elastic/appex-qa
 packages/kbn-json-ast @elastic/kibana-operations
-x-pack/packages/ml/json_schemas @elastic/ml-ui
-test/health_gateway/plugins/status @elastic/kibana-core
-test/plugin_functional/plugins/kbn_sample_panel_action @elastic/appex-sharedux
-test/plugin_functional/plugins/kbn_top_nav @elastic/kibana-core
-test/plugin_functional/plugins/kbn_tp_custom_visualizations @elastic/kibana-visualizations
-test/interpreter_functional/plugins/kbn_tp_run_pipeline @elastic/kibana-core
-x-pack/test/functional_cors/plugins/kibana_cors_test @elastic/kibana-security
 packages/kbn-kibana-manifest-schema @elastic/kibana-operations
-src/plugins/kibana_overview @elastic/appex-sharedux
-src/plugins/kibana_react @elastic/appex-sharedux
-src/plugins/kibana_usage_collection @elastic/kibana-core
-src/plugins/kibana_utils @elastic/appex-sharedux
-x-pack/plugins/kubernetes_security @elastic/kibana-cloud-security-posture
-x-pack/packages/kbn-langchain @elastic/security-generative-ai
 packages/kbn-language-documentation @elastic/kibana-esql
-x-pack/examples/lens_config_builder_example @elastic/kibana-visualizations
 packages/kbn-lens-embeddable-utils @elastic/obs-ux-infra_services-team @elastic/kibana-visualizations
 packages/kbn-lens-formula-docs @elastic/kibana-visualizations
-x-pack/examples/lens_embeddable_inline_editing_example @elastic/kibana-visualizations
-x-pack/plugins/lens @elastic/kibana-visualizations
-x-pack/plugins/license_api_guard @elastic/kibana-management
-x-pack/plugins/license_management @elastic/kibana-management
-x-pack/plugins/licensing @elastic/kibana-core
-src/plugins/links @elastic/kibana-presentation
 packages/kbn-lint-packages-cli @elastic/kibana-operations
 packages/kbn-lint-ts-projects-cli @elastic/kibana-operations
-x-pack/plugins/lists @elastic/security-detection-engine
-examples/locator_examples @elastic/appex-sharedux
-examples/locator_explorer @elastic/appex-sharedux
 packages/kbn-logging @elastic/kibana-core
 packages/kbn-logging-mocks @elastic/kibana-core
-x-pack/plugins/observability_solution/logs_data_access @elastic/obs-knowledge-team @elastic/obs-ux-logs-team
-x-pack/plugins/observability_solution/logs_explorer @elastic/obs-ux-logs-team
-x-pack/plugins/observability_solution/logs_shared @elastic/obs-ux-logs-team
-x-pack/plugins/logstash @elastic/logstash
 packages/kbn-managed-content-badge @elastic/kibana-visualizations
 packages/kbn-managed-vscode-config @elastic/kibana-operations
 packages/kbn-managed-vscode-config-cli @elastic/kibana-operations
 packages/kbn-management/cards_navigation @elastic/kibana-management
-src/plugins/management @elastic/kibana-management
 packages/kbn-management/settings/application @elastic/kibana-management
 packages/kbn-management/settings/components/field_category @elastic/kibana-management
 packages/kbn-management/settings/components/field_input @elastic/kibana-management
 packages/kbn-management/settings/components/field_row @elastic/kibana-management
 packages/kbn-management/settings/components/form @elastic/kibana-management
 packages/kbn-management/settings/field_definition @elastic/kibana-management
-packages/kbn-management/settings/setting_ids @elastic/appex-sharedux @elastic/kibana-management
 packages/kbn-management/settings/section_registry @elastic/appex-sharedux @elastic/kibana-management
+packages/kbn-management/settings/setting_ids @elastic/appex-sharedux @elastic/kibana-management
 packages/kbn-management/settings/types @elastic/kibana-management
 packages/kbn-management/settings/utilities @elastic/kibana-management
 packages/kbn-management/storybook/config @elastic/kibana-management
-test/plugin_functional/plugins/management_test_plugin @elastic/kibana-management
 packages/kbn-manifest @elastic/kibana-core
 packages/kbn-mapbox-gl @elastic/kibana-presentation
-x-pack/examples/third_party_maps_source_example @elastic/kibana-presentation
-src/plugins/maps_ems @elastic/kibana-presentation
-x-pack/plugins/maps @elastic/kibana-presentation
-x-pack/packages/maps/vector_tile_utils @elastic/kibana-presentation
-x-pack/plugins/observability_solution/metrics_data_access @elastic/obs-knowledge-team @elastic/obs-ux-infra_services-team
-x-pack/packages/ml/agg_utils @elastic/ml-ui
-x-pack/packages/ml/anomaly_utils @elastic/ml-ui
-x-pack/packages/ml/cancellable_search @elastic/ml-ui
-x-pack/packages/ml/category_validator @elastic/ml-ui
-x-pack/packages/ml/chi2test @elastic/ml-ui
-x-pack/packages/ml/creation_wizard_utils @elastic/ml-ui
-x-pack/packages/ml/data_frame_analytics_utils @elastic/ml-ui
-x-pack/packages/ml/data_grid @elastic/ml-ui
-x-pack/packages/ml/data_view_utils @elastic/ml-ui
-x-pack/packages/ml/date_picker @elastic/ml-ui
-x-pack/packages/ml/date_utils @elastic/ml-ui
-x-pack/packages/ml/error_utils @elastic/ml-ui
-x-pack/packages/ml/field_stats_flyout @elastic/ml-ui
-x-pack/packages/ml/in_memory_table @elastic/ml-ui
-x-pack/packages/ml/is_defined @elastic/ml-ui
-x-pack/packages/ml/is_populated_object @elastic/ml-ui
-x-pack/packages/ml/kibana_theme @elastic/ml-ui
-x-pack/packages/ml/local_storage @elastic/ml-ui
-x-pack/packages/ml/nested_property @elastic/ml-ui
-x-pack/packages/ml/number_utils @elastic/ml-ui
-x-pack/packages/ml/parse_interval @elastic/ml-ui
-x-pack/plugins/ml @elastic/ml-ui
-x-pack/packages/ml/query_utils @elastic/ml-ui
-x-pack/packages/ml/random_sampler_utils @elastic/ml-ui
-x-pack/packages/ml/response_stream @elastic/ml-ui
-x-pack/packages/ml/route_utils @elastic/ml-ui
-x-pack/packages/ml/runtime_field_utils @elastic/ml-ui
-x-pack/packages/ml/string_hash @elastic/ml-ui
-x-pack/packages/ml/time_buckets @elastic/ml-ui
-x-pack/packages/ml/trained_models_utils @elastic/ml-ui
-x-pack/packages/ml/ui_actions @elastic/ml-ui
-x-pack/packages/ml/url_state @elastic/ml-ui
-x-pack/packages/ml/validators @elastic/ml-ui
 packages/kbn-mock-idp-plugin @elastic/kibana-security
 packages/kbn-mock-idp-utils @elastic/kibana-security
 packages/kbn-monaco @elastic/appex-sharedux
-x-pack/plugins/monitoring_collection @elastic/stack-monitoring
-x-pack/plugins/monitoring @elastic/stack-monitoring
-src/plugins/navigation @elastic/appex-sharedux
-src/plugins/newsfeed @elastic/kibana-core
-test/common/plugins/newsfeed @elastic/kibana-core
-src/plugins/no_data_page @elastic/appex-sharedux
-x-pack/plugins/notifications @elastic/appex-sharedux
 packages/kbn-object-versioning @elastic/appex-sharedux
 packages/kbn-object-versioning-utils @elastic/appex-sharedux
-x-pack/plugins/observability_solution/observability_ai_assistant_app @elastic/obs-ai-assistant
-x-pack/plugins/observability_solution/observability_ai_assistant_management @elastic/obs-ai-assistant
-x-pack/plugins/observability_solution/observability_ai_assistant @elastic/obs-ai-assistant
-x-pack/packages/observability/alert_details @elastic/obs-ux-management-team
-x-pack/packages/observability/alerting_rule_utils @elastic/obs-ux-management-team
-x-pack/packages/observability/alerting_test_data @elastic/obs-ux-management-team
-x-pack/test/cases_api_integration/common/plugins/observability @elastic/response-ops
-x-pack/packages/observability/get_padded_alert_time_range_util @elastic/obs-ux-management-team
-x-pack/plugins/observability_solution/observability_logs_explorer @elastic/obs-ux-logs-team
-x-pack/packages/observability/logs_overview @elastic/obs-ux-logs-team
-x-pack/plugins/observability_solution/observability_onboarding/e2e @elastic/obs-ux-logs-team @elastic/obs-ux-onboarding-team
-x-pack/plugins/observability_solution/observability_onboarding @elastic/obs-ux-logs-team @elastic/obs-ux-onboarding-team
-x-pack/plugins/observability_solution/observability @elastic/obs-ux-management-team
-x-pack/plugins/observability_solution/observability_shared @elastic/observability-ui
-x-pack/packages/observability/synthetics_test_data @elastic/obs-ux-management-team
-x-pack/packages/observability/observability_utils @elastic/observability-ui
-x-pack/test/security_api_integration/plugins/oidc_provider @elastic/kibana-security
-test/common/plugins/otel_metrics @elastic/obs-ux-infra_services-team
 packages/kbn-openapi-bundler @elastic/security-detection-rule-management
 packages/kbn-openapi-common @elastic/security-detection-rule-management
 packages/kbn-openapi-generator @elastic/security-detection-rule-management
 packages/kbn-optimizer @elastic/kibana-operations
 packages/kbn-optimizer-webpack-helpers @elastic/kibana-operations
 packages/kbn-osquery-io-ts-types @elastic/security-asset-management
-x-pack/plugins/osquery @elastic/security-defend-workflows
-examples/partial_results_example @elastic/kibana-data-discovery
-x-pack/plugins/painless_lab @elastic/kibana-management
 packages/kbn-panel-loader @elastic/kibana-presentation
 packages/kbn-peggy @elastic/kibana-operations
 packages/kbn-peggy-loader @elastic/kibana-operations
@@ -686,28 +432,10 @@ packages/kbn-picomatcher @elastic/kibana-operations
 packages/kbn-plugin-check @elastic/appex-sharedux
 packages/kbn-plugin-generator @elastic/kibana-operations
 packages/kbn-plugin-helpers @elastic/kibana-operations
-examples/portable_dashboards_example @elastic/kibana-presentation
-examples/preboot_example @elastic/kibana-security @elastic/kibana-core
-packages/presentation/presentation_containers @elastic/kibana-presentation
-src/plugins/presentation_panel @elastic/kibana-presentation
-packages/presentation/presentation_publishing @elastic/kibana-presentation
-src/plugins/presentation_util @elastic/kibana-presentation
-x-pack/packages/ai-infra/product-doc-artifact-builder @elastic/appex-ai-infra
-x-pack/plugins/observability_solution/profiling_data_access @elastic/obs-ux-infra_services-team
-x-pack/plugins/observability_solution/profiling @elastic/obs-ux-infra_services-team
 packages/kbn-profiling-utils @elastic/obs-ux-infra_services-team
-x-pack/packages/kbn-random-sampling @elastic/kibana-visualizations
 packages/kbn-react-field @elastic/kibana-data-discovery
 packages/kbn-react-hooks @elastic/obs-ux-logs-team
-packages/react/kibana_context/common @elastic/appex-sharedux
-packages/react/kibana_context/render @elastic/appex-sharedux
-packages/react/kibana_context/root @elastic/appex-sharedux
-packages/react/kibana_context/styled @elastic/appex-sharedux
-packages/react/kibana_context/theme @elastic/appex-sharedux
-packages/react/kibana_mount @elastic/appex-sharedux
 packages/kbn-recently-accessed @elastic/appex-sharedux
-x-pack/plugins/remote_clusters @elastic/kibana-management
-test/plugin_functional/plugins/rendering_plugin @elastic/kibana-core
 packages/kbn-repo-file-maps @elastic/kibana-operations
 packages/kbn-repo-info @elastic/kibana-operations
 packages/kbn-repo-linter @elastic/kibana-operations
@@ -716,97 +444,35 @@ packages/kbn-repo-path @elastic/kibana-operations
 packages/kbn-repo-source-classifier @elastic/kibana-operations
 packages/kbn-repo-source-classifier-cli @elastic/kibana-operations
 packages/kbn-reporting/common @elastic/appex-sharedux
-packages/kbn-reporting/get_csv_panel_actions @elastic/appex-sharedux
 packages/kbn-reporting/export_types/csv @elastic/appex-sharedux
 packages/kbn-reporting/export_types/csv_common @elastic/appex-sharedux
 packages/kbn-reporting/export_types/pdf @elastic/appex-sharedux
 packages/kbn-reporting/export_types/pdf_common @elastic/appex-sharedux
 packages/kbn-reporting/export_types/png @elastic/appex-sharedux
 packages/kbn-reporting/export_types/png_common @elastic/appex-sharedux
+packages/kbn-reporting/get_csv_panel_actions @elastic/appex-sharedux
 packages/kbn-reporting/mocks_server @elastic/appex-sharedux
-x-pack/plugins/reporting @elastic/appex-sharedux
 packages/kbn-reporting/public @elastic/appex-sharedux
 packages/kbn-reporting/server @elastic/appex-sharedux
 packages/kbn-resizable-layout @elastic/kibana-data-discovery
-examples/resizable_layout_examples @elastic/kibana-data-discovery
-x-pack/test/plugin_functional/plugins/resolver_test @elastic/security-solution
-packages/response-ops/feature_flag_service @elastic/response-ops
-packages/response-ops/rule_params @elastic/response-ops
-examples/response_stream @elastic/ml-ui
 packages/kbn-rison @elastic/kibana-operations
-x-pack/packages/rollup @elastic/kibana-management
-x-pack/plugins/rollup @elastic/kibana-management
 packages/kbn-router-to-openapispec @elastic/kibana-core
 packages/kbn-router-utils @elastic/obs-ux-logs-team
-examples/routing_example @elastic/kibana-core
 packages/kbn-rrule @elastic/response-ops
 packages/kbn-rule-data-utils @elastic/security-detections-response @elastic/response-ops @elastic/obs-ux-management-team
-x-pack/plugins/rule_registry @elastic/response-ops @elastic/obs-ux-management-team
-x-pack/plugins/runtime_fields @elastic/kibana-management
 packages/kbn-safer-lodash-set @elastic/kibana-security
-x-pack/test/security_api_integration/plugins/saml_provider @elastic/kibana-security
-x-pack/test/plugin_api_integration/plugins/sample_task_plugin @elastic/response-ops
-x-pack/test/task_manager_claimer_update_by_query/plugins/sample_task_plugin_mget @elastic/response-ops
-test/plugin_functional/plugins/saved_object_export_transforms @elastic/kibana-core
-test/plugin_functional/plugins/saved_object_import_warnings @elastic/kibana-core
-x-pack/test/saved_object_api_integration/common/plugins/saved_object_test_plugin @elastic/kibana-security
-src/plugins/saved_objects_finder @elastic/kibana-data-discovery
-test/plugin_functional/plugins/saved_objects_hidden_from_http_apis_type @elastic/kibana-core
-test/plugin_functional/plugins/saved_objects_hidden_type @elastic/kibana-core
-src/plugins/saved_objects_management @elastic/kibana-core
-src/plugins/saved_objects @elastic/appex-sharedux
 packages/kbn-saved-objects-settings @elastic/appex-sharedux
-src/plugins/saved_objects_tagging_oss @elastic/appex-sharedux
-x-pack/plugins/saved_objects_tagging @elastic/appex-sharedux
-src/plugins/saved_search @elastic/kibana-data-discovery
-examples/screenshot_mode_example @elastic/appex-sharedux
-src/plugins/screenshot_mode @elastic/appex-sharedux
-x-pack/examples/screenshotting_example @elastic/appex-sharedux
-x-pack/plugins/screenshotting @elastic/kibana-reporting-services
 packages/kbn-screenshotting-server @elastic/appex-sharedux
 packages/kbn-search-api-keys-components @elastic/search-kibana
 packages/kbn-search-api-keys-server @elastic/search-kibana
 packages/kbn-search-api-panels @elastic/search-kibana
-x-pack/plugins/search_assistant @elastic/search-kibana
 packages/kbn-search-connectors @elastic/search-kibana
-x-pack/plugins/search_connectors @elastic/search-kibana
 packages/kbn-search-errors @elastic/kibana-data-discovery
-examples/search_examples @elastic/kibana-data-discovery
-x-pack/plugins/search_homepage @elastic/search-kibana
 packages/kbn-search-index-documents @elastic/search-kibana
-x-pack/plugins/search_indices @elastic/search-kibana
-x-pack/plugins/search_inference_endpoints @elastic/search-kibana
-x-pack/plugins/search_notebooks @elastic/search-kibana
-x-pack/plugins/search_playground @elastic/search-kibana
 packages/kbn-search-response-warnings @elastic/kibana-data-discovery
-x-pack/packages/search/shared_ui @elastic/search-kibana
 packages/kbn-search-types @elastic/kibana-data-discovery
-x-pack/plugins/searchprofiler @elastic/kibana-management
-x-pack/test/security_api_integration/packages/helpers @elastic/kibana-security
-x-pack/packages/security/api_key_management @elastic/kibana-security
-x-pack/packages/security/authorization_core @elastic/kibana-security
-x-pack/packages/security/authorization_core_common @elastic/kibana-security
-x-pack/packages/security/form_components @elastic/kibana-security
 packages/kbn-security-hardening @elastic/kibana-security
-x-pack/plugins/security @elastic/kibana-security
-x-pack/packages/security/plugin_types_common @elastic/kibana-security
-x-pack/packages/security/plugin_types_public @elastic/kibana-security
-x-pack/packages/security/plugin_types_server @elastic/kibana-security
-x-pack/packages/security/role_management_model @elastic/kibana-security
-x-pack/packages/security-solution/distribution_bar @elastic/kibana-cloud-security-posture
-x-pack/plugins/security_solution_ess @elastic/security-solution
-x-pack/packages/security-solution/features @elastic/security-threat-hunting-explore
-x-pack/test/cases_api_integration/common/plugins/security_solution @elastic/response-ops
-x-pack/packages/security-solution/navigation @elastic/security-threat-hunting-explore
-x-pack/plugins/security_solution @elastic/security-solution
-x-pack/plugins/security_solution_serverless @elastic/security-solution
-x-pack/packages/security-solution/side_nav @elastic/security-threat-hunting-explore
-x-pack/packages/security-solution/storybook/config @elastic/security-threat-hunting-explore
-x-pack/packages/security-solution/upselling @elastic/security-threat-hunting-explore
-x-pack/test/security_functional/plugins/test_endpoints @elastic/kibana-security
-x-pack/packages/security/ui_components @elastic/kibana-security
 packages/kbn-securitysolution-autocomplete @elastic/security-detection-engine
-x-pack/packages/security-solution/data_table @elastic/security-threat-hunting-investigations
 packages/kbn-securitysolution-ecs @elastic/security-threat-hunting-explore
 packages/kbn-securitysolution-endpoint-exceptions-common @elastic/security-detection-engine
 packages/kbn-securitysolution-es-utils @elastic/security-detection-engine
@@ -829,37 +495,90 @@ packages/kbn-server-http-tools @elastic/kibana-core
 packages/kbn-server-route-repository @elastic/obs-knowledge-team
 packages/kbn-server-route-repository-client @elastic/obs-knowledge-team
 packages/kbn-server-route-repository-utils @elastic/obs-knowledge-team
-x-pack/plugins/serverless @elastic/appex-sharedux
+packages/kbn-set-map @elastic/kibana-operations
+packages/kbn-shared-svg @elastic/obs-ux-infra_services-team
+packages/kbn-shared-ux-utility @elastic/appex-sharedux
+packages/kbn-some-dev-log @elastic/kibana-operations
+packages/kbn-sort-package-json @elastic/kibana-operations
+packages/kbn-sort-predicates @elastic/kibana-visualizations
+packages/kbn-sse-utils @elastic/obs-knowledge-team
+packages/kbn-sse-utils-client @elastic/obs-knowledge-team
+packages/kbn-sse-utils-server @elastic/obs-knowledge-team
+packages/kbn-std @elastic/kibana-core
+packages/kbn-stdio-dev-helpers @elastic/kibana-operations
+packages/kbn-storybook @elastic/kibana-operations
+packages/kbn-telemetry-tools @elastic/kibana-core
+packages/kbn-test @elastic/kibana-operations @elastic/appex-qa
+packages/kbn-test-eui-helpers @elastic/kibana-visualizations
+packages/kbn-test-jest-helpers @elastic/kibana-operations @elastic/appex-qa
+packages/kbn-test-subj-selector @elastic/kibana-operations @elastic/appex-qa
+packages/kbn-timelion-grammar @elastic/kibana-visualizations
+packages/kbn-timerange @elastic/obs-ux-logs-team
+packages/kbn-tinymath @elastic/kibana-visualizations
+packages/kbn-tooling-log @elastic/kibana-operations
+packages/kbn-transpose-utils @elastic/kibana-visualizations
+packages/kbn-triggers-actions-ui-types @elastic/response-ops
+packages/kbn-try-in-console @elastic/search-kibana
+packages/kbn-ts-projects @elastic/kibana-operations
+packages/kbn-ts-type-check-cli @elastic/kibana-operations
+packages/kbn-typed-react-router-config @elastic/obs-knowledge-team @elastic/obs-ux-infra_services-team
+packages/kbn-ui-actions-browser @elastic/appex-sharedux
+packages/kbn-ui-shared-deps-npm @elastic/kibana-operations
+packages/kbn-ui-shared-deps-src @elastic/kibana-operations
+packages/kbn-ui-theme @elastic/kibana-operations
+packages/kbn-unified-data-table @elastic/kibana-data-discovery @elastic/security-threat-hunting-investigations
+packages/kbn-unified-doc-viewer @elastic/kibana-data-discovery
+packages/kbn-unified-field-list @elastic/kibana-data-discovery
+packages/kbn-unsaved-changes-badge @elastic/kibana-data-discovery
+packages/kbn-unsaved-changes-prompt @elastic/kibana-management
+packages/kbn-use-tracked-promise @elastic/obs-ux-logs-team
+packages/kbn-user-profile-components @elastic/kibana-security
+packages/kbn-utility-types @elastic/kibana-core
+packages/kbn-utility-types-jest @elastic/kibana-operations
+packages/kbn-utils @elastic/kibana-operations
+packages/kbn-validate-next-docs-cli @elastic/kibana-operations
+packages/kbn-visualization-ui-components @elastic/kibana-visualizations
+packages/kbn-visualization-utils @elastic/kibana-visualizations
+packages/kbn-web-worker-stub @elastic/kibana-operations
+packages/kbn-whereis-pkg-cli @elastic/kibana-operations
+packages/kbn-xstate-utils @elastic/obs-ux-logs-team
+packages/kbn-yarn-lock-validator @elastic/kibana-operations
+packages/kbn-zod @elastic/kibana-core
+packages/kbn-zod-helpers @elastic/security-detection-rule-management
+packages/presentation/presentation_containers @elastic/kibana-presentation
+packages/presentation/presentation_publishing @elastic/kibana-presentation
+packages/react/kibana_context/common @elastic/appex-sharedux
+packages/react/kibana_context/render @elastic/appex-sharedux
+packages/react/kibana_context/root @elastic/appex-sharedux
+packages/react/kibana_context/styled @elastic/appex-sharedux
+packages/react/kibana_context/theme @elastic/appex-sharedux
+packages/react/kibana_mount @elastic/appex-sharedux
+packages/response-ops/feature_flag_service @elastic/response-ops
+packages/response-ops/rule_params @elastic/response-ops
+packages/serverless/project_switcher @elastic/appex-sharedux
 packages/serverless/settings/common @elastic/appex-sharedux @elastic/kibana-management
-x-pack/plugins/serverless_observability @elastic/obs-ux-management-team
 packages/serverless/settings/observability_project @elastic/appex-sharedux @elastic/kibana-management @elastic/obs-ux-management-team
-packages/serverless/project_switcher @elastic/appex-sharedux
-x-pack/plugins/serverless_search @elastic/search-kibana
 packages/serverless/settings/search_project @elastic/search-kibana @elastic/kibana-management
 packages/serverless/settings/security_project @elastic/security-solution @elastic/kibana-management
 packages/serverless/storybook/config @elastic/appex-sharedux
 packages/serverless/types @elastic/appex-sharedux
-test/plugin_functional/plugins/session_notifications @elastic/kibana-core
-x-pack/plugins/session_view @elastic/kibana-cloud-security-posture
-packages/kbn-set-map @elastic/kibana-operations
-examples/share_examples @elastic/appex-sharedux
-src/plugins/share @elastic/appex-sharedux
-packages/kbn-shared-svg @elastic/obs-ux-infra_services-team
 packages/shared-ux/avatar/solution @elastic/appex-sharedux
-packages/shared-ux/button/exit_full_screen @elastic/appex-sharedux
 packages/shared-ux/button_toolbar @elastic/appex-sharedux
+packages/shared-ux/button/exit_full_screen @elastic/appex-sharedux
 packages/shared-ux/card/no_data/impl @elastic/appex-sharedux
 packages/shared-ux/card/no_data/mocks @elastic/appex-sharedux
 packages/shared-ux/card/no_data/types @elastic/appex-sharedux
 packages/shared-ux/chrome/navigation @elastic/appex-sharedux
+packages/shared-ux/code_editor/impl @elastic/appex-sharedux
+packages/shared-ux/code_editor/mocks @elastic/appex-sharedux
 packages/shared-ux/error_boundary @elastic/appex-sharedux
 packages/shared-ux/file/context @elastic/appex-sharedux
+packages/shared-ux/file/file_picker/impl @elastic/appex-sharedux
+packages/shared-ux/file/file_upload/impl @elastic/appex-sharedux
 packages/shared-ux/file/image/impl @elastic/appex-sharedux
 packages/shared-ux/file/image/mocks @elastic/appex-sharedux
 packages/shared-ux/file/mocks @elastic/appex-sharedux
-packages/shared-ux/file/file_picker/impl @elastic/appex-sharedux
 packages/shared-ux/file/types @elastic/appex-sharedux
-packages/shared-ux/file/file_upload/impl @elastic/appex-sharedux
 packages/shared-ux/file/util @elastic/appex-sharedux
 packages/shared-ux/link/redirect_app/impl @elastic/appex-sharedux
 packages/shared-ux/link/redirect_app/mocks @elastic/appex-sharedux
@@ -867,6 +586,7 @@ packages/shared-ux/link/redirect_app/types @elastic/appex-sharedux
 packages/shared-ux/markdown/impl @elastic/appex-sharedux
 packages/shared-ux/markdown/mocks @elastic/appex-sharedux
 packages/shared-ux/markdown/types @elastic/appex-sharedux
+packages/shared-ux/modal/tabbed @elastic/appex-sharedux
 packages/shared-ux/page/analytics_no_data/impl @elastic/appex-sharedux
 packages/shared-ux/page/analytics_no_data/mocks @elastic/appex-sharedux
 packages/shared-ux/page/analytics_no_data/types @elastic/appex-sharedux
@@ -876,10 +596,10 @@ packages/shared-ux/page/kibana_no_data/types @elastic/appex-sharedux
 packages/shared-ux/page/kibana_template/impl @elastic/appex-sharedux
 packages/shared-ux/page/kibana_template/mocks @elastic/appex-sharedux
 packages/shared-ux/page/kibana_template/types @elastic/appex-sharedux
-packages/shared-ux/page/no_data/impl @elastic/appex-sharedux
 packages/shared-ux/page/no_data_config/impl @elastic/appex-sharedux
 packages/shared-ux/page/no_data_config/mocks @elastic/appex-sharedux
 packages/shared-ux/page/no_data_config/types @elastic/appex-sharedux
+packages/shared-ux/page/no_data/impl @elastic/appex-sharedux
 packages/shared-ux/page/no_data/mocks @elastic/appex-sharedux
 packages/shared-ux/page/no_data/types @elastic/appex-sharedux
 packages/shared-ux/page/solution_nav @elastic/appex-sharedux
@@ -892,109 +612,89 @@ packages/shared-ux/router/mocks @elastic/appex-sharedux
 packages/shared-ux/router/types @elastic/appex-sharedux
 packages/shared-ux/storybook/config @elastic/appex-sharedux
 packages/shared-ux/storybook/mock @elastic/appex-sharedux
-packages/shared-ux/modal/tabbed @elastic/appex-sharedux
 packages/shared-ux/table_persist @elastic/appex-sharedux
-packages/kbn-shared-ux-utility @elastic/appex-sharedux
-x-pack/plugins/observability_solution/slo @elastic/obs-ux-management-team
-x-pack/packages/kbn-slo-schema @elastic/obs-ux-management-team
-x-pack/plugins/snapshot_restore @elastic/kibana-management
-packages/kbn-some-dev-log @elastic/kibana-operations
-packages/kbn-sort-package-json @elastic/kibana-operations
-packages/kbn-sort-predicates @elastic/kibana-visualizations
-x-pack/plugins/spaces @elastic/kibana-security
-x-pack/test/spaces_api_integration/common/plugins/spaces_test_plugin @elastic/kibana-security
-packages/kbn-sse-utils @elastic/obs-knowledge-team
-packages/kbn-sse-utils-client @elastic/obs-knowledge-team
-packages/kbn-sse-utils-server @elastic/obs-knowledge-team
-x-pack/plugins/stack_alerts @elastic/response-ops
-x-pack/plugins/stack_connectors @elastic/response-ops
-x-pack/test/usage_collection/plugins/stack_management_usage_test @elastic/kibana-management
-examples/state_containers_examples @elastic/appex-sharedux
-test/server_integration/plugins/status_plugin_a @elastic/kibana-core
-test/server_integration/plugins/status_plugin_b @elastic/kibana-core
-packages/kbn-std @elastic/kibana-core
-packages/kbn-stdio-dev-helpers @elastic/kibana-operations
-packages/kbn-storybook @elastic/kibana-operations
-x-pack/plugins/observability_solution/synthetics/e2e @elastic/obs-ux-management-team
-x-pack/plugins/observability_solution/synthetics @elastic/obs-ux-management-team
-x-pack/packages/kbn-synthetics-private-location @elastic/obs-ux-management-team
-x-pack/test/alerting_api_integration/common/plugins/task_manager_fixture @elastic/response-ops
-x-pack/test/plugin_api_perf/plugins/task_manager_performance @elastic/response-ops
-x-pack/plugins/task_manager @elastic/response-ops
+src/core @elastic/kibana-core
+src/plugins/advanced_settings @elastic/appex-sharedux @elastic/kibana-management
+src/plugins/ai_assistant_management/selection @elastic/obs-knowledge-team
+src/plugins/bfetch @elastic/appex-sharedux
+src/plugins/chart_expressions/common @elastic/kibana-visualizations
+src/plugins/chart_expressions/expression_gauge @elastic/kibana-visualizations
+src/plugins/chart_expressions/expression_heatmap @elastic/kibana-visualizations
+src/plugins/chart_expressions/expression_legacy_metric @elastic/kibana-visualizations
+src/plugins/chart_expressions/expression_metric @elastic/kibana-visualizations
+src/plugins/chart_expressions/expression_partition_vis @elastic/kibana-visualizations
+src/plugins/chart_expressions/expression_tagcloud @elastic/kibana-visualizations
+src/plugins/chart_expressions/expression_xy @elastic/kibana-visualizations
+src/plugins/charts @elastic/kibana-visualizations
+src/plugins/console @elastic/kibana-management
+src/plugins/content_management @elastic/appex-sharedux
+src/plugins/controls @elastic/kibana-presentation
+src/plugins/custom_integrations @elastic/fleet
+src/plugins/dashboard @elastic/kibana-presentation
+src/plugins/data @elastic/kibana-visualizations @elastic/kibana-data-discovery
+src/plugins/data_view_editor @elastic/kibana-data-discovery
+src/plugins/data_view_field_editor @elastic/kibana-data-discovery
+src/plugins/data_view_management @elastic/kibana-data-discovery
+src/plugins/data_views @elastic/kibana-data-discovery
+src/plugins/dev_tools @elastic/kibana-management
+src/plugins/discover @elastic/kibana-data-discovery
+src/plugins/discover_shared @elastic/kibana-data-discovery @elastic/obs-ux-logs-team
+src/plugins/embeddable @elastic/kibana-presentation
+src/plugins/es_ui_shared @elastic/kibana-management
+src/plugins/esql @elastic/kibana-esql
+src/plugins/esql_datagrid @elastic/kibana-esql
+src/plugins/event_annotation @elastic/kibana-visualizations
+src/plugins/event_annotation_listing @elastic/kibana-visualizations
+src/plugins/expression_error @elastic/kibana-presentation
+src/plugins/expression_image @elastic/kibana-presentation
+src/plugins/expression_metric @elastic/kibana-presentation
+src/plugins/expression_repeat_image @elastic/kibana-presentation
+src/plugins/expression_reveal_image @elastic/kibana-presentation
+src/plugins/expression_shape @elastic/kibana-presentation
+src/plugins/expressions @elastic/kibana-visualizations
+src/plugins/field_formats @elastic/kibana-data-discovery
+src/plugins/files @elastic/appex-sharedux
+src/plugins/files_management @elastic/appex-sharedux
+src/plugins/ftr_apis @elastic/kibana-core
+src/plugins/guided_onboarding @elastic/appex-sharedux
+src/plugins/home @elastic/kibana-core
+src/plugins/image_embeddable @elastic/appex-sharedux
+src/plugins/input_control_vis @elastic/kibana-presentation
+src/plugins/inspector @elastic/kibana-presentation
+src/plugins/interactive_setup @elastic/kibana-security
+src/plugins/kibana_overview @elastic/appex-sharedux
+src/plugins/kibana_react @elastic/appex-sharedux
+src/plugins/kibana_usage_collection @elastic/kibana-core
+src/plugins/kibana_utils @elastic/appex-sharedux
+src/plugins/links @elastic/kibana-presentation
+src/plugins/management @elastic/kibana-management
+src/plugins/maps_ems @elastic/kibana-presentation
+src/plugins/navigation @elastic/appex-sharedux
+src/plugins/newsfeed @elastic/kibana-core
+src/plugins/no_data_page @elastic/appex-sharedux
+src/plugins/presentation_panel @elastic/kibana-presentation
+src/plugins/presentation_util @elastic/kibana-presentation
+src/plugins/saved_objects @elastic/appex-sharedux
+src/plugins/saved_objects_finder @elastic/kibana-data-discovery
+src/plugins/saved_objects_management @elastic/kibana-core
+src/plugins/saved_objects_tagging_oss @elastic/appex-sharedux
+src/plugins/saved_search @elastic/kibana-data-discovery
+src/plugins/screenshot_mode @elastic/appex-sharedux
+src/plugins/share @elastic/appex-sharedux
+src/plugins/telemetry @elastic/kibana-core
 src/plugins/telemetry_collection_manager @elastic/kibana-core
-x-pack/plugins/telemetry_collection_xpack @elastic/kibana-core
 src/plugins/telemetry_management_section @elastic/kibana-core
-src/plugins/telemetry @elastic/kibana-core
-test/plugin_functional/plugins/telemetry @elastic/kibana-core
-packages/kbn-telemetry-tools @elastic/kibana-core
-packages/kbn-test @elastic/kibana-operations @elastic/appex-qa
-packages/kbn-test-eui-helpers @elastic/kibana-visualizations
-x-pack/test/licensing_plugin/plugins/test_feature_usage @elastic/kibana-security
-packages/kbn-test-jest-helpers @elastic/kibana-operations @elastic/appex-qa
-packages/kbn-test-subj-selector @elastic/kibana-operations @elastic/appex-qa
-x-pack/test_serverless
-test
-x-pack/test
-x-pack/performance @elastic/appex-qa
-x-pack/examples/testing_embedded_lens @elastic/kibana-visualizations
-x-pack/examples/third_party_lens_navigation_prompt @elastic/kibana-visualizations
-x-pack/examples/third_party_vis_lens_example @elastic/kibana-visualizations
-x-pack/plugins/threat_intelligence @elastic/security-threat-hunting-investigations
-x-pack/plugins/timelines @elastic/security-threat-hunting-investigations
-packages/kbn-timelion-grammar @elastic/kibana-visualizations
-packages/kbn-timerange @elastic/obs-ux-logs-team
-packages/kbn-tinymath @elastic/kibana-visualizations
-packages/kbn-tooling-log @elastic/kibana-operations
-x-pack/plugins/transform @elastic/ml-ui
-x-pack/plugins/translations @elastic/kibana-localization
-packages/kbn-transpose-utils @elastic/kibana-visualizations
-x-pack/examples/triggers_actions_ui_example @elastic/response-ops
-x-pack/plugins/triggers_actions_ui @elastic/response-ops
-packages/kbn-triggers-actions-ui-types @elastic/response-ops
-packages/kbn-try-in-console @elastic/search-kibana
-packages/kbn-ts-projects @elastic/kibana-operations
-packages/kbn-ts-type-check-cli @elastic/kibana-operations
-packages/kbn-typed-react-router-config @elastic/obs-knowledge-team @elastic/obs-ux-infra_services-team
-packages/kbn-ui-actions-browser @elastic/appex-sharedux
-x-pack/examples/ui_actions_enhanced_examples @elastic/appex-sharedux
-src/plugins/ui_actions_enhanced @elastic/appex-sharedux
-examples/ui_action_examples @elastic/appex-sharedux
-examples/ui_actions_explorer @elastic/appex-sharedux
 src/plugins/ui_actions @elastic/appex-sharedux
-test/plugin_functional/plugins/ui_settings_plugin @elastic/kibana-core
-packages/kbn-ui-shared-deps-npm @elastic/kibana-operations
-packages/kbn-ui-shared-deps-src @elastic/kibana-operations
-packages/kbn-ui-theme @elastic/kibana-operations
-packages/kbn-unified-data-table @elastic/kibana-data-discovery @elastic/security-threat-hunting-investigations
-packages/kbn-unified-doc-viewer @elastic/kibana-data-discovery
-examples/unified_doc_viewer @elastic/kibana-core
+src/plugins/ui_actions_enhanced @elastic/appex-sharedux
 src/plugins/unified_doc_viewer @elastic/kibana-data-discovery
-packages/kbn-unified-field-list @elastic/kibana-data-discovery
-examples/unified_field_list_examples @elastic/kibana-data-discovery
 src/plugins/unified_histogram @elastic/kibana-data-discovery
 src/plugins/unified_search @elastic/kibana-visualizations
-packages/kbn-unsaved-changes-badge @elastic/kibana-data-discovery
-packages/kbn-unsaved-changes-prompt @elastic/kibana-management
-x-pack/plugins/upgrade_assistant @elastic/kibana-management
-x-pack/plugins/observability_solution/uptime @elastic/obs-ux-management-team
-x-pack/plugins/drilldowns/url_drilldown @elastic/appex-sharedux
 src/plugins/url_forwarding @elastic/kibana-visualizations
 src/plugins/usage_collection @elastic/kibana-core
-test/plugin_functional/plugins/usage_collection @elastic/kibana-core
-packages/kbn-use-tracked-promise @elastic/obs-ux-logs-team
-packages/kbn-user-profile-components @elastic/kibana-security
-examples/user_profile_examples @elastic/kibana-security
-x-pack/test/security_api_integration/plugins/user_profiles_consumer @elastic/kibana-security
-packages/kbn-utility-types @elastic/kibana-core
-packages/kbn-utility-types-jest @elastic/kibana-operations
-packages/kbn-utils @elastic/kibana-operations
-x-pack/plugins/observability_solution/ux @elastic/obs-ux-infra_services-team
-examples/v8_profiler_examples @elastic/response-ops
-packages/kbn-validate-next-docs-cli @elastic/kibana-operations
 src/plugins/vis_default_editor @elastic/kibana-visualizations
+src/plugins/vis_type_markdown @elastic/kibana-presentation
 src/plugins/vis_types/gauge @elastic/kibana-visualizations
 src/plugins/vis_types/heatmap @elastic/kibana-visualizations
-src/plugins/vis_type_markdown @elastic/kibana-presentation
 src/plugins/vis_types/metric @elastic/kibana-visualizations
 src/plugins/vis_types/pie @elastic/kibana-visualizations
 src/plugins/vis_types/table @elastic/kibana-visualizations
@@ -1004,16 +704,316 @@ src/plugins/vis_types/timeseries @elastic/kibana-visualizations
 src/plugins/vis_types/vega @elastic/kibana-visualizations
 src/plugins/vis_types/vislib @elastic/kibana-visualizations
 src/plugins/vis_types/xy @elastic/kibana-visualizations
-packages/kbn-visualization-ui-components @elastic/kibana-visualizations
-packages/kbn-visualization-utils @elastic/kibana-visualizations
 src/plugins/visualizations @elastic/kibana-visualizations
+test
+test/analytics/plugins/analytics_ftr_helpers @elastic/kibana-core
+test/analytics/plugins/analytics_plugin_a @elastic/kibana-core
+test/common/plugins/newsfeed @elastic/kibana-core
+test/common/plugins/otel_metrics @elastic/obs-ux-infra_services-team
+test/health_gateway/plugins/status @elastic/kibana-core
+test/interactive_setup_api_integration/plugins/test_endpoints @elastic/kibana-security
+test/interpreter_functional/plugins/kbn_tp_run_pipeline @elastic/kibana-core
+test/node_roles_functional/plugins/core_plugin_initializer_context @elastic/kibana-core
+test/plugin_functional/plugins/app_link_test @elastic/kibana-core
+test/plugin_functional/plugins/core_app_status @elastic/kibana-core
+test/plugin_functional/plugins/core_dynamic_resolving_a @elastic/kibana-core
+test/plugin_functional/plugins/core_dynamic_resolving_b @elastic/kibana-core
+test/plugin_functional/plugins/core_history_block @elastic/kibana-core
+test/plugin_functional/plugins/core_http @elastic/kibana-core
+test/plugin_functional/plugins/core_plugin_a @elastic/kibana-core
+test/plugin_functional/plugins/core_plugin_appleave @elastic/kibana-core
+test/plugin_functional/plugins/core_plugin_b @elastic/kibana-core
+test/plugin_functional/plugins/core_plugin_chromeless @elastic/kibana-core
+test/plugin_functional/plugins/core_plugin_deep_links @elastic/kibana-core
+test/plugin_functional/plugins/core_plugin_deprecations @elastic/kibana-core
+test/plugin_functional/plugins/core_plugin_execution_context @elastic/kibana-core
+test/plugin_functional/plugins/core_plugin_helpmenu @elastic/kibana-core
+test/plugin_functional/plugins/core_plugin_route_timeouts @elastic/kibana-core
+test/plugin_functional/plugins/core_plugin_static_assets @elastic/kibana-core
+test/plugin_functional/plugins/core_provider_plugin @elastic/kibana-core
+test/plugin_functional/plugins/data_search @elastic/kibana-data-discovery
+test/plugin_functional/plugins/elasticsearch_client_plugin @elastic/kibana-core
+test/plugin_functional/plugins/eui_provider_dev_warning @elastic/appex-sharedux
+test/plugin_functional/plugins/hardening @elastic/kibana-security
+test/plugin_functional/plugins/index_patterns @elastic/kibana-data-discovery
+test/plugin_functional/plugins/kbn_sample_panel_action @elastic/appex-sharedux
+test/plugin_functional/plugins/kbn_top_nav @elastic/kibana-core
+test/plugin_functional/plugins/kbn_tp_custom_visualizations @elastic/kibana-visualizations
+test/plugin_functional/plugins/management_test_plugin @elastic/kibana-management
+test/plugin_functional/plugins/rendering_plugin @elastic/kibana-core
+test/plugin_functional/plugins/saved_object_export_transforms @elastic/kibana-core
+test/plugin_functional/plugins/saved_object_import_warnings @elastic/kibana-core
+test/plugin_functional/plugins/saved_objects_hidden_from_http_apis_type @elastic/kibana-core
+test/plugin_functional/plugins/saved_objects_hidden_type @elastic/kibana-core
+test/plugin_functional/plugins/session_notifications @elastic/kibana-core
+test/plugin_functional/plugins/telemetry @elastic/kibana-core
+test/plugin_functional/plugins/ui_settings_plugin @elastic/kibana-core
+test/plugin_functional/plugins/usage_collection @elastic/kibana-core
+test/server_integration/plugins/status_plugin_a @elastic/kibana-core
+test/server_integration/plugins/status_plugin_b @elastic/kibana-core
+x-pack/examples/alerting_example @elastic/response-ops
+x-pack/examples/embedded_lens_example @elastic/kibana-visualizations
+x-pack/examples/exploratory_view_example @elastic/obs-ux-infra_services-team
+x-pack/examples/gen_ai_streaming_response_example @elastic/response-ops
+x-pack/examples/lens_config_builder_example @elastic/kibana-visualizations
+x-pack/examples/lens_embeddable_inline_editing_example @elastic/kibana-visualizations
+x-pack/examples/screenshotting_example @elastic/appex-sharedux
+x-pack/examples/testing_embedded_lens @elastic/kibana-visualizations
+x-pack/examples/third_party_lens_navigation_prompt @elastic/kibana-visualizations
+x-pack/examples/third_party_maps_source_example @elastic/kibana-presentation
+x-pack/examples/third_party_vis_lens_example @elastic/kibana-visualizations
+x-pack/examples/triggers_actions_ui_example @elastic/response-ops
+x-pack/examples/ui_actions_enhanced_examples @elastic/appex-sharedux
+x-pack/packages/ai-infra/inference-common @elastic/appex-ai-infra
+x-pack/packages/ai-infra/product-doc-artifact-builder @elastic/appex-ai-infra
+x-pack/packages/index-management/index_management_shared_types @elastic/kibana-management
+x-pack/packages/kbn-ai-assistant @elastic/search-kibana
+x-pack/packages/kbn-ai-assistant-common @elastic/search-kibana
+x-pack/packages/kbn-alerting-comparators @elastic/response-ops
+x-pack/packages/kbn-alerting-state-types @elastic/response-ops
+x-pack/packages/kbn-cloud-security-posture/common @elastic/kibana-cloud-security-posture
+x-pack/packages/kbn-cloud-security-posture/graph @elastic/kibana-cloud-security-posture
+x-pack/packages/kbn-cloud-security-posture/public @elastic/kibana-cloud-security-posture
+x-pack/packages/kbn-data-forge @elastic/obs-ux-management-team
+x-pack/packages/kbn-elastic-assistant @elastic/security-generative-ai
+x-pack/packages/kbn-elastic-assistant-common @elastic/security-generative-ai
+x-pack/packages/kbn-entities-schema @elastic/obs-entities
+x-pack/packages/kbn-infra-forge @elastic/obs-ux-management-team
+x-pack/packages/kbn-langchain @elastic/security-generative-ai
+x-pack/packages/kbn-random-sampling @elastic/kibana-visualizations
+x-pack/packages/kbn-slo-schema @elastic/obs-ux-management-team
+x-pack/packages/kbn-synthetics-private-location @elastic/obs-ux-management-team
+x-pack/packages/maps/vector_tile_utils @elastic/kibana-presentation
+x-pack/packages/ml/agg_utils @elastic/ml-ui
+x-pack/packages/ml/aiops_change_point_detection @elastic/ml-ui
+x-pack/packages/ml/aiops_common @elastic/ml-ui
+x-pack/packages/ml/aiops_components @elastic/ml-ui
+x-pack/packages/ml/aiops_log_pattern_analysis @elastic/ml-ui
+x-pack/packages/ml/aiops_log_rate_analysis @elastic/ml-ui
+x-pack/packages/ml/aiops_test_utils @elastic/ml-ui
+x-pack/packages/ml/anomaly_utils @elastic/ml-ui
+x-pack/packages/ml/cancellable_search @elastic/ml-ui
+x-pack/packages/ml/category_validator @elastic/ml-ui
+x-pack/packages/ml/chi2test @elastic/ml-ui
+x-pack/packages/ml/creation_wizard_utils @elastic/ml-ui
+x-pack/packages/ml/data_frame_analytics_utils @elastic/ml-ui
+x-pack/packages/ml/data_grid @elastic/ml-ui
+x-pack/packages/ml/data_view_utils @elastic/ml-ui
+x-pack/packages/ml/date_picker @elastic/ml-ui
+x-pack/packages/ml/date_utils @elastic/ml-ui
+x-pack/packages/ml/error_utils @elastic/ml-ui
+x-pack/packages/ml/field_stats_flyout @elastic/ml-ui
+x-pack/packages/ml/in_memory_table @elastic/ml-ui
+x-pack/packages/ml/inference_integration_flyout @elastic/ml-ui
+x-pack/packages/ml/is_defined @elastic/ml-ui
+x-pack/packages/ml/is_populated_object @elastic/ml-ui
+x-pack/packages/ml/json_schemas @elastic/ml-ui
+x-pack/packages/ml/kibana_theme @elastic/ml-ui
+x-pack/packages/ml/local_storage @elastic/ml-ui
+x-pack/packages/ml/nested_property @elastic/ml-ui
+x-pack/packages/ml/number_utils @elastic/ml-ui
+x-pack/packages/ml/parse_interval @elastic/ml-ui
+x-pack/packages/ml/query_utils @elastic/ml-ui
+x-pack/packages/ml/random_sampler_utils @elastic/ml-ui
+x-pack/packages/ml/response_stream @elastic/ml-ui
+x-pack/packages/ml/route_utils @elastic/ml-ui
+x-pack/packages/ml/runtime_field_utils @elastic/ml-ui
+x-pack/packages/ml/string_hash @elastic/ml-ui
+x-pack/packages/ml/time_buckets @elastic/ml-ui
+x-pack/packages/ml/trained_models_utils @elastic/ml-ui
+x-pack/packages/ml/ui_actions @elastic/ml-ui
+x-pack/packages/ml/url_state @elastic/ml-ui
+x-pack/packages/ml/validators @elastic/ml-ui
+x-pack/packages/observability/alert_details @elastic/obs-ux-management-team
+x-pack/packages/observability/alerting_rule_utils @elastic/obs-ux-management-team
+x-pack/packages/observability/alerting_test_data @elastic/obs-ux-management-team
+x-pack/packages/observability/get_padded_alert_time_range_util @elastic/obs-ux-management-team
+x-pack/packages/observability/logs_overview @elastic/obs-ux-logs-team
+x-pack/packages/observability/observability_utils @elastic/observability-ui
+x-pack/packages/observability/synthetics_test_data @elastic/obs-ux-management-team
+x-pack/packages/rollup @elastic/kibana-management
+x-pack/packages/search/shared_ui @elastic/search-kibana
+x-pack/packages/security-solution/data_table @elastic/security-threat-hunting-investigations
+x-pack/packages/security-solution/distribution_bar @elastic/kibana-cloud-security-posture
+x-pack/packages/security-solution/ecs_data_quality_dashboard @elastic/security-threat-hunting-explore
+x-pack/packages/security-solution/features @elastic/security-threat-hunting-explore
+x-pack/packages/security-solution/navigation @elastic/security-threat-hunting-explore
+x-pack/packages/security-solution/side_nav @elastic/security-threat-hunting-explore
+x-pack/packages/security-solution/storybook/config @elastic/security-threat-hunting-explore
+x-pack/packages/security-solution/upselling @elastic/security-threat-hunting-explore
+x-pack/packages/security/api_key_management @elastic/kibana-security
+x-pack/packages/security/authorization_core @elastic/kibana-security
+x-pack/packages/security/authorization_core_common @elastic/kibana-security
+x-pack/packages/security/form_components @elastic/kibana-security
+x-pack/packages/security/plugin_types_common @elastic/kibana-security
+x-pack/packages/security/plugin_types_public @elastic/kibana-security
+x-pack/packages/security/plugin_types_server @elastic/kibana-security
+x-pack/packages/security/role_management_model @elastic/kibana-security
+x-pack/packages/security/ui_components @elastic/kibana-security
+x-pack/performance @elastic/appex-qa
+x-pack/plugins/actions @elastic/response-ops
+x-pack/plugins/aiops @elastic/ml-ui
+x-pack/plugins/alerting @elastic/response-ops
+x-pack/plugins/banners @elastic/appex-sharedux
+x-pack/plugins/canvas @elastic/kibana-presentation
+x-pack/plugins/cases @elastic/response-ops
+x-pack/plugins/cloud @elastic/kibana-core
+x-pack/plugins/cloud_defend @elastic/kibana-cloud-security-posture
+x-pack/plugins/cloud_integrations/cloud_chat @elastic/kibana-core
+x-pack/plugins/cloud_integrations/cloud_data_migration @elastic/kibana-management
+x-pack/plugins/cloud_integrations/cloud_experiments @elastic/kibana-core
+x-pack/plugins/cloud_integrations/cloud_full_story @elastic/kibana-core
+x-pack/plugins/cloud_integrations/cloud_links @elastic/kibana-core
+x-pack/plugins/cloud_security_posture @elastic/kibana-cloud-security-posture
+x-pack/plugins/cross_cluster_replication @elastic/kibana-management
+x-pack/plugins/custom_branding @elastic/appex-sharedux
+x-pack/plugins/dashboard_enhanced @elastic/kibana-presentation
+x-pack/plugins/data_quality @elastic/obs-ux-logs-team
+x-pack/plugins/data_usage @elastic/obs-ai-assistant @elastic/security-solution
+x-pack/plugins/data_visualizer @elastic/ml-ui
+x-pack/plugins/discover_enhanced @elastic/kibana-data-discovery
+x-pack/plugins/drilldowns/url_drilldown @elastic/appex-sharedux
+x-pack/plugins/ecs_data_quality_dashboard @elastic/security-threat-hunting-explore
+x-pack/plugins/elastic_assistant @elastic/security-generative-ai
+x-pack/plugins/embeddable_enhanced @elastic/kibana-presentation
+x-pack/plugins/encrypted_saved_objects @elastic/kibana-security
+x-pack/plugins/enterprise_search @elastic/search-kibana
+x-pack/plugins/entity_manager @elastic/obs-entities
+x-pack/plugins/event_log @elastic/response-ops
+x-pack/plugins/features @elastic/kibana-core
+x-pack/plugins/fields_metadata @elastic/obs-ux-logs-team
+x-pack/plugins/file_upload @elastic/kibana-presentation @elastic/ml-ui
+x-pack/plugins/fleet @elastic/fleet
+x-pack/plugins/global_search @elastic/appex-sharedux
+x-pack/plugins/global_search_bar @elastic/appex-sharedux
+x-pack/plugins/global_search_providers @elastic/appex-sharedux
+x-pack/plugins/graph @elastic/kibana-visualizations
+x-pack/plugins/grokdebugger @elastic/kibana-management
+x-pack/plugins/index_lifecycle_management @elastic/kibana-management
+x-pack/plugins/index_management @elastic/kibana-management
+x-pack/plugins/inference @elastic/appex-ai-infra
+x-pack/plugins/ingest_pipelines @elastic/kibana-management
+x-pack/plugins/integration_assistant @elastic/security-scalability
+x-pack/plugins/kubernetes_security @elastic/kibana-cloud-security-posture
+x-pack/plugins/lens @elastic/kibana-visualizations
+x-pack/plugins/license_api_guard @elastic/kibana-management
+x-pack/plugins/license_management @elastic/kibana-management
+x-pack/plugins/licensing @elastic/kibana-core
+x-pack/plugins/lists @elastic/security-detection-engine
+x-pack/plugins/logstash @elastic/logstash
+x-pack/plugins/maps @elastic/kibana-presentation
+x-pack/plugins/ml @elastic/ml-ui
+x-pack/plugins/monitoring @elastic/stack-monitoring
+x-pack/plugins/monitoring_collection @elastic/stack-monitoring
+x-pack/plugins/notifications @elastic/appex-sharedux
+x-pack/plugins/observability_solution/apm @elastic/obs-ux-infra_services-team
+x-pack/plugins/observability_solution/apm_data_access @elastic/obs-knowledge-team @elastic/obs-ux-infra_services-team
+x-pack/plugins/observability_solution/apm/ftr_e2e @elastic/obs-ux-infra_services-team
+x-pack/plugins/observability_solution/dataset_quality @elastic/obs-ux-logs-team
+x-pack/plugins/observability_solution/entities_data_access @elastic/obs-entities
+x-pack/plugins/observability_solution/exploratory_view @elastic/obs-ux-management-team
+x-pack/plugins/observability_solution/infra @elastic/obs-ux-logs-team @elastic/obs-ux-infra_services-team
+x-pack/plugins/observability_solution/inventory @elastic/obs-ux-infra_services-team
+x-pack/plugins/observability_solution/inventory/e2e @elastic/obs-ux-infra_services-team
+x-pack/plugins/observability_solution/investigate @elastic/obs-ux-management-team
+x-pack/plugins/observability_solution/investigate_app @elastic/obs-ux-management-team
+x-pack/plugins/observability_solution/logs_data_access @elastic/obs-knowledge-team @elastic/obs-ux-logs-team
+x-pack/plugins/observability_solution/logs_explorer @elastic/obs-ux-logs-team
+x-pack/plugins/observability_solution/logs_shared @elastic/obs-ux-logs-team
+x-pack/plugins/observability_solution/metrics_data_access @elastic/obs-knowledge-team @elastic/obs-ux-infra_services-team
+x-pack/plugins/observability_solution/observability @elastic/obs-ux-management-team
+x-pack/plugins/observability_solution/observability_ai_assistant @elastic/obs-ai-assistant
+x-pack/plugins/observability_solution/observability_ai_assistant_app @elastic/obs-ai-assistant
+x-pack/plugins/observability_solution/observability_ai_assistant_management @elastic/obs-ai-assistant
+x-pack/plugins/observability_solution/observability_logs_explorer @elastic/obs-ux-logs-team
+x-pack/plugins/observability_solution/observability_onboarding @elastic/obs-ux-logs-team @elastic/obs-ux-onboarding-team
+x-pack/plugins/observability_solution/observability_onboarding/e2e @elastic/obs-ux-logs-team @elastic/obs-ux-onboarding-team
+x-pack/plugins/observability_solution/observability_shared @elastic/observability-ui
+x-pack/plugins/observability_solution/profiling @elastic/obs-ux-infra_services-team
+x-pack/plugins/observability_solution/profiling_data_access @elastic/obs-ux-infra_services-team
+x-pack/plugins/observability_solution/slo @elastic/obs-ux-management-team
+x-pack/plugins/observability_solution/synthetics @elastic/obs-ux-management-team
+x-pack/plugins/observability_solution/synthetics/e2e @elastic/obs-ux-management-team
+x-pack/plugins/observability_solution/uptime @elastic/obs-ux-management-team
+x-pack/plugins/observability_solution/ux @elastic/obs-ux-infra_services-team
+x-pack/plugins/osquery @elastic/security-defend-workflows
+x-pack/plugins/painless_lab @elastic/kibana-management
+x-pack/plugins/remote_clusters @elastic/kibana-management
+x-pack/plugins/reporting @elastic/appex-sharedux
+x-pack/plugins/rollup @elastic/kibana-management
+x-pack/plugins/rule_registry @elastic/response-ops @elastic/obs-ux-management-team
+x-pack/plugins/runtime_fields @elastic/kibana-management
+x-pack/plugins/saved_objects_tagging @elastic/appex-sharedux
+x-pack/plugins/screenshotting @elastic/kibana-reporting-services
+x-pack/plugins/search_assistant @elastic/search-kibana
+x-pack/plugins/search_connectors @elastic/search-kibana
+x-pack/plugins/search_homepage @elastic/search-kibana
+x-pack/plugins/search_indices @elastic/search-kibana
+x-pack/plugins/search_inference_endpoints @elastic/search-kibana
+x-pack/plugins/search_notebooks @elastic/search-kibana
+x-pack/plugins/search_playground @elastic/search-kibana
+x-pack/plugins/searchprofiler @elastic/kibana-management
+x-pack/plugins/security @elastic/kibana-security
+x-pack/plugins/security_solution @elastic/security-solution
+x-pack/plugins/security_solution_ess @elastic/security-solution
+x-pack/plugins/security_solution_serverless @elastic/security-solution
+x-pack/plugins/serverless @elastic/appex-sharedux
+x-pack/plugins/serverless_observability @elastic/obs-ux-management-team
+x-pack/plugins/serverless_search @elastic/search-kibana
+x-pack/plugins/session_view @elastic/kibana-cloud-security-posture
+x-pack/plugins/snapshot_restore @elastic/kibana-management
+x-pack/plugins/spaces @elastic/kibana-security
+x-pack/plugins/stack_alerts @elastic/response-ops
+x-pack/plugins/stack_connectors @elastic/response-ops
+x-pack/plugins/task_manager @elastic/response-ops
+x-pack/plugins/telemetry_collection_xpack @elastic/kibana-core
+x-pack/plugins/threat_intelligence @elastic/security-threat-hunting-investigations
+x-pack/plugins/timelines @elastic/security-threat-hunting-investigations
+x-pack/plugins/transform @elastic/ml-ui
+x-pack/plugins/translations @elastic/kibana-localization
+x-pack/plugins/triggers_actions_ui @elastic/response-ops
+x-pack/plugins/upgrade_assistant @elastic/kibana-management
 x-pack/plugins/watcher @elastic/kibana-management
-packages/kbn-web-worker-stub @elastic/kibana-operations
-packages/kbn-whereis-pkg-cli @elastic/kibana-operations
-packages/kbn-xstate-utils @elastic/obs-ux-logs-team
-packages/kbn-yarn-lock-validator @elastic/kibana-operations
-packages/kbn-zod @elastic/kibana-core
-packages/kbn-zod-helpers @elastic/security-detection-rule-management
+x-pack/test
+x-pack/test_serverless
+x-pack/test/alerting_api_integration/common/plugins/aad @elastic/response-ops
+x-pack/test/alerting_api_integration/common/plugins/actions_simulators @elastic/response-ops
+x-pack/test/alerting_api_integration/common/plugins/alerts @elastic/response-ops
+x-pack/test/alerting_api_integration/common/plugins/alerts_restricted @elastic/response-ops
+x-pack/test/alerting_api_integration/common/plugins/task_manager_fixture @elastic/response-ops
+x-pack/test/alerting_api_integration/packages/helpers @elastic/response-ops
+x-pack/test/api_integration/apis/entity_manager/fixture_plugin @elastic/obs-entities
+x-pack/test/cases_api_integration/common/plugins/cases @elastic/response-ops
+x-pack/test/cases_api_integration/common/plugins/observability @elastic/response-ops
+x-pack/test/cases_api_integration/common/plugins/security_solution @elastic/response-ops
+x-pack/test/cloud_integration/plugins/saml_provider @elastic/kibana-core
+x-pack/test/encrypted_saved_objects_api_integration/plugins/api_consumer_plugin @elastic/kibana-security
+x-pack/test/functional_cors/plugins/kibana_cors_test @elastic/kibana-security
+x-pack/test/functional_embedded/plugins/iframe_embedded @elastic/kibana-core
+x-pack/test/functional_execution_context/plugins/alerts @elastic/kibana-core
+x-pack/test/functional_with_es_ssl/plugins/alerts @elastic/response-ops
+x-pack/test/functional_with_es_ssl/plugins/cases @elastic/response-ops
+x-pack/test/licensing_plugin/plugins/test_feature_usage @elastic/kibana-security
+x-pack/test/plugin_api_integration/plugins/elasticsearch_client @elastic/kibana-core
+x-pack/test/plugin_api_integration/plugins/event_log @elastic/response-ops
+x-pack/test/plugin_api_integration/plugins/feature_usage_test @elastic/kibana-security
+x-pack/test/plugin_api_integration/plugins/sample_task_plugin @elastic/response-ops
+x-pack/test/plugin_api_perf/plugins/task_manager_performance @elastic/response-ops
+x-pack/test/plugin_functional/plugins/global_search_test @elastic/kibana-core
+x-pack/test/plugin_functional/plugins/resolver_test @elastic/security-solution
+x-pack/test/saved_object_api_integration/common/plugins/saved_object_test_plugin @elastic/kibana-security
+x-pack/test/security_api_integration/packages/helpers @elastic/kibana-security
+x-pack/test/security_api_integration/plugins/audit_log @elastic/kibana-security
+x-pack/test/security_api_integration/plugins/features_provider @elastic/kibana-security
+x-pack/test/security_api_integration/plugins/oidc_provider @elastic/kibana-security
+x-pack/test/security_api_integration/plugins/saml_provider @elastic/kibana-security
+x-pack/test/security_api_integration/plugins/user_profiles_consumer @elastic/kibana-security
+x-pack/test/security_functional/plugins/test_endpoints @elastic/kibana-security
+x-pack/test/spaces_api_integration/common/plugins/spaces_test_plugin @elastic/kibana-security
+x-pack/test/task_manager_claimer_update_by_query/plugins/sample_task_plugin_mget @elastic/response-ops
+x-pack/test/ui_capabilities/common/plugins/foo_plugin @elastic/kibana-security
+x-pack/test/usage_collection/plugins/application_usage_test @elastic/kibana-core
+x-pack/test/usage_collection/plugins/stack_management_usage_test @elastic/kibana-management
 ####
 ## Everything below this line overrides the default assignments for each package.
 ## Items lower in the file have higher precedence:
diff --git a/api_docs/actions.mdx b/api_docs/actions.mdx
index 2d0938a5f3e7e..fa51f52b7cdf6 100644
--- a/api_docs/actions.mdx
+++ b/api_docs/actions.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/actions
 title: "actions"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the actions plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'actions']
 ---
 import actionsObj from './actions.devdocs.json';
diff --git a/api_docs/advanced_settings.mdx b/api_docs/advanced_settings.mdx
index fe9de10c7caf1..e7b138c10b420 100644
--- a/api_docs/advanced_settings.mdx
+++ b/api_docs/advanced_settings.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/advancedSettings
 title: "advancedSettings"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the advancedSettings plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'advancedSettings']
 ---
 import advancedSettingsObj from './advanced_settings.devdocs.json';
diff --git a/api_docs/ai_assistant_management_selection.mdx b/api_docs/ai_assistant_management_selection.mdx
index a52b1bfcfe11a..b9114f8038026 100644
--- a/api_docs/ai_assistant_management_selection.mdx
+++ b/api_docs/ai_assistant_management_selection.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiAssistantManagementSelection
 title: "aiAssistantManagementSelection"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the aiAssistantManagementSelection plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiAssistantManagementSelection']
 ---
 import aiAssistantManagementSelectionObj from './ai_assistant_management_selection.devdocs.json';
diff --git a/api_docs/aiops.mdx b/api_docs/aiops.mdx
index 044a29123d58e..c2a1abdd0a06c 100644
--- a/api_docs/aiops.mdx
+++ b/api_docs/aiops.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiops
 title: "aiops"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the aiops plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiops']
 ---
 import aiopsObj from './aiops.devdocs.json';
diff --git a/api_docs/alerting.mdx b/api_docs/alerting.mdx
index 8f6588d9b4fb3..2ecf65d41e3c7 100644
--- a/api_docs/alerting.mdx
+++ b/api_docs/alerting.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/alerting
 title: "alerting"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the alerting plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'alerting']
 ---
 import alertingObj from './alerting.devdocs.json';
diff --git a/api_docs/apm.mdx b/api_docs/apm.mdx
index c175c1a53d2ee..2034c6ce17bf8 100644
--- a/api_docs/apm.mdx
+++ b/api_docs/apm.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/apm
 title: "apm"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the apm plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'apm']
 ---
 import apmObj from './apm.devdocs.json';
diff --git a/api_docs/apm_data_access.mdx b/api_docs/apm_data_access.mdx
index 8577e434ee12e..c26ccc64a4e44 100644
--- a/api_docs/apm_data_access.mdx
+++ b/api_docs/apm_data_access.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/apmDataAccess
 title: "apmDataAccess"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the apmDataAccess plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'apmDataAccess']
 ---
 import apmDataAccessObj from './apm_data_access.devdocs.json';
diff --git a/api_docs/banners.mdx b/api_docs/banners.mdx
index cb28fdaa0ed02..aae10e2e05cf7 100644
--- a/api_docs/banners.mdx
+++ b/api_docs/banners.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/banners
 title: "banners"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the banners plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'banners']
 ---
 import bannersObj from './banners.devdocs.json';
diff --git a/api_docs/bfetch.mdx b/api_docs/bfetch.mdx
index 000ea07f51809..be0de8598b678 100644
--- a/api_docs/bfetch.mdx
+++ b/api_docs/bfetch.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/bfetch
 title: "bfetch"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the bfetch plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'bfetch']
 ---
 import bfetchObj from './bfetch.devdocs.json';
diff --git a/api_docs/canvas.mdx b/api_docs/canvas.mdx
index b705eff254f78..06720a72f7666 100644
--- a/api_docs/canvas.mdx
+++ b/api_docs/canvas.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/canvas
 title: "canvas"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the canvas plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'canvas']
 ---
 import canvasObj from './canvas.devdocs.json';
diff --git a/api_docs/cases.mdx b/api_docs/cases.mdx
index 90490722bc9e0..2ec2976cb483b 100644
--- a/api_docs/cases.mdx
+++ b/api_docs/cases.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cases
 title: "cases"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the cases plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cases']
 ---
 import casesObj from './cases.devdocs.json';
diff --git a/api_docs/charts.mdx b/api_docs/charts.mdx
index 5222b22b37cd6..7ae787f3247c9 100644
--- a/api_docs/charts.mdx
+++ b/api_docs/charts.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/charts
 title: "charts"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the charts plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'charts']
 ---
 import chartsObj from './charts.devdocs.json';
diff --git a/api_docs/cloud.mdx b/api_docs/cloud.mdx
index e9d89fc39abc3..77745d48ba4d8 100644
--- a/api_docs/cloud.mdx
+++ b/api_docs/cloud.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cloud
 title: "cloud"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the cloud plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cloud']
 ---
 import cloudObj from './cloud.devdocs.json';
diff --git a/api_docs/cloud_data_migration.mdx b/api_docs/cloud_data_migration.mdx
index 99c2ac8388839..50b04f69ca143 100644
--- a/api_docs/cloud_data_migration.mdx
+++ b/api_docs/cloud_data_migration.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cloudDataMigration
 title: "cloudDataMigration"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the cloudDataMigration plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cloudDataMigration']
 ---
 import cloudDataMigrationObj from './cloud_data_migration.devdocs.json';
diff --git a/api_docs/cloud_defend.mdx b/api_docs/cloud_defend.mdx
index c0ccd079cd3b2..1416f07d6631b 100644
--- a/api_docs/cloud_defend.mdx
+++ b/api_docs/cloud_defend.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cloudDefend
 title: "cloudDefend"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the cloudDefend plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cloudDefend']
 ---
 import cloudDefendObj from './cloud_defend.devdocs.json';
diff --git a/api_docs/cloud_security_posture.mdx b/api_docs/cloud_security_posture.mdx
index d62735d5755e6..54da59b8c6a17 100644
--- a/api_docs/cloud_security_posture.mdx
+++ b/api_docs/cloud_security_posture.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cloudSecurityPosture
 title: "cloudSecurityPosture"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the cloudSecurityPosture plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cloudSecurityPosture']
 ---
 import cloudSecurityPostureObj from './cloud_security_posture.devdocs.json';
diff --git a/api_docs/console.mdx b/api_docs/console.mdx
index 12c5f75c080fd..88e509676a240 100644
--- a/api_docs/console.mdx
+++ b/api_docs/console.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/console
 title: "console"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the console plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'console']
 ---
 import consoleObj from './console.devdocs.json';
diff --git a/api_docs/content_management.mdx b/api_docs/content_management.mdx
index 5ccee0d0d76ab..14cb88808946f 100644
--- a/api_docs/content_management.mdx
+++ b/api_docs/content_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/contentManagement
 title: "contentManagement"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the contentManagement plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'contentManagement']
 ---
 import contentManagementObj from './content_management.devdocs.json';
diff --git a/api_docs/controls.mdx b/api_docs/controls.mdx
index f5dc85d777d44..2d4a12f38c6c0 100644
--- a/api_docs/controls.mdx
+++ b/api_docs/controls.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/controls
 title: "controls"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the controls plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'controls']
 ---
 import controlsObj from './controls.devdocs.json';
diff --git a/api_docs/custom_integrations.mdx b/api_docs/custom_integrations.mdx
index 179493c9fb581..66a192ceffa84 100644
--- a/api_docs/custom_integrations.mdx
+++ b/api_docs/custom_integrations.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/customIntegrations
 title: "customIntegrations"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the customIntegrations plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'customIntegrations']
 ---
 import customIntegrationsObj from './custom_integrations.devdocs.json';
diff --git a/api_docs/dashboard.mdx b/api_docs/dashboard.mdx
index e0a4caa1b1e83..99fe56fdd02a9 100644
--- a/api_docs/dashboard.mdx
+++ b/api_docs/dashboard.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dashboard
 title: "dashboard"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the dashboard plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dashboard']
 ---
 import dashboardObj from './dashboard.devdocs.json';
diff --git a/api_docs/dashboard_enhanced.mdx b/api_docs/dashboard_enhanced.mdx
index 16db1515083a0..fddb30563e8f2 100644
--- a/api_docs/dashboard_enhanced.mdx
+++ b/api_docs/dashboard_enhanced.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dashboardEnhanced
 title: "dashboardEnhanced"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the dashboardEnhanced plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dashboardEnhanced']
 ---
 import dashboardEnhancedObj from './dashboard_enhanced.devdocs.json';
diff --git a/api_docs/data.mdx b/api_docs/data.mdx
index 694155fd543f5..904d8f9fcc2d4 100644
--- a/api_docs/data.mdx
+++ b/api_docs/data.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/data
 title: "data"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the data plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'data']
 ---
 import dataObj from './data.devdocs.json';
diff --git a/api_docs/data_quality.mdx b/api_docs/data_quality.mdx
index be8bef73ffa27..b10205492408f 100644
--- a/api_docs/data_quality.mdx
+++ b/api_docs/data_quality.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dataQuality
 title: "dataQuality"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the dataQuality plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dataQuality']
 ---
 import dataQualityObj from './data_quality.devdocs.json';
diff --git a/api_docs/data_query.mdx b/api_docs/data_query.mdx
index c762301147adf..0af86fc5c3d8f 100644
--- a/api_docs/data_query.mdx
+++ b/api_docs/data_query.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/data-query
 title: "data.query"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the data.query plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'data.query']
 ---
 import dataQueryObj from './data_query.devdocs.json';
diff --git a/api_docs/data_search.mdx b/api_docs/data_search.mdx
index 1b615574c1026..27e3b8677f87c 100644
--- a/api_docs/data_search.mdx
+++ b/api_docs/data_search.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/data-search
 title: "data.search"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the data.search plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'data.search']
 ---
 import dataSearchObj from './data_search.devdocs.json';
diff --git a/api_docs/data_usage.mdx b/api_docs/data_usage.mdx
index 025d5a49c4b2f..5f1f5c662cf92 100644
--- a/api_docs/data_usage.mdx
+++ b/api_docs/data_usage.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dataUsage
 title: "dataUsage"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the dataUsage plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dataUsage']
 ---
 import dataUsageObj from './data_usage.devdocs.json';
diff --git a/api_docs/data_view_editor.mdx b/api_docs/data_view_editor.mdx
index 0ac756ae0ebd4..6542d0dc019c0 100644
--- a/api_docs/data_view_editor.mdx
+++ b/api_docs/data_view_editor.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dataViewEditor
 title: "dataViewEditor"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the dataViewEditor plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dataViewEditor']
 ---
 import dataViewEditorObj from './data_view_editor.devdocs.json';
diff --git a/api_docs/data_view_field_editor.mdx b/api_docs/data_view_field_editor.mdx
index 24a2ffdbf8ab2..878d3004ccf04 100644
--- a/api_docs/data_view_field_editor.mdx
+++ b/api_docs/data_view_field_editor.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dataViewFieldEditor
 title: "dataViewFieldEditor"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the dataViewFieldEditor plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dataViewFieldEditor']
 ---
 import dataViewFieldEditorObj from './data_view_field_editor.devdocs.json';
diff --git a/api_docs/data_view_management.mdx b/api_docs/data_view_management.mdx
index 7fa82008f2983..2fb6a4c9eed05 100644
--- a/api_docs/data_view_management.mdx
+++ b/api_docs/data_view_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dataViewManagement
 title: "dataViewManagement"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the dataViewManagement plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dataViewManagement']
 ---
 import dataViewManagementObj from './data_view_management.devdocs.json';
diff --git a/api_docs/data_views.mdx b/api_docs/data_views.mdx
index d7eda0937f397..a6652281e2926 100644
--- a/api_docs/data_views.mdx
+++ b/api_docs/data_views.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dataViews
 title: "dataViews"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the dataViews plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dataViews']
 ---
 import dataViewsObj from './data_views.devdocs.json';
diff --git a/api_docs/data_visualizer.mdx b/api_docs/data_visualizer.mdx
index ea86b04d3c6df..f0a7f7b978222 100644
--- a/api_docs/data_visualizer.mdx
+++ b/api_docs/data_visualizer.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dataVisualizer
 title: "dataVisualizer"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the dataVisualizer plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dataVisualizer']
 ---
 import dataVisualizerObj from './data_visualizer.devdocs.json';
diff --git a/api_docs/dataset_quality.devdocs.json b/api_docs/dataset_quality.devdocs.json
index b0a5233462aef..0f42873f1c07f 100644
--- a/api_docs/dataset_quality.devdocs.json
+++ b/api_docs/dataset_quality.devdocs.json
@@ -457,7 +457,7 @@
           "DatasetQualityRouteHandlerResources",
           ", { aggregatable: boolean; datasets: string[]; }, ",
           "DatasetQualityRouteCreateOptions",
-          ">; \"GET /internal/dataset_quality/data_streams/degraded_docs\": ",
+          ">; \"GET /internal/dataset_quality/data_streams/total_docs\": ",
           {
             "pluginId": "@kbn/server-route-repository-utils",
             "scope": "common",
@@ -465,7 +465,7 @@
             "section": "def-common.ServerRoute",
             "text": "ServerRoute"
           },
-          "<\"GET /internal/dataset_quality/data_streams/degraded_docs\", ",
+          "<\"GET /internal/dataset_quality/data_streams/total_docs\", ",
           "TypeC",
           "<{ query: ",
           "IntersectionC",
@@ -479,13 +479,39 @@
           "TypeC",
           "<{ type: ",
           "KeyofC",
-          "<{ logs: null; metrics: null; traces: null; synthetics: null; profiling: null; }>; }>, ",
+          "<{ logs: null; metrics: null; traces: null; synthetics: null; profiling: null; }>; }>]>; }>, ",
+          "DatasetQualityRouteHandlerResources",
+          ", { totalDocs: { dataset: string; count: number; }[]; }, ",
+          "DatasetQualityRouteCreateOptions",
+          ">; \"GET /internal/dataset_quality/data_streams/degraded_docs\": ",
+          {
+            "pluginId": "@kbn/server-route-repository-utils",
+            "scope": "common",
+            "docId": "kibKbnServerRouteRepositoryUtilsPluginApi",
+            "section": "def-common.ServerRoute",
+            "text": "ServerRoute"
+          },
+          "<\"GET /internal/dataset_quality/data_streams/degraded_docs\", ",
+          "TypeC",
+          "<{ query: ",
+          "IntersectionC",
+          "<[",
+          "TypeC",
+          "<{ start: ",
+          "Type",
+          "<number, string, unknown>; end: ",
+          "Type",
+          "<number, string, unknown>; }>, ",
+          "TypeC",
+          "<{ types: ",
+          "Type",
+          "<(\"profiling\" | \"metrics\" | \"synthetics\" | \"traces\" | \"logs\")[], (\"profiling\" | \"metrics\" | \"synthetics\" | \"traces\" | \"logs\")[], unknown>; }>, ",
           "PartialC",
           "<{ datasetQuery: ",
           "StringC",
           "; }>]>; }>, ",
           "DatasetQualityRouteHandlerResources",
-          ", { degradedDocs: { dataset: string; count: number; docsCount: number; percentage: number; }[]; }, ",
+          ", { degradedDocs: { dataset: string; count: number; }[]; }, ",
           "DatasetQualityRouteCreateOptions",
           ">; \"GET /internal/dataset_quality/data_streams/stats\": ",
           {
@@ -798,7 +824,7 @@
           "DatasetQualityRouteHandlerResources",
           ", { aggregatable: boolean; datasets: string[]; }, ",
           "DatasetQualityRouteCreateOptions",
-          ">; \"GET /internal/dataset_quality/data_streams/degraded_docs\": ",
+          ">; \"GET /internal/dataset_quality/data_streams/total_docs\": ",
           {
             "pluginId": "@kbn/server-route-repository-utils",
             "scope": "common",
@@ -806,7 +832,7 @@
             "section": "def-common.ServerRoute",
             "text": "ServerRoute"
           },
-          "<\"GET /internal/dataset_quality/data_streams/degraded_docs\", ",
+          "<\"GET /internal/dataset_quality/data_streams/total_docs\", ",
           "TypeC",
           "<{ query: ",
           "IntersectionC",
@@ -820,13 +846,39 @@
           "TypeC",
           "<{ type: ",
           "KeyofC",
-          "<{ logs: null; metrics: null; traces: null; synthetics: null; profiling: null; }>; }>, ",
+          "<{ logs: null; metrics: null; traces: null; synthetics: null; profiling: null; }>; }>]>; }>, ",
+          "DatasetQualityRouteHandlerResources",
+          ", { totalDocs: { dataset: string; count: number; }[]; }, ",
+          "DatasetQualityRouteCreateOptions",
+          ">; \"GET /internal/dataset_quality/data_streams/degraded_docs\": ",
+          {
+            "pluginId": "@kbn/server-route-repository-utils",
+            "scope": "common",
+            "docId": "kibKbnServerRouteRepositoryUtilsPluginApi",
+            "section": "def-common.ServerRoute",
+            "text": "ServerRoute"
+          },
+          "<\"GET /internal/dataset_quality/data_streams/degraded_docs\", ",
+          "TypeC",
+          "<{ query: ",
+          "IntersectionC",
+          "<[",
+          "TypeC",
+          "<{ start: ",
+          "Type",
+          "<number, string, unknown>; end: ",
+          "Type",
+          "<number, string, unknown>; }>, ",
+          "TypeC",
+          "<{ types: ",
+          "Type",
+          "<(\"profiling\" | \"metrics\" | \"synthetics\" | \"traces\" | \"logs\")[], (\"profiling\" | \"metrics\" | \"synthetics\" | \"traces\" | \"logs\")[], unknown>; }>, ",
           "PartialC",
           "<{ datasetQuery: ",
           "StringC",
           "; }>]>; }>, ",
           "DatasetQualityRouteHandlerResources",
-          ", { degradedDocs: { dataset: string; count: number; docsCount: number; percentage: number; }[]; }, ",
+          ", { degradedDocs: { dataset: string; count: number; }[]; }, ",
           "DatasetQualityRouteCreateOptions",
           ">; \"GET /internal/dataset_quality/data_streams/stats\": ",
           {
diff --git a/api_docs/dataset_quality.mdx b/api_docs/dataset_quality.mdx
index 76ecb3ab0e196..ded0371873d0d 100644
--- a/api_docs/dataset_quality.mdx
+++ b/api_docs/dataset_quality.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/datasetQuality
 title: "datasetQuality"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the datasetQuality plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'datasetQuality']
 ---
 import datasetQualityObj from './dataset_quality.devdocs.json';
diff --git a/api_docs/deprecations_by_api.mdx b/api_docs/deprecations_by_api.mdx
index eb8ebbe13fc02..c865cb51fb9e8 100644
--- a/api_docs/deprecations_by_api.mdx
+++ b/api_docs/deprecations_by_api.mdx
@@ -7,7 +7,7 @@ id: kibDevDocsDeprecationsByApi
 slug: /kibana-dev-docs/api-meta/deprecated-api-list-by-api
 title: Deprecated API usage by API
 description: A list of deprecated APIs, which plugins are still referencing them, and when they need to be removed by.
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana']
 ---
 
@@ -22,7 +22,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibSecurityPluginApi" section="def-server.SecurityPluginSetup.authz" text="authz"/> | actions, savedObjectsTagging, ml, enterpriseSearch | - |
 | <DocLink id="kibKbnCoreSavedObjectsApiBrowserPluginApi" section="def-public.SimpleSavedObject" text="SimpleSavedObject"/> | @kbn/core-saved-objects-browser-internal, @kbn/core, savedObjects, visualizations, aiops, dataVisualizer, ml, dashboardEnhanced, graph, lens, securitySolution, eventAnnotation, @kbn/core-saved-objects-browser-mocks | - |
 | <DocLink id="kibKbnCoreSavedObjectsCommonPluginApi" section="def-common.SavedObjectAttributes" text="SavedObjectAttributes"/> | @kbn/core, embeddable, savedObjects, visualizations, canvas, graph, ml | - |
-| <DocLink id="kibKbnCoreSavedObjectsServerPluginApi" section="def-server.SavedObjectsType.migrations" text="migrations"/> | @kbn/core-saved-objects-base-server-internal, @kbn/core-saved-objects-migration-server-internal, @kbn/core-saved-objects-server-internal, @kbn/core-ui-settings-server-internal, @kbn/core-usage-data-server-internal, taskManager, dataViews, spaces, actions, share, data, alerting, @kbn/core-saved-objects-migration-server-mocks, lens, cases, savedSearch, canvas, fleet, cloudSecurityPosture, ml, logsShared, graph, lists, maps, visualizations, infra, apmDataAccess, securitySolution, apm, slo, synthetics, uptime, dashboard, eventAnnotation, links, savedObjectsManagement, @kbn/core-test-helpers-so-type-serializer, @kbn/core-saved-objects-api-server-internal | - |
+| <DocLink id="kibKbnCoreSavedObjectsServerPluginApi" section="def-server.SavedObjectsType.migrations" text="migrations"/> | @kbn/core-saved-objects-base-server-internal, @kbn/core-saved-objects-migration-server-internal, @kbn/core-saved-objects-server-internal, @kbn/core-ui-settings-server-internal, @kbn/core-usage-data-server-internal, taskManager, dataViews, spaces, actions, share, data, alerting, @kbn/core-saved-objects-migration-server-mocks, lens, cases, savedSearch, canvas, fleet, cloudSecurityPosture, ml, logsShared, graph, lists, maps, infra, visualizations, apmDataAccess, securitySolution, apm, slo, synthetics, uptime, dashboard, eventAnnotation, links, savedObjectsManagement, @kbn/core-test-helpers-so-type-serializer, @kbn/core-saved-objects-api-server-internal | - |
 | <DocLink id="kibDataPluginApi" section="def-public.SearchSource.fetch" text="fetch"/> | stackAlerts, alerting, securitySolution, inputControlVis | - |
 | <DocLink id="kibDataPluginApi" section="def-public.DataPublicPluginStart.indexPatterns" text="indexPatterns"/> | graph, stackAlerts, inputControlVis, securitySolution | - |
 | <DocLink id="kibDataPluginApi" section="def-public.DataPublicPluginStart.fieldFormats" text="fieldFormats"/> | dataVisualizer, stackAlerts, expressionPartitionVis | - |
@@ -67,7 +67,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibKbnSecuritysolutionListConstantsPluginApi" section="def-common.ENDPOINT_BLOCKLISTS_LIST_DESCRIPTION" text="ENDPOINT_BLOCKLISTS_LIST_DESCRIPTION"/> | securitySolution | - |
 | <DocLink id="kibKbnUiThemePluginApi" section="def-common.darkMode" text="darkMode"/> | @kbn/monaco, securitySolution | - |
 | <DocLink id="kibKbnUnifiedDataTablePluginApi" section="def-public.UnifiedDataTableProps.externalControlColumns" text="externalControlColumns"/> | cloudSecurityPosture, securitySolution | - |
-| <DocLink id="kibSecurityPluginApi" section="def-server.SecurityPluginStart.authc" text="authc"/> | alerting, observabilityAIAssistant, fleet, cloudSecurityPosture, entityManager, serverlessSearch, transform, upgradeAssistant, apm, synthetics, security | - |
+| <DocLink id="kibSecurityPluginApi" section="def-server.SecurityPluginStart.authc" text="authc"/> | alerting, observabilityAIAssistant, fleet, cloudSecurityPosture, entityManager, apm, serverlessSearch, transform, upgradeAssistant, synthetics, security | - |
 | <DocLink id="kibTaskManagerPluginApi" section="def-server.TaskManagerSetupContract.index" text="index"/> | actions, alerting | - |
 | <DocLink id="kibDataPluginApi" section="def-public.syncQueryStateWithUrl" text="syncQueryStateWithUrl"/> | monitoring | - |
 | <DocLink id="kibKbnCoreSavedObjectsCommonPluginApi" section="def-common.SavedObjectReference" text="SavedObjectReference"/> | @kbn/core-saved-objects-api-browser, @kbn/core, savedObjectsManagement, savedObjects, visualizations, savedObjectsTagging, eventAnnotation, lens, maps, graph, dashboard, kibanaUtils, expressions, data, savedObjectsTaggingOss, embeddable, uiActionsEnhanced, canvas, dashboardEnhanced, globalSearchProviders, controls | - |
@@ -169,13 +169,9 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibKbnCoreSavedObjectsServerPluginApi" section="def-server.SavedObjectMigrationContext.convertToMultiNamespaceTypeVersion" text="convertToMultiNamespaceTypeVersion"/> | encryptedSavedObjects | - |
 | <DocLink id="kibKbnEsqlAstPluginApi" section="def-common.ESQLColumn.quoted" text="quoted"/> | @kbn/esql-validation-autocomplete | - |
 | <DocLink id="kibKbnEsqlValidationAutocompletePluginApi" section="def-common.CommandDefinition.modes" text="modes"/> | @kbn/monaco | - |
-| <DocLink id="kibKbnReportingExportTypesCsvPluginApi" section="def-server.CsvSearchSourceImmediateExportType" text="CsvSearchSourceImmediateExportType"/> | reporting | - |
-| <DocLink id="kibKbnReportingExportTypesCsvCommonPluginApi" section="def-common.JobParamsDownloadCSV" text="JobParamsDownloadCSV"/> | @kbn/reporting-export-types-csv, reporting | - |
-| <DocLink id="kibKbnReportingExportTypesCsvCommonPluginApi" section="def-common.CSV_SEARCHSOURCE_IMMEDIATE_TYPE" text="CSV_SEARCHSOURCE_IMMEDIATE_TYPE"/> | @kbn/reporting-export-types-csv, reporting | - |
 | <DocLink id="kibKbnReportingExportTypesCsvCommonPluginApi" section="def-common.CSV_JOB_TYPE_DEPRECATED" text="CSV_JOB_TYPE_DEPRECATED"/> | reporting | - |
 | <DocLink id="kibKbnReportingExportTypesPdfPluginApi" section="def-server.PdfV1ExportType" text="PdfV1ExportType"/> | reporting | - |
 | <DocLink id="kibKbnReportingExportTypesPdfCommonPluginApi" section="def-common.JobParamsPDFDeprecated" text="JobParamsPDFDeprecated"/> | @kbn/reporting-export-types-pdf | - |
-| <DocLink id="kibKbnReportingPublicPluginApi" section="def-public.ReportingAPIClient.createImmediateReport" text="createImmediateReport"/> | @kbn/reporting-csv-share-panel | - |
 | <DocLink id="kibLicensingPluginApi" section="def-public.LicensingPluginSetup.license$" text="license$"/> | security, aiops, licenseManagement, ml, crossClusterReplication, logstash, painlessLab, searchprofiler, watcher, profiling, apm, slo | 8.8.0 |
 | <DocLink id="kibLicensingPluginApi" section="def-server.LicensingPluginSetup.license$" text="license$"/> | spaces, security, actions, alerting, aiops, remoteClusters, ml, graph, indexLifecycleManagement, osquery, securitySolution, painlessLab, rollup, searchprofiler, snapshotRestore, transform, upgradeAssistant | 8.8.0 |
 | <DocLink id="kibLicensingPluginApi" section="def-public.PublicLicense.mode" text="mode"/> | fleet, apm, security, securitySolution | 8.8.0 |
diff --git a/api_docs/deprecations_by_plugin.mdx b/api_docs/deprecations_by_plugin.mdx
index bda4c89ae7803..aaaffd539da70 100644
--- a/api_docs/deprecations_by_plugin.mdx
+++ b/api_docs/deprecations_by_plugin.mdx
@@ -7,7 +7,7 @@ id: kibDevDocsDeprecationsByPlugin
 slug: /kibana-dev-docs/api-meta/deprecated-api-list-by-plugin
 title: Deprecated API usage by plugin
 description: A list of deprecated APIs, which plugins are still referencing them, and when they need to be removed by.
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana']
 ---
 
@@ -402,23 +402,6 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 
 
 
-## @kbn/reporting-csv-share-panel
-
-| Deprecated API | Reference location(s) | Remove By |
-| ---------------|-----------|-----------|
-| <DocLink id="kibKbnReportingPublicPluginApi" section="def-public.ReportingAPIClient.createImmediateReport" text="createImmediateReport"/> | [get_csv_panel_action.tsx](https://github.com/elastic/kibana/tree/main/packages/kbn-reporting/get_csv_panel_actions/panel_actions/get_csv_panel_action.tsx#:~:text=createImmediateReport), [get_csv_panel_action.test.ts](https://github.com/elastic/kibana/tree/main/packages/kbn-reporting/get_csv_panel_actions/panel_actions/get_csv_panel_action.test.ts#:~:text=createImmediateReport) | - |
-
-
-
-## @kbn/reporting-export-types-csv
-
-| Deprecated API | Reference location(s) | Remove By |
-| ---------------|-----------|-----------|
-| <DocLink id="kibKbnReportingExportTypesCsvCommonPluginApi" section="def-common.JobParamsDownloadCSV" text="JobParamsDownloadCSV"/> | [csv_searchsource_immediate.ts](https://github.com/elastic/kibana/tree/main/packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.ts#:~:text=JobParamsDownloadCSV), [csv_searchsource_immediate.ts](https://github.com/elastic/kibana/tree/main/packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.ts#:~:text=JobParamsDownloadCSV), [csv_searchsource_immediate.ts](https://github.com/elastic/kibana/tree/main/packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.ts#:~:text=JobParamsDownloadCSV), [csv_searchsource_immediate.ts](https://github.com/elastic/kibana/tree/main/packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.ts#:~:text=JobParamsDownloadCSV) | - |
-| <DocLink id="kibKbnReportingExportTypesCsvCommonPluginApi" section="def-common.CSV_SEARCHSOURCE_IMMEDIATE_TYPE" text="CSV_SEARCHSOURCE_IMMEDIATE_TYPE"/> | [csv_searchsource_immediate.ts](https://github.com/elastic/kibana/tree/main/packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.ts#:~:text=CSV_SEARCHSOURCE_IMMEDIATE_TYPE), [csv_searchsource_immediate.ts](https://github.com/elastic/kibana/tree/main/packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.ts#:~:text=CSV_SEARCHSOURCE_IMMEDIATE_TYPE), [csv_searchsource_immediate.ts](https://github.com/elastic/kibana/tree/main/packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.ts#:~:text=CSV_SEARCHSOURCE_IMMEDIATE_TYPE), [csv_searchsource_immediate.ts](https://github.com/elastic/kibana/tree/main/packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.ts#:~:text=CSV_SEARCHSOURCE_IMMEDIATE_TYPE) | - |
-
-
-
 ## @kbn/reporting-export-types-pdf
 
 | Deprecated API | Reference location(s) | Remove By |
@@ -1219,9 +1202,6 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 
 | Deprecated API | Reference location(s) | Remove By |
 | ---------------|-----------|-----------|
-| <DocLink id="kibKbnReportingExportTypesCsvPluginApi" section="def-server.CsvSearchSourceImmediateExportType" text="CsvSearchSourceImmediateExportType"/> | [core.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/reporting/server/core.ts#:~:text=CsvSearchSourceImmediateExportType), [core.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/reporting/server/core.ts#:~:text=CsvSearchSourceImmediateExportType) | - |
-| <DocLink id="kibKbnReportingExportTypesCsvCommonPluginApi" section="def-common.JobParamsDownloadCSV" text="JobParamsDownloadCSV"/> | [csv_searchsource_immediate.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/reporting/server/routes/internal/generate/csv_searchsource_immediate.ts#:~:text=JobParamsDownloadCSV), [csv_searchsource_immediate.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/reporting/server/routes/internal/generate/csv_searchsource_immediate.ts#:~:text=JobParamsDownloadCSV) | - |
-| <DocLink id="kibKbnReportingExportTypesCsvCommonPluginApi" section="def-common.CSV_SEARCHSOURCE_IMMEDIATE_TYPE" text="CSV_SEARCHSOURCE_IMMEDIATE_TYPE"/> | [csv_searchsource_immediate.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/reporting/server/routes/internal/generate/csv_searchsource_immediate.ts#:~:text=CSV_SEARCHSOURCE_IMMEDIATE_TYPE), [csv_searchsource_immediate.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/reporting/server/routes/internal/generate/csv_searchsource_immediate.ts#:~:text=CSV_SEARCHSOURCE_IMMEDIATE_TYPE), [csv_searchsource_immediate.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/reporting/server/routes/internal/generate/csv_searchsource_immediate.ts#:~:text=CSV_SEARCHSOURCE_IMMEDIATE_TYPE) | - |
 | <DocLink id="kibKbnReportingExportTypesCsvCommonPluginApi" section="def-common.CSV_JOB_TYPE_DEPRECATED" text="CSV_JOB_TYPE_DEPRECATED"/> | [get_document_payload.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/reporting/server/routes/common/jobs/get_document_payload.ts#:~:text=CSV_JOB_TYPE_DEPRECATED), [get_document_payload.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/reporting/server/routes/common/jobs/get_document_payload.ts#:~:text=CSV_JOB_TYPE_DEPRECATED) | - |
 | <DocLink id="kibKbnReportingExportTypesPdfPluginApi" section="def-server.PdfV1ExportType" text="PdfV1ExportType"/> | [core.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/reporting/server/core.ts#:~:text=PdfV1ExportType), [core.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/reporting/server/core.ts#:~:text=PdfV1ExportType) | - |
 
diff --git a/api_docs/deprecations_by_team.mdx b/api_docs/deprecations_by_team.mdx
index 29b66afafbf7a..b121725f85955 100644
--- a/api_docs/deprecations_by_team.mdx
+++ b/api_docs/deprecations_by_team.mdx
@@ -7,7 +7,7 @@ id: kibDevDocsDeprecationsDueByTeam
 slug: /kibana-dev-docs/api-meta/deprecations-due-by-team
 title: Deprecated APIs due to be removed, by team
 description: Lists the teams that are referencing deprecated APIs with a remove by date.
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana']
 ---
 
diff --git a/api_docs/dev_tools.mdx b/api_docs/dev_tools.mdx
index ffc1501149a81..6923efca25b38 100644
--- a/api_docs/dev_tools.mdx
+++ b/api_docs/dev_tools.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/devTools
 title: "devTools"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the devTools plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'devTools']
 ---
 import devToolsObj from './dev_tools.devdocs.json';
diff --git a/api_docs/discover.mdx b/api_docs/discover.mdx
index 9f536018730f2..bec825b10a980 100644
--- a/api_docs/discover.mdx
+++ b/api_docs/discover.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/discover
 title: "discover"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the discover plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'discover']
 ---
 import discoverObj from './discover.devdocs.json';
diff --git a/api_docs/discover_enhanced.mdx b/api_docs/discover_enhanced.mdx
index 3d3bf711922bf..149d2fd9f8923 100644
--- a/api_docs/discover_enhanced.mdx
+++ b/api_docs/discover_enhanced.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/discoverEnhanced
 title: "discoverEnhanced"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the discoverEnhanced plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'discoverEnhanced']
 ---
 import discoverEnhancedObj from './discover_enhanced.devdocs.json';
diff --git a/api_docs/discover_shared.mdx b/api_docs/discover_shared.mdx
index f69d2a37c207f..e89156ae08873 100644
--- a/api_docs/discover_shared.mdx
+++ b/api_docs/discover_shared.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/discoverShared
 title: "discoverShared"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the discoverShared plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'discoverShared']
 ---
 import discoverSharedObj from './discover_shared.devdocs.json';
diff --git a/api_docs/ecs_data_quality_dashboard.mdx b/api_docs/ecs_data_quality_dashboard.mdx
index cccc4dc30a3fe..178c10b48954f 100644
--- a/api_docs/ecs_data_quality_dashboard.mdx
+++ b/api_docs/ecs_data_quality_dashboard.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/ecsDataQualityDashboard
 title: "ecsDataQualityDashboard"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the ecsDataQualityDashboard plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'ecsDataQualityDashboard']
 ---
 import ecsDataQualityDashboardObj from './ecs_data_quality_dashboard.devdocs.json';
diff --git a/api_docs/elastic_assistant.mdx b/api_docs/elastic_assistant.mdx
index b2d74ee427eff..177bb345de7d7 100644
--- a/api_docs/elastic_assistant.mdx
+++ b/api_docs/elastic_assistant.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/elasticAssistant
 title: "elasticAssistant"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the elasticAssistant plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'elasticAssistant']
 ---
 import elasticAssistantObj from './elastic_assistant.devdocs.json';
diff --git a/api_docs/embeddable.mdx b/api_docs/embeddable.mdx
index 72852e92db3ea..32952e3eb5a55 100644
--- a/api_docs/embeddable.mdx
+++ b/api_docs/embeddable.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/embeddable
 title: "embeddable"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the embeddable plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'embeddable']
 ---
 import embeddableObj from './embeddable.devdocs.json';
diff --git a/api_docs/embeddable_enhanced.mdx b/api_docs/embeddable_enhanced.mdx
index 6cac4c9edcbc6..96b7ced5979c2 100644
--- a/api_docs/embeddable_enhanced.mdx
+++ b/api_docs/embeddable_enhanced.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/embeddableEnhanced
 title: "embeddableEnhanced"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the embeddableEnhanced plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'embeddableEnhanced']
 ---
 import embeddableEnhancedObj from './embeddable_enhanced.devdocs.json';
diff --git a/api_docs/encrypted_saved_objects.mdx b/api_docs/encrypted_saved_objects.mdx
index 936301e9f136b..239abb0ee04ac 100644
--- a/api_docs/encrypted_saved_objects.mdx
+++ b/api_docs/encrypted_saved_objects.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/encryptedSavedObjects
 title: "encryptedSavedObjects"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the encryptedSavedObjects plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'encryptedSavedObjects']
 ---
 import encryptedSavedObjectsObj from './encrypted_saved_objects.devdocs.json';
diff --git a/api_docs/enterprise_search.mdx b/api_docs/enterprise_search.mdx
index a01e6b4bf3659..b070c5515e8c7 100644
--- a/api_docs/enterprise_search.mdx
+++ b/api_docs/enterprise_search.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/enterpriseSearch
 title: "enterpriseSearch"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the enterpriseSearch plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'enterpriseSearch']
 ---
 import enterpriseSearchObj from './enterprise_search.devdocs.json';
diff --git a/api_docs/entities_data_access.mdx b/api_docs/entities_data_access.mdx
index 128358a3c149c..ec0a009bd39d6 100644
--- a/api_docs/entities_data_access.mdx
+++ b/api_docs/entities_data_access.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/entitiesDataAccess
 title: "entitiesDataAccess"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the entitiesDataAccess plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'entitiesDataAccess']
 ---
 import entitiesDataAccessObj from './entities_data_access.devdocs.json';
diff --git a/api_docs/entity_manager.mdx b/api_docs/entity_manager.mdx
index 5eca7049e93c7..0e9c56f5f74c2 100644
--- a/api_docs/entity_manager.mdx
+++ b/api_docs/entity_manager.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/entityManager
 title: "entityManager"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the entityManager plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'entityManager']
 ---
 import entityManagerObj from './entity_manager.devdocs.json';
diff --git a/api_docs/es_ui_shared.mdx b/api_docs/es_ui_shared.mdx
index a304bee597e84..144af5967b71f 100644
--- a/api_docs/es_ui_shared.mdx
+++ b/api_docs/es_ui_shared.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/esUiShared
 title: "esUiShared"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the esUiShared plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'esUiShared']
 ---
 import esUiSharedObj from './es_ui_shared.devdocs.json';
diff --git a/api_docs/esql.mdx b/api_docs/esql.mdx
index 0151e029a9353..bf13db78f712c 100644
--- a/api_docs/esql.mdx
+++ b/api_docs/esql.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/esql
 title: "esql"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the esql plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'esql']
 ---
 import esqlObj from './esql.devdocs.json';
diff --git a/api_docs/esql_data_grid.mdx b/api_docs/esql_data_grid.mdx
index 4630c504aa9d2..453cbb8eabed8 100644
--- a/api_docs/esql_data_grid.mdx
+++ b/api_docs/esql_data_grid.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/esqlDataGrid
 title: "esqlDataGrid"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the esqlDataGrid plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'esqlDataGrid']
 ---
 import esqlDataGridObj from './esql_data_grid.devdocs.json';
diff --git a/api_docs/event_annotation.mdx b/api_docs/event_annotation.mdx
index cc36c1a89c9b6..eee41945816bb 100644
--- a/api_docs/event_annotation.mdx
+++ b/api_docs/event_annotation.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/eventAnnotation
 title: "eventAnnotation"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the eventAnnotation plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'eventAnnotation']
 ---
 import eventAnnotationObj from './event_annotation.devdocs.json';
diff --git a/api_docs/event_annotation_listing.mdx b/api_docs/event_annotation_listing.mdx
index 21a8b747911cd..dd7e3398866d0 100644
--- a/api_docs/event_annotation_listing.mdx
+++ b/api_docs/event_annotation_listing.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/eventAnnotationListing
 title: "eventAnnotationListing"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the eventAnnotationListing plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'eventAnnotationListing']
 ---
 import eventAnnotationListingObj from './event_annotation_listing.devdocs.json';
diff --git a/api_docs/event_log.mdx b/api_docs/event_log.mdx
index d6d56dddacb81..010e116fa87e7 100644
--- a/api_docs/event_log.mdx
+++ b/api_docs/event_log.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/eventLog
 title: "eventLog"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the eventLog plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'eventLog']
 ---
 import eventLogObj from './event_log.devdocs.json';
diff --git a/api_docs/exploratory_view.mdx b/api_docs/exploratory_view.mdx
index b0bb6c22bfd2d..0107e3ec28f95 100644
--- a/api_docs/exploratory_view.mdx
+++ b/api_docs/exploratory_view.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/exploratoryView
 title: "exploratoryView"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the exploratoryView plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'exploratoryView']
 ---
 import exploratoryViewObj from './exploratory_view.devdocs.json';
diff --git a/api_docs/expression_error.mdx b/api_docs/expression_error.mdx
index 7831c3a04fd75..1ab1b234cf6a4 100644
--- a/api_docs/expression_error.mdx
+++ b/api_docs/expression_error.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionError
 title: "expressionError"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionError plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionError']
 ---
 import expressionErrorObj from './expression_error.devdocs.json';
diff --git a/api_docs/expression_gauge.mdx b/api_docs/expression_gauge.mdx
index 676873f510688..acab5ba912f4c 100644
--- a/api_docs/expression_gauge.mdx
+++ b/api_docs/expression_gauge.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionGauge
 title: "expressionGauge"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionGauge plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionGauge']
 ---
 import expressionGaugeObj from './expression_gauge.devdocs.json';
diff --git a/api_docs/expression_heatmap.mdx b/api_docs/expression_heatmap.mdx
index e0496b040bbe2..6a25d18c89413 100644
--- a/api_docs/expression_heatmap.mdx
+++ b/api_docs/expression_heatmap.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionHeatmap
 title: "expressionHeatmap"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionHeatmap plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionHeatmap']
 ---
 import expressionHeatmapObj from './expression_heatmap.devdocs.json';
diff --git a/api_docs/expression_image.mdx b/api_docs/expression_image.mdx
index 7a872c8b46d75..0d10a5f1e2ea8 100644
--- a/api_docs/expression_image.mdx
+++ b/api_docs/expression_image.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionImage
 title: "expressionImage"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionImage plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionImage']
 ---
 import expressionImageObj from './expression_image.devdocs.json';
diff --git a/api_docs/expression_legacy_metric_vis.mdx b/api_docs/expression_legacy_metric_vis.mdx
index 9a5d33f750d25..c851ba10cf7f3 100644
--- a/api_docs/expression_legacy_metric_vis.mdx
+++ b/api_docs/expression_legacy_metric_vis.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionLegacyMetricVis
 title: "expressionLegacyMetricVis"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionLegacyMetricVis plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionLegacyMetricVis']
 ---
 import expressionLegacyMetricVisObj from './expression_legacy_metric_vis.devdocs.json';
diff --git a/api_docs/expression_metric.mdx b/api_docs/expression_metric.mdx
index 47830f9940288..48ae85d1e0892 100644
--- a/api_docs/expression_metric.mdx
+++ b/api_docs/expression_metric.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionMetric
 title: "expressionMetric"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionMetric plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionMetric']
 ---
 import expressionMetricObj from './expression_metric.devdocs.json';
diff --git a/api_docs/expression_metric_vis.mdx b/api_docs/expression_metric_vis.mdx
index bda279797d76e..13f73b1a8689d 100644
--- a/api_docs/expression_metric_vis.mdx
+++ b/api_docs/expression_metric_vis.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionMetricVis
 title: "expressionMetricVis"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionMetricVis plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionMetricVis']
 ---
 import expressionMetricVisObj from './expression_metric_vis.devdocs.json';
diff --git a/api_docs/expression_partition_vis.mdx b/api_docs/expression_partition_vis.mdx
index 91487dfd4e3ec..3f2794ff47b93 100644
--- a/api_docs/expression_partition_vis.mdx
+++ b/api_docs/expression_partition_vis.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionPartitionVis
 title: "expressionPartitionVis"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionPartitionVis plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionPartitionVis']
 ---
 import expressionPartitionVisObj from './expression_partition_vis.devdocs.json';
diff --git a/api_docs/expression_repeat_image.mdx b/api_docs/expression_repeat_image.mdx
index 30ed4f45da2d7..d9feafe1095cb 100644
--- a/api_docs/expression_repeat_image.mdx
+++ b/api_docs/expression_repeat_image.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionRepeatImage
 title: "expressionRepeatImage"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionRepeatImage plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionRepeatImage']
 ---
 import expressionRepeatImageObj from './expression_repeat_image.devdocs.json';
diff --git a/api_docs/expression_reveal_image.mdx b/api_docs/expression_reveal_image.mdx
index 52993a1109d91..e2c334f631962 100644
--- a/api_docs/expression_reveal_image.mdx
+++ b/api_docs/expression_reveal_image.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionRevealImage
 title: "expressionRevealImage"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionRevealImage plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionRevealImage']
 ---
 import expressionRevealImageObj from './expression_reveal_image.devdocs.json';
diff --git a/api_docs/expression_shape.mdx b/api_docs/expression_shape.mdx
index d510a9d43d2ec..4bf6d90095e6a 100644
--- a/api_docs/expression_shape.mdx
+++ b/api_docs/expression_shape.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionShape
 title: "expressionShape"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionShape plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionShape']
 ---
 import expressionShapeObj from './expression_shape.devdocs.json';
diff --git a/api_docs/expression_tagcloud.mdx b/api_docs/expression_tagcloud.mdx
index fe32526b4b9bf..8cdd1dc351c64 100644
--- a/api_docs/expression_tagcloud.mdx
+++ b/api_docs/expression_tagcloud.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionTagcloud
 title: "expressionTagcloud"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionTagcloud plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionTagcloud']
 ---
 import expressionTagcloudObj from './expression_tagcloud.devdocs.json';
diff --git a/api_docs/expression_x_y.mdx b/api_docs/expression_x_y.mdx
index fa30eb121c0ee..1ccb348b8c561 100644
--- a/api_docs/expression_x_y.mdx
+++ b/api_docs/expression_x_y.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionXY
 title: "expressionXY"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionXY plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionXY']
 ---
 import expressionXYObj from './expression_x_y.devdocs.json';
diff --git a/api_docs/expressions.mdx b/api_docs/expressions.mdx
index 428aca2034b24..a055daac82f42 100644
--- a/api_docs/expressions.mdx
+++ b/api_docs/expressions.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressions
 title: "expressions"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressions plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressions']
 ---
 import expressionsObj from './expressions.devdocs.json';
diff --git a/api_docs/features.mdx b/api_docs/features.mdx
index eb1affd111c84..652a3f185f656 100644
--- a/api_docs/features.mdx
+++ b/api_docs/features.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/features
 title: "features"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the features plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'features']
 ---
 import featuresObj from './features.devdocs.json';
diff --git a/api_docs/field_formats.mdx b/api_docs/field_formats.mdx
index 43cd3aa871553..9825232fbb788 100644
--- a/api_docs/field_formats.mdx
+++ b/api_docs/field_formats.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/fieldFormats
 title: "fieldFormats"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the fieldFormats plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'fieldFormats']
 ---
 import fieldFormatsObj from './field_formats.devdocs.json';
diff --git a/api_docs/fields_metadata.mdx b/api_docs/fields_metadata.mdx
index ede8ade212ff8..3ef73cae51942 100644
--- a/api_docs/fields_metadata.mdx
+++ b/api_docs/fields_metadata.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/fieldsMetadata
 title: "fieldsMetadata"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the fieldsMetadata plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'fieldsMetadata']
 ---
 import fieldsMetadataObj from './fields_metadata.devdocs.json';
diff --git a/api_docs/file_upload.mdx b/api_docs/file_upload.mdx
index e537915671882..2a3202f85d1e9 100644
--- a/api_docs/file_upload.mdx
+++ b/api_docs/file_upload.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/fileUpload
 title: "fileUpload"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the fileUpload plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'fileUpload']
 ---
 import fileUploadObj from './file_upload.devdocs.json';
diff --git a/api_docs/files.mdx b/api_docs/files.mdx
index edf46fa957552..0e94395cbccfb 100644
--- a/api_docs/files.mdx
+++ b/api_docs/files.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/files
 title: "files"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the files plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'files']
 ---
 import filesObj from './files.devdocs.json';
diff --git a/api_docs/files_management.mdx b/api_docs/files_management.mdx
index eee2ea3b7266f..25036ca6a8805 100644
--- a/api_docs/files_management.mdx
+++ b/api_docs/files_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/filesManagement
 title: "filesManagement"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the filesManagement plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'filesManagement']
 ---
 import filesManagementObj from './files_management.devdocs.json';
diff --git a/api_docs/fleet.devdocs.json b/api_docs/fleet.devdocs.json
index 1b09c8410d594..95969d738570b 100644
--- a/api_docs/fleet.devdocs.json
+++ b/api_docs/fleet.devdocs.json
@@ -990,27 +990,6 @@
             "path": "x-pack/plugins/fleet/common/types/rest_spec/epm.ts",
             "deprecated": false,
             "trackAdoption": false
-          },
-          {
-            "parentPluginId": "fleet",
-            "id": "def-public.GetPackagesResponse.response",
-            "type": "Array",
-            "tags": [],
-            "label": "response",
-            "description": [],
-            "signature": [
-              {
-                "pluginId": "fleet",
-                "scope": "common",
-                "docId": "kibFleetPluginApi",
-                "section": "def-common.PackageList",
-                "text": "PackageList"
-              },
-              " | undefined"
-            ],
-            "path": "x-pack/plugins/fleet/common/types/rest_spec/epm.ts",
-            "deprecated": false,
-            "trackAdoption": false
           }
         ],
         "initialIsOpen": false
@@ -4206,6 +4185,17 @@
             "deprecated": false,
             "trackAdoption": false
           },
+          {
+            "parentPluginId": "fleet",
+            "id": "def-public.EPM_API_ROUTES.INFO_WITHOUT_VERSION_PATTERN",
+            "type": "string",
+            "tags": [],
+            "label": "INFO_WITHOUT_VERSION_PATTERN",
+            "description": [],
+            "path": "x-pack/plugins/fleet/common/constants/routes.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
           {
             "parentPluginId": "fleet",
             "id": "def-public.EPM_API_ROUTES.INFO_PATTERN",
@@ -4360,39 +4350,6 @@
             "deprecated": false,
             "trackAdoption": false
           },
-          {
-            "parentPluginId": "fleet",
-            "id": "def-public.EPM_API_ROUTES.INFO_PATTERN_DEPRECATED",
-            "type": "string",
-            "tags": [],
-            "label": "INFO_PATTERN_DEPRECATED",
-            "description": [],
-            "path": "x-pack/plugins/fleet/common/constants/routes.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "fleet",
-            "id": "def-public.EPM_API_ROUTES.INSTALL_FROM_REGISTRY_PATTERN_DEPRECATED",
-            "type": "string",
-            "tags": [],
-            "label": "INSTALL_FROM_REGISTRY_PATTERN_DEPRECATED",
-            "description": [],
-            "path": "x-pack/plugins/fleet/common/constants/routes.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "fleet",
-            "id": "def-public.EPM_API_ROUTES.DELETE_PATTERN_DEPRECATED",
-            "type": "string",
-            "tags": [],
-            "label": "DELETE_PATTERN_DEPRECATED",
-            "description": [],
-            "path": "x-pack/plugins/fleet/common/constants/routes.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
           {
             "parentPluginId": "fleet",
             "id": "def-public.EPM_API_ROUTES.REAUTHORIZE_TRANSFORMS",
@@ -20932,36 +20889,6 @@
             "path": "x-pack/plugins/fleet/common/types/rest_spec/epm.ts",
             "deprecated": false,
             "trackAdoption": false
-          },
-          {
-            "parentPluginId": "fleet",
-            "id": "def-common.BulkInstallPackagesResponse.response",
-            "type": "Array",
-            "tags": [],
-            "label": "response",
-            "description": [],
-            "signature": [
-              "(",
-              {
-                "pluginId": "fleet",
-                "scope": "common",
-                "docId": "kibFleetPluginApi",
-                "section": "def-common.BulkInstallPackageInfo",
-                "text": "BulkInstallPackageInfo"
-              },
-              " | ",
-              {
-                "pluginId": "fleet",
-                "scope": "common",
-                "docId": "kibFleetPluginApi",
-                "section": "def-common.IBulkInstallPackageHTTPError",
-                "text": "IBulkInstallPackageHTTPError"
-              },
-              ")[] | undefined"
-            ],
-            "path": "x-pack/plugins/fleet/common/types/rest_spec/epm.ts",
-            "deprecated": false,
-            "trackAdoption": false
           }
         ],
         "initialIsOpen": false
@@ -22978,27 +22905,6 @@
             "path": "x-pack/plugins/fleet/common/types/rest_spec/epm.ts",
             "deprecated": false,
             "trackAdoption": false
-          },
-          {
-            "parentPluginId": "fleet",
-            "id": "def-common.GetInfoResponse.response",
-            "type": "CompoundType",
-            "tags": [],
-            "label": "response",
-            "description": [],
-            "signature": [
-              {
-                "pluginId": "fleet",
-                "scope": "common",
-                "docId": "kibFleetPluginApi",
-                "section": "def-common.PackageInfo",
-                "text": "PackageInfo"
-              },
-              " | undefined"
-            ],
-            "path": "x-pack/plugins/fleet/common/types/rest_spec/epm.ts",
-            "deprecated": false,
-            "trackAdoption": false
           }
         ],
         "initialIsOpen": false
@@ -23170,27 +23076,6 @@
             "path": "x-pack/plugins/fleet/common/types/rest_spec/epm.ts",
             "deprecated": false,
             "trackAdoption": false
-          },
-          {
-            "parentPluginId": "fleet",
-            "id": "def-common.GetPackagesResponse.response",
-            "type": "Array",
-            "tags": [],
-            "label": "response",
-            "description": [],
-            "signature": [
-              {
-                "pluginId": "fleet",
-                "scope": "common",
-                "docId": "kibFleetPluginApi",
-                "section": "def-common.PackageList",
-                "text": "PackageList"
-              },
-              " | undefined"
-            ],
-            "path": "x-pack/plugins/fleet/common/types/rest_spec/epm.ts",
-            "deprecated": false,
-            "trackAdoption": false
           }
         ],
         "initialIsOpen": false
@@ -28470,10 +28355,10 @@
             "section": "def-common.RegistrySearchResult",
             "text": "RegistrySearchResult"
           },
-          "> & { id: string; integration?: string | undefined; installationInfo?: ",
-          "InstallationInfo",
-          " | undefined; savedObject?: ",
+          "> & { id: string; integration?: string | undefined; savedObject?: ",
           "InstallableSavedObject",
+          " | undefined; installationInfo?: ",
+          "InstallationInfo",
           " | undefined; }"
         ],
         "path": "x-pack/plugins/fleet/common/types/models/epm.ts",
@@ -30509,6 +30394,17 @@
             "deprecated": false,
             "trackAdoption": false
           },
+          {
+            "parentPluginId": "fleet",
+            "id": "def-common.EPM_API_ROUTES.INFO_WITHOUT_VERSION_PATTERN",
+            "type": "string",
+            "tags": [],
+            "label": "INFO_WITHOUT_VERSION_PATTERN",
+            "description": [],
+            "path": "x-pack/plugins/fleet/common/constants/routes.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
           {
             "parentPluginId": "fleet",
             "id": "def-common.EPM_API_ROUTES.INFO_PATTERN",
@@ -30663,39 +30559,6 @@
             "deprecated": false,
             "trackAdoption": false
           },
-          {
-            "parentPluginId": "fleet",
-            "id": "def-common.EPM_API_ROUTES.INFO_PATTERN_DEPRECATED",
-            "type": "string",
-            "tags": [],
-            "label": "INFO_PATTERN_DEPRECATED",
-            "description": [],
-            "path": "x-pack/plugins/fleet/common/constants/routes.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "fleet",
-            "id": "def-common.EPM_API_ROUTES.INSTALL_FROM_REGISTRY_PATTERN_DEPRECATED",
-            "type": "string",
-            "tags": [],
-            "label": "INSTALL_FROM_REGISTRY_PATTERN_DEPRECATED",
-            "description": [],
-            "path": "x-pack/plugins/fleet/common/constants/routes.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "fleet",
-            "id": "def-common.EPM_API_ROUTES.DELETE_PATTERN_DEPRECATED",
-            "type": "string",
-            "tags": [],
-            "label": "DELETE_PATTERN_DEPRECATED",
-            "description": [],
-            "path": "x-pack/plugins/fleet/common/constants/routes.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
           {
             "parentPluginId": "fleet",
             "id": "def-common.EPM_API_ROUTES.REAUTHORIZE_TRANSFORMS",
@@ -30904,7 +30767,7 @@
             "label": "getInstallPath",
             "description": [],
             "signature": [
-              "(pkgName: string, pkgVersion: string) => string"
+              "(pkgName: string, pkgVersion?: string | undefined) => string"
             ],
             "path": "x-pack/plugins/fleet/common/services/routes.ts",
             "deprecated": false,
@@ -30933,12 +30796,12 @@
                 "label": "pkgVersion",
                 "description": [],
                 "signature": [
-                  "string"
+                  "string | undefined"
                 ],
                 "path": "x-pack/plugins/fleet/common/services/routes.ts",
                 "deprecated": false,
                 "trackAdoption": false,
-                "isRequired": true
+                "isRequired": false
               }
             ],
             "returnComment": []
@@ -30967,7 +30830,7 @@
             "label": "getRemovePath",
             "description": [],
             "signature": [
-              "(pkgName: string, pkgVersion: string) => string"
+              "(pkgName: string, pkgVersion?: string | undefined) => string"
             ],
             "path": "x-pack/plugins/fleet/common/services/routes.ts",
             "deprecated": false,
@@ -30996,12 +30859,12 @@
                 "label": "pkgVersion",
                 "description": [],
                 "signature": [
-                  "string"
+                  "string | undefined"
                 ],
                 "path": "x-pack/plugins/fleet/common/services/routes.ts",
                 "deprecated": false,
                 "trackAdoption": false,
-                "isRequired": true
+                "isRequired": false
               }
             ],
             "returnComment": []
diff --git a/api_docs/fleet.mdx b/api_docs/fleet.mdx
index 0bd611aad070c..cf74a4f50b4d7 100644
--- a/api_docs/fleet.mdx
+++ b/api_docs/fleet.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/fleet
 title: "fleet"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the fleet plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'fleet']
 ---
 import fleetObj from './fleet.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/fleet](https://github.com/orgs/elastic/teams/fleet) for questi
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 1426 | 5 | 1303 | 81 |
+| 1418 | 5 | 1295 | 81 |
 
 ## Client
 
diff --git a/api_docs/global_search.mdx b/api_docs/global_search.mdx
index 2c1de2526413e..d738ac5a515b9 100644
--- a/api_docs/global_search.mdx
+++ b/api_docs/global_search.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/globalSearch
 title: "globalSearch"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the globalSearch plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'globalSearch']
 ---
 import globalSearchObj from './global_search.devdocs.json';
diff --git a/api_docs/guided_onboarding.mdx b/api_docs/guided_onboarding.mdx
index bc911bac8a459..854622e384f2b 100644
--- a/api_docs/guided_onboarding.mdx
+++ b/api_docs/guided_onboarding.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/guidedOnboarding
 title: "guidedOnboarding"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the guidedOnboarding plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'guidedOnboarding']
 ---
 import guidedOnboardingObj from './guided_onboarding.devdocs.json';
diff --git a/api_docs/home.mdx b/api_docs/home.mdx
index 3eb519f221810..13ce7256eec23 100644
--- a/api_docs/home.mdx
+++ b/api_docs/home.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/home
 title: "home"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the home plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'home']
 ---
 import homeObj from './home.devdocs.json';
diff --git a/api_docs/image_embeddable.mdx b/api_docs/image_embeddable.mdx
index dbdd6475436df..b62aca4da3a97 100644
--- a/api_docs/image_embeddable.mdx
+++ b/api_docs/image_embeddable.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/imageEmbeddable
 title: "imageEmbeddable"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the imageEmbeddable plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'imageEmbeddable']
 ---
 import imageEmbeddableObj from './image_embeddable.devdocs.json';
diff --git a/api_docs/index_lifecycle_management.mdx b/api_docs/index_lifecycle_management.mdx
index afdd2f43325bb..742f756d668a1 100644
--- a/api_docs/index_lifecycle_management.mdx
+++ b/api_docs/index_lifecycle_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/indexLifecycleManagement
 title: "indexLifecycleManagement"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the indexLifecycleManagement plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'indexLifecycleManagement']
 ---
 import indexLifecycleManagementObj from './index_lifecycle_management.devdocs.json';
diff --git a/api_docs/index_management.mdx b/api_docs/index_management.mdx
index fc07f5e9d59ac..721792f702c42 100644
--- a/api_docs/index_management.mdx
+++ b/api_docs/index_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/indexManagement
 title: "indexManagement"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the indexManagement plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'indexManagement']
 ---
 import indexManagementObj from './index_management.devdocs.json';
diff --git a/api_docs/inference.mdx b/api_docs/inference.mdx
index 3b990b0c3a694..744709a33569c 100644
--- a/api_docs/inference.mdx
+++ b/api_docs/inference.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/inference
 title: "inference"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the inference plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'inference']
 ---
 import inferenceObj from './inference.devdocs.json';
diff --git a/api_docs/infra.mdx b/api_docs/infra.mdx
index f8a969160728f..b17dde41245ef 100644
--- a/api_docs/infra.mdx
+++ b/api_docs/infra.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/infra
 title: "infra"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the infra plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'infra']
 ---
 import infraObj from './infra.devdocs.json';
diff --git a/api_docs/ingest_pipelines.mdx b/api_docs/ingest_pipelines.mdx
index 32b47085bdcb9..aadcbd67839a9 100644
--- a/api_docs/ingest_pipelines.mdx
+++ b/api_docs/ingest_pipelines.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/ingestPipelines
 title: "ingestPipelines"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the ingestPipelines plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'ingestPipelines']
 ---
 import ingestPipelinesObj from './ingest_pipelines.devdocs.json';
diff --git a/api_docs/inspector.mdx b/api_docs/inspector.mdx
index dccfe71080cb6..09953d6b4e553 100644
--- a/api_docs/inspector.mdx
+++ b/api_docs/inspector.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/inspector
 title: "inspector"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the inspector plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'inspector']
 ---
 import inspectorObj from './inspector.devdocs.json';
diff --git a/api_docs/integration_assistant.mdx b/api_docs/integration_assistant.mdx
index f49cf1b365ab7..1515d2266b024 100644
--- a/api_docs/integration_assistant.mdx
+++ b/api_docs/integration_assistant.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/integrationAssistant
 title: "integrationAssistant"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the integrationAssistant plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'integrationAssistant']
 ---
 import integrationAssistantObj from './integration_assistant.devdocs.json';
diff --git a/api_docs/interactive_setup.mdx b/api_docs/interactive_setup.mdx
index 50416668f4df0..1424b3b5810ea 100644
--- a/api_docs/interactive_setup.mdx
+++ b/api_docs/interactive_setup.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/interactiveSetup
 title: "interactiveSetup"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the interactiveSetup plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'interactiveSetup']
 ---
 import interactiveSetupObj from './interactive_setup.devdocs.json';
diff --git a/api_docs/inventory.mdx b/api_docs/inventory.mdx
index 947915c5c8589..e1497243a2186 100644
--- a/api_docs/inventory.mdx
+++ b/api_docs/inventory.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/inventory
 title: "inventory"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the inventory plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'inventory']
 ---
 import inventoryObj from './inventory.devdocs.json';
diff --git a/api_docs/investigate.mdx b/api_docs/investigate.mdx
index 468f5aba08fc3..332be87f0570b 100644
--- a/api_docs/investigate.mdx
+++ b/api_docs/investigate.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/investigate
 title: "investigate"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the investigate plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'investigate']
 ---
 import investigateObj from './investigate.devdocs.json';
diff --git a/api_docs/investigate_app.mdx b/api_docs/investigate_app.mdx
index 1ad9629c16018..8baa98baa79f6 100644
--- a/api_docs/investigate_app.mdx
+++ b/api_docs/investigate_app.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/investigateApp
 title: "investigateApp"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the investigateApp plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'investigateApp']
 ---
 import investigateAppObj from './investigate_app.devdocs.json';
diff --git a/api_docs/kbn_actions_types.mdx b/api_docs/kbn_actions_types.mdx
index 23d243f3870d0..06eceb40d78ba 100644
--- a/api_docs/kbn_actions_types.mdx
+++ b/api_docs/kbn_actions_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-actions-types
 title: "@kbn/actions-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/actions-types plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/actions-types']
 ---
 import kbnActionsTypesObj from './kbn_actions_types.devdocs.json';
diff --git a/api_docs/kbn_ai_assistant.mdx b/api_docs/kbn_ai_assistant.mdx
index 40a4d81e7d2f9..a8dbbb89c8acf 100644
--- a/api_docs/kbn_ai_assistant.mdx
+++ b/api_docs/kbn_ai_assistant.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ai-assistant
 title: "@kbn/ai-assistant"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ai-assistant plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ai-assistant']
 ---
 import kbnAiAssistantObj from './kbn_ai_assistant.devdocs.json';
diff --git a/api_docs/kbn_ai_assistant_common.mdx b/api_docs/kbn_ai_assistant_common.mdx
index e2e80e4044090..aeb160c6f438d 100644
--- a/api_docs/kbn_ai_assistant_common.mdx
+++ b/api_docs/kbn_ai_assistant_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ai-assistant-common
 title: "@kbn/ai-assistant-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ai-assistant-common plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ai-assistant-common']
 ---
 import kbnAiAssistantCommonObj from './kbn_ai_assistant_common.devdocs.json';
diff --git a/api_docs/kbn_aiops_components.mdx b/api_docs/kbn_aiops_components.mdx
index 16c79eadc55d7..1044eab69d0e9 100644
--- a/api_docs/kbn_aiops_components.mdx
+++ b/api_docs/kbn_aiops_components.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-aiops-components
 title: "@kbn/aiops-components"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/aiops-components plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/aiops-components']
 ---
 import kbnAiopsComponentsObj from './kbn_aiops_components.devdocs.json';
diff --git a/api_docs/kbn_aiops_log_pattern_analysis.mdx b/api_docs/kbn_aiops_log_pattern_analysis.mdx
index 79b19e18e25d2..b2e3809bce255 100644
--- a/api_docs/kbn_aiops_log_pattern_analysis.mdx
+++ b/api_docs/kbn_aiops_log_pattern_analysis.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-aiops-log-pattern-analysis
 title: "@kbn/aiops-log-pattern-analysis"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/aiops-log-pattern-analysis plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/aiops-log-pattern-analysis']
 ---
 import kbnAiopsLogPatternAnalysisObj from './kbn_aiops_log_pattern_analysis.devdocs.json';
diff --git a/api_docs/kbn_aiops_log_rate_analysis.mdx b/api_docs/kbn_aiops_log_rate_analysis.mdx
index 59856214286aa..457df3dbf7e57 100644
--- a/api_docs/kbn_aiops_log_rate_analysis.mdx
+++ b/api_docs/kbn_aiops_log_rate_analysis.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-aiops-log-rate-analysis
 title: "@kbn/aiops-log-rate-analysis"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/aiops-log-rate-analysis plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/aiops-log-rate-analysis']
 ---
 import kbnAiopsLogRateAnalysisObj from './kbn_aiops_log_rate_analysis.devdocs.json';
diff --git a/api_docs/kbn_alerting_api_integration_helpers.mdx b/api_docs/kbn_alerting_api_integration_helpers.mdx
index d2e43132d3baa..5c2c5fde9c6be 100644
--- a/api_docs/kbn_alerting_api_integration_helpers.mdx
+++ b/api_docs/kbn_alerting_api_integration_helpers.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-alerting-api-integration-helpers
 title: "@kbn/alerting-api-integration-helpers"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/alerting-api-integration-helpers plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/alerting-api-integration-helpers']
 ---
 import kbnAlertingApiIntegrationHelpersObj from './kbn_alerting_api_integration_helpers.devdocs.json';
diff --git a/api_docs/kbn_alerting_comparators.mdx b/api_docs/kbn_alerting_comparators.mdx
index a1a0a27c3dca4..e0aa4a6d3c1c4 100644
--- a/api_docs/kbn_alerting_comparators.mdx
+++ b/api_docs/kbn_alerting_comparators.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-alerting-comparators
 title: "@kbn/alerting-comparators"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/alerting-comparators plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/alerting-comparators']
 ---
 import kbnAlertingComparatorsObj from './kbn_alerting_comparators.devdocs.json';
diff --git a/api_docs/kbn_alerting_state_types.mdx b/api_docs/kbn_alerting_state_types.mdx
index 4303bdb6e47f4..a84abb2c3a98e 100644
--- a/api_docs/kbn_alerting_state_types.mdx
+++ b/api_docs/kbn_alerting_state_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-alerting-state-types
 title: "@kbn/alerting-state-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/alerting-state-types plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/alerting-state-types']
 ---
 import kbnAlertingStateTypesObj from './kbn_alerting_state_types.devdocs.json';
diff --git a/api_docs/kbn_alerting_types.mdx b/api_docs/kbn_alerting_types.mdx
index f3325a895c155..8744a99b8a380 100644
--- a/api_docs/kbn_alerting_types.mdx
+++ b/api_docs/kbn_alerting_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-alerting-types
 title: "@kbn/alerting-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/alerting-types plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/alerting-types']
 ---
 import kbnAlertingTypesObj from './kbn_alerting_types.devdocs.json';
diff --git a/api_docs/kbn_alerts_as_data_utils.mdx b/api_docs/kbn_alerts_as_data_utils.mdx
index f98e4f0031cda..a0d08f8704bdd 100644
--- a/api_docs/kbn_alerts_as_data_utils.mdx
+++ b/api_docs/kbn_alerts_as_data_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-alerts-as-data-utils
 title: "@kbn/alerts-as-data-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/alerts-as-data-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/alerts-as-data-utils']
 ---
 import kbnAlertsAsDataUtilsObj from './kbn_alerts_as_data_utils.devdocs.json';
diff --git a/api_docs/kbn_alerts_grouping.mdx b/api_docs/kbn_alerts_grouping.mdx
index fac8796c6e9e4..0fbf745cb4697 100644
--- a/api_docs/kbn_alerts_grouping.mdx
+++ b/api_docs/kbn_alerts_grouping.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-alerts-grouping
 title: "@kbn/alerts-grouping"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/alerts-grouping plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/alerts-grouping']
 ---
 import kbnAlertsGroupingObj from './kbn_alerts_grouping.devdocs.json';
diff --git a/api_docs/kbn_alerts_ui_shared.mdx b/api_docs/kbn_alerts_ui_shared.mdx
index 71cec495e8387..6bce96338590e 100644
--- a/api_docs/kbn_alerts_ui_shared.mdx
+++ b/api_docs/kbn_alerts_ui_shared.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-alerts-ui-shared
 title: "@kbn/alerts-ui-shared"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/alerts-ui-shared plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/alerts-ui-shared']
 ---
 import kbnAlertsUiSharedObj from './kbn_alerts_ui_shared.devdocs.json';
diff --git a/api_docs/kbn_analytics.mdx b/api_docs/kbn_analytics.mdx
index 5e910ff6a31c2..9b6b4326cb128 100644
--- a/api_docs/kbn_analytics.mdx
+++ b/api_docs/kbn_analytics.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-analytics
 title: "@kbn/analytics"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/analytics plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/analytics']
 ---
 import kbnAnalyticsObj from './kbn_analytics.devdocs.json';
diff --git a/api_docs/kbn_analytics_collection_utils.mdx b/api_docs/kbn_analytics_collection_utils.mdx
index 8553d8f10da03..eb892e4a95317 100644
--- a/api_docs/kbn_analytics_collection_utils.mdx
+++ b/api_docs/kbn_analytics_collection_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-analytics-collection-utils
 title: "@kbn/analytics-collection-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/analytics-collection-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/analytics-collection-utils']
 ---
 import kbnAnalyticsCollectionUtilsObj from './kbn_analytics_collection_utils.devdocs.json';
diff --git a/api_docs/kbn_apm_config_loader.mdx b/api_docs/kbn_apm_config_loader.mdx
index 411bd0e27e18a..2da4485d7a9bf 100644
--- a/api_docs/kbn_apm_config_loader.mdx
+++ b/api_docs/kbn_apm_config_loader.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-apm-config-loader
 title: "@kbn/apm-config-loader"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/apm-config-loader plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/apm-config-loader']
 ---
 import kbnApmConfigLoaderObj from './kbn_apm_config_loader.devdocs.json';
diff --git a/api_docs/kbn_apm_data_view.mdx b/api_docs/kbn_apm_data_view.mdx
index 14a8ea562eeff..139e7232323e9 100644
--- a/api_docs/kbn_apm_data_view.mdx
+++ b/api_docs/kbn_apm_data_view.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-apm-data-view
 title: "@kbn/apm-data-view"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/apm-data-view plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/apm-data-view']
 ---
 import kbnApmDataViewObj from './kbn_apm_data_view.devdocs.json';
diff --git a/api_docs/kbn_apm_synthtrace.mdx b/api_docs/kbn_apm_synthtrace.mdx
index 0c0f99defe2e7..7b3745f85deae 100644
--- a/api_docs/kbn_apm_synthtrace.mdx
+++ b/api_docs/kbn_apm_synthtrace.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-apm-synthtrace
 title: "@kbn/apm-synthtrace"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/apm-synthtrace plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/apm-synthtrace']
 ---
 import kbnApmSynthtraceObj from './kbn_apm_synthtrace.devdocs.json';
diff --git a/api_docs/kbn_apm_synthtrace_client.mdx b/api_docs/kbn_apm_synthtrace_client.mdx
index f0e6fc01b8dbe..fad5c75324958 100644
--- a/api_docs/kbn_apm_synthtrace_client.mdx
+++ b/api_docs/kbn_apm_synthtrace_client.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-apm-synthtrace-client
 title: "@kbn/apm-synthtrace-client"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/apm-synthtrace-client plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/apm-synthtrace-client']
 ---
 import kbnApmSynthtraceClientObj from './kbn_apm_synthtrace_client.devdocs.json';
diff --git a/api_docs/kbn_apm_types.mdx b/api_docs/kbn_apm_types.mdx
index e92f4b42ff01e..c919493d79196 100644
--- a/api_docs/kbn_apm_types.mdx
+++ b/api_docs/kbn_apm_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-apm-types
 title: "@kbn/apm-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/apm-types plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/apm-types']
 ---
 import kbnApmTypesObj from './kbn_apm_types.devdocs.json';
diff --git a/api_docs/kbn_apm_utils.mdx b/api_docs/kbn_apm_utils.mdx
index 4a21019d037b2..4a48c41fb16a6 100644
--- a/api_docs/kbn_apm_utils.mdx
+++ b/api_docs/kbn_apm_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-apm-utils
 title: "@kbn/apm-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/apm-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/apm-utils']
 ---
 import kbnApmUtilsObj from './kbn_apm_utils.devdocs.json';
diff --git a/api_docs/kbn_avc_banner.mdx b/api_docs/kbn_avc_banner.mdx
index 977b066769fe9..b911efd40ac59 100644
--- a/api_docs/kbn_avc_banner.mdx
+++ b/api_docs/kbn_avc_banner.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-avc-banner
 title: "@kbn/avc-banner"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/avc-banner plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/avc-banner']
 ---
 import kbnAvcBannerObj from './kbn_avc_banner.devdocs.json';
diff --git a/api_docs/kbn_axe_config.mdx b/api_docs/kbn_axe_config.mdx
index 16b2eb4b939e5..d9642db245794 100644
--- a/api_docs/kbn_axe_config.mdx
+++ b/api_docs/kbn_axe_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-axe-config
 title: "@kbn/axe-config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/axe-config plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/axe-config']
 ---
 import kbnAxeConfigObj from './kbn_axe_config.devdocs.json';
diff --git a/api_docs/kbn_bfetch_error.mdx b/api_docs/kbn_bfetch_error.mdx
index 78239eee5e5c5..882caa2a8497d 100644
--- a/api_docs/kbn_bfetch_error.mdx
+++ b/api_docs/kbn_bfetch_error.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-bfetch-error
 title: "@kbn/bfetch-error"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/bfetch-error plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/bfetch-error']
 ---
 import kbnBfetchErrorObj from './kbn_bfetch_error.devdocs.json';
diff --git a/api_docs/kbn_calculate_auto.mdx b/api_docs/kbn_calculate_auto.mdx
index 269fcf98e0583..9b85ad479b6cc 100644
--- a/api_docs/kbn_calculate_auto.mdx
+++ b/api_docs/kbn_calculate_auto.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-calculate-auto
 title: "@kbn/calculate-auto"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/calculate-auto plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/calculate-auto']
 ---
 import kbnCalculateAutoObj from './kbn_calculate_auto.devdocs.json';
diff --git a/api_docs/kbn_calculate_width_from_char_count.mdx b/api_docs/kbn_calculate_width_from_char_count.mdx
index ba174bebb90ba..fe5f23651d24c 100644
--- a/api_docs/kbn_calculate_width_from_char_count.mdx
+++ b/api_docs/kbn_calculate_width_from_char_count.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-calculate-width-from-char-count
 title: "@kbn/calculate-width-from-char-count"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/calculate-width-from-char-count plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/calculate-width-from-char-count']
 ---
 import kbnCalculateWidthFromCharCountObj from './kbn_calculate_width_from_char_count.devdocs.json';
diff --git a/api_docs/kbn_cases_components.mdx b/api_docs/kbn_cases_components.mdx
index 04aad66926fcb..8e77dc34cc012 100644
--- a/api_docs/kbn_cases_components.mdx
+++ b/api_docs/kbn_cases_components.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-cases-components
 title: "@kbn/cases-components"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/cases-components plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/cases-components']
 ---
 import kbnCasesComponentsObj from './kbn_cases_components.devdocs.json';
diff --git a/api_docs/kbn_cbor.mdx b/api_docs/kbn_cbor.mdx
index 702f57ce2fca1..31f3ab231b7fc 100644
--- a/api_docs/kbn_cbor.mdx
+++ b/api_docs/kbn_cbor.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-cbor
 title: "@kbn/cbor"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/cbor plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/cbor']
 ---
 import kbnCborObj from './kbn_cbor.devdocs.json';
diff --git a/api_docs/kbn_cell_actions.mdx b/api_docs/kbn_cell_actions.mdx
index b3b996408ccd6..f73f955595326 100644
--- a/api_docs/kbn_cell_actions.mdx
+++ b/api_docs/kbn_cell_actions.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-cell-actions
 title: "@kbn/cell-actions"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/cell-actions plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/cell-actions']
 ---
 import kbnCellActionsObj from './kbn_cell_actions.devdocs.json';
diff --git a/api_docs/kbn_chart_expressions_common.mdx b/api_docs/kbn_chart_expressions_common.mdx
index 18c3439afb5b7..aef50ebb62b63 100644
--- a/api_docs/kbn_chart_expressions_common.mdx
+++ b/api_docs/kbn_chart_expressions_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-chart-expressions-common
 title: "@kbn/chart-expressions-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/chart-expressions-common plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/chart-expressions-common']
 ---
 import kbnChartExpressionsCommonObj from './kbn_chart_expressions_common.devdocs.json';
diff --git a/api_docs/kbn_chart_icons.mdx b/api_docs/kbn_chart_icons.mdx
index 774bfa816f8bc..f9e5e18c5ef84 100644
--- a/api_docs/kbn_chart_icons.mdx
+++ b/api_docs/kbn_chart_icons.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-chart-icons
 title: "@kbn/chart-icons"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/chart-icons plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/chart-icons']
 ---
 import kbnChartIconsObj from './kbn_chart_icons.devdocs.json';
diff --git a/api_docs/kbn_ci_stats_core.mdx b/api_docs/kbn_ci_stats_core.mdx
index db82b4520a795..e39742061b7b1 100644
--- a/api_docs/kbn_ci_stats_core.mdx
+++ b/api_docs/kbn_ci_stats_core.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ci-stats-core
 title: "@kbn/ci-stats-core"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ci-stats-core plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ci-stats-core']
 ---
 import kbnCiStatsCoreObj from './kbn_ci_stats_core.devdocs.json';
diff --git a/api_docs/kbn_ci_stats_performance_metrics.mdx b/api_docs/kbn_ci_stats_performance_metrics.mdx
index 2cbba4fe0944c..00824f80f5570 100644
--- a/api_docs/kbn_ci_stats_performance_metrics.mdx
+++ b/api_docs/kbn_ci_stats_performance_metrics.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ci-stats-performance-metrics
 title: "@kbn/ci-stats-performance-metrics"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ci-stats-performance-metrics plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ci-stats-performance-metrics']
 ---
 import kbnCiStatsPerformanceMetricsObj from './kbn_ci_stats_performance_metrics.devdocs.json';
diff --git a/api_docs/kbn_ci_stats_reporter.mdx b/api_docs/kbn_ci_stats_reporter.mdx
index 6c65d204aaa78..d914d53f625db 100644
--- a/api_docs/kbn_ci_stats_reporter.mdx
+++ b/api_docs/kbn_ci_stats_reporter.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ci-stats-reporter
 title: "@kbn/ci-stats-reporter"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ci-stats-reporter plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ci-stats-reporter']
 ---
 import kbnCiStatsReporterObj from './kbn_ci_stats_reporter.devdocs.json';
diff --git a/api_docs/kbn_cli_dev_mode.mdx b/api_docs/kbn_cli_dev_mode.mdx
index de15aec7cf8d8..3ac4e1da35719 100644
--- a/api_docs/kbn_cli_dev_mode.mdx
+++ b/api_docs/kbn_cli_dev_mode.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-cli-dev-mode
 title: "@kbn/cli-dev-mode"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/cli-dev-mode plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/cli-dev-mode']
 ---
 import kbnCliDevModeObj from './kbn_cli_dev_mode.devdocs.json';
diff --git a/api_docs/kbn_cloud_security_posture.mdx b/api_docs/kbn_cloud_security_posture.mdx
index 1da3d91b93ba0..f34c151844016 100644
--- a/api_docs/kbn_cloud_security_posture.mdx
+++ b/api_docs/kbn_cloud_security_posture.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-cloud-security-posture
 title: "@kbn/cloud-security-posture"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/cloud-security-posture plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/cloud-security-posture']
 ---
 import kbnCloudSecurityPostureObj from './kbn_cloud_security_posture.devdocs.json';
diff --git a/api_docs/kbn_cloud_security_posture_common.devdocs.json b/api_docs/kbn_cloud_security_posture_common.devdocs.json
index 7a23e5f8cfbd0..9416b32992a1d 100644
--- a/api_docs/kbn_cloud_security_posture_common.devdocs.json
+++ b/api_docs/kbn_cloud_security_posture_common.devdocs.json
@@ -83,7 +83,7 @@
             "label": "trackUiMetric",
             "description": [],
             "signature": [
-              "(metricType: string, eventName: CloudSecurityUiCounters) => void"
+              "(metricType: string, eventName: string) => void"
             ],
             "path": "x-pack/packages/kbn-cloud-security-posture/common/utils/ui_metrics.ts",
             "deprecated": false,
@@ -107,12 +107,12 @@
               {
                 "parentPluginId": "@kbn/cloud-security-posture-common",
                 "id": "def-common.UiMetricService.trackUiMetric.$2",
-                "type": "CompoundType",
+                "type": "string",
                 "tags": [],
                 "label": "eventName",
                 "description": [],
                 "signature": [
-                  "CloudSecurityUiCounters"
+                  "string"
                 ],
                 "path": "x-pack/packages/kbn-cloud-security-posture/common/utils/ui_metrics.ts",
                 "deprecated": false,
diff --git a/api_docs/kbn_cloud_security_posture_common.mdx b/api_docs/kbn_cloud_security_posture_common.mdx
index c6abfcc1da15e..cda42aa426810 100644
--- a/api_docs/kbn_cloud_security_posture_common.mdx
+++ b/api_docs/kbn_cloud_security_posture_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-cloud-security-posture-common
 title: "@kbn/cloud-security-posture-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/cloud-security-posture-common plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/cloud-security-posture-common']
 ---
 import kbnCloudSecurityPostureCommonObj from './kbn_cloud_security_posture_common.devdocs.json';
diff --git a/api_docs/kbn_cloud_security_posture_graph.mdx b/api_docs/kbn_cloud_security_posture_graph.mdx
index a83800135b8b9..a6bd27fc26a10 100644
--- a/api_docs/kbn_cloud_security_posture_graph.mdx
+++ b/api_docs/kbn_cloud_security_posture_graph.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-cloud-security-posture-graph
 title: "@kbn/cloud-security-posture-graph"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/cloud-security-posture-graph plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/cloud-security-posture-graph']
 ---
 import kbnCloudSecurityPostureGraphObj from './kbn_cloud_security_posture_graph.devdocs.json';
diff --git a/api_docs/kbn_code_editor.mdx b/api_docs/kbn_code_editor.mdx
index 7c5e58bc09c93..843f505fa9c1d 100644
--- a/api_docs/kbn_code_editor.mdx
+++ b/api_docs/kbn_code_editor.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-code-editor
 title: "@kbn/code-editor"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/code-editor plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/code-editor']
 ---
 import kbnCodeEditorObj from './kbn_code_editor.devdocs.json';
diff --git a/api_docs/kbn_code_editor_mock.mdx b/api_docs/kbn_code_editor_mock.mdx
index 4cd49ae807df6..88f1f16cd1bee 100644
--- a/api_docs/kbn_code_editor_mock.mdx
+++ b/api_docs/kbn_code_editor_mock.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-code-editor-mock
 title: "@kbn/code-editor-mock"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/code-editor-mock plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/code-editor-mock']
 ---
 import kbnCodeEditorMockObj from './kbn_code_editor_mock.devdocs.json';
diff --git a/api_docs/kbn_code_owners.mdx b/api_docs/kbn_code_owners.mdx
index 920b7fbe20966..a8ed74e45c725 100644
--- a/api_docs/kbn_code_owners.mdx
+++ b/api_docs/kbn_code_owners.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-code-owners
 title: "@kbn/code-owners"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/code-owners plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/code-owners']
 ---
 import kbnCodeOwnersObj from './kbn_code_owners.devdocs.json';
diff --git a/api_docs/kbn_coloring.mdx b/api_docs/kbn_coloring.mdx
index d8270b3ac8d6b..1e7b9ea9c0383 100644
--- a/api_docs/kbn_coloring.mdx
+++ b/api_docs/kbn_coloring.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-coloring
 title: "@kbn/coloring"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/coloring plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/coloring']
 ---
 import kbnColoringObj from './kbn_coloring.devdocs.json';
diff --git a/api_docs/kbn_config.mdx b/api_docs/kbn_config.mdx
index 8449100bf79ca..cb741fc2ff28e 100644
--- a/api_docs/kbn_config.mdx
+++ b/api_docs/kbn_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-config
 title: "@kbn/config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/config plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/config']
 ---
 import kbnConfigObj from './kbn_config.devdocs.json';
diff --git a/api_docs/kbn_config_mocks.mdx b/api_docs/kbn_config_mocks.mdx
index 873dad567ad49..e3786caf19645 100644
--- a/api_docs/kbn_config_mocks.mdx
+++ b/api_docs/kbn_config_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-config-mocks
 title: "@kbn/config-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/config-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/config-mocks']
 ---
 import kbnConfigMocksObj from './kbn_config_mocks.devdocs.json';
diff --git a/api_docs/kbn_config_schema.mdx b/api_docs/kbn_config_schema.mdx
index 84816984da010..1e3c1cf824fd9 100644
--- a/api_docs/kbn_config_schema.mdx
+++ b/api_docs/kbn_config_schema.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-config-schema
 title: "@kbn/config-schema"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/config-schema plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/config-schema']
 ---
 import kbnConfigSchemaObj from './kbn_config_schema.devdocs.json';
diff --git a/api_docs/kbn_content_management_content_editor.mdx b/api_docs/kbn_content_management_content_editor.mdx
index 80c25017ad739..c38a7d5efa7ea 100644
--- a/api_docs/kbn_content_management_content_editor.mdx
+++ b/api_docs/kbn_content_management_content_editor.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-content-management-content-editor
 title: "@kbn/content-management-content-editor"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/content-management-content-editor plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/content-management-content-editor']
 ---
 import kbnContentManagementContentEditorObj from './kbn_content_management_content_editor.devdocs.json';
diff --git a/api_docs/kbn_content_management_content_insights_public.mdx b/api_docs/kbn_content_management_content_insights_public.mdx
index f53ce023771aa..5b605d71bc723 100644
--- a/api_docs/kbn_content_management_content_insights_public.mdx
+++ b/api_docs/kbn_content_management_content_insights_public.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-content-management-content-insights-public
 title: "@kbn/content-management-content-insights-public"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/content-management-content-insights-public plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/content-management-content-insights-public']
 ---
 import kbnContentManagementContentInsightsPublicObj from './kbn_content_management_content_insights_public.devdocs.json';
diff --git a/api_docs/kbn_content_management_content_insights_server.mdx b/api_docs/kbn_content_management_content_insights_server.mdx
index 904071301683b..573e9daaa9180 100644
--- a/api_docs/kbn_content_management_content_insights_server.mdx
+++ b/api_docs/kbn_content_management_content_insights_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-content-management-content-insights-server
 title: "@kbn/content-management-content-insights-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/content-management-content-insights-server plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/content-management-content-insights-server']
 ---
 import kbnContentManagementContentInsightsServerObj from './kbn_content_management_content_insights_server.devdocs.json';
diff --git a/api_docs/kbn_content_management_favorites_public.mdx b/api_docs/kbn_content_management_favorites_public.mdx
index bdeac5ac2068d..9a2795cac48a0 100644
--- a/api_docs/kbn_content_management_favorites_public.mdx
+++ b/api_docs/kbn_content_management_favorites_public.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-content-management-favorites-public
 title: "@kbn/content-management-favorites-public"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/content-management-favorites-public plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/content-management-favorites-public']
 ---
 import kbnContentManagementFavoritesPublicObj from './kbn_content_management_favorites_public.devdocs.json';
diff --git a/api_docs/kbn_content_management_favorites_server.mdx b/api_docs/kbn_content_management_favorites_server.mdx
index eb954f7d202d4..e2c4eddde85df 100644
--- a/api_docs/kbn_content_management_favorites_server.mdx
+++ b/api_docs/kbn_content_management_favorites_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-content-management-favorites-server
 title: "@kbn/content-management-favorites-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/content-management-favorites-server plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/content-management-favorites-server']
 ---
 import kbnContentManagementFavoritesServerObj from './kbn_content_management_favorites_server.devdocs.json';
diff --git a/api_docs/kbn_content_management_tabbed_table_list_view.mdx b/api_docs/kbn_content_management_tabbed_table_list_view.mdx
index 38d0de9620f8a..e8016584b0047 100644
--- a/api_docs/kbn_content_management_tabbed_table_list_view.mdx
+++ b/api_docs/kbn_content_management_tabbed_table_list_view.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-content-management-tabbed-table-list-view
 title: "@kbn/content-management-tabbed-table-list-view"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/content-management-tabbed-table-list-view plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/content-management-tabbed-table-list-view']
 ---
 import kbnContentManagementTabbedTableListViewObj from './kbn_content_management_tabbed_table_list_view.devdocs.json';
diff --git a/api_docs/kbn_content_management_table_list_view.mdx b/api_docs/kbn_content_management_table_list_view.mdx
index 72e2e3b6267e6..47cfc043428f8 100644
--- a/api_docs/kbn_content_management_table_list_view.mdx
+++ b/api_docs/kbn_content_management_table_list_view.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-content-management-table-list-view
 title: "@kbn/content-management-table-list-view"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/content-management-table-list-view plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/content-management-table-list-view']
 ---
 import kbnContentManagementTableListViewObj from './kbn_content_management_table_list_view.devdocs.json';
diff --git a/api_docs/kbn_content_management_table_list_view_common.mdx b/api_docs/kbn_content_management_table_list_view_common.mdx
index 7bf9fdf272c08..7c77857b9ae94 100644
--- a/api_docs/kbn_content_management_table_list_view_common.mdx
+++ b/api_docs/kbn_content_management_table_list_view_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-content-management-table-list-view-common
 title: "@kbn/content-management-table-list-view-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/content-management-table-list-view-common plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/content-management-table-list-view-common']
 ---
 import kbnContentManagementTableListViewCommonObj from './kbn_content_management_table_list_view_common.devdocs.json';
diff --git a/api_docs/kbn_content_management_table_list_view_table.mdx b/api_docs/kbn_content_management_table_list_view_table.mdx
index d9b1d32f77cb7..ecbf0ee4a5e27 100644
--- a/api_docs/kbn_content_management_table_list_view_table.mdx
+++ b/api_docs/kbn_content_management_table_list_view_table.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-content-management-table-list-view-table
 title: "@kbn/content-management-table-list-view-table"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/content-management-table-list-view-table plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/content-management-table-list-view-table']
 ---
 import kbnContentManagementTableListViewTableObj from './kbn_content_management_table_list_view_table.devdocs.json';
diff --git a/api_docs/kbn_content_management_user_profiles.mdx b/api_docs/kbn_content_management_user_profiles.mdx
index ffe8ae55d3410..282541a9f04c4 100644
--- a/api_docs/kbn_content_management_user_profiles.mdx
+++ b/api_docs/kbn_content_management_user_profiles.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-content-management-user-profiles
 title: "@kbn/content-management-user-profiles"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/content-management-user-profiles plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/content-management-user-profiles']
 ---
 import kbnContentManagementUserProfilesObj from './kbn_content_management_user_profiles.devdocs.json';
diff --git a/api_docs/kbn_content_management_utils.mdx b/api_docs/kbn_content_management_utils.mdx
index dfee350e60ec2..6c6d97bdf151b 100644
--- a/api_docs/kbn_content_management_utils.mdx
+++ b/api_docs/kbn_content_management_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-content-management-utils
 title: "@kbn/content-management-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/content-management-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/content-management-utils']
 ---
 import kbnContentManagementUtilsObj from './kbn_content_management_utils.devdocs.json';
diff --git a/api_docs/kbn_core_analytics_browser.mdx b/api_docs/kbn_core_analytics_browser.mdx
index 08d6ae4b2c0bd..884e8bdce45d6 100644
--- a/api_docs/kbn_core_analytics_browser.mdx
+++ b/api_docs/kbn_core_analytics_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-browser
 title: "@kbn/core-analytics-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-analytics-browser plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-analytics-browser']
 ---
 import kbnCoreAnalyticsBrowserObj from './kbn_core_analytics_browser.devdocs.json';
diff --git a/api_docs/kbn_core_analytics_browser_internal.mdx b/api_docs/kbn_core_analytics_browser_internal.mdx
index c4e034a98fa5f..9bf640384ea57 100644
--- a/api_docs/kbn_core_analytics_browser_internal.mdx
+++ b/api_docs/kbn_core_analytics_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-browser-internal
 title: "@kbn/core-analytics-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-analytics-browser-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-analytics-browser-internal']
 ---
 import kbnCoreAnalyticsBrowserInternalObj from './kbn_core_analytics_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_analytics_browser_mocks.mdx b/api_docs/kbn_core_analytics_browser_mocks.mdx
index 932c4df060a56..35e13c4bdc390 100644
--- a/api_docs/kbn_core_analytics_browser_mocks.mdx
+++ b/api_docs/kbn_core_analytics_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-browser-mocks
 title: "@kbn/core-analytics-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-analytics-browser-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-analytics-browser-mocks']
 ---
 import kbnCoreAnalyticsBrowserMocksObj from './kbn_core_analytics_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_analytics_server.mdx b/api_docs/kbn_core_analytics_server.mdx
index d7231d6acac4a..49c40d36c54fa 100644
--- a/api_docs/kbn_core_analytics_server.mdx
+++ b/api_docs/kbn_core_analytics_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-server
 title: "@kbn/core-analytics-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-analytics-server plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-analytics-server']
 ---
 import kbnCoreAnalyticsServerObj from './kbn_core_analytics_server.devdocs.json';
diff --git a/api_docs/kbn_core_analytics_server_internal.mdx b/api_docs/kbn_core_analytics_server_internal.mdx
index 2309f9c5657c7..8c6fe9eb7ef7c 100644
--- a/api_docs/kbn_core_analytics_server_internal.mdx
+++ b/api_docs/kbn_core_analytics_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-server-internal
 title: "@kbn/core-analytics-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-analytics-server-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-analytics-server-internal']
 ---
 import kbnCoreAnalyticsServerInternalObj from './kbn_core_analytics_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_analytics_server_mocks.mdx b/api_docs/kbn_core_analytics_server_mocks.mdx
index f4395a7f234c9..163f1a443bcea 100644
--- a/api_docs/kbn_core_analytics_server_mocks.mdx
+++ b/api_docs/kbn_core_analytics_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-server-mocks
 title: "@kbn/core-analytics-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-analytics-server-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-analytics-server-mocks']
 ---
 import kbnCoreAnalyticsServerMocksObj from './kbn_core_analytics_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_application_browser.mdx b/api_docs/kbn_core_application_browser.mdx
index 3d8474e494b25..eebc7bf6d0ea9 100644
--- a/api_docs/kbn_core_application_browser.mdx
+++ b/api_docs/kbn_core_application_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-application-browser
 title: "@kbn/core-application-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-application-browser plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-application-browser']
 ---
 import kbnCoreApplicationBrowserObj from './kbn_core_application_browser.devdocs.json';
diff --git a/api_docs/kbn_core_application_browser_internal.mdx b/api_docs/kbn_core_application_browser_internal.mdx
index dbc19314ab036..a715913c597a5 100644
--- a/api_docs/kbn_core_application_browser_internal.mdx
+++ b/api_docs/kbn_core_application_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-application-browser-internal
 title: "@kbn/core-application-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-application-browser-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-application-browser-internal']
 ---
 import kbnCoreApplicationBrowserInternalObj from './kbn_core_application_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_application_browser_mocks.mdx b/api_docs/kbn_core_application_browser_mocks.mdx
index 75729071682b1..09cf249b9e302 100644
--- a/api_docs/kbn_core_application_browser_mocks.mdx
+++ b/api_docs/kbn_core_application_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-application-browser-mocks
 title: "@kbn/core-application-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-application-browser-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-application-browser-mocks']
 ---
 import kbnCoreApplicationBrowserMocksObj from './kbn_core_application_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_application_common.mdx b/api_docs/kbn_core_application_common.mdx
index 4fc3b5b44df43..cd4b9a871f65c 100644
--- a/api_docs/kbn_core_application_common.mdx
+++ b/api_docs/kbn_core_application_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-application-common
 title: "@kbn/core-application-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-application-common plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-application-common']
 ---
 import kbnCoreApplicationCommonObj from './kbn_core_application_common.devdocs.json';
diff --git a/api_docs/kbn_core_apps_browser_internal.mdx b/api_docs/kbn_core_apps_browser_internal.mdx
index 58a9f17c82631..629b0f8f401e2 100644
--- a/api_docs/kbn_core_apps_browser_internal.mdx
+++ b/api_docs/kbn_core_apps_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-apps-browser-internal
 title: "@kbn/core-apps-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-apps-browser-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-apps-browser-internal']
 ---
 import kbnCoreAppsBrowserInternalObj from './kbn_core_apps_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_apps_browser_mocks.mdx b/api_docs/kbn_core_apps_browser_mocks.mdx
index 5630f5822d184..5e793044dc581 100644
--- a/api_docs/kbn_core_apps_browser_mocks.mdx
+++ b/api_docs/kbn_core_apps_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-apps-browser-mocks
 title: "@kbn/core-apps-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-apps-browser-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-apps-browser-mocks']
 ---
 import kbnCoreAppsBrowserMocksObj from './kbn_core_apps_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_apps_server_internal.mdx b/api_docs/kbn_core_apps_server_internal.mdx
index 329656a09591f..0dc9e90aaa736 100644
--- a/api_docs/kbn_core_apps_server_internal.mdx
+++ b/api_docs/kbn_core_apps_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-apps-server-internal
 title: "@kbn/core-apps-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-apps-server-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-apps-server-internal']
 ---
 import kbnCoreAppsServerInternalObj from './kbn_core_apps_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_base_browser_mocks.mdx b/api_docs/kbn_core_base_browser_mocks.mdx
index c039ebc47fe7b..a1e96552832f3 100644
--- a/api_docs/kbn_core_base_browser_mocks.mdx
+++ b/api_docs/kbn_core_base_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-base-browser-mocks
 title: "@kbn/core-base-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-base-browser-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-base-browser-mocks']
 ---
 import kbnCoreBaseBrowserMocksObj from './kbn_core_base_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_base_common.mdx b/api_docs/kbn_core_base_common.mdx
index b91c293f93cfb..e6a914fbc4292 100644
--- a/api_docs/kbn_core_base_common.mdx
+++ b/api_docs/kbn_core_base_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-base-common
 title: "@kbn/core-base-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-base-common plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-base-common']
 ---
 import kbnCoreBaseCommonObj from './kbn_core_base_common.devdocs.json';
diff --git a/api_docs/kbn_core_base_server_internal.mdx b/api_docs/kbn_core_base_server_internal.mdx
index 790a3c6ba3517..e4f5f9e9f5a22 100644
--- a/api_docs/kbn_core_base_server_internal.mdx
+++ b/api_docs/kbn_core_base_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-base-server-internal
 title: "@kbn/core-base-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-base-server-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-base-server-internal']
 ---
 import kbnCoreBaseServerInternalObj from './kbn_core_base_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_base_server_mocks.mdx b/api_docs/kbn_core_base_server_mocks.mdx
index 4232fd927b7a8..2927f73fa29f7 100644
--- a/api_docs/kbn_core_base_server_mocks.mdx
+++ b/api_docs/kbn_core_base_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-base-server-mocks
 title: "@kbn/core-base-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-base-server-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-base-server-mocks']
 ---
 import kbnCoreBaseServerMocksObj from './kbn_core_base_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_capabilities_browser_mocks.mdx b/api_docs/kbn_core_capabilities_browser_mocks.mdx
index 50c38360bc2b3..07f287061af92 100644
--- a/api_docs/kbn_core_capabilities_browser_mocks.mdx
+++ b/api_docs/kbn_core_capabilities_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-capabilities-browser-mocks
 title: "@kbn/core-capabilities-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-capabilities-browser-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-capabilities-browser-mocks']
 ---
 import kbnCoreCapabilitiesBrowserMocksObj from './kbn_core_capabilities_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_capabilities_common.mdx b/api_docs/kbn_core_capabilities_common.mdx
index 10cbb3a42f717..94ab32ef54c6c 100644
--- a/api_docs/kbn_core_capabilities_common.mdx
+++ b/api_docs/kbn_core_capabilities_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-capabilities-common
 title: "@kbn/core-capabilities-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-capabilities-common plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-capabilities-common']
 ---
 import kbnCoreCapabilitiesCommonObj from './kbn_core_capabilities_common.devdocs.json';
diff --git a/api_docs/kbn_core_capabilities_server.mdx b/api_docs/kbn_core_capabilities_server.mdx
index 21a636aa7ac30..1e1c151c5a844 100644
--- a/api_docs/kbn_core_capabilities_server.mdx
+++ b/api_docs/kbn_core_capabilities_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-capabilities-server
 title: "@kbn/core-capabilities-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-capabilities-server plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-capabilities-server']
 ---
 import kbnCoreCapabilitiesServerObj from './kbn_core_capabilities_server.devdocs.json';
diff --git a/api_docs/kbn_core_capabilities_server_mocks.mdx b/api_docs/kbn_core_capabilities_server_mocks.mdx
index 02474a59d662e..b188c90881545 100644
--- a/api_docs/kbn_core_capabilities_server_mocks.mdx
+++ b/api_docs/kbn_core_capabilities_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-capabilities-server-mocks
 title: "@kbn/core-capabilities-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-capabilities-server-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-capabilities-server-mocks']
 ---
 import kbnCoreCapabilitiesServerMocksObj from './kbn_core_capabilities_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_chrome_browser.mdx b/api_docs/kbn_core_chrome_browser.mdx
index e4e5f6c1af421..4fc4d099bbe9a 100644
--- a/api_docs/kbn_core_chrome_browser.mdx
+++ b/api_docs/kbn_core_chrome_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-chrome-browser
 title: "@kbn/core-chrome-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-chrome-browser plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-chrome-browser']
 ---
 import kbnCoreChromeBrowserObj from './kbn_core_chrome_browser.devdocs.json';
diff --git a/api_docs/kbn_core_chrome_browser_mocks.mdx b/api_docs/kbn_core_chrome_browser_mocks.mdx
index 3f4208ad1ae09..d89036a197088 100644
--- a/api_docs/kbn_core_chrome_browser_mocks.mdx
+++ b/api_docs/kbn_core_chrome_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-chrome-browser-mocks
 title: "@kbn/core-chrome-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-chrome-browser-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-chrome-browser-mocks']
 ---
 import kbnCoreChromeBrowserMocksObj from './kbn_core_chrome_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_config_server_internal.mdx b/api_docs/kbn_core_config_server_internal.mdx
index e8afe9bd646ae..9eadca18c937e 100644
--- a/api_docs/kbn_core_config_server_internal.mdx
+++ b/api_docs/kbn_core_config_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-config-server-internal
 title: "@kbn/core-config-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-config-server-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-config-server-internal']
 ---
 import kbnCoreConfigServerInternalObj from './kbn_core_config_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_custom_branding_browser.mdx b/api_docs/kbn_core_custom_branding_browser.mdx
index 8b9fd4b698d5f..e6960e6dbd31a 100644
--- a/api_docs/kbn_core_custom_branding_browser.mdx
+++ b/api_docs/kbn_core_custom_branding_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-custom-branding-browser
 title: "@kbn/core-custom-branding-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-custom-branding-browser plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-custom-branding-browser']
 ---
 import kbnCoreCustomBrandingBrowserObj from './kbn_core_custom_branding_browser.devdocs.json';
diff --git a/api_docs/kbn_core_custom_branding_browser_internal.mdx b/api_docs/kbn_core_custom_branding_browser_internal.mdx
index c5ed9476efd22..3ae52e4e14ecb 100644
--- a/api_docs/kbn_core_custom_branding_browser_internal.mdx
+++ b/api_docs/kbn_core_custom_branding_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-custom-branding-browser-internal
 title: "@kbn/core-custom-branding-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-custom-branding-browser-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-custom-branding-browser-internal']
 ---
 import kbnCoreCustomBrandingBrowserInternalObj from './kbn_core_custom_branding_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_custom_branding_browser_mocks.mdx b/api_docs/kbn_core_custom_branding_browser_mocks.mdx
index f5f1ada88d619..be6ef7497f4e7 100644
--- a/api_docs/kbn_core_custom_branding_browser_mocks.mdx
+++ b/api_docs/kbn_core_custom_branding_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-custom-branding-browser-mocks
 title: "@kbn/core-custom-branding-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-custom-branding-browser-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-custom-branding-browser-mocks']
 ---
 import kbnCoreCustomBrandingBrowserMocksObj from './kbn_core_custom_branding_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_custom_branding_common.mdx b/api_docs/kbn_core_custom_branding_common.mdx
index e86aa10a19179..c9650e7755515 100644
--- a/api_docs/kbn_core_custom_branding_common.mdx
+++ b/api_docs/kbn_core_custom_branding_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-custom-branding-common
 title: "@kbn/core-custom-branding-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-custom-branding-common plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-custom-branding-common']
 ---
 import kbnCoreCustomBrandingCommonObj from './kbn_core_custom_branding_common.devdocs.json';
diff --git a/api_docs/kbn_core_custom_branding_server.mdx b/api_docs/kbn_core_custom_branding_server.mdx
index 9a9d3b221f78e..2acdc4986a45a 100644
--- a/api_docs/kbn_core_custom_branding_server.mdx
+++ b/api_docs/kbn_core_custom_branding_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-custom-branding-server
 title: "@kbn/core-custom-branding-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-custom-branding-server plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-custom-branding-server']
 ---
 import kbnCoreCustomBrandingServerObj from './kbn_core_custom_branding_server.devdocs.json';
diff --git a/api_docs/kbn_core_custom_branding_server_internal.mdx b/api_docs/kbn_core_custom_branding_server_internal.mdx
index b93a08d18123a..d6627cd7605a8 100644
--- a/api_docs/kbn_core_custom_branding_server_internal.mdx
+++ b/api_docs/kbn_core_custom_branding_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-custom-branding-server-internal
 title: "@kbn/core-custom-branding-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-custom-branding-server-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-custom-branding-server-internal']
 ---
 import kbnCoreCustomBrandingServerInternalObj from './kbn_core_custom_branding_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_custom_branding_server_mocks.mdx b/api_docs/kbn_core_custom_branding_server_mocks.mdx
index 57d503043c1ad..a56e273133964 100644
--- a/api_docs/kbn_core_custom_branding_server_mocks.mdx
+++ b/api_docs/kbn_core_custom_branding_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-custom-branding-server-mocks
 title: "@kbn/core-custom-branding-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-custom-branding-server-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-custom-branding-server-mocks']
 ---
 import kbnCoreCustomBrandingServerMocksObj from './kbn_core_custom_branding_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_deprecations_browser.mdx b/api_docs/kbn_core_deprecations_browser.mdx
index e6bcad717b405..cd245391a08fc 100644
--- a/api_docs/kbn_core_deprecations_browser.mdx
+++ b/api_docs/kbn_core_deprecations_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-browser
 title: "@kbn/core-deprecations-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-deprecations-browser plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-browser']
 ---
 import kbnCoreDeprecationsBrowserObj from './kbn_core_deprecations_browser.devdocs.json';
diff --git a/api_docs/kbn_core_deprecations_browser_internal.mdx b/api_docs/kbn_core_deprecations_browser_internal.mdx
index 5d0a2c69423fd..091036411cfc0 100644
--- a/api_docs/kbn_core_deprecations_browser_internal.mdx
+++ b/api_docs/kbn_core_deprecations_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-browser-internal
 title: "@kbn/core-deprecations-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-deprecations-browser-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-browser-internal']
 ---
 import kbnCoreDeprecationsBrowserInternalObj from './kbn_core_deprecations_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_deprecations_browser_mocks.mdx b/api_docs/kbn_core_deprecations_browser_mocks.mdx
index 2dbababad6f92..9aa15de26bae7 100644
--- a/api_docs/kbn_core_deprecations_browser_mocks.mdx
+++ b/api_docs/kbn_core_deprecations_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-browser-mocks
 title: "@kbn/core-deprecations-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-deprecations-browser-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-browser-mocks']
 ---
 import kbnCoreDeprecationsBrowserMocksObj from './kbn_core_deprecations_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_deprecations_common.mdx b/api_docs/kbn_core_deprecations_common.mdx
index c4649935ad989..74daf61ea6d55 100644
--- a/api_docs/kbn_core_deprecations_common.mdx
+++ b/api_docs/kbn_core_deprecations_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-common
 title: "@kbn/core-deprecations-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-deprecations-common plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-common']
 ---
 import kbnCoreDeprecationsCommonObj from './kbn_core_deprecations_common.devdocs.json';
diff --git a/api_docs/kbn_core_deprecations_server.mdx b/api_docs/kbn_core_deprecations_server.mdx
index 4340e599c3559..35e915d670e63 100644
--- a/api_docs/kbn_core_deprecations_server.mdx
+++ b/api_docs/kbn_core_deprecations_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-server
 title: "@kbn/core-deprecations-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-deprecations-server plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-server']
 ---
 import kbnCoreDeprecationsServerObj from './kbn_core_deprecations_server.devdocs.json';
diff --git a/api_docs/kbn_core_deprecations_server_internal.mdx b/api_docs/kbn_core_deprecations_server_internal.mdx
index 9b8357be9bac7..3e3b50e409921 100644
--- a/api_docs/kbn_core_deprecations_server_internal.mdx
+++ b/api_docs/kbn_core_deprecations_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-server-internal
 title: "@kbn/core-deprecations-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-deprecations-server-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-server-internal']
 ---
 import kbnCoreDeprecationsServerInternalObj from './kbn_core_deprecations_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_deprecations_server_mocks.mdx b/api_docs/kbn_core_deprecations_server_mocks.mdx
index 304df9b7ce274..52276927bb318 100644
--- a/api_docs/kbn_core_deprecations_server_mocks.mdx
+++ b/api_docs/kbn_core_deprecations_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-server-mocks
 title: "@kbn/core-deprecations-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-deprecations-server-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-server-mocks']
 ---
 import kbnCoreDeprecationsServerMocksObj from './kbn_core_deprecations_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_doc_links_browser.mdx b/api_docs/kbn_core_doc_links_browser.mdx
index 358174bf8b250..93886781c4896 100644
--- a/api_docs/kbn_core_doc_links_browser.mdx
+++ b/api_docs/kbn_core_doc_links_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-doc-links-browser
 title: "@kbn/core-doc-links-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-doc-links-browser plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-doc-links-browser']
 ---
 import kbnCoreDocLinksBrowserObj from './kbn_core_doc_links_browser.devdocs.json';
diff --git a/api_docs/kbn_core_doc_links_browser_mocks.mdx b/api_docs/kbn_core_doc_links_browser_mocks.mdx
index 19ab96693b1bc..34b5cc2deff42 100644
--- a/api_docs/kbn_core_doc_links_browser_mocks.mdx
+++ b/api_docs/kbn_core_doc_links_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-doc-links-browser-mocks
 title: "@kbn/core-doc-links-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-doc-links-browser-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-doc-links-browser-mocks']
 ---
 import kbnCoreDocLinksBrowserMocksObj from './kbn_core_doc_links_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_doc_links_server.mdx b/api_docs/kbn_core_doc_links_server.mdx
index fb5be4e5925df..d1e24692560a9 100644
--- a/api_docs/kbn_core_doc_links_server.mdx
+++ b/api_docs/kbn_core_doc_links_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-doc-links-server
 title: "@kbn/core-doc-links-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-doc-links-server plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-doc-links-server']
 ---
 import kbnCoreDocLinksServerObj from './kbn_core_doc_links_server.devdocs.json';
diff --git a/api_docs/kbn_core_doc_links_server_mocks.mdx b/api_docs/kbn_core_doc_links_server_mocks.mdx
index 13c4847aa028d..1096a5fc9824b 100644
--- a/api_docs/kbn_core_doc_links_server_mocks.mdx
+++ b/api_docs/kbn_core_doc_links_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-doc-links-server-mocks
 title: "@kbn/core-doc-links-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-doc-links-server-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-doc-links-server-mocks']
 ---
 import kbnCoreDocLinksServerMocksObj from './kbn_core_doc_links_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_elasticsearch_client_server_internal.mdx b/api_docs/kbn_core_elasticsearch_client_server_internal.mdx
index ca6aea74575bd..0689e2d02aac1 100644
--- a/api_docs/kbn_core_elasticsearch_client_server_internal.mdx
+++ b/api_docs/kbn_core_elasticsearch_client_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-elasticsearch-client-server-internal
 title: "@kbn/core-elasticsearch-client-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-elasticsearch-client-server-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-elasticsearch-client-server-internal']
 ---
 import kbnCoreElasticsearchClientServerInternalObj from './kbn_core_elasticsearch_client_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_elasticsearch_client_server_mocks.mdx b/api_docs/kbn_core_elasticsearch_client_server_mocks.mdx
index d33c950bd945a..cfafed11b028e 100644
--- a/api_docs/kbn_core_elasticsearch_client_server_mocks.mdx
+++ b/api_docs/kbn_core_elasticsearch_client_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-elasticsearch-client-server-mocks
 title: "@kbn/core-elasticsearch-client-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-elasticsearch-client-server-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-elasticsearch-client-server-mocks']
 ---
 import kbnCoreElasticsearchClientServerMocksObj from './kbn_core_elasticsearch_client_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_elasticsearch_server.mdx b/api_docs/kbn_core_elasticsearch_server.mdx
index 07b3db79355a6..a165a3a59b870 100644
--- a/api_docs/kbn_core_elasticsearch_server.mdx
+++ b/api_docs/kbn_core_elasticsearch_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-elasticsearch-server
 title: "@kbn/core-elasticsearch-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-elasticsearch-server plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-elasticsearch-server']
 ---
 import kbnCoreElasticsearchServerObj from './kbn_core_elasticsearch_server.devdocs.json';
diff --git a/api_docs/kbn_core_elasticsearch_server_internal.mdx b/api_docs/kbn_core_elasticsearch_server_internal.mdx
index 681bfe2eaad32..9eb4e05a4446b 100644
--- a/api_docs/kbn_core_elasticsearch_server_internal.mdx
+++ b/api_docs/kbn_core_elasticsearch_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-elasticsearch-server-internal
 title: "@kbn/core-elasticsearch-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-elasticsearch-server-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-elasticsearch-server-internal']
 ---
 import kbnCoreElasticsearchServerInternalObj from './kbn_core_elasticsearch_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_elasticsearch_server_mocks.mdx b/api_docs/kbn_core_elasticsearch_server_mocks.mdx
index c6ebdec575975..0fa1c4ab91c55 100644
--- a/api_docs/kbn_core_elasticsearch_server_mocks.mdx
+++ b/api_docs/kbn_core_elasticsearch_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-elasticsearch-server-mocks
 title: "@kbn/core-elasticsearch-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-elasticsearch-server-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-elasticsearch-server-mocks']
 ---
 import kbnCoreElasticsearchServerMocksObj from './kbn_core_elasticsearch_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_environment_server_internal.mdx b/api_docs/kbn_core_environment_server_internal.mdx
index d5eea9d1abb7b..8922f7f1a32e1 100644
--- a/api_docs/kbn_core_environment_server_internal.mdx
+++ b/api_docs/kbn_core_environment_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-environment-server-internal
 title: "@kbn/core-environment-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-environment-server-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-environment-server-internal']
 ---
 import kbnCoreEnvironmentServerInternalObj from './kbn_core_environment_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_environment_server_mocks.mdx b/api_docs/kbn_core_environment_server_mocks.mdx
index 179efddfd19a4..d11e176ae7671 100644
--- a/api_docs/kbn_core_environment_server_mocks.mdx
+++ b/api_docs/kbn_core_environment_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-environment-server-mocks
 title: "@kbn/core-environment-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-environment-server-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-environment-server-mocks']
 ---
 import kbnCoreEnvironmentServerMocksObj from './kbn_core_environment_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_execution_context_browser.mdx b/api_docs/kbn_core_execution_context_browser.mdx
index 4f05b697d61c7..a3f6a4c9f3a55 100644
--- a/api_docs/kbn_core_execution_context_browser.mdx
+++ b/api_docs/kbn_core_execution_context_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-browser
 title: "@kbn/core-execution-context-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-execution-context-browser plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-browser']
 ---
 import kbnCoreExecutionContextBrowserObj from './kbn_core_execution_context_browser.devdocs.json';
diff --git a/api_docs/kbn_core_execution_context_browser_internal.mdx b/api_docs/kbn_core_execution_context_browser_internal.mdx
index 509adf37d5b19..13189d9d890a9 100644
--- a/api_docs/kbn_core_execution_context_browser_internal.mdx
+++ b/api_docs/kbn_core_execution_context_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-browser-internal
 title: "@kbn/core-execution-context-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-execution-context-browser-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-browser-internal']
 ---
 import kbnCoreExecutionContextBrowserInternalObj from './kbn_core_execution_context_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_execution_context_browser_mocks.mdx b/api_docs/kbn_core_execution_context_browser_mocks.mdx
index 522b02f2529e2..d57555201a1ef 100644
--- a/api_docs/kbn_core_execution_context_browser_mocks.mdx
+++ b/api_docs/kbn_core_execution_context_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-browser-mocks
 title: "@kbn/core-execution-context-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-execution-context-browser-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-browser-mocks']
 ---
 import kbnCoreExecutionContextBrowserMocksObj from './kbn_core_execution_context_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_execution_context_common.mdx b/api_docs/kbn_core_execution_context_common.mdx
index 014ba44b95b31..81000836d99d9 100644
--- a/api_docs/kbn_core_execution_context_common.mdx
+++ b/api_docs/kbn_core_execution_context_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-common
 title: "@kbn/core-execution-context-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-execution-context-common plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-common']
 ---
 import kbnCoreExecutionContextCommonObj from './kbn_core_execution_context_common.devdocs.json';
diff --git a/api_docs/kbn_core_execution_context_server.mdx b/api_docs/kbn_core_execution_context_server.mdx
index 548fc4319cd80..a9a8436924f39 100644
--- a/api_docs/kbn_core_execution_context_server.mdx
+++ b/api_docs/kbn_core_execution_context_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-server
 title: "@kbn/core-execution-context-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-execution-context-server plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-server']
 ---
 import kbnCoreExecutionContextServerObj from './kbn_core_execution_context_server.devdocs.json';
diff --git a/api_docs/kbn_core_execution_context_server_internal.mdx b/api_docs/kbn_core_execution_context_server_internal.mdx
index 60371494c7862..4d48d1025ec64 100644
--- a/api_docs/kbn_core_execution_context_server_internal.mdx
+++ b/api_docs/kbn_core_execution_context_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-server-internal
 title: "@kbn/core-execution-context-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-execution-context-server-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-server-internal']
 ---
 import kbnCoreExecutionContextServerInternalObj from './kbn_core_execution_context_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_execution_context_server_mocks.mdx b/api_docs/kbn_core_execution_context_server_mocks.mdx
index be55d839de8a8..6ed64398c751f 100644
--- a/api_docs/kbn_core_execution_context_server_mocks.mdx
+++ b/api_docs/kbn_core_execution_context_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-server-mocks
 title: "@kbn/core-execution-context-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-execution-context-server-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-server-mocks']
 ---
 import kbnCoreExecutionContextServerMocksObj from './kbn_core_execution_context_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_fatal_errors_browser.mdx b/api_docs/kbn_core_fatal_errors_browser.mdx
index e91b03c2671b0..ac922c779fd32 100644
--- a/api_docs/kbn_core_fatal_errors_browser.mdx
+++ b/api_docs/kbn_core_fatal_errors_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-fatal-errors-browser
 title: "@kbn/core-fatal-errors-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-fatal-errors-browser plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-fatal-errors-browser']
 ---
 import kbnCoreFatalErrorsBrowserObj from './kbn_core_fatal_errors_browser.devdocs.json';
diff --git a/api_docs/kbn_core_fatal_errors_browser_mocks.mdx b/api_docs/kbn_core_fatal_errors_browser_mocks.mdx
index 7d11e213801db..559ef064d6054 100644
--- a/api_docs/kbn_core_fatal_errors_browser_mocks.mdx
+++ b/api_docs/kbn_core_fatal_errors_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-fatal-errors-browser-mocks
 title: "@kbn/core-fatal-errors-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-fatal-errors-browser-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-fatal-errors-browser-mocks']
 ---
 import kbnCoreFatalErrorsBrowserMocksObj from './kbn_core_fatal_errors_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_feature_flags_browser.mdx b/api_docs/kbn_core_feature_flags_browser.mdx
index f22771ef52d1a..584903f36c773 100644
--- a/api_docs/kbn_core_feature_flags_browser.mdx
+++ b/api_docs/kbn_core_feature_flags_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-feature-flags-browser
 title: "@kbn/core-feature-flags-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-feature-flags-browser plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-feature-flags-browser']
 ---
 import kbnCoreFeatureFlagsBrowserObj from './kbn_core_feature_flags_browser.devdocs.json';
diff --git a/api_docs/kbn_core_feature_flags_browser_internal.mdx b/api_docs/kbn_core_feature_flags_browser_internal.mdx
index 0219e571cc5ff..9392937e77d64 100644
--- a/api_docs/kbn_core_feature_flags_browser_internal.mdx
+++ b/api_docs/kbn_core_feature_flags_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-feature-flags-browser-internal
 title: "@kbn/core-feature-flags-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-feature-flags-browser-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-feature-flags-browser-internal']
 ---
 import kbnCoreFeatureFlagsBrowserInternalObj from './kbn_core_feature_flags_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_feature_flags_browser_mocks.mdx b/api_docs/kbn_core_feature_flags_browser_mocks.mdx
index 2cee4edb6a1a0..d9a63ab0b657b 100644
--- a/api_docs/kbn_core_feature_flags_browser_mocks.mdx
+++ b/api_docs/kbn_core_feature_flags_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-feature-flags-browser-mocks
 title: "@kbn/core-feature-flags-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-feature-flags-browser-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-feature-flags-browser-mocks']
 ---
 import kbnCoreFeatureFlagsBrowserMocksObj from './kbn_core_feature_flags_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_feature_flags_server.mdx b/api_docs/kbn_core_feature_flags_server.mdx
index 6b0e9fc03be3f..ac31af279754c 100644
--- a/api_docs/kbn_core_feature_flags_server.mdx
+++ b/api_docs/kbn_core_feature_flags_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-feature-flags-server
 title: "@kbn/core-feature-flags-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-feature-flags-server plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-feature-flags-server']
 ---
 import kbnCoreFeatureFlagsServerObj from './kbn_core_feature_flags_server.devdocs.json';
diff --git a/api_docs/kbn_core_feature_flags_server_internal.mdx b/api_docs/kbn_core_feature_flags_server_internal.mdx
index 355fd7df8a765..840be6f31b4eb 100644
--- a/api_docs/kbn_core_feature_flags_server_internal.mdx
+++ b/api_docs/kbn_core_feature_flags_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-feature-flags-server-internal
 title: "@kbn/core-feature-flags-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-feature-flags-server-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-feature-flags-server-internal']
 ---
 import kbnCoreFeatureFlagsServerInternalObj from './kbn_core_feature_flags_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_feature_flags_server_mocks.mdx b/api_docs/kbn_core_feature_flags_server_mocks.mdx
index fbef6d8af8c33..af78cf1543437 100644
--- a/api_docs/kbn_core_feature_flags_server_mocks.mdx
+++ b/api_docs/kbn_core_feature_flags_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-feature-flags-server-mocks
 title: "@kbn/core-feature-flags-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-feature-flags-server-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-feature-flags-server-mocks']
 ---
 import kbnCoreFeatureFlagsServerMocksObj from './kbn_core_feature_flags_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_http_browser.mdx b/api_docs/kbn_core_http_browser.mdx
index fd25a21375128..b0813b2873243 100644
--- a/api_docs/kbn_core_http_browser.mdx
+++ b/api_docs/kbn_core_http_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-browser
 title: "@kbn/core-http-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-browser plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-browser']
 ---
 import kbnCoreHttpBrowserObj from './kbn_core_http_browser.devdocs.json';
diff --git a/api_docs/kbn_core_http_browser_internal.mdx b/api_docs/kbn_core_http_browser_internal.mdx
index 4224b548fd4bd..ce8052d52711d 100644
--- a/api_docs/kbn_core_http_browser_internal.mdx
+++ b/api_docs/kbn_core_http_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-browser-internal
 title: "@kbn/core-http-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-browser-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-browser-internal']
 ---
 import kbnCoreHttpBrowserInternalObj from './kbn_core_http_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_http_browser_mocks.mdx b/api_docs/kbn_core_http_browser_mocks.mdx
index a71c4f6dc0f7e..7279104a7c13d 100644
--- a/api_docs/kbn_core_http_browser_mocks.mdx
+++ b/api_docs/kbn_core_http_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-browser-mocks
 title: "@kbn/core-http-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-browser-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-browser-mocks']
 ---
 import kbnCoreHttpBrowserMocksObj from './kbn_core_http_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_http_common.mdx b/api_docs/kbn_core_http_common.mdx
index f976a0ecb43a5..9993b795ac673 100644
--- a/api_docs/kbn_core_http_common.mdx
+++ b/api_docs/kbn_core_http_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-common
 title: "@kbn/core-http-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-common plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-common']
 ---
 import kbnCoreHttpCommonObj from './kbn_core_http_common.devdocs.json';
diff --git a/api_docs/kbn_core_http_context_server_mocks.mdx b/api_docs/kbn_core_http_context_server_mocks.mdx
index 3c5878bc9406f..515419f83e6f4 100644
--- a/api_docs/kbn_core_http_context_server_mocks.mdx
+++ b/api_docs/kbn_core_http_context_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-context-server-mocks
 title: "@kbn/core-http-context-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-context-server-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-context-server-mocks']
 ---
 import kbnCoreHttpContextServerMocksObj from './kbn_core_http_context_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_http_request_handler_context_server.mdx b/api_docs/kbn_core_http_request_handler_context_server.mdx
index c62ab5cec7669..63b8b7e6b91e5 100644
--- a/api_docs/kbn_core_http_request_handler_context_server.mdx
+++ b/api_docs/kbn_core_http_request_handler_context_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-request-handler-context-server
 title: "@kbn/core-http-request-handler-context-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-request-handler-context-server plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-request-handler-context-server']
 ---
 import kbnCoreHttpRequestHandlerContextServerObj from './kbn_core_http_request_handler_context_server.devdocs.json';
diff --git a/api_docs/kbn_core_http_resources_server.mdx b/api_docs/kbn_core_http_resources_server.mdx
index 964c53a4d0f22..85dd1d9e3ce2c 100644
--- a/api_docs/kbn_core_http_resources_server.mdx
+++ b/api_docs/kbn_core_http_resources_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-resources-server
 title: "@kbn/core-http-resources-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-resources-server plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-resources-server']
 ---
 import kbnCoreHttpResourcesServerObj from './kbn_core_http_resources_server.devdocs.json';
diff --git a/api_docs/kbn_core_http_resources_server_internal.mdx b/api_docs/kbn_core_http_resources_server_internal.mdx
index c490e20d1fc1d..5858b199e6f29 100644
--- a/api_docs/kbn_core_http_resources_server_internal.mdx
+++ b/api_docs/kbn_core_http_resources_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-resources-server-internal
 title: "@kbn/core-http-resources-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-resources-server-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-resources-server-internal']
 ---
 import kbnCoreHttpResourcesServerInternalObj from './kbn_core_http_resources_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_http_resources_server_mocks.mdx b/api_docs/kbn_core_http_resources_server_mocks.mdx
index ccc7d7b740838..604331ee51487 100644
--- a/api_docs/kbn_core_http_resources_server_mocks.mdx
+++ b/api_docs/kbn_core_http_resources_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-resources-server-mocks
 title: "@kbn/core-http-resources-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-resources-server-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-resources-server-mocks']
 ---
 import kbnCoreHttpResourcesServerMocksObj from './kbn_core_http_resources_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_http_router_server_internal.mdx b/api_docs/kbn_core_http_router_server_internal.mdx
index c76a88f272be8..a752ddbfdc9ee 100644
--- a/api_docs/kbn_core_http_router_server_internal.mdx
+++ b/api_docs/kbn_core_http_router_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-router-server-internal
 title: "@kbn/core-http-router-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-router-server-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-router-server-internal']
 ---
 import kbnCoreHttpRouterServerInternalObj from './kbn_core_http_router_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_http_router_server_mocks.mdx b/api_docs/kbn_core_http_router_server_mocks.mdx
index ec40c303395f4..274265cc183ba 100644
--- a/api_docs/kbn_core_http_router_server_mocks.mdx
+++ b/api_docs/kbn_core_http_router_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-router-server-mocks
 title: "@kbn/core-http-router-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-router-server-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-router-server-mocks']
 ---
 import kbnCoreHttpRouterServerMocksObj from './kbn_core_http_router_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_http_server.devdocs.json b/api_docs/kbn_core_http_server.devdocs.json
index 78a5ec9023ff9..eaaa76b078727 100644
--- a/api_docs/kbn_core_http_server.devdocs.json
+++ b/api_docs/kbn_core_http_server.devdocs.json
@@ -4667,10 +4667,6 @@
                 "plugin": "logstash",
                 "path": "x-pack/plugins/logstash/server/routes/pipelines/list.ts"
               },
-              {
-                "plugin": "visTypeTimeseries",
-                "path": "src/plugins/vis_types/timeseries/server/routes/fields.ts"
-              },
               {
                 "plugin": "metricsDataAccess",
                 "path": "x-pack/plugins/observability_solution/metrics_data_access/server/lib/adapters/framework/kibana_framework_adapter.ts"
@@ -4679,6 +4675,10 @@
                 "plugin": "metricsDataAccess",
                 "path": "x-pack/plugins/observability_solution/metrics_data_access/server/routes/metric_indices/index.ts"
               },
+              {
+                "plugin": "visTypeTimeseries",
+                "path": "src/plugins/vis_types/timeseries/server/routes/fields.ts"
+              },
               {
                 "plugin": "infra",
                 "path": "x-pack/plugins/observability_solution/infra/server/lib/adapters/framework/kibana_framework_adapter.ts"
@@ -7233,14 +7233,14 @@
                 "plugin": "logstash",
                 "path": "x-pack/plugins/logstash/server/routes/pipelines/delete.ts"
               },
-              {
-                "plugin": "visTypeTimeseries",
-                "path": "src/plugins/vis_types/timeseries/server/routes/vis.ts"
-              },
               {
                 "plugin": "metricsDataAccess",
                 "path": "x-pack/plugins/observability_solution/metrics_data_access/server/lib/adapters/framework/kibana_framework_adapter.ts"
               },
+              {
+                "plugin": "visTypeTimeseries",
+                "path": "src/plugins/vis_types/timeseries/server/routes/vis.ts"
+              },
               {
                 "plugin": "infra",
                 "path": "x-pack/plugins/observability_solution/infra/server/lib/adapters/framework/kibana_framework_adapter.ts"
@@ -7329,10 +7329,6 @@
                 "plugin": "painlessLab",
                 "path": "x-pack/plugins/painless_lab/server/routes/api/execute.ts"
               },
-              {
-                "plugin": "reporting",
-                "path": "x-pack/plugins/reporting/server/routes/internal/generate/csv_searchsource_immediate.ts"
-              },
               {
                 "plugin": "reporting",
                 "path": "x-pack/plugins/reporting/server/routes/internal/generate/generate_from_jobparams.ts"
@@ -15671,6 +15667,22 @@
                 "plugin": "securitySolution",
                 "path": "x-pack/plugins/security_solution/server/lib/entity_analytics/entity_store/routes/list.ts"
               },
+              {
+                "plugin": "securitySolution",
+                "path": "x-pack/plugins/security_solution/server/lib/entity_analytics/entity_store/routes/privileges.ts"
+              },
+              {
+                "plugin": "securitySolution",
+                "path": "x-pack/plugins/security_solution/server/lib/siem_migrations/rules/api/get.ts"
+              },
+              {
+                "plugin": "securitySolution",
+                "path": "x-pack/plugins/security_solution/server/lib/siem_migrations/rules/api/stats.ts"
+              },
+              {
+                "plugin": "securitySolution",
+                "path": "x-pack/plugins/security_solution/server/lib/siem_migrations/rules/api/stats_all.ts"
+              },
               {
                 "plugin": "securitySolution",
                 "path": "x-pack/plugins/security_solution/server/endpoint/routes/metadata/index.ts"
@@ -16186,6 +16198,14 @@
                 "plugin": "securitySolution",
                 "path": "x-pack/plugins/security_solution/server/lib/tags/routes/create_tag.ts"
               },
+              {
+                "plugin": "securitySolution",
+                "path": "x-pack/plugins/security_solution/server/lib/siem_migrations/rules/api/start.ts"
+              },
+              {
+                "plugin": "securitySolution",
+                "path": "x-pack/plugins/security_solution/server/lib/siem_migrations/rules/api/stop.ts"
+              },
               {
                 "plugin": "transform",
                 "path": "x-pack/plugins/transform/server/routes/api/transforms_create/register_route.ts"
diff --git a/api_docs/kbn_core_http_server.mdx b/api_docs/kbn_core_http_server.mdx
index a78901d76b41a..b8a9fc53480fd 100644
--- a/api_docs/kbn_core_http_server.mdx
+++ b/api_docs/kbn_core_http_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-server
 title: "@kbn/core-http-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-server plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-server']
 ---
 import kbnCoreHttpServerObj from './kbn_core_http_server.devdocs.json';
diff --git a/api_docs/kbn_core_http_server_internal.mdx b/api_docs/kbn_core_http_server_internal.mdx
index 24b837de603d0..14996338795fc 100644
--- a/api_docs/kbn_core_http_server_internal.mdx
+++ b/api_docs/kbn_core_http_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-server-internal
 title: "@kbn/core-http-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-server-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-server-internal']
 ---
 import kbnCoreHttpServerInternalObj from './kbn_core_http_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_http_server_mocks.mdx b/api_docs/kbn_core_http_server_mocks.mdx
index 8380f8a71d37f..55eb735615801 100644
--- a/api_docs/kbn_core_http_server_mocks.mdx
+++ b/api_docs/kbn_core_http_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-server-mocks
 title: "@kbn/core-http-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-server-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-server-mocks']
 ---
 import kbnCoreHttpServerMocksObj from './kbn_core_http_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_i18n_browser.mdx b/api_docs/kbn_core_i18n_browser.mdx
index 14cff220b2a27..c5269b6716509 100644
--- a/api_docs/kbn_core_i18n_browser.mdx
+++ b/api_docs/kbn_core_i18n_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-i18n-browser
 title: "@kbn/core-i18n-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-i18n-browser plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-i18n-browser']
 ---
 import kbnCoreI18nBrowserObj from './kbn_core_i18n_browser.devdocs.json';
diff --git a/api_docs/kbn_core_i18n_browser_mocks.mdx b/api_docs/kbn_core_i18n_browser_mocks.mdx
index 4d61e2a9e7a33..a868a7596ce32 100644
--- a/api_docs/kbn_core_i18n_browser_mocks.mdx
+++ b/api_docs/kbn_core_i18n_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-i18n-browser-mocks
 title: "@kbn/core-i18n-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-i18n-browser-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-i18n-browser-mocks']
 ---
 import kbnCoreI18nBrowserMocksObj from './kbn_core_i18n_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_i18n_server.mdx b/api_docs/kbn_core_i18n_server.mdx
index 747f4c136edd2..28ffc8faae479 100644
--- a/api_docs/kbn_core_i18n_server.mdx
+++ b/api_docs/kbn_core_i18n_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-i18n-server
 title: "@kbn/core-i18n-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-i18n-server plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-i18n-server']
 ---
 import kbnCoreI18nServerObj from './kbn_core_i18n_server.devdocs.json';
diff --git a/api_docs/kbn_core_i18n_server_internal.mdx b/api_docs/kbn_core_i18n_server_internal.mdx
index 58c6ffe27502f..4b23c804824a9 100644
--- a/api_docs/kbn_core_i18n_server_internal.mdx
+++ b/api_docs/kbn_core_i18n_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-i18n-server-internal
 title: "@kbn/core-i18n-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-i18n-server-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-i18n-server-internal']
 ---
 import kbnCoreI18nServerInternalObj from './kbn_core_i18n_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_i18n_server_mocks.mdx b/api_docs/kbn_core_i18n_server_mocks.mdx
index bf003056bd4cd..57a6ee46da201 100644
--- a/api_docs/kbn_core_i18n_server_mocks.mdx
+++ b/api_docs/kbn_core_i18n_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-i18n-server-mocks
 title: "@kbn/core-i18n-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-i18n-server-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-i18n-server-mocks']
 ---
 import kbnCoreI18nServerMocksObj from './kbn_core_i18n_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_injected_metadata_browser_mocks.mdx b/api_docs/kbn_core_injected_metadata_browser_mocks.mdx
index ee71e11c4937d..854a4d561ab63 100644
--- a/api_docs/kbn_core_injected_metadata_browser_mocks.mdx
+++ b/api_docs/kbn_core_injected_metadata_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-injected-metadata-browser-mocks
 title: "@kbn/core-injected-metadata-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-injected-metadata-browser-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-injected-metadata-browser-mocks']
 ---
 import kbnCoreInjectedMetadataBrowserMocksObj from './kbn_core_injected_metadata_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_integrations_browser_internal.mdx b/api_docs/kbn_core_integrations_browser_internal.mdx
index 84e826480aa08..048be5b6149d1 100644
--- a/api_docs/kbn_core_integrations_browser_internal.mdx
+++ b/api_docs/kbn_core_integrations_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-integrations-browser-internal
 title: "@kbn/core-integrations-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-integrations-browser-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-integrations-browser-internal']
 ---
 import kbnCoreIntegrationsBrowserInternalObj from './kbn_core_integrations_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_integrations_browser_mocks.mdx b/api_docs/kbn_core_integrations_browser_mocks.mdx
index f64d45fa90a9b..c0fc5f8986573 100644
--- a/api_docs/kbn_core_integrations_browser_mocks.mdx
+++ b/api_docs/kbn_core_integrations_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-integrations-browser-mocks
 title: "@kbn/core-integrations-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-integrations-browser-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-integrations-browser-mocks']
 ---
 import kbnCoreIntegrationsBrowserMocksObj from './kbn_core_integrations_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_lifecycle_browser.mdx b/api_docs/kbn_core_lifecycle_browser.mdx
index eddbf953b51a7..a0234b5842c79 100644
--- a/api_docs/kbn_core_lifecycle_browser.mdx
+++ b/api_docs/kbn_core_lifecycle_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-lifecycle-browser
 title: "@kbn/core-lifecycle-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-lifecycle-browser plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-lifecycle-browser']
 ---
 import kbnCoreLifecycleBrowserObj from './kbn_core_lifecycle_browser.devdocs.json';
diff --git a/api_docs/kbn_core_lifecycle_browser_mocks.mdx b/api_docs/kbn_core_lifecycle_browser_mocks.mdx
index 6f45ab8011b13..d4c421aa6ba90 100644
--- a/api_docs/kbn_core_lifecycle_browser_mocks.mdx
+++ b/api_docs/kbn_core_lifecycle_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-lifecycle-browser-mocks
 title: "@kbn/core-lifecycle-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-lifecycle-browser-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-lifecycle-browser-mocks']
 ---
 import kbnCoreLifecycleBrowserMocksObj from './kbn_core_lifecycle_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_lifecycle_server.mdx b/api_docs/kbn_core_lifecycle_server.mdx
index e38e5e3ca87be..edfeff0233bd2 100644
--- a/api_docs/kbn_core_lifecycle_server.mdx
+++ b/api_docs/kbn_core_lifecycle_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-lifecycle-server
 title: "@kbn/core-lifecycle-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-lifecycle-server plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-lifecycle-server']
 ---
 import kbnCoreLifecycleServerObj from './kbn_core_lifecycle_server.devdocs.json';
diff --git a/api_docs/kbn_core_lifecycle_server_mocks.mdx b/api_docs/kbn_core_lifecycle_server_mocks.mdx
index 1e9ceea8b7fa2..92ccdff2ec470 100644
--- a/api_docs/kbn_core_lifecycle_server_mocks.mdx
+++ b/api_docs/kbn_core_lifecycle_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-lifecycle-server-mocks
 title: "@kbn/core-lifecycle-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-lifecycle-server-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-lifecycle-server-mocks']
 ---
 import kbnCoreLifecycleServerMocksObj from './kbn_core_lifecycle_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_logging_browser_mocks.mdx b/api_docs/kbn_core_logging_browser_mocks.mdx
index 2b0381ca058c5..6652d081bd5c1 100644
--- a/api_docs/kbn_core_logging_browser_mocks.mdx
+++ b/api_docs/kbn_core_logging_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-logging-browser-mocks
 title: "@kbn/core-logging-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-logging-browser-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-logging-browser-mocks']
 ---
 import kbnCoreLoggingBrowserMocksObj from './kbn_core_logging_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_logging_common_internal.mdx b/api_docs/kbn_core_logging_common_internal.mdx
index 36f946a3296a0..c17a7ff6bf424 100644
--- a/api_docs/kbn_core_logging_common_internal.mdx
+++ b/api_docs/kbn_core_logging_common_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-logging-common-internal
 title: "@kbn/core-logging-common-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-logging-common-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-logging-common-internal']
 ---
 import kbnCoreLoggingCommonInternalObj from './kbn_core_logging_common_internal.devdocs.json';
diff --git a/api_docs/kbn_core_logging_server.mdx b/api_docs/kbn_core_logging_server.mdx
index 545acddec37d6..01c39f41c9334 100644
--- a/api_docs/kbn_core_logging_server.mdx
+++ b/api_docs/kbn_core_logging_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-logging-server
 title: "@kbn/core-logging-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-logging-server plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-logging-server']
 ---
 import kbnCoreLoggingServerObj from './kbn_core_logging_server.devdocs.json';
diff --git a/api_docs/kbn_core_logging_server_internal.mdx b/api_docs/kbn_core_logging_server_internal.mdx
index 006df566e745e..cea58aee49be2 100644
--- a/api_docs/kbn_core_logging_server_internal.mdx
+++ b/api_docs/kbn_core_logging_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-logging-server-internal
 title: "@kbn/core-logging-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-logging-server-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-logging-server-internal']
 ---
 import kbnCoreLoggingServerInternalObj from './kbn_core_logging_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_logging_server_mocks.mdx b/api_docs/kbn_core_logging_server_mocks.mdx
index 0491b9be3f8dc..bf342ff5b6f98 100644
--- a/api_docs/kbn_core_logging_server_mocks.mdx
+++ b/api_docs/kbn_core_logging_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-logging-server-mocks
 title: "@kbn/core-logging-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-logging-server-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-logging-server-mocks']
 ---
 import kbnCoreLoggingServerMocksObj from './kbn_core_logging_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_metrics_collectors_server_internal.mdx b/api_docs/kbn_core_metrics_collectors_server_internal.mdx
index 6152d7feeadcf..a832de35717bd 100644
--- a/api_docs/kbn_core_metrics_collectors_server_internal.mdx
+++ b/api_docs/kbn_core_metrics_collectors_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-metrics-collectors-server-internal
 title: "@kbn/core-metrics-collectors-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-metrics-collectors-server-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-metrics-collectors-server-internal']
 ---
 import kbnCoreMetricsCollectorsServerInternalObj from './kbn_core_metrics_collectors_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_metrics_collectors_server_mocks.mdx b/api_docs/kbn_core_metrics_collectors_server_mocks.mdx
index dbbac6bae4946..e3f4a12ff9a3f 100644
--- a/api_docs/kbn_core_metrics_collectors_server_mocks.mdx
+++ b/api_docs/kbn_core_metrics_collectors_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-metrics-collectors-server-mocks
 title: "@kbn/core-metrics-collectors-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-metrics-collectors-server-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-metrics-collectors-server-mocks']
 ---
 import kbnCoreMetricsCollectorsServerMocksObj from './kbn_core_metrics_collectors_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_metrics_server.mdx b/api_docs/kbn_core_metrics_server.mdx
index e68b791b424e2..f6506c6620c45 100644
--- a/api_docs/kbn_core_metrics_server.mdx
+++ b/api_docs/kbn_core_metrics_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-metrics-server
 title: "@kbn/core-metrics-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-metrics-server plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-metrics-server']
 ---
 import kbnCoreMetricsServerObj from './kbn_core_metrics_server.devdocs.json';
diff --git a/api_docs/kbn_core_metrics_server_internal.mdx b/api_docs/kbn_core_metrics_server_internal.mdx
index 618c72169b086..3704d47077534 100644
--- a/api_docs/kbn_core_metrics_server_internal.mdx
+++ b/api_docs/kbn_core_metrics_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-metrics-server-internal
 title: "@kbn/core-metrics-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-metrics-server-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-metrics-server-internal']
 ---
 import kbnCoreMetricsServerInternalObj from './kbn_core_metrics_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_metrics_server_mocks.mdx b/api_docs/kbn_core_metrics_server_mocks.mdx
index 4af2b0ac0dd2a..246e26b957ff5 100644
--- a/api_docs/kbn_core_metrics_server_mocks.mdx
+++ b/api_docs/kbn_core_metrics_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-metrics-server-mocks
 title: "@kbn/core-metrics-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-metrics-server-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-metrics-server-mocks']
 ---
 import kbnCoreMetricsServerMocksObj from './kbn_core_metrics_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_mount_utils_browser.mdx b/api_docs/kbn_core_mount_utils_browser.mdx
index c0618bb976fa8..44f9e4b68ecdf 100644
--- a/api_docs/kbn_core_mount_utils_browser.mdx
+++ b/api_docs/kbn_core_mount_utils_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-mount-utils-browser
 title: "@kbn/core-mount-utils-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-mount-utils-browser plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-mount-utils-browser']
 ---
 import kbnCoreMountUtilsBrowserObj from './kbn_core_mount_utils_browser.devdocs.json';
diff --git a/api_docs/kbn_core_node_server.mdx b/api_docs/kbn_core_node_server.mdx
index 47ad84ff36380..df4f9fd8b59c3 100644
--- a/api_docs/kbn_core_node_server.mdx
+++ b/api_docs/kbn_core_node_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-node-server
 title: "@kbn/core-node-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-node-server plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-node-server']
 ---
 import kbnCoreNodeServerObj from './kbn_core_node_server.devdocs.json';
diff --git a/api_docs/kbn_core_node_server_internal.mdx b/api_docs/kbn_core_node_server_internal.mdx
index 1893eab795d8f..0e542e8b1a74f 100644
--- a/api_docs/kbn_core_node_server_internal.mdx
+++ b/api_docs/kbn_core_node_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-node-server-internal
 title: "@kbn/core-node-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-node-server-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-node-server-internal']
 ---
 import kbnCoreNodeServerInternalObj from './kbn_core_node_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_node_server_mocks.mdx b/api_docs/kbn_core_node_server_mocks.mdx
index 6729b2a2bec51..5a16ea984ed06 100644
--- a/api_docs/kbn_core_node_server_mocks.mdx
+++ b/api_docs/kbn_core_node_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-node-server-mocks
 title: "@kbn/core-node-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-node-server-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-node-server-mocks']
 ---
 import kbnCoreNodeServerMocksObj from './kbn_core_node_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_notifications_browser.mdx b/api_docs/kbn_core_notifications_browser.mdx
index 94cfccb99b00e..4db890fc5e558 100644
--- a/api_docs/kbn_core_notifications_browser.mdx
+++ b/api_docs/kbn_core_notifications_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-notifications-browser
 title: "@kbn/core-notifications-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-notifications-browser plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-notifications-browser']
 ---
 import kbnCoreNotificationsBrowserObj from './kbn_core_notifications_browser.devdocs.json';
diff --git a/api_docs/kbn_core_notifications_browser_internal.mdx b/api_docs/kbn_core_notifications_browser_internal.mdx
index 255e076666dbd..04607c4bb096c 100644
--- a/api_docs/kbn_core_notifications_browser_internal.mdx
+++ b/api_docs/kbn_core_notifications_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-notifications-browser-internal
 title: "@kbn/core-notifications-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-notifications-browser-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-notifications-browser-internal']
 ---
 import kbnCoreNotificationsBrowserInternalObj from './kbn_core_notifications_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_notifications_browser_mocks.mdx b/api_docs/kbn_core_notifications_browser_mocks.mdx
index 2949727101750..6ff23a9c6e4e8 100644
--- a/api_docs/kbn_core_notifications_browser_mocks.mdx
+++ b/api_docs/kbn_core_notifications_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-notifications-browser-mocks
 title: "@kbn/core-notifications-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-notifications-browser-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-notifications-browser-mocks']
 ---
 import kbnCoreNotificationsBrowserMocksObj from './kbn_core_notifications_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_overlays_browser.mdx b/api_docs/kbn_core_overlays_browser.mdx
index 76eebf28e05bb..10bedd4743660 100644
--- a/api_docs/kbn_core_overlays_browser.mdx
+++ b/api_docs/kbn_core_overlays_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-overlays-browser
 title: "@kbn/core-overlays-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-overlays-browser plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-overlays-browser']
 ---
 import kbnCoreOverlaysBrowserObj from './kbn_core_overlays_browser.devdocs.json';
diff --git a/api_docs/kbn_core_overlays_browser_internal.mdx b/api_docs/kbn_core_overlays_browser_internal.mdx
index a9c083430aef0..cc9948c4a9116 100644
--- a/api_docs/kbn_core_overlays_browser_internal.mdx
+++ b/api_docs/kbn_core_overlays_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-overlays-browser-internal
 title: "@kbn/core-overlays-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-overlays-browser-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-overlays-browser-internal']
 ---
 import kbnCoreOverlaysBrowserInternalObj from './kbn_core_overlays_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_overlays_browser_mocks.mdx b/api_docs/kbn_core_overlays_browser_mocks.mdx
index 6f2e27315d5e5..a57e5510e5835 100644
--- a/api_docs/kbn_core_overlays_browser_mocks.mdx
+++ b/api_docs/kbn_core_overlays_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-overlays-browser-mocks
 title: "@kbn/core-overlays-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-overlays-browser-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-overlays-browser-mocks']
 ---
 import kbnCoreOverlaysBrowserMocksObj from './kbn_core_overlays_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_plugins_browser.mdx b/api_docs/kbn_core_plugins_browser.mdx
index d3ec6f24f5c38..0d3ae6e0c3872 100644
--- a/api_docs/kbn_core_plugins_browser.mdx
+++ b/api_docs/kbn_core_plugins_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-plugins-browser
 title: "@kbn/core-plugins-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-plugins-browser plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-plugins-browser']
 ---
 import kbnCorePluginsBrowserObj from './kbn_core_plugins_browser.devdocs.json';
diff --git a/api_docs/kbn_core_plugins_browser_mocks.mdx b/api_docs/kbn_core_plugins_browser_mocks.mdx
index 6812125f80c91..c87eba8ae90d9 100644
--- a/api_docs/kbn_core_plugins_browser_mocks.mdx
+++ b/api_docs/kbn_core_plugins_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-plugins-browser-mocks
 title: "@kbn/core-plugins-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-plugins-browser-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-plugins-browser-mocks']
 ---
 import kbnCorePluginsBrowserMocksObj from './kbn_core_plugins_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_plugins_contracts_browser.mdx b/api_docs/kbn_core_plugins_contracts_browser.mdx
index 00f4f3ffe4d0f..3d7c0b0a3c68b 100644
--- a/api_docs/kbn_core_plugins_contracts_browser.mdx
+++ b/api_docs/kbn_core_plugins_contracts_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-plugins-contracts-browser
 title: "@kbn/core-plugins-contracts-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-plugins-contracts-browser plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-plugins-contracts-browser']
 ---
 import kbnCorePluginsContractsBrowserObj from './kbn_core_plugins_contracts_browser.devdocs.json';
diff --git a/api_docs/kbn_core_plugins_contracts_server.mdx b/api_docs/kbn_core_plugins_contracts_server.mdx
index ab58c30d9fb60..f54700070d469 100644
--- a/api_docs/kbn_core_plugins_contracts_server.mdx
+++ b/api_docs/kbn_core_plugins_contracts_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-plugins-contracts-server
 title: "@kbn/core-plugins-contracts-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-plugins-contracts-server plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-plugins-contracts-server']
 ---
 import kbnCorePluginsContractsServerObj from './kbn_core_plugins_contracts_server.devdocs.json';
diff --git a/api_docs/kbn_core_plugins_server.mdx b/api_docs/kbn_core_plugins_server.mdx
index 202170d048719..137dbb71481d3 100644
--- a/api_docs/kbn_core_plugins_server.mdx
+++ b/api_docs/kbn_core_plugins_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-plugins-server
 title: "@kbn/core-plugins-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-plugins-server plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-plugins-server']
 ---
 import kbnCorePluginsServerObj from './kbn_core_plugins_server.devdocs.json';
diff --git a/api_docs/kbn_core_plugins_server_mocks.mdx b/api_docs/kbn_core_plugins_server_mocks.mdx
index b8f8f89edab3f..bacb2cde8be1d 100644
--- a/api_docs/kbn_core_plugins_server_mocks.mdx
+++ b/api_docs/kbn_core_plugins_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-plugins-server-mocks
 title: "@kbn/core-plugins-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-plugins-server-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-plugins-server-mocks']
 ---
 import kbnCorePluginsServerMocksObj from './kbn_core_plugins_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_preboot_server.mdx b/api_docs/kbn_core_preboot_server.mdx
index 7a6f6cb752118..d6c0416a645e9 100644
--- a/api_docs/kbn_core_preboot_server.mdx
+++ b/api_docs/kbn_core_preboot_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-preboot-server
 title: "@kbn/core-preboot-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-preboot-server plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-preboot-server']
 ---
 import kbnCorePrebootServerObj from './kbn_core_preboot_server.devdocs.json';
diff --git a/api_docs/kbn_core_preboot_server_mocks.mdx b/api_docs/kbn_core_preboot_server_mocks.mdx
index 1d1a1a7516343..2f84dca729190 100644
--- a/api_docs/kbn_core_preboot_server_mocks.mdx
+++ b/api_docs/kbn_core_preboot_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-preboot-server-mocks
 title: "@kbn/core-preboot-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-preboot-server-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-preboot-server-mocks']
 ---
 import kbnCorePrebootServerMocksObj from './kbn_core_preboot_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_rendering_browser_mocks.mdx b/api_docs/kbn_core_rendering_browser_mocks.mdx
index ebfc1bba3453c..9ec083c48bebc 100644
--- a/api_docs/kbn_core_rendering_browser_mocks.mdx
+++ b/api_docs/kbn_core_rendering_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-rendering-browser-mocks
 title: "@kbn/core-rendering-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-rendering-browser-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-rendering-browser-mocks']
 ---
 import kbnCoreRenderingBrowserMocksObj from './kbn_core_rendering_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_rendering_server_internal.mdx b/api_docs/kbn_core_rendering_server_internal.mdx
index 6e345f0d7dae7..39eef2eb60224 100644
--- a/api_docs/kbn_core_rendering_server_internal.mdx
+++ b/api_docs/kbn_core_rendering_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-rendering-server-internal
 title: "@kbn/core-rendering-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-rendering-server-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-rendering-server-internal']
 ---
 import kbnCoreRenderingServerInternalObj from './kbn_core_rendering_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_rendering_server_mocks.mdx b/api_docs/kbn_core_rendering_server_mocks.mdx
index c8ad43c3ceb89..568306e36e210 100644
--- a/api_docs/kbn_core_rendering_server_mocks.mdx
+++ b/api_docs/kbn_core_rendering_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-rendering-server-mocks
 title: "@kbn/core-rendering-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-rendering-server-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-rendering-server-mocks']
 ---
 import kbnCoreRenderingServerMocksObj from './kbn_core_rendering_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_root_server_internal.mdx b/api_docs/kbn_core_root_server_internal.mdx
index ecab7953e6eef..9a7d0fd92d1cd 100644
--- a/api_docs/kbn_core_root_server_internal.mdx
+++ b/api_docs/kbn_core_root_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-root-server-internal
 title: "@kbn/core-root-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-root-server-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-root-server-internal']
 ---
 import kbnCoreRootServerInternalObj from './kbn_core_root_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_api_browser.mdx b/api_docs/kbn_core_saved_objects_api_browser.mdx
index 584284101c625..78c825a5b072e 100644
--- a/api_docs/kbn_core_saved_objects_api_browser.mdx
+++ b/api_docs/kbn_core_saved_objects_api_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-api-browser
 title: "@kbn/core-saved-objects-api-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-api-browser plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-api-browser']
 ---
 import kbnCoreSavedObjectsApiBrowserObj from './kbn_core_saved_objects_api_browser.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_api_server.mdx b/api_docs/kbn_core_saved_objects_api_server.mdx
index 8138f57fbe6b7..8045b8c020a7c 100644
--- a/api_docs/kbn_core_saved_objects_api_server.mdx
+++ b/api_docs/kbn_core_saved_objects_api_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-api-server
 title: "@kbn/core-saved-objects-api-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-api-server plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-api-server']
 ---
 import kbnCoreSavedObjectsApiServerObj from './kbn_core_saved_objects_api_server.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_api_server_mocks.mdx b/api_docs/kbn_core_saved_objects_api_server_mocks.mdx
index edebbad09bc54..64267f26331be 100644
--- a/api_docs/kbn_core_saved_objects_api_server_mocks.mdx
+++ b/api_docs/kbn_core_saved_objects_api_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-api-server-mocks
 title: "@kbn/core-saved-objects-api-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-api-server-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-api-server-mocks']
 ---
 import kbnCoreSavedObjectsApiServerMocksObj from './kbn_core_saved_objects_api_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_base_server_internal.mdx b/api_docs/kbn_core_saved_objects_base_server_internal.mdx
index 4f5ae24b32efd..fad5ec2597c50 100644
--- a/api_docs/kbn_core_saved_objects_base_server_internal.mdx
+++ b/api_docs/kbn_core_saved_objects_base_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-base-server-internal
 title: "@kbn/core-saved-objects-base-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-base-server-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-base-server-internal']
 ---
 import kbnCoreSavedObjectsBaseServerInternalObj from './kbn_core_saved_objects_base_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_base_server_mocks.mdx b/api_docs/kbn_core_saved_objects_base_server_mocks.mdx
index 7a9a0de6d047b..bef54c34d97ae 100644
--- a/api_docs/kbn_core_saved_objects_base_server_mocks.mdx
+++ b/api_docs/kbn_core_saved_objects_base_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-base-server-mocks
 title: "@kbn/core-saved-objects-base-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-base-server-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-base-server-mocks']
 ---
 import kbnCoreSavedObjectsBaseServerMocksObj from './kbn_core_saved_objects_base_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_browser.mdx b/api_docs/kbn_core_saved_objects_browser.mdx
index a96a40ed7085f..8d3099ff010a8 100644
--- a/api_docs/kbn_core_saved_objects_browser.mdx
+++ b/api_docs/kbn_core_saved_objects_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-browser
 title: "@kbn/core-saved-objects-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-browser plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-browser']
 ---
 import kbnCoreSavedObjectsBrowserObj from './kbn_core_saved_objects_browser.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_browser_internal.mdx b/api_docs/kbn_core_saved_objects_browser_internal.mdx
index 20bad0e9af8de..592ee0d31f062 100644
--- a/api_docs/kbn_core_saved_objects_browser_internal.mdx
+++ b/api_docs/kbn_core_saved_objects_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-browser-internal
 title: "@kbn/core-saved-objects-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-browser-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-browser-internal']
 ---
 import kbnCoreSavedObjectsBrowserInternalObj from './kbn_core_saved_objects_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_browser_mocks.mdx b/api_docs/kbn_core_saved_objects_browser_mocks.mdx
index aefcf29645439..5a7687c521b31 100644
--- a/api_docs/kbn_core_saved_objects_browser_mocks.mdx
+++ b/api_docs/kbn_core_saved_objects_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-browser-mocks
 title: "@kbn/core-saved-objects-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-browser-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-browser-mocks']
 ---
 import kbnCoreSavedObjectsBrowserMocksObj from './kbn_core_saved_objects_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_common.mdx b/api_docs/kbn_core_saved_objects_common.mdx
index 7b3c56bce264c..739b739545107 100644
--- a/api_docs/kbn_core_saved_objects_common.mdx
+++ b/api_docs/kbn_core_saved_objects_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-common
 title: "@kbn/core-saved-objects-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-common plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-common']
 ---
 import kbnCoreSavedObjectsCommonObj from './kbn_core_saved_objects_common.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_import_export_server_internal.mdx b/api_docs/kbn_core_saved_objects_import_export_server_internal.mdx
index 0d0f39c10bc44..72adb322f85af 100644
--- a/api_docs/kbn_core_saved_objects_import_export_server_internal.mdx
+++ b/api_docs/kbn_core_saved_objects_import_export_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-import-export-server-internal
 title: "@kbn/core-saved-objects-import-export-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-import-export-server-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-import-export-server-internal']
 ---
 import kbnCoreSavedObjectsImportExportServerInternalObj from './kbn_core_saved_objects_import_export_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_import_export_server_mocks.mdx b/api_docs/kbn_core_saved_objects_import_export_server_mocks.mdx
index b5917501e6576..2f96c5504d638 100644
--- a/api_docs/kbn_core_saved_objects_import_export_server_mocks.mdx
+++ b/api_docs/kbn_core_saved_objects_import_export_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-import-export-server-mocks
 title: "@kbn/core-saved-objects-import-export-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-import-export-server-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-import-export-server-mocks']
 ---
 import kbnCoreSavedObjectsImportExportServerMocksObj from './kbn_core_saved_objects_import_export_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_migration_server_internal.mdx b/api_docs/kbn_core_saved_objects_migration_server_internal.mdx
index 7730a03a23e84..01eaddf28f02c 100644
--- a/api_docs/kbn_core_saved_objects_migration_server_internal.mdx
+++ b/api_docs/kbn_core_saved_objects_migration_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-migration-server-internal
 title: "@kbn/core-saved-objects-migration-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-migration-server-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-migration-server-internal']
 ---
 import kbnCoreSavedObjectsMigrationServerInternalObj from './kbn_core_saved_objects_migration_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_migration_server_mocks.mdx b/api_docs/kbn_core_saved_objects_migration_server_mocks.mdx
index 412dbcfa5d600..2fc3cbdd6f8cf 100644
--- a/api_docs/kbn_core_saved_objects_migration_server_mocks.mdx
+++ b/api_docs/kbn_core_saved_objects_migration_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-migration-server-mocks
 title: "@kbn/core-saved-objects-migration-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-migration-server-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-migration-server-mocks']
 ---
 import kbnCoreSavedObjectsMigrationServerMocksObj from './kbn_core_saved_objects_migration_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_server.devdocs.json b/api_docs/kbn_core_saved_objects_server.devdocs.json
index e06d2d9295f41..7abce2de776e5 100644
--- a/api_docs/kbn_core_saved_objects_server.devdocs.json
+++ b/api_docs/kbn_core_saved_objects_server.devdocs.json
@@ -10755,14 +10755,14 @@
                 "plugin": "maps",
                 "path": "x-pack/plugins/maps/server/saved_objects/setup_saved_objects.ts"
               },
-              {
-                "plugin": "visualizations",
-                "path": "src/plugins/visualizations/server/saved_objects/visualization.ts"
-              },
               {
                 "plugin": "infra",
                 "path": "x-pack/plugins/observability_solution/infra/server/lib/sources/saved_object_type.ts"
               },
+              {
+                "plugin": "visualizations",
+                "path": "src/plugins/visualizations/server/saved_objects/visualization.ts"
+              },
               {
                 "plugin": "apmDataAccess",
                 "path": "x-pack/plugins/observability_solution/apm_data_access/server/saved_objects/apm_indices.ts"
diff --git a/api_docs/kbn_core_saved_objects_server.mdx b/api_docs/kbn_core_saved_objects_server.mdx
index f3630286150d7..b6aeeb771958c 100644
--- a/api_docs/kbn_core_saved_objects_server.mdx
+++ b/api_docs/kbn_core_saved_objects_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-server
 title: "@kbn/core-saved-objects-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-server plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-server']
 ---
 import kbnCoreSavedObjectsServerObj from './kbn_core_saved_objects_server.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_server_internal.mdx b/api_docs/kbn_core_saved_objects_server_internal.mdx
index 9f3a3691603b5..074a782ace07d 100644
--- a/api_docs/kbn_core_saved_objects_server_internal.mdx
+++ b/api_docs/kbn_core_saved_objects_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-server-internal
 title: "@kbn/core-saved-objects-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-server-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-server-internal']
 ---
 import kbnCoreSavedObjectsServerInternalObj from './kbn_core_saved_objects_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_server_mocks.mdx b/api_docs/kbn_core_saved_objects_server_mocks.mdx
index 02b60f7eb0d3d..427ac9041c441 100644
--- a/api_docs/kbn_core_saved_objects_server_mocks.mdx
+++ b/api_docs/kbn_core_saved_objects_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-server-mocks
 title: "@kbn/core-saved-objects-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-server-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-server-mocks']
 ---
 import kbnCoreSavedObjectsServerMocksObj from './kbn_core_saved_objects_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_utils_server.mdx b/api_docs/kbn_core_saved_objects_utils_server.mdx
index 725c25d09e1fc..3f06586fdd7e5 100644
--- a/api_docs/kbn_core_saved_objects_utils_server.mdx
+++ b/api_docs/kbn_core_saved_objects_utils_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-utils-server
 title: "@kbn/core-saved-objects-utils-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-utils-server plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-utils-server']
 ---
 import kbnCoreSavedObjectsUtilsServerObj from './kbn_core_saved_objects_utils_server.devdocs.json';
diff --git a/api_docs/kbn_core_security_browser.mdx b/api_docs/kbn_core_security_browser.mdx
index d0ae9eefbf4f4..12ba465b91dcd 100644
--- a/api_docs/kbn_core_security_browser.mdx
+++ b/api_docs/kbn_core_security_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-security-browser
 title: "@kbn/core-security-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-security-browser plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-security-browser']
 ---
 import kbnCoreSecurityBrowserObj from './kbn_core_security_browser.devdocs.json';
diff --git a/api_docs/kbn_core_security_browser_internal.mdx b/api_docs/kbn_core_security_browser_internal.mdx
index eba9bca6d0951..390595bd5fdc1 100644
--- a/api_docs/kbn_core_security_browser_internal.mdx
+++ b/api_docs/kbn_core_security_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-security-browser-internal
 title: "@kbn/core-security-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-security-browser-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-security-browser-internal']
 ---
 import kbnCoreSecurityBrowserInternalObj from './kbn_core_security_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_security_browser_mocks.mdx b/api_docs/kbn_core_security_browser_mocks.mdx
index edcb33afa9fd9..dc19fa0d61a72 100644
--- a/api_docs/kbn_core_security_browser_mocks.mdx
+++ b/api_docs/kbn_core_security_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-security-browser-mocks
 title: "@kbn/core-security-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-security-browser-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-security-browser-mocks']
 ---
 import kbnCoreSecurityBrowserMocksObj from './kbn_core_security_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_security_common.mdx b/api_docs/kbn_core_security_common.mdx
index c0dbcbb4dd4ec..64a002e598174 100644
--- a/api_docs/kbn_core_security_common.mdx
+++ b/api_docs/kbn_core_security_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-security-common
 title: "@kbn/core-security-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-security-common plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-security-common']
 ---
 import kbnCoreSecurityCommonObj from './kbn_core_security_common.devdocs.json';
diff --git a/api_docs/kbn_core_security_server.mdx b/api_docs/kbn_core_security_server.mdx
index 173b9fff46340..4bff4d1b1a806 100644
--- a/api_docs/kbn_core_security_server.mdx
+++ b/api_docs/kbn_core_security_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-security-server
 title: "@kbn/core-security-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-security-server plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-security-server']
 ---
 import kbnCoreSecurityServerObj from './kbn_core_security_server.devdocs.json';
diff --git a/api_docs/kbn_core_security_server_internal.mdx b/api_docs/kbn_core_security_server_internal.mdx
index 3f2ebd5e061e0..e2d27e497b159 100644
--- a/api_docs/kbn_core_security_server_internal.mdx
+++ b/api_docs/kbn_core_security_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-security-server-internal
 title: "@kbn/core-security-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-security-server-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-security-server-internal']
 ---
 import kbnCoreSecurityServerInternalObj from './kbn_core_security_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_security_server_mocks.mdx b/api_docs/kbn_core_security_server_mocks.mdx
index df4af097e14ff..102bbde0fca76 100644
--- a/api_docs/kbn_core_security_server_mocks.mdx
+++ b/api_docs/kbn_core_security_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-security-server-mocks
 title: "@kbn/core-security-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-security-server-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-security-server-mocks']
 ---
 import kbnCoreSecurityServerMocksObj from './kbn_core_security_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_status_common.mdx b/api_docs/kbn_core_status_common.mdx
index 4aafadc33d8a5..b6c0d5d0b4d59 100644
--- a/api_docs/kbn_core_status_common.mdx
+++ b/api_docs/kbn_core_status_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-status-common
 title: "@kbn/core-status-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-status-common plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-status-common']
 ---
 import kbnCoreStatusCommonObj from './kbn_core_status_common.devdocs.json';
diff --git a/api_docs/kbn_core_status_common_internal.mdx b/api_docs/kbn_core_status_common_internal.mdx
index 296485874d525..3c9f4df4e0123 100644
--- a/api_docs/kbn_core_status_common_internal.mdx
+++ b/api_docs/kbn_core_status_common_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-status-common-internal
 title: "@kbn/core-status-common-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-status-common-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-status-common-internal']
 ---
 import kbnCoreStatusCommonInternalObj from './kbn_core_status_common_internal.devdocs.json';
diff --git a/api_docs/kbn_core_status_server.mdx b/api_docs/kbn_core_status_server.mdx
index 9cccfd6f92164..a0d8891f5d84e 100644
--- a/api_docs/kbn_core_status_server.mdx
+++ b/api_docs/kbn_core_status_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-status-server
 title: "@kbn/core-status-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-status-server plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-status-server']
 ---
 import kbnCoreStatusServerObj from './kbn_core_status_server.devdocs.json';
diff --git a/api_docs/kbn_core_status_server_internal.mdx b/api_docs/kbn_core_status_server_internal.mdx
index 9486bfafcd97a..f7daadc857ad8 100644
--- a/api_docs/kbn_core_status_server_internal.mdx
+++ b/api_docs/kbn_core_status_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-status-server-internal
 title: "@kbn/core-status-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-status-server-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-status-server-internal']
 ---
 import kbnCoreStatusServerInternalObj from './kbn_core_status_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_status_server_mocks.mdx b/api_docs/kbn_core_status_server_mocks.mdx
index f5bb2c646b8eb..47dbd10542ac4 100644
--- a/api_docs/kbn_core_status_server_mocks.mdx
+++ b/api_docs/kbn_core_status_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-status-server-mocks
 title: "@kbn/core-status-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-status-server-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-status-server-mocks']
 ---
 import kbnCoreStatusServerMocksObj from './kbn_core_status_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_test_helpers_deprecations_getters.mdx b/api_docs/kbn_core_test_helpers_deprecations_getters.mdx
index ef636613b3267..de16e562ccb20 100644
--- a/api_docs/kbn_core_test_helpers_deprecations_getters.mdx
+++ b/api_docs/kbn_core_test_helpers_deprecations_getters.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-test-helpers-deprecations-getters
 title: "@kbn/core-test-helpers-deprecations-getters"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-test-helpers-deprecations-getters plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-test-helpers-deprecations-getters']
 ---
 import kbnCoreTestHelpersDeprecationsGettersObj from './kbn_core_test_helpers_deprecations_getters.devdocs.json';
diff --git a/api_docs/kbn_core_test_helpers_http_setup_browser.mdx b/api_docs/kbn_core_test_helpers_http_setup_browser.mdx
index ef3dde73cc67f..960e862db8ade 100644
--- a/api_docs/kbn_core_test_helpers_http_setup_browser.mdx
+++ b/api_docs/kbn_core_test_helpers_http_setup_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-test-helpers-http-setup-browser
 title: "@kbn/core-test-helpers-http-setup-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-test-helpers-http-setup-browser plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-test-helpers-http-setup-browser']
 ---
 import kbnCoreTestHelpersHttpSetupBrowserObj from './kbn_core_test_helpers_http_setup_browser.devdocs.json';
diff --git a/api_docs/kbn_core_test_helpers_kbn_server.mdx b/api_docs/kbn_core_test_helpers_kbn_server.mdx
index 919b655271ff5..0cfbf4ee33cca 100644
--- a/api_docs/kbn_core_test_helpers_kbn_server.mdx
+++ b/api_docs/kbn_core_test_helpers_kbn_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-test-helpers-kbn-server
 title: "@kbn/core-test-helpers-kbn-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-test-helpers-kbn-server plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-test-helpers-kbn-server']
 ---
 import kbnCoreTestHelpersKbnServerObj from './kbn_core_test_helpers_kbn_server.devdocs.json';
diff --git a/api_docs/kbn_core_test_helpers_model_versions.mdx b/api_docs/kbn_core_test_helpers_model_versions.mdx
index d209bb1d42cfe..b82c1eb67db36 100644
--- a/api_docs/kbn_core_test_helpers_model_versions.mdx
+++ b/api_docs/kbn_core_test_helpers_model_versions.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-test-helpers-model-versions
 title: "@kbn/core-test-helpers-model-versions"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-test-helpers-model-versions plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-test-helpers-model-versions']
 ---
 import kbnCoreTestHelpersModelVersionsObj from './kbn_core_test_helpers_model_versions.devdocs.json';
diff --git a/api_docs/kbn_core_test_helpers_so_type_serializer.mdx b/api_docs/kbn_core_test_helpers_so_type_serializer.mdx
index e9dbf21b94eb7..800060a210d55 100644
--- a/api_docs/kbn_core_test_helpers_so_type_serializer.mdx
+++ b/api_docs/kbn_core_test_helpers_so_type_serializer.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-test-helpers-so-type-serializer
 title: "@kbn/core-test-helpers-so-type-serializer"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-test-helpers-so-type-serializer plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-test-helpers-so-type-serializer']
 ---
 import kbnCoreTestHelpersSoTypeSerializerObj from './kbn_core_test_helpers_so_type_serializer.devdocs.json';
diff --git a/api_docs/kbn_core_test_helpers_test_utils.mdx b/api_docs/kbn_core_test_helpers_test_utils.mdx
index f20844bb6a3e9..8a648f35ef581 100644
--- a/api_docs/kbn_core_test_helpers_test_utils.mdx
+++ b/api_docs/kbn_core_test_helpers_test_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-test-helpers-test-utils
 title: "@kbn/core-test-helpers-test-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-test-helpers-test-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-test-helpers-test-utils']
 ---
 import kbnCoreTestHelpersTestUtilsObj from './kbn_core_test_helpers_test_utils.devdocs.json';
diff --git a/api_docs/kbn_core_theme_browser.mdx b/api_docs/kbn_core_theme_browser.mdx
index 2541f837f8bd2..09aa4184ff5ac 100644
--- a/api_docs/kbn_core_theme_browser.mdx
+++ b/api_docs/kbn_core_theme_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-theme-browser
 title: "@kbn/core-theme-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-theme-browser plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-theme-browser']
 ---
 import kbnCoreThemeBrowserObj from './kbn_core_theme_browser.devdocs.json';
diff --git a/api_docs/kbn_core_theme_browser_mocks.mdx b/api_docs/kbn_core_theme_browser_mocks.mdx
index 7ce99e5f4b547..2df0e4ebee697 100644
--- a/api_docs/kbn_core_theme_browser_mocks.mdx
+++ b/api_docs/kbn_core_theme_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-theme-browser-mocks
 title: "@kbn/core-theme-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-theme-browser-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-theme-browser-mocks']
 ---
 import kbnCoreThemeBrowserMocksObj from './kbn_core_theme_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_ui_settings_browser.mdx b/api_docs/kbn_core_ui_settings_browser.mdx
index 550bb289571fd..5929b0370b6ce 100644
--- a/api_docs/kbn_core_ui_settings_browser.mdx
+++ b/api_docs/kbn_core_ui_settings_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-browser
 title: "@kbn/core-ui-settings-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-ui-settings-browser plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-browser']
 ---
 import kbnCoreUiSettingsBrowserObj from './kbn_core_ui_settings_browser.devdocs.json';
diff --git a/api_docs/kbn_core_ui_settings_browser_internal.mdx b/api_docs/kbn_core_ui_settings_browser_internal.mdx
index e291b5b0ef2ea..6189dbce74902 100644
--- a/api_docs/kbn_core_ui_settings_browser_internal.mdx
+++ b/api_docs/kbn_core_ui_settings_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-browser-internal
 title: "@kbn/core-ui-settings-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-ui-settings-browser-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-browser-internal']
 ---
 import kbnCoreUiSettingsBrowserInternalObj from './kbn_core_ui_settings_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_ui_settings_browser_mocks.mdx b/api_docs/kbn_core_ui_settings_browser_mocks.mdx
index 2adc93b74797a..c4a8f8c008522 100644
--- a/api_docs/kbn_core_ui_settings_browser_mocks.mdx
+++ b/api_docs/kbn_core_ui_settings_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-browser-mocks
 title: "@kbn/core-ui-settings-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-ui-settings-browser-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-browser-mocks']
 ---
 import kbnCoreUiSettingsBrowserMocksObj from './kbn_core_ui_settings_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_ui_settings_common.mdx b/api_docs/kbn_core_ui_settings_common.mdx
index 895ccb71bd3f5..676037f84d266 100644
--- a/api_docs/kbn_core_ui_settings_common.mdx
+++ b/api_docs/kbn_core_ui_settings_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-common
 title: "@kbn/core-ui-settings-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-ui-settings-common plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-common']
 ---
 import kbnCoreUiSettingsCommonObj from './kbn_core_ui_settings_common.devdocs.json';
diff --git a/api_docs/kbn_core_ui_settings_server.mdx b/api_docs/kbn_core_ui_settings_server.mdx
index 936c9871d1e1e..a2e5373c866a4 100644
--- a/api_docs/kbn_core_ui_settings_server.mdx
+++ b/api_docs/kbn_core_ui_settings_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-server
 title: "@kbn/core-ui-settings-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-ui-settings-server plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-server']
 ---
 import kbnCoreUiSettingsServerObj from './kbn_core_ui_settings_server.devdocs.json';
diff --git a/api_docs/kbn_core_ui_settings_server_internal.mdx b/api_docs/kbn_core_ui_settings_server_internal.mdx
index a9221d42c90b6..3f40141559136 100644
--- a/api_docs/kbn_core_ui_settings_server_internal.mdx
+++ b/api_docs/kbn_core_ui_settings_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-server-internal
 title: "@kbn/core-ui-settings-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-ui-settings-server-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-server-internal']
 ---
 import kbnCoreUiSettingsServerInternalObj from './kbn_core_ui_settings_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_ui_settings_server_mocks.mdx b/api_docs/kbn_core_ui_settings_server_mocks.mdx
index 6d47071ffe6d2..d8984f8c05955 100644
--- a/api_docs/kbn_core_ui_settings_server_mocks.mdx
+++ b/api_docs/kbn_core_ui_settings_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-server-mocks
 title: "@kbn/core-ui-settings-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-ui-settings-server-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-server-mocks']
 ---
 import kbnCoreUiSettingsServerMocksObj from './kbn_core_ui_settings_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_usage_data_server.mdx b/api_docs/kbn_core_usage_data_server.mdx
index 1dfb4a3e34abf..426b4ddc8b547 100644
--- a/api_docs/kbn_core_usage_data_server.mdx
+++ b/api_docs/kbn_core_usage_data_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-usage-data-server
 title: "@kbn/core-usage-data-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-usage-data-server plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-usage-data-server']
 ---
 import kbnCoreUsageDataServerObj from './kbn_core_usage_data_server.devdocs.json';
diff --git a/api_docs/kbn_core_usage_data_server_internal.mdx b/api_docs/kbn_core_usage_data_server_internal.mdx
index 158251df07e0a..e2ab248d5b6a1 100644
--- a/api_docs/kbn_core_usage_data_server_internal.mdx
+++ b/api_docs/kbn_core_usage_data_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-usage-data-server-internal
 title: "@kbn/core-usage-data-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-usage-data-server-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-usage-data-server-internal']
 ---
 import kbnCoreUsageDataServerInternalObj from './kbn_core_usage_data_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_usage_data_server_mocks.mdx b/api_docs/kbn_core_usage_data_server_mocks.mdx
index 60f66a50a785f..ec07e4314facc 100644
--- a/api_docs/kbn_core_usage_data_server_mocks.mdx
+++ b/api_docs/kbn_core_usage_data_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-usage-data-server-mocks
 title: "@kbn/core-usage-data-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-usage-data-server-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-usage-data-server-mocks']
 ---
 import kbnCoreUsageDataServerMocksObj from './kbn_core_usage_data_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_user_profile_browser.mdx b/api_docs/kbn_core_user_profile_browser.mdx
index 2853909368a5e..3aa4d5e179d35 100644
--- a/api_docs/kbn_core_user_profile_browser.mdx
+++ b/api_docs/kbn_core_user_profile_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-user-profile-browser
 title: "@kbn/core-user-profile-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-user-profile-browser plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-user-profile-browser']
 ---
 import kbnCoreUserProfileBrowserObj from './kbn_core_user_profile_browser.devdocs.json';
diff --git a/api_docs/kbn_core_user_profile_browser_internal.mdx b/api_docs/kbn_core_user_profile_browser_internal.mdx
index e4036b359f459..6af8863367836 100644
--- a/api_docs/kbn_core_user_profile_browser_internal.mdx
+++ b/api_docs/kbn_core_user_profile_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-user-profile-browser-internal
 title: "@kbn/core-user-profile-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-user-profile-browser-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-user-profile-browser-internal']
 ---
 import kbnCoreUserProfileBrowserInternalObj from './kbn_core_user_profile_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_user_profile_browser_mocks.mdx b/api_docs/kbn_core_user_profile_browser_mocks.mdx
index d181abea38e60..5ec140c23fc8f 100644
--- a/api_docs/kbn_core_user_profile_browser_mocks.mdx
+++ b/api_docs/kbn_core_user_profile_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-user-profile-browser-mocks
 title: "@kbn/core-user-profile-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-user-profile-browser-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-user-profile-browser-mocks']
 ---
 import kbnCoreUserProfileBrowserMocksObj from './kbn_core_user_profile_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_user_profile_common.mdx b/api_docs/kbn_core_user_profile_common.mdx
index a547a652f841f..20a3cf17ee880 100644
--- a/api_docs/kbn_core_user_profile_common.mdx
+++ b/api_docs/kbn_core_user_profile_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-user-profile-common
 title: "@kbn/core-user-profile-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-user-profile-common plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-user-profile-common']
 ---
 import kbnCoreUserProfileCommonObj from './kbn_core_user_profile_common.devdocs.json';
diff --git a/api_docs/kbn_core_user_profile_server.mdx b/api_docs/kbn_core_user_profile_server.mdx
index 7c5c109349b94..f5cc61af1ebf1 100644
--- a/api_docs/kbn_core_user_profile_server.mdx
+++ b/api_docs/kbn_core_user_profile_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-user-profile-server
 title: "@kbn/core-user-profile-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-user-profile-server plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-user-profile-server']
 ---
 import kbnCoreUserProfileServerObj from './kbn_core_user_profile_server.devdocs.json';
diff --git a/api_docs/kbn_core_user_profile_server_internal.mdx b/api_docs/kbn_core_user_profile_server_internal.mdx
index efc8aca4aaf72..f92ce6539b87a 100644
--- a/api_docs/kbn_core_user_profile_server_internal.mdx
+++ b/api_docs/kbn_core_user_profile_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-user-profile-server-internal
 title: "@kbn/core-user-profile-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-user-profile-server-internal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-user-profile-server-internal']
 ---
 import kbnCoreUserProfileServerInternalObj from './kbn_core_user_profile_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_user_profile_server_mocks.mdx b/api_docs/kbn_core_user_profile_server_mocks.mdx
index 7f0f79c0d61b0..3f2cef5e0cbb1 100644
--- a/api_docs/kbn_core_user_profile_server_mocks.mdx
+++ b/api_docs/kbn_core_user_profile_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-user-profile-server-mocks
 title: "@kbn/core-user-profile-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-user-profile-server-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-user-profile-server-mocks']
 ---
 import kbnCoreUserProfileServerMocksObj from './kbn_core_user_profile_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_user_settings_server.mdx b/api_docs/kbn_core_user_settings_server.mdx
index 979e7ea2ee323..0f480e1ebd322 100644
--- a/api_docs/kbn_core_user_settings_server.mdx
+++ b/api_docs/kbn_core_user_settings_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-user-settings-server
 title: "@kbn/core-user-settings-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-user-settings-server plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-user-settings-server']
 ---
 import kbnCoreUserSettingsServerObj from './kbn_core_user_settings_server.devdocs.json';
diff --git a/api_docs/kbn_core_user_settings_server_mocks.mdx b/api_docs/kbn_core_user_settings_server_mocks.mdx
index f19ee3ccf165b..747379e5a8339 100644
--- a/api_docs/kbn_core_user_settings_server_mocks.mdx
+++ b/api_docs/kbn_core_user_settings_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-user-settings-server-mocks
 title: "@kbn/core-user-settings-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-user-settings-server-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-user-settings-server-mocks']
 ---
 import kbnCoreUserSettingsServerMocksObj from './kbn_core_user_settings_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_crypto.mdx b/api_docs/kbn_crypto.mdx
index a17b5b14b12a5..cf1869d74bc41 100644
--- a/api_docs/kbn_crypto.mdx
+++ b/api_docs/kbn_crypto.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-crypto
 title: "@kbn/crypto"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/crypto plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/crypto']
 ---
 import kbnCryptoObj from './kbn_crypto.devdocs.json';
diff --git a/api_docs/kbn_crypto_browser.mdx b/api_docs/kbn_crypto_browser.mdx
index 91d9c1f23d120..f13c9534079c9 100644
--- a/api_docs/kbn_crypto_browser.mdx
+++ b/api_docs/kbn_crypto_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-crypto-browser
 title: "@kbn/crypto-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/crypto-browser plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/crypto-browser']
 ---
 import kbnCryptoBrowserObj from './kbn_crypto_browser.devdocs.json';
diff --git a/api_docs/kbn_custom_icons.mdx b/api_docs/kbn_custom_icons.mdx
index de88984974dc7..8bdf560b36530 100644
--- a/api_docs/kbn_custom_icons.mdx
+++ b/api_docs/kbn_custom_icons.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-custom-icons
 title: "@kbn/custom-icons"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/custom-icons plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/custom-icons']
 ---
 import kbnCustomIconsObj from './kbn_custom_icons.devdocs.json';
diff --git a/api_docs/kbn_custom_integrations.mdx b/api_docs/kbn_custom_integrations.mdx
index ce12ee6c83345..4c884e0697e94 100644
--- a/api_docs/kbn_custom_integrations.mdx
+++ b/api_docs/kbn_custom_integrations.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-custom-integrations
 title: "@kbn/custom-integrations"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/custom-integrations plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/custom-integrations']
 ---
 import kbnCustomIntegrationsObj from './kbn_custom_integrations.devdocs.json';
diff --git a/api_docs/kbn_cypress_config.mdx b/api_docs/kbn_cypress_config.mdx
index 764ee0db2bc32..89682b024e9b6 100644
--- a/api_docs/kbn_cypress_config.mdx
+++ b/api_docs/kbn_cypress_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-cypress-config
 title: "@kbn/cypress-config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/cypress-config plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/cypress-config']
 ---
 import kbnCypressConfigObj from './kbn_cypress_config.devdocs.json';
diff --git a/api_docs/kbn_data_forge.mdx b/api_docs/kbn_data_forge.mdx
index 3e6244701fb22..4a7c188dcfe60 100644
--- a/api_docs/kbn_data_forge.mdx
+++ b/api_docs/kbn_data_forge.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-data-forge
 title: "@kbn/data-forge"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/data-forge plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/data-forge']
 ---
 import kbnDataForgeObj from './kbn_data_forge.devdocs.json';
diff --git a/api_docs/kbn_data_service.mdx b/api_docs/kbn_data_service.mdx
index c880ae8029b35..97d34629c5076 100644
--- a/api_docs/kbn_data_service.mdx
+++ b/api_docs/kbn_data_service.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-data-service
 title: "@kbn/data-service"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/data-service plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/data-service']
 ---
 import kbnDataServiceObj from './kbn_data_service.devdocs.json';
diff --git a/api_docs/kbn_data_stream_adapter.mdx b/api_docs/kbn_data_stream_adapter.mdx
index b2eb038389fce..7839f9e873a70 100644
--- a/api_docs/kbn_data_stream_adapter.mdx
+++ b/api_docs/kbn_data_stream_adapter.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-data-stream-adapter
 title: "@kbn/data-stream-adapter"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/data-stream-adapter plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/data-stream-adapter']
 ---
 import kbnDataStreamAdapterObj from './kbn_data_stream_adapter.devdocs.json';
diff --git a/api_docs/kbn_data_view_utils.mdx b/api_docs/kbn_data_view_utils.mdx
index e6618be7b9a76..5390b2289d1ae 100644
--- a/api_docs/kbn_data_view_utils.mdx
+++ b/api_docs/kbn_data_view_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-data-view-utils
 title: "@kbn/data-view-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/data-view-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/data-view-utils']
 ---
 import kbnDataViewUtilsObj from './kbn_data_view_utils.devdocs.json';
diff --git a/api_docs/kbn_datemath.mdx b/api_docs/kbn_datemath.mdx
index 6d63bc1862dc8..331af8c004d95 100644
--- a/api_docs/kbn_datemath.mdx
+++ b/api_docs/kbn_datemath.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-datemath
 title: "@kbn/datemath"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/datemath plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/datemath']
 ---
 import kbnDatemathObj from './kbn_datemath.devdocs.json';
diff --git a/api_docs/kbn_deeplinks_analytics.mdx b/api_docs/kbn_deeplinks_analytics.mdx
index 1e40c1f000aa3..604ec7de3dba5 100644
--- a/api_docs/kbn_deeplinks_analytics.mdx
+++ b/api_docs/kbn_deeplinks_analytics.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-deeplinks-analytics
 title: "@kbn/deeplinks-analytics"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/deeplinks-analytics plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/deeplinks-analytics']
 ---
 import kbnDeeplinksAnalyticsObj from './kbn_deeplinks_analytics.devdocs.json';
diff --git a/api_docs/kbn_deeplinks_devtools.mdx b/api_docs/kbn_deeplinks_devtools.mdx
index 5f051970f0f94..6da262fad6edf 100644
--- a/api_docs/kbn_deeplinks_devtools.mdx
+++ b/api_docs/kbn_deeplinks_devtools.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-deeplinks-devtools
 title: "@kbn/deeplinks-devtools"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/deeplinks-devtools plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/deeplinks-devtools']
 ---
 import kbnDeeplinksDevtoolsObj from './kbn_deeplinks_devtools.devdocs.json';
diff --git a/api_docs/kbn_deeplinks_fleet.mdx b/api_docs/kbn_deeplinks_fleet.mdx
index 1815255e1c27c..dabf38b294286 100644
--- a/api_docs/kbn_deeplinks_fleet.mdx
+++ b/api_docs/kbn_deeplinks_fleet.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-deeplinks-fleet
 title: "@kbn/deeplinks-fleet"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/deeplinks-fleet plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/deeplinks-fleet']
 ---
 import kbnDeeplinksFleetObj from './kbn_deeplinks_fleet.devdocs.json';
diff --git a/api_docs/kbn_deeplinks_management.mdx b/api_docs/kbn_deeplinks_management.mdx
index 28cbfafd8c271..018101ec18368 100644
--- a/api_docs/kbn_deeplinks_management.mdx
+++ b/api_docs/kbn_deeplinks_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-deeplinks-management
 title: "@kbn/deeplinks-management"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/deeplinks-management plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/deeplinks-management']
 ---
 import kbnDeeplinksManagementObj from './kbn_deeplinks_management.devdocs.json';
diff --git a/api_docs/kbn_deeplinks_ml.mdx b/api_docs/kbn_deeplinks_ml.mdx
index 0151cdad1e2db..24dabe52473f9 100644
--- a/api_docs/kbn_deeplinks_ml.mdx
+++ b/api_docs/kbn_deeplinks_ml.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-deeplinks-ml
 title: "@kbn/deeplinks-ml"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/deeplinks-ml plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/deeplinks-ml']
 ---
 import kbnDeeplinksMlObj from './kbn_deeplinks_ml.devdocs.json';
diff --git a/api_docs/kbn_deeplinks_observability.mdx b/api_docs/kbn_deeplinks_observability.mdx
index c37364413c38e..5c070d2d3df95 100644
--- a/api_docs/kbn_deeplinks_observability.mdx
+++ b/api_docs/kbn_deeplinks_observability.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-deeplinks-observability
 title: "@kbn/deeplinks-observability"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/deeplinks-observability plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/deeplinks-observability']
 ---
 import kbnDeeplinksObservabilityObj from './kbn_deeplinks_observability.devdocs.json';
diff --git a/api_docs/kbn_deeplinks_search.mdx b/api_docs/kbn_deeplinks_search.mdx
index 4611016c5731c..85b77aefe8b74 100644
--- a/api_docs/kbn_deeplinks_search.mdx
+++ b/api_docs/kbn_deeplinks_search.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-deeplinks-search
 title: "@kbn/deeplinks-search"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/deeplinks-search plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/deeplinks-search']
 ---
 import kbnDeeplinksSearchObj from './kbn_deeplinks_search.devdocs.json';
diff --git a/api_docs/kbn_deeplinks_security.mdx b/api_docs/kbn_deeplinks_security.mdx
index 7ba0fe30a6912..28a317cff5014 100644
--- a/api_docs/kbn_deeplinks_security.mdx
+++ b/api_docs/kbn_deeplinks_security.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-deeplinks-security
 title: "@kbn/deeplinks-security"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/deeplinks-security plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/deeplinks-security']
 ---
 import kbnDeeplinksSecurityObj from './kbn_deeplinks_security.devdocs.json';
diff --git a/api_docs/kbn_deeplinks_shared.mdx b/api_docs/kbn_deeplinks_shared.mdx
index e93942bd13dae..4e89e90fcd475 100644
--- a/api_docs/kbn_deeplinks_shared.mdx
+++ b/api_docs/kbn_deeplinks_shared.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-deeplinks-shared
 title: "@kbn/deeplinks-shared"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/deeplinks-shared plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/deeplinks-shared']
 ---
 import kbnDeeplinksSharedObj from './kbn_deeplinks_shared.devdocs.json';
diff --git a/api_docs/kbn_default_nav_analytics.mdx b/api_docs/kbn_default_nav_analytics.mdx
index 755d380fc7045..db0eae0536155 100644
--- a/api_docs/kbn_default_nav_analytics.mdx
+++ b/api_docs/kbn_default_nav_analytics.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-default-nav-analytics
 title: "@kbn/default-nav-analytics"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/default-nav-analytics plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/default-nav-analytics']
 ---
 import kbnDefaultNavAnalyticsObj from './kbn_default_nav_analytics.devdocs.json';
diff --git a/api_docs/kbn_default_nav_devtools.mdx b/api_docs/kbn_default_nav_devtools.mdx
index 4651fe94505b4..4149f956d7937 100644
--- a/api_docs/kbn_default_nav_devtools.mdx
+++ b/api_docs/kbn_default_nav_devtools.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-default-nav-devtools
 title: "@kbn/default-nav-devtools"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/default-nav-devtools plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/default-nav-devtools']
 ---
 import kbnDefaultNavDevtoolsObj from './kbn_default_nav_devtools.devdocs.json';
diff --git a/api_docs/kbn_default_nav_management.mdx b/api_docs/kbn_default_nav_management.mdx
index b116cfc741656..4dbbfdedfc7c6 100644
--- a/api_docs/kbn_default_nav_management.mdx
+++ b/api_docs/kbn_default_nav_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-default-nav-management
 title: "@kbn/default-nav-management"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/default-nav-management plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/default-nav-management']
 ---
 import kbnDefaultNavManagementObj from './kbn_default_nav_management.devdocs.json';
diff --git a/api_docs/kbn_default_nav_ml.mdx b/api_docs/kbn_default_nav_ml.mdx
index 4afee494882d2..841b302c2bbb3 100644
--- a/api_docs/kbn_default_nav_ml.mdx
+++ b/api_docs/kbn_default_nav_ml.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-default-nav-ml
 title: "@kbn/default-nav-ml"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/default-nav-ml plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/default-nav-ml']
 ---
 import kbnDefaultNavMlObj from './kbn_default_nav_ml.devdocs.json';
diff --git a/api_docs/kbn_dev_cli_errors.mdx b/api_docs/kbn_dev_cli_errors.mdx
index e608b8f6b73dc..5d6c945b46f65 100644
--- a/api_docs/kbn_dev_cli_errors.mdx
+++ b/api_docs/kbn_dev_cli_errors.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-dev-cli-errors
 title: "@kbn/dev-cli-errors"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/dev-cli-errors plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/dev-cli-errors']
 ---
 import kbnDevCliErrorsObj from './kbn_dev_cli_errors.devdocs.json';
diff --git a/api_docs/kbn_dev_cli_runner.mdx b/api_docs/kbn_dev_cli_runner.mdx
index d272d34850133..71ee98c622fc8 100644
--- a/api_docs/kbn_dev_cli_runner.mdx
+++ b/api_docs/kbn_dev_cli_runner.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-dev-cli-runner
 title: "@kbn/dev-cli-runner"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/dev-cli-runner plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/dev-cli-runner']
 ---
 import kbnDevCliRunnerObj from './kbn_dev_cli_runner.devdocs.json';
diff --git a/api_docs/kbn_dev_proc_runner.mdx b/api_docs/kbn_dev_proc_runner.mdx
index d0564614550c9..552994f331895 100644
--- a/api_docs/kbn_dev_proc_runner.mdx
+++ b/api_docs/kbn_dev_proc_runner.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-dev-proc-runner
 title: "@kbn/dev-proc-runner"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/dev-proc-runner plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/dev-proc-runner']
 ---
 import kbnDevProcRunnerObj from './kbn_dev_proc_runner.devdocs.json';
diff --git a/api_docs/kbn_dev_utils.mdx b/api_docs/kbn_dev_utils.mdx
index ea6af279c45be..dba4a3ac82899 100644
--- a/api_docs/kbn_dev_utils.mdx
+++ b/api_docs/kbn_dev_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-dev-utils
 title: "@kbn/dev-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/dev-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/dev-utils']
 ---
 import kbnDevUtilsObj from './kbn_dev_utils.devdocs.json';
diff --git a/api_docs/kbn_discover_contextual_components.mdx b/api_docs/kbn_discover_contextual_components.mdx
index 2219c6cb0c929..70bf2ef281fbb 100644
--- a/api_docs/kbn_discover_contextual_components.mdx
+++ b/api_docs/kbn_discover_contextual_components.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-discover-contextual-components
 title: "@kbn/discover-contextual-components"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/discover-contextual-components plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/discover-contextual-components']
 ---
 import kbnDiscoverContextualComponentsObj from './kbn_discover_contextual_components.devdocs.json';
diff --git a/api_docs/kbn_discover_utils.mdx b/api_docs/kbn_discover_utils.mdx
index a889177a228f3..3bfafd9e09fae 100644
--- a/api_docs/kbn_discover_utils.mdx
+++ b/api_docs/kbn_discover_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-discover-utils
 title: "@kbn/discover-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/discover-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/discover-utils']
 ---
 import kbnDiscoverUtilsObj from './kbn_discover_utils.devdocs.json';
diff --git a/api_docs/kbn_doc_links.mdx b/api_docs/kbn_doc_links.mdx
index b135f6d5f0f2d..6b81a164c2fe2 100644
--- a/api_docs/kbn_doc_links.mdx
+++ b/api_docs/kbn_doc_links.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-doc-links
 title: "@kbn/doc-links"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/doc-links plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/doc-links']
 ---
 import kbnDocLinksObj from './kbn_doc_links.devdocs.json';
diff --git a/api_docs/kbn_docs_utils.mdx b/api_docs/kbn_docs_utils.mdx
index 1ea80de173be1..dadbcecc81339 100644
--- a/api_docs/kbn_docs_utils.mdx
+++ b/api_docs/kbn_docs_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-docs-utils
 title: "@kbn/docs-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/docs-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/docs-utils']
 ---
 import kbnDocsUtilsObj from './kbn_docs_utils.devdocs.json';
diff --git a/api_docs/kbn_dom_drag_drop.mdx b/api_docs/kbn_dom_drag_drop.mdx
index ca1793e122646..bf764d1173138 100644
--- a/api_docs/kbn_dom_drag_drop.mdx
+++ b/api_docs/kbn_dom_drag_drop.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-dom-drag-drop
 title: "@kbn/dom-drag-drop"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/dom-drag-drop plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/dom-drag-drop']
 ---
 import kbnDomDragDropObj from './kbn_dom_drag_drop.devdocs.json';
diff --git a/api_docs/kbn_ebt_tools.mdx b/api_docs/kbn_ebt_tools.mdx
index 5cd30ab7a056f..c308752e2dbb0 100644
--- a/api_docs/kbn_ebt_tools.mdx
+++ b/api_docs/kbn_ebt_tools.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ebt-tools
 title: "@kbn/ebt-tools"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ebt-tools plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ebt-tools']
 ---
 import kbnEbtToolsObj from './kbn_ebt_tools.devdocs.json';
diff --git a/api_docs/kbn_ecs_data_quality_dashboard.mdx b/api_docs/kbn_ecs_data_quality_dashboard.mdx
index c7b6b1d6e06b2..5e4346770a5d0 100644
--- a/api_docs/kbn_ecs_data_quality_dashboard.mdx
+++ b/api_docs/kbn_ecs_data_quality_dashboard.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ecs-data-quality-dashboard
 title: "@kbn/ecs-data-quality-dashboard"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ecs-data-quality-dashboard plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ecs-data-quality-dashboard']
 ---
 import kbnEcsDataQualityDashboardObj from './kbn_ecs_data_quality_dashboard.devdocs.json';
diff --git a/api_docs/kbn_elastic_agent_utils.mdx b/api_docs/kbn_elastic_agent_utils.mdx
index 9255f328835dc..537a120d257cf 100644
--- a/api_docs/kbn_elastic_agent_utils.mdx
+++ b/api_docs/kbn_elastic_agent_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-elastic-agent-utils
 title: "@kbn/elastic-agent-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/elastic-agent-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/elastic-agent-utils']
 ---
 import kbnElasticAgentUtilsObj from './kbn_elastic_agent_utils.devdocs.json';
diff --git a/api_docs/kbn_elastic_assistant.mdx b/api_docs/kbn_elastic_assistant.mdx
index 50929b20864a8..d8f989e3fa372 100644
--- a/api_docs/kbn_elastic_assistant.mdx
+++ b/api_docs/kbn_elastic_assistant.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-elastic-assistant
 title: "@kbn/elastic-assistant"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/elastic-assistant plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/elastic-assistant']
 ---
 import kbnElasticAssistantObj from './kbn_elastic_assistant.devdocs.json';
diff --git a/api_docs/kbn_elastic_assistant_common.mdx b/api_docs/kbn_elastic_assistant_common.mdx
index cdb8d7987e673..a17ed3e8829c9 100644
--- a/api_docs/kbn_elastic_assistant_common.mdx
+++ b/api_docs/kbn_elastic_assistant_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-elastic-assistant-common
 title: "@kbn/elastic-assistant-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/elastic-assistant-common plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/elastic-assistant-common']
 ---
 import kbnElasticAssistantCommonObj from './kbn_elastic_assistant_common.devdocs.json';
diff --git a/api_docs/kbn_entities_schema.mdx b/api_docs/kbn_entities_schema.mdx
index b826e501998bc..f68f79069b788 100644
--- a/api_docs/kbn_entities_schema.mdx
+++ b/api_docs/kbn_entities_schema.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-entities-schema
 title: "@kbn/entities-schema"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/entities-schema plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/entities-schema']
 ---
 import kbnEntitiesSchemaObj from './kbn_entities_schema.devdocs.json';
diff --git a/api_docs/kbn_es.mdx b/api_docs/kbn_es.mdx
index d445a60037635..76301bc3072e6 100644
--- a/api_docs/kbn_es.mdx
+++ b/api_docs/kbn_es.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-es
 title: "@kbn/es"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/es plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/es']
 ---
 import kbnEsObj from './kbn_es.devdocs.json';
diff --git a/api_docs/kbn_es_archiver.mdx b/api_docs/kbn_es_archiver.mdx
index 8566e3b74dd49..487646d42dc31 100644
--- a/api_docs/kbn_es_archiver.mdx
+++ b/api_docs/kbn_es_archiver.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-es-archiver
 title: "@kbn/es-archiver"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/es-archiver plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/es-archiver']
 ---
 import kbnEsArchiverObj from './kbn_es_archiver.devdocs.json';
diff --git a/api_docs/kbn_es_errors.mdx b/api_docs/kbn_es_errors.mdx
index 825595bb9603b..86e7b54ec1d01 100644
--- a/api_docs/kbn_es_errors.mdx
+++ b/api_docs/kbn_es_errors.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-es-errors
 title: "@kbn/es-errors"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/es-errors plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/es-errors']
 ---
 import kbnEsErrorsObj from './kbn_es_errors.devdocs.json';
diff --git a/api_docs/kbn_es_query.mdx b/api_docs/kbn_es_query.mdx
index 24d299c1ede02..295b1d61c1e89 100644
--- a/api_docs/kbn_es_query.mdx
+++ b/api_docs/kbn_es_query.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-es-query
 title: "@kbn/es-query"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/es-query plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/es-query']
 ---
 import kbnEsQueryObj from './kbn_es_query.devdocs.json';
diff --git a/api_docs/kbn_es_types.mdx b/api_docs/kbn_es_types.mdx
index a7c6cd220b2f9..0eccf0650c09c 100644
--- a/api_docs/kbn_es_types.mdx
+++ b/api_docs/kbn_es_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-es-types
 title: "@kbn/es-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/es-types plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/es-types']
 ---
 import kbnEsTypesObj from './kbn_es_types.devdocs.json';
diff --git a/api_docs/kbn_eslint_plugin_imports.mdx b/api_docs/kbn_eslint_plugin_imports.mdx
index 25394de801afc..b1273a981555f 100644
--- a/api_docs/kbn_eslint_plugin_imports.mdx
+++ b/api_docs/kbn_eslint_plugin_imports.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-eslint-plugin-imports
 title: "@kbn/eslint-plugin-imports"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/eslint-plugin-imports plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/eslint-plugin-imports']
 ---
 import kbnEslintPluginImportsObj from './kbn_eslint_plugin_imports.devdocs.json';
diff --git a/api_docs/kbn_esql_ast.mdx b/api_docs/kbn_esql_ast.mdx
index e029abe42fa85..933faae85c88a 100644
--- a/api_docs/kbn_esql_ast.mdx
+++ b/api_docs/kbn_esql_ast.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-esql-ast
 title: "@kbn/esql-ast"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/esql-ast plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/esql-ast']
 ---
 import kbnEsqlAstObj from './kbn_esql_ast.devdocs.json';
diff --git a/api_docs/kbn_esql_editor.mdx b/api_docs/kbn_esql_editor.mdx
index c5abb2897dc91..6da139ebb70dd 100644
--- a/api_docs/kbn_esql_editor.mdx
+++ b/api_docs/kbn_esql_editor.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-esql-editor
 title: "@kbn/esql-editor"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/esql-editor plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/esql-editor']
 ---
 import kbnEsqlEditorObj from './kbn_esql_editor.devdocs.json';
diff --git a/api_docs/kbn_esql_utils.mdx b/api_docs/kbn_esql_utils.mdx
index 2beb7a08ec737..470e7cb682d5b 100644
--- a/api_docs/kbn_esql_utils.mdx
+++ b/api_docs/kbn_esql_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-esql-utils
 title: "@kbn/esql-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/esql-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/esql-utils']
 ---
 import kbnEsqlUtilsObj from './kbn_esql_utils.devdocs.json';
diff --git a/api_docs/kbn_esql_validation_autocomplete.mdx b/api_docs/kbn_esql_validation_autocomplete.mdx
index 16613b0945695..25efeb1d1d6e0 100644
--- a/api_docs/kbn_esql_validation_autocomplete.mdx
+++ b/api_docs/kbn_esql_validation_autocomplete.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-esql-validation-autocomplete
 title: "@kbn/esql-validation-autocomplete"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/esql-validation-autocomplete plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/esql-validation-autocomplete']
 ---
 import kbnEsqlValidationAutocompleteObj from './kbn_esql_validation_autocomplete.devdocs.json';
diff --git a/api_docs/kbn_event_annotation_common.mdx b/api_docs/kbn_event_annotation_common.mdx
index cd55ee6de291c..0108c3a849975 100644
--- a/api_docs/kbn_event_annotation_common.mdx
+++ b/api_docs/kbn_event_annotation_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-event-annotation-common
 title: "@kbn/event-annotation-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/event-annotation-common plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/event-annotation-common']
 ---
 import kbnEventAnnotationCommonObj from './kbn_event_annotation_common.devdocs.json';
diff --git a/api_docs/kbn_event_annotation_components.mdx b/api_docs/kbn_event_annotation_components.mdx
index 7bd229a977277..808307d31446a 100644
--- a/api_docs/kbn_event_annotation_components.mdx
+++ b/api_docs/kbn_event_annotation_components.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-event-annotation-components
 title: "@kbn/event-annotation-components"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/event-annotation-components plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/event-annotation-components']
 ---
 import kbnEventAnnotationComponentsObj from './kbn_event_annotation_components.devdocs.json';
diff --git a/api_docs/kbn_expandable_flyout.mdx b/api_docs/kbn_expandable_flyout.mdx
index 9f050e6312f66..3773b58f16aa1 100644
--- a/api_docs/kbn_expandable_flyout.mdx
+++ b/api_docs/kbn_expandable_flyout.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-expandable-flyout
 title: "@kbn/expandable-flyout"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/expandable-flyout plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/expandable-flyout']
 ---
 import kbnExpandableFlyoutObj from './kbn_expandable_flyout.devdocs.json';
diff --git a/api_docs/kbn_field_types.mdx b/api_docs/kbn_field_types.mdx
index 1b6d4c8b2867d..d8b48d9b481ce 100644
--- a/api_docs/kbn_field_types.mdx
+++ b/api_docs/kbn_field_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-field-types
 title: "@kbn/field-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/field-types plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/field-types']
 ---
 import kbnFieldTypesObj from './kbn_field_types.devdocs.json';
diff --git a/api_docs/kbn_field_utils.mdx b/api_docs/kbn_field_utils.mdx
index a9159e701d731..6242e22a938ba 100644
--- a/api_docs/kbn_field_utils.mdx
+++ b/api_docs/kbn_field_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-field-utils
 title: "@kbn/field-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/field-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/field-utils']
 ---
 import kbnFieldUtilsObj from './kbn_field_utils.devdocs.json';
diff --git a/api_docs/kbn_find_used_node_modules.mdx b/api_docs/kbn_find_used_node_modules.mdx
index 0422ff1833b1d..90b5d7aef4f63 100644
--- a/api_docs/kbn_find_used_node_modules.mdx
+++ b/api_docs/kbn_find_used_node_modules.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-find-used-node-modules
 title: "@kbn/find-used-node-modules"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/find-used-node-modules plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/find-used-node-modules']
 ---
 import kbnFindUsedNodeModulesObj from './kbn_find_used_node_modules.devdocs.json';
diff --git a/api_docs/kbn_formatters.mdx b/api_docs/kbn_formatters.mdx
index fe208fd75aed8..bf5c085e23d17 100644
--- a/api_docs/kbn_formatters.mdx
+++ b/api_docs/kbn_formatters.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-formatters
 title: "@kbn/formatters"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/formatters plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/formatters']
 ---
 import kbnFormattersObj from './kbn_formatters.devdocs.json';
diff --git a/api_docs/kbn_ftr_common_functional_services.devdocs.json b/api_docs/kbn_ftr_common_functional_services.devdocs.json
index da4cb9fdb2ab7..db15c99a518fc 100644
--- a/api_docs/kbn_ftr_common_functional_services.devdocs.json
+++ b/api_docs/kbn_ftr_common_functional_services.devdocs.json
@@ -1608,7 +1608,23 @@
             "section": "def-common.FtrProviderContext",
             "text": "FtrProviderContext"
           },
-          ") => { getInteractiveUserSessionCookieWithRoleScope(role: string): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string): Promise<",
+          ") => { getInteractiveUserSessionCookieWithRoleScope(role: string, options?: ",
+          {
+            "pluginId": "@kbn/test",
+            "scope": "common",
+            "docId": "kibKbnTestPluginApi",
+            "section": "def-common.GetCookieOptions",
+            "text": "GetCookieOptions"
+          },
+          " | undefined): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string, options?: ",
+          {
+            "pluginId": "@kbn/test",
+            "scope": "common",
+            "docId": "kibKbnTestPluginApi",
+            "section": "def-common.GetCookieOptions",
+            "text": "GetCookieOptions"
+          },
+          " | undefined): Promise<",
           {
             "pluginId": "@kbn/ftr-common-functional-services",
             "scope": "common",
@@ -1804,7 +1820,23 @@
             "section": "def-common.FtrProviderContext",
             "text": "FtrProviderContext"
           },
-          ") => { getInteractiveUserSessionCookieWithRoleScope(role: string): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string): Promise<",
+          ") => { getInteractiveUserSessionCookieWithRoleScope(role: string, options?: ",
+          {
+            "pluginId": "@kbn/test",
+            "scope": "common",
+            "docId": "kibKbnTestPluginApi",
+            "section": "def-common.GetCookieOptions",
+            "text": "GetCookieOptions"
+          },
+          " | undefined): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string, options?: ",
+          {
+            "pluginId": "@kbn/test",
+            "scope": "common",
+            "docId": "kibKbnTestPluginApi",
+            "section": "def-common.GetCookieOptions",
+            "text": "GetCookieOptions"
+          },
+          " | undefined): Promise<",
           {
             "pluginId": "@kbn/ftr-common-functional-services",
             "scope": "common",
@@ -1937,7 +1969,23 @@
         "label": "SamlAuthProviderType",
         "description": [],
         "signature": [
-          "{ getInteractiveUserSessionCookieWithRoleScope(role: string): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string): Promise<",
+          "{ getInteractiveUserSessionCookieWithRoleScope(role: string, options?: ",
+          {
+            "pluginId": "@kbn/test",
+            "scope": "common",
+            "docId": "kibKbnTestPluginApi",
+            "section": "def-common.GetCookieOptions",
+            "text": "GetCookieOptions"
+          },
+          " | undefined): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string, options?: ",
+          {
+            "pluginId": "@kbn/test",
+            "scope": "common",
+            "docId": "kibKbnTestPluginApi",
+            "section": "def-common.GetCookieOptions",
+            "text": "GetCookieOptions"
+          },
+          " | undefined): Promise<",
           {
             "pluginId": "@kbn/ftr-common-functional-services",
             "scope": "common",
@@ -2178,7 +2226,23 @@
                     "section": "def-common.FtrProviderContext",
                     "text": "FtrProviderContext"
                   },
-                  ") => { getInteractiveUserSessionCookieWithRoleScope(role: string): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string): Promise<",
+                  ") => { getInteractiveUserSessionCookieWithRoleScope(role: string, options?: ",
+                  {
+                    "pluginId": "@kbn/test",
+                    "scope": "common",
+                    "docId": "kibKbnTestPluginApi",
+                    "section": "def-common.GetCookieOptions",
+                    "text": "GetCookieOptions"
+                  },
+                  " | undefined): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string, options?: ",
+                  {
+                    "pluginId": "@kbn/test",
+                    "scope": "common",
+                    "docId": "kibKbnTestPluginApi",
+                    "section": "def-common.GetCookieOptions",
+                    "text": "GetCookieOptions"
+                  },
+                  " | undefined): Promise<",
                   {
                     "pluginId": "@kbn/ftr-common-functional-services",
                     "scope": "common",
@@ -2374,7 +2438,23 @@
                     "section": "def-common.FtrProviderContext",
                     "text": "FtrProviderContext"
                   },
-                  ") => { getInteractiveUserSessionCookieWithRoleScope(role: string): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string): Promise<",
+                  ") => { getInteractiveUserSessionCookieWithRoleScope(role: string, options?: ",
+                  {
+                    "pluginId": "@kbn/test",
+                    "scope": "common",
+                    "docId": "kibKbnTestPluginApi",
+                    "section": "def-common.GetCookieOptions",
+                    "text": "GetCookieOptions"
+                  },
+                  " | undefined): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string, options?: ",
+                  {
+                    "pluginId": "@kbn/test",
+                    "scope": "common",
+                    "docId": "kibKbnTestPluginApi",
+                    "section": "def-common.GetCookieOptions",
+                    "text": "GetCookieOptions"
+                  },
+                  " | undefined): Promise<",
                   {
                     "pluginId": "@kbn/ftr-common-functional-services",
                     "scope": "common",
@@ -2623,7 +2703,23 @@
                     "section": "def-common.FtrProviderContext",
                     "text": "FtrProviderContext"
                   },
-                  ") => { getInteractiveUserSessionCookieWithRoleScope(role: string): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string): Promise<",
+                  ") => { getInteractiveUserSessionCookieWithRoleScope(role: string, options?: ",
+                  {
+                    "pluginId": "@kbn/test",
+                    "scope": "common",
+                    "docId": "kibKbnTestPluginApi",
+                    "section": "def-common.GetCookieOptions",
+                    "text": "GetCookieOptions"
+                  },
+                  " | undefined): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string, options?: ",
+                  {
+                    "pluginId": "@kbn/test",
+                    "scope": "common",
+                    "docId": "kibKbnTestPluginApi",
+                    "section": "def-common.GetCookieOptions",
+                    "text": "GetCookieOptions"
+                  },
+                  " | undefined): Promise<",
                   {
                     "pluginId": "@kbn/ftr-common-functional-services",
                     "scope": "common",
@@ -2819,7 +2915,23 @@
                     "section": "def-common.FtrProviderContext",
                     "text": "FtrProviderContext"
                   },
-                  ") => { getInteractiveUserSessionCookieWithRoleScope(role: string): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string): Promise<",
+                  ") => { getInteractiveUserSessionCookieWithRoleScope(role: string, options?: ",
+                  {
+                    "pluginId": "@kbn/test",
+                    "scope": "common",
+                    "docId": "kibKbnTestPluginApi",
+                    "section": "def-common.GetCookieOptions",
+                    "text": "GetCookieOptions"
+                  },
+                  " | undefined): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string, options?: ",
+                  {
+                    "pluginId": "@kbn/test",
+                    "scope": "common",
+                    "docId": "kibKbnTestPluginApi",
+                    "section": "def-common.GetCookieOptions",
+                    "text": "GetCookieOptions"
+                  },
+                  " | undefined): Promise<",
                   {
                     "pluginId": "@kbn/ftr-common-functional-services",
                     "scope": "common",
@@ -3068,7 +3180,23 @@
                     "section": "def-common.FtrProviderContext",
                     "text": "FtrProviderContext"
                   },
-                  ") => { getInteractiveUserSessionCookieWithRoleScope(role: string): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string): Promise<",
+                  ") => { getInteractiveUserSessionCookieWithRoleScope(role: string, options?: ",
+                  {
+                    "pluginId": "@kbn/test",
+                    "scope": "common",
+                    "docId": "kibKbnTestPluginApi",
+                    "section": "def-common.GetCookieOptions",
+                    "text": "GetCookieOptions"
+                  },
+                  " | undefined): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string, options?: ",
+                  {
+                    "pluginId": "@kbn/test",
+                    "scope": "common",
+                    "docId": "kibKbnTestPluginApi",
+                    "section": "def-common.GetCookieOptions",
+                    "text": "GetCookieOptions"
+                  },
+                  " | undefined): Promise<",
                   {
                     "pluginId": "@kbn/ftr-common-functional-services",
                     "scope": "common",
@@ -3264,7 +3392,23 @@
                     "section": "def-common.FtrProviderContext",
                     "text": "FtrProviderContext"
                   },
-                  ") => { getInteractiveUserSessionCookieWithRoleScope(role: string): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string): Promise<",
+                  ") => { getInteractiveUserSessionCookieWithRoleScope(role: string, options?: ",
+                  {
+                    "pluginId": "@kbn/test",
+                    "scope": "common",
+                    "docId": "kibKbnTestPluginApi",
+                    "section": "def-common.GetCookieOptions",
+                    "text": "GetCookieOptions"
+                  },
+                  " | undefined): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string, options?: ",
+                  {
+                    "pluginId": "@kbn/test",
+                    "scope": "common",
+                    "docId": "kibKbnTestPluginApi",
+                    "section": "def-common.GetCookieOptions",
+                    "text": "GetCookieOptions"
+                  },
+                  " | undefined): Promise<",
                   {
                     "pluginId": "@kbn/ftr-common-functional-services",
                     "scope": "common",
@@ -3548,7 +3692,23 @@
                     "section": "def-common.FtrProviderContext",
                     "text": "FtrProviderContext"
                   },
-                  ") => { getInteractiveUserSessionCookieWithRoleScope(role: string): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string): Promise<",
+                  ") => { getInteractiveUserSessionCookieWithRoleScope(role: string, options?: ",
+                  {
+                    "pluginId": "@kbn/test",
+                    "scope": "common",
+                    "docId": "kibKbnTestPluginApi",
+                    "section": "def-common.GetCookieOptions",
+                    "text": "GetCookieOptions"
+                  },
+                  " | undefined): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string, options?: ",
+                  {
+                    "pluginId": "@kbn/test",
+                    "scope": "common",
+                    "docId": "kibKbnTestPluginApi",
+                    "section": "def-common.GetCookieOptions",
+                    "text": "GetCookieOptions"
+                  },
+                  " | undefined): Promise<",
                   {
                     "pluginId": "@kbn/ftr-common-functional-services",
                     "scope": "common",
@@ -3744,7 +3904,23 @@
                     "section": "def-common.FtrProviderContext",
                     "text": "FtrProviderContext"
                   },
-                  ") => { getInteractiveUserSessionCookieWithRoleScope(role: string): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string): Promise<",
+                  ") => { getInteractiveUserSessionCookieWithRoleScope(role: string, options?: ",
+                  {
+                    "pluginId": "@kbn/test",
+                    "scope": "common",
+                    "docId": "kibKbnTestPluginApi",
+                    "section": "def-common.GetCookieOptions",
+                    "text": "GetCookieOptions"
+                  },
+                  " | undefined): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string, options?: ",
+                  {
+                    "pluginId": "@kbn/test",
+                    "scope": "common",
+                    "docId": "kibKbnTestPluginApi",
+                    "section": "def-common.GetCookieOptions",
+                    "text": "GetCookieOptions"
+                  },
+                  " | undefined): Promise<",
                   {
                     "pluginId": "@kbn/ftr-common-functional-services",
                     "scope": "common",
@@ -4007,7 +4183,23 @@
                     "section": "def-common.FtrProviderContext",
                     "text": "FtrProviderContext"
                   },
-                  ") => { getInteractiveUserSessionCookieWithRoleScope(role: string): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string): Promise<",
+                  ") => { getInteractiveUserSessionCookieWithRoleScope(role: string, options?: ",
+                  {
+                    "pluginId": "@kbn/test",
+                    "scope": "common",
+                    "docId": "kibKbnTestPluginApi",
+                    "section": "def-common.GetCookieOptions",
+                    "text": "GetCookieOptions"
+                  },
+                  " | undefined): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string, options?: ",
+                  {
+                    "pluginId": "@kbn/test",
+                    "scope": "common",
+                    "docId": "kibKbnTestPluginApi",
+                    "section": "def-common.GetCookieOptions",
+                    "text": "GetCookieOptions"
+                  },
+                  " | undefined): Promise<",
                   {
                     "pluginId": "@kbn/ftr-common-functional-services",
                     "scope": "common",
@@ -4203,7 +4395,23 @@
                     "section": "def-common.FtrProviderContext",
                     "text": "FtrProviderContext"
                   },
-                  ") => { getInteractiveUserSessionCookieWithRoleScope(role: string): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string): Promise<",
+                  ") => { getInteractiveUserSessionCookieWithRoleScope(role: string, options?: ",
+                  {
+                    "pluginId": "@kbn/test",
+                    "scope": "common",
+                    "docId": "kibKbnTestPluginApi",
+                    "section": "def-common.GetCookieOptions",
+                    "text": "GetCookieOptions"
+                  },
+                  " | undefined): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string, options?: ",
+                  {
+                    "pluginId": "@kbn/test",
+                    "scope": "common",
+                    "docId": "kibKbnTestPluginApi",
+                    "section": "def-common.GetCookieOptions",
+                    "text": "GetCookieOptions"
+                  },
+                  " | undefined): Promise<",
                   {
                     "pluginId": "@kbn/ftr-common-functional-services",
                     "scope": "common",
@@ -4372,7 +4580,23 @@
                 "section": "def-common.FtrProviderContext",
                 "text": "FtrProviderContext"
               },
-              ") => { getInteractiveUserSessionCookieWithRoleScope(role: string): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string): Promise<",
+              ") => { getInteractiveUserSessionCookieWithRoleScope(role: string, options?: ",
+              {
+                "pluginId": "@kbn/test",
+                "scope": "common",
+                "docId": "kibKbnTestPluginApi",
+                "section": "def-common.GetCookieOptions",
+                "text": "GetCookieOptions"
+              },
+              " | undefined): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string, options?: ",
+              {
+                "pluginId": "@kbn/test",
+                "scope": "common",
+                "docId": "kibKbnTestPluginApi",
+                "section": "def-common.GetCookieOptions",
+                "text": "GetCookieOptions"
+              },
+              " | undefined): Promise<",
               {
                 "pluginId": "@kbn/ftr-common-functional-services",
                 "scope": "common",
@@ -4558,7 +4782,23 @@
                     "section": "def-common.FtrProviderContext",
                     "text": "FtrProviderContext"
                   },
-                  ") => { getInteractiveUserSessionCookieWithRoleScope(role: string): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string): Promise<",
+                  ") => { getInteractiveUserSessionCookieWithRoleScope(role: string, options?: ",
+                  {
+                    "pluginId": "@kbn/test",
+                    "scope": "common",
+                    "docId": "kibKbnTestPluginApi",
+                    "section": "def-common.GetCookieOptions",
+                    "text": "GetCookieOptions"
+                  },
+                  " | undefined): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string, options?: ",
+                  {
+                    "pluginId": "@kbn/test",
+                    "scope": "common",
+                    "docId": "kibKbnTestPluginApi",
+                    "section": "def-common.GetCookieOptions",
+                    "text": "GetCookieOptions"
+                  },
+                  " | undefined): Promise<",
                   {
                     "pluginId": "@kbn/ftr-common-functional-services",
                     "scope": "common",
@@ -4754,7 +4994,23 @@
                     "section": "def-common.FtrProviderContext",
                     "text": "FtrProviderContext"
                   },
-                  ") => { getInteractiveUserSessionCookieWithRoleScope(role: string): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string): Promise<",
+                  ") => { getInteractiveUserSessionCookieWithRoleScope(role: string, options?: ",
+                  {
+                    "pluginId": "@kbn/test",
+                    "scope": "common",
+                    "docId": "kibKbnTestPluginApi",
+                    "section": "def-common.GetCookieOptions",
+                    "text": "GetCookieOptions"
+                  },
+                  " | undefined): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string, options?: ",
+                  {
+                    "pluginId": "@kbn/test",
+                    "scope": "common",
+                    "docId": "kibKbnTestPluginApi",
+                    "section": "def-common.GetCookieOptions",
+                    "text": "GetCookieOptions"
+                  },
+                  " | undefined): Promise<",
                   {
                     "pluginId": "@kbn/ftr-common-functional-services",
                     "scope": "common",
@@ -4997,7 +5253,23 @@
                     "section": "def-common.FtrProviderContext",
                     "text": "FtrProviderContext"
                   },
-                  ") => { getInteractiveUserSessionCookieWithRoleScope(role: string): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string): Promise<",
+                  ") => { getInteractiveUserSessionCookieWithRoleScope(role: string, options?: ",
+                  {
+                    "pluginId": "@kbn/test",
+                    "scope": "common",
+                    "docId": "kibKbnTestPluginApi",
+                    "section": "def-common.GetCookieOptions",
+                    "text": "GetCookieOptions"
+                  },
+                  " | undefined): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string, options?: ",
+                  {
+                    "pluginId": "@kbn/test",
+                    "scope": "common",
+                    "docId": "kibKbnTestPluginApi",
+                    "section": "def-common.GetCookieOptions",
+                    "text": "GetCookieOptions"
+                  },
+                  " | undefined): Promise<",
                   {
                     "pluginId": "@kbn/ftr-common-functional-services",
                     "scope": "common",
@@ -5193,7 +5465,23 @@
                     "section": "def-common.FtrProviderContext",
                     "text": "FtrProviderContext"
                   },
-                  ") => { getInteractiveUserSessionCookieWithRoleScope(role: string): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string): Promise<",
+                  ") => { getInteractiveUserSessionCookieWithRoleScope(role: string, options?: ",
+                  {
+                    "pluginId": "@kbn/test",
+                    "scope": "common",
+                    "docId": "kibKbnTestPluginApi",
+                    "section": "def-common.GetCookieOptions",
+                    "text": "GetCookieOptions"
+                  },
+                  " | undefined): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string, options?: ",
+                  {
+                    "pluginId": "@kbn/test",
+                    "scope": "common",
+                    "docId": "kibKbnTestPluginApi",
+                    "section": "def-common.GetCookieOptions",
+                    "text": "GetCookieOptions"
+                  },
+                  " | undefined): Promise<",
                   {
                     "pluginId": "@kbn/ftr-common-functional-services",
                     "scope": "common",
@@ -5436,7 +5724,23 @@
                     "section": "def-common.FtrProviderContext",
                     "text": "FtrProviderContext"
                   },
-                  ") => { getInteractiveUserSessionCookieWithRoleScope(role: string): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string): Promise<",
+                  ") => { getInteractiveUserSessionCookieWithRoleScope(role: string, options?: ",
+                  {
+                    "pluginId": "@kbn/test",
+                    "scope": "common",
+                    "docId": "kibKbnTestPluginApi",
+                    "section": "def-common.GetCookieOptions",
+                    "text": "GetCookieOptions"
+                  },
+                  " | undefined): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string, options?: ",
+                  {
+                    "pluginId": "@kbn/test",
+                    "scope": "common",
+                    "docId": "kibKbnTestPluginApi",
+                    "section": "def-common.GetCookieOptions",
+                    "text": "GetCookieOptions"
+                  },
+                  " | undefined): Promise<",
                   {
                     "pluginId": "@kbn/ftr-common-functional-services",
                     "scope": "common",
@@ -5632,7 +5936,23 @@
                     "section": "def-common.FtrProviderContext",
                     "text": "FtrProviderContext"
                   },
-                  ") => { getInteractiveUserSessionCookieWithRoleScope(role: string): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string): Promise<",
+                  ") => { getInteractiveUserSessionCookieWithRoleScope(role: string, options?: ",
+                  {
+                    "pluginId": "@kbn/test",
+                    "scope": "common",
+                    "docId": "kibKbnTestPluginApi",
+                    "section": "def-common.GetCookieOptions",
+                    "text": "GetCookieOptions"
+                  },
+                  " | undefined): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string, options?: ",
+                  {
+                    "pluginId": "@kbn/test",
+                    "scope": "common",
+                    "docId": "kibKbnTestPluginApi",
+                    "section": "def-common.GetCookieOptions",
+                    "text": "GetCookieOptions"
+                  },
+                  " | undefined): Promise<",
                   {
                     "pluginId": "@kbn/ftr-common-functional-services",
                     "scope": "common",
@@ -5878,7 +6198,23 @@
                     "section": "def-common.FtrProviderContext",
                     "text": "FtrProviderContext"
                   },
-                  ") => { getInteractiveUserSessionCookieWithRoleScope(role: string): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string): Promise<",
+                  ") => { getInteractiveUserSessionCookieWithRoleScope(role: string, options?: ",
+                  {
+                    "pluginId": "@kbn/test",
+                    "scope": "common",
+                    "docId": "kibKbnTestPluginApi",
+                    "section": "def-common.GetCookieOptions",
+                    "text": "GetCookieOptions"
+                  },
+                  " | undefined): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string, options?: ",
+                  {
+                    "pluginId": "@kbn/test",
+                    "scope": "common",
+                    "docId": "kibKbnTestPluginApi",
+                    "section": "def-common.GetCookieOptions",
+                    "text": "GetCookieOptions"
+                  },
+                  " | undefined): Promise<",
                   {
                     "pluginId": "@kbn/ftr-common-functional-services",
                     "scope": "common",
@@ -6074,7 +6410,23 @@
                     "section": "def-common.FtrProviderContext",
                     "text": "FtrProviderContext"
                   },
-                  ") => { getInteractiveUserSessionCookieWithRoleScope(role: string): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string): Promise<",
+                  ") => { getInteractiveUserSessionCookieWithRoleScope(role: string, options?: ",
+                  {
+                    "pluginId": "@kbn/test",
+                    "scope": "common",
+                    "docId": "kibKbnTestPluginApi",
+                    "section": "def-common.GetCookieOptions",
+                    "text": "GetCookieOptions"
+                  },
+                  " | undefined): Promise<string>; getM2MApiCookieCredentialsWithRoleScope(role: string, options?: ",
+                  {
+                    "pluginId": "@kbn/test",
+                    "scope": "common",
+                    "docId": "kibKbnTestPluginApi",
+                    "section": "def-common.GetCookieOptions",
+                    "text": "GetCookieOptions"
+                  },
+                  " | undefined): Promise<",
                   {
                     "pluginId": "@kbn/ftr-common-functional-services",
                     "scope": "common",
diff --git a/api_docs/kbn_ftr_common_functional_services.mdx b/api_docs/kbn_ftr_common_functional_services.mdx
index c100d6574538a..53008e315afcd 100644
--- a/api_docs/kbn_ftr_common_functional_services.mdx
+++ b/api_docs/kbn_ftr_common_functional_services.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ftr-common-functional-services
 title: "@kbn/ftr-common-functional-services"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ftr-common-functional-services plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ftr-common-functional-services']
 ---
 import kbnFtrCommonFunctionalServicesObj from './kbn_ftr_common_functional_services.devdocs.json';
diff --git a/api_docs/kbn_ftr_common_functional_ui_services.mdx b/api_docs/kbn_ftr_common_functional_ui_services.mdx
index 67bd8b0d53553..92b6ef495825d 100644
--- a/api_docs/kbn_ftr_common_functional_ui_services.mdx
+++ b/api_docs/kbn_ftr_common_functional_ui_services.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ftr-common-functional-ui-services
 title: "@kbn/ftr-common-functional-ui-services"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ftr-common-functional-ui-services plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ftr-common-functional-ui-services']
 ---
 import kbnFtrCommonFunctionalUiServicesObj from './kbn_ftr_common_functional_ui_services.devdocs.json';
diff --git a/api_docs/kbn_generate.mdx b/api_docs/kbn_generate.mdx
index fa6d74b607f8c..581400d28110f 100644
--- a/api_docs/kbn_generate.mdx
+++ b/api_docs/kbn_generate.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-generate
 title: "@kbn/generate"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/generate plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/generate']
 ---
 import kbnGenerateObj from './kbn_generate.devdocs.json';
diff --git a/api_docs/kbn_generate_console_definitions.mdx b/api_docs/kbn_generate_console_definitions.mdx
index ec14481606c0e..796e3e3b13faa 100644
--- a/api_docs/kbn_generate_console_definitions.mdx
+++ b/api_docs/kbn_generate_console_definitions.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-generate-console-definitions
 title: "@kbn/generate-console-definitions"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/generate-console-definitions plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/generate-console-definitions']
 ---
 import kbnGenerateConsoleDefinitionsObj from './kbn_generate_console_definitions.devdocs.json';
diff --git a/api_docs/kbn_generate_csv.mdx b/api_docs/kbn_generate_csv.mdx
index 27b350125d2a2..8f7056f0da0f1 100644
--- a/api_docs/kbn_generate_csv.mdx
+++ b/api_docs/kbn_generate_csv.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-generate-csv
 title: "@kbn/generate-csv"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/generate-csv plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/generate-csv']
 ---
 import kbnGenerateCsvObj from './kbn_generate_csv.devdocs.json';
diff --git a/api_docs/kbn_grid_layout.mdx b/api_docs/kbn_grid_layout.mdx
index a1b9c50dea62a..b55a064d8b4fe 100644
--- a/api_docs/kbn_grid_layout.mdx
+++ b/api_docs/kbn_grid_layout.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-grid-layout
 title: "@kbn/grid-layout"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/grid-layout plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/grid-layout']
 ---
 import kbnGridLayoutObj from './kbn_grid_layout.devdocs.json';
diff --git a/api_docs/kbn_grouping.mdx b/api_docs/kbn_grouping.mdx
index 60188a01a4903..62b4c18316bc4 100644
--- a/api_docs/kbn_grouping.mdx
+++ b/api_docs/kbn_grouping.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-grouping
 title: "@kbn/grouping"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/grouping plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/grouping']
 ---
 import kbnGroupingObj from './kbn_grouping.devdocs.json';
diff --git a/api_docs/kbn_guided_onboarding.mdx b/api_docs/kbn_guided_onboarding.mdx
index 0a8993693dbc3..3daa0246e3930 100644
--- a/api_docs/kbn_guided_onboarding.mdx
+++ b/api_docs/kbn_guided_onboarding.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-guided-onboarding
 title: "@kbn/guided-onboarding"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/guided-onboarding plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/guided-onboarding']
 ---
 import kbnGuidedOnboardingObj from './kbn_guided_onboarding.devdocs.json';
diff --git a/api_docs/kbn_handlebars.mdx b/api_docs/kbn_handlebars.mdx
index 484de7df26918..3e3a0bbbeb249 100644
--- a/api_docs/kbn_handlebars.mdx
+++ b/api_docs/kbn_handlebars.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-handlebars
 title: "@kbn/handlebars"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/handlebars plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/handlebars']
 ---
 import kbnHandlebarsObj from './kbn_handlebars.devdocs.json';
diff --git a/api_docs/kbn_hapi_mocks.mdx b/api_docs/kbn_hapi_mocks.mdx
index 4d976b1da4471..be94473ae3244 100644
--- a/api_docs/kbn_hapi_mocks.mdx
+++ b/api_docs/kbn_hapi_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-hapi-mocks
 title: "@kbn/hapi-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/hapi-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/hapi-mocks']
 ---
 import kbnHapiMocksObj from './kbn_hapi_mocks.devdocs.json';
diff --git a/api_docs/kbn_health_gateway_server.mdx b/api_docs/kbn_health_gateway_server.mdx
index 07377c5aa9069..fcf057c9110c0 100644
--- a/api_docs/kbn_health_gateway_server.mdx
+++ b/api_docs/kbn_health_gateway_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-health-gateway-server
 title: "@kbn/health-gateway-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/health-gateway-server plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/health-gateway-server']
 ---
 import kbnHealthGatewayServerObj from './kbn_health_gateway_server.devdocs.json';
diff --git a/api_docs/kbn_home_sample_data_card.mdx b/api_docs/kbn_home_sample_data_card.mdx
index 670602973bd52..3ec8018196949 100644
--- a/api_docs/kbn_home_sample_data_card.mdx
+++ b/api_docs/kbn_home_sample_data_card.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-home-sample-data-card
 title: "@kbn/home-sample-data-card"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/home-sample-data-card plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/home-sample-data-card']
 ---
 import kbnHomeSampleDataCardObj from './kbn_home_sample_data_card.devdocs.json';
diff --git a/api_docs/kbn_home_sample_data_tab.mdx b/api_docs/kbn_home_sample_data_tab.mdx
index 385a3beb42180..721703b2d7e82 100644
--- a/api_docs/kbn_home_sample_data_tab.mdx
+++ b/api_docs/kbn_home_sample_data_tab.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-home-sample-data-tab
 title: "@kbn/home-sample-data-tab"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/home-sample-data-tab plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/home-sample-data-tab']
 ---
 import kbnHomeSampleDataTabObj from './kbn_home_sample_data_tab.devdocs.json';
diff --git a/api_docs/kbn_i18n.mdx b/api_docs/kbn_i18n.mdx
index 043065c80ead6..9135b773f19d4 100644
--- a/api_docs/kbn_i18n.mdx
+++ b/api_docs/kbn_i18n.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-i18n
 title: "@kbn/i18n"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/i18n plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/i18n']
 ---
 import kbnI18nObj from './kbn_i18n.devdocs.json';
diff --git a/api_docs/kbn_i18n_react.mdx b/api_docs/kbn_i18n_react.mdx
index 8393a8de144e9..88ddec2610aac 100644
--- a/api_docs/kbn_i18n_react.mdx
+++ b/api_docs/kbn_i18n_react.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-i18n-react
 title: "@kbn/i18n-react"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/i18n-react plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/i18n-react']
 ---
 import kbnI18nReactObj from './kbn_i18n_react.devdocs.json';
diff --git a/api_docs/kbn_import_resolver.mdx b/api_docs/kbn_import_resolver.mdx
index a80fa33dae80f..17d0c6a4e5870 100644
--- a/api_docs/kbn_import_resolver.mdx
+++ b/api_docs/kbn_import_resolver.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-import-resolver
 title: "@kbn/import-resolver"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/import-resolver plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/import-resolver']
 ---
 import kbnImportResolverObj from './kbn_import_resolver.devdocs.json';
diff --git a/api_docs/kbn_index_management_shared_types.mdx b/api_docs/kbn_index_management_shared_types.mdx
index 21c63e7d7c18e..275d6ed277f05 100644
--- a/api_docs/kbn_index_management_shared_types.mdx
+++ b/api_docs/kbn_index_management_shared_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-index-management-shared-types
 title: "@kbn/index-management-shared-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/index-management-shared-types plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/index-management-shared-types']
 ---
 import kbnIndexManagementSharedTypesObj from './kbn_index_management_shared_types.devdocs.json';
diff --git a/api_docs/kbn_inference_common.mdx b/api_docs/kbn_inference_common.mdx
index 138e699222acf..4ffa26ebb6503 100644
--- a/api_docs/kbn_inference_common.mdx
+++ b/api_docs/kbn_inference_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-inference-common
 title: "@kbn/inference-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/inference-common plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/inference-common']
 ---
 import kbnInferenceCommonObj from './kbn_inference_common.devdocs.json';
diff --git a/api_docs/kbn_inference_integration_flyout.mdx b/api_docs/kbn_inference_integration_flyout.mdx
index d57fe4e6254f9..1646e4a8d1374 100644
--- a/api_docs/kbn_inference_integration_flyout.mdx
+++ b/api_docs/kbn_inference_integration_flyout.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-inference_integration_flyout
 title: "@kbn/inference_integration_flyout"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/inference_integration_flyout plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/inference_integration_flyout']
 ---
 import kbnInferenceIntegrationFlyoutObj from './kbn_inference_integration_flyout.devdocs.json';
diff --git a/api_docs/kbn_infra_forge.mdx b/api_docs/kbn_infra_forge.mdx
index 898eeb2298a7f..07cc3812fbf8d 100644
--- a/api_docs/kbn_infra_forge.mdx
+++ b/api_docs/kbn_infra_forge.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-infra-forge
 title: "@kbn/infra-forge"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/infra-forge plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/infra-forge']
 ---
 import kbnInfraForgeObj from './kbn_infra_forge.devdocs.json';
diff --git a/api_docs/kbn_interpreter.mdx b/api_docs/kbn_interpreter.mdx
index 6a03c64a0994b..6671d420b7099 100644
--- a/api_docs/kbn_interpreter.mdx
+++ b/api_docs/kbn_interpreter.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-interpreter
 title: "@kbn/interpreter"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/interpreter plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/interpreter']
 ---
 import kbnInterpreterObj from './kbn_interpreter.devdocs.json';
diff --git a/api_docs/kbn_investigation_shared.mdx b/api_docs/kbn_investigation_shared.mdx
index c03ed5cdafb76..bb7ccff618d62 100644
--- a/api_docs/kbn_investigation_shared.mdx
+++ b/api_docs/kbn_investigation_shared.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-investigation-shared
 title: "@kbn/investigation-shared"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/investigation-shared plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/investigation-shared']
 ---
 import kbnInvestigationSharedObj from './kbn_investigation_shared.devdocs.json';
diff --git a/api_docs/kbn_io_ts_utils.mdx b/api_docs/kbn_io_ts_utils.mdx
index c4436311efcb1..86de5fcd6722b 100644
--- a/api_docs/kbn_io_ts_utils.mdx
+++ b/api_docs/kbn_io_ts_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-io-ts-utils
 title: "@kbn/io-ts-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/io-ts-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/io-ts-utils']
 ---
 import kbnIoTsUtilsObj from './kbn_io_ts_utils.devdocs.json';
diff --git a/api_docs/kbn_ipynb.mdx b/api_docs/kbn_ipynb.mdx
index 675e76db1a444..17685e2f8a6f4 100644
--- a/api_docs/kbn_ipynb.mdx
+++ b/api_docs/kbn_ipynb.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ipynb
 title: "@kbn/ipynb"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ipynb plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ipynb']
 ---
 import kbnIpynbObj from './kbn_ipynb.devdocs.json';
diff --git a/api_docs/kbn_item_buffer.mdx b/api_docs/kbn_item_buffer.mdx
index 45669c406eedb..e1825e70b2e8c 100644
--- a/api_docs/kbn_item_buffer.mdx
+++ b/api_docs/kbn_item_buffer.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-item-buffer
 title: "@kbn/item-buffer"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/item-buffer plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/item-buffer']
 ---
 import kbnItemBufferObj from './kbn_item_buffer.devdocs.json';
diff --git a/api_docs/kbn_jest_serializers.mdx b/api_docs/kbn_jest_serializers.mdx
index d1410ef30cff8..af04231944cd1 100644
--- a/api_docs/kbn_jest_serializers.mdx
+++ b/api_docs/kbn_jest_serializers.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-jest-serializers
 title: "@kbn/jest-serializers"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/jest-serializers plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/jest-serializers']
 ---
 import kbnJestSerializersObj from './kbn_jest_serializers.devdocs.json';
diff --git a/api_docs/kbn_journeys.mdx b/api_docs/kbn_journeys.mdx
index 207f52bed4189..69370c42de852 100644
--- a/api_docs/kbn_journeys.mdx
+++ b/api_docs/kbn_journeys.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-journeys
 title: "@kbn/journeys"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/journeys plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/journeys']
 ---
 import kbnJourneysObj from './kbn_journeys.devdocs.json';
diff --git a/api_docs/kbn_json_ast.mdx b/api_docs/kbn_json_ast.mdx
index 2cdb8dbf8e1a7..dcf2d611673cf 100644
--- a/api_docs/kbn_json_ast.mdx
+++ b/api_docs/kbn_json_ast.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-json-ast
 title: "@kbn/json-ast"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/json-ast plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/json-ast']
 ---
 import kbnJsonAstObj from './kbn_json_ast.devdocs.json';
diff --git a/api_docs/kbn_json_schemas.mdx b/api_docs/kbn_json_schemas.mdx
index a87c702eb903e..1fb92decbfd85 100644
--- a/api_docs/kbn_json_schemas.mdx
+++ b/api_docs/kbn_json_schemas.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-json-schemas
 title: "@kbn/json-schemas"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/json-schemas plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/json-schemas']
 ---
 import kbnJsonSchemasObj from './kbn_json_schemas.devdocs.json';
diff --git a/api_docs/kbn_kibana_manifest_schema.mdx b/api_docs/kbn_kibana_manifest_schema.mdx
index 69512eb9fa3dc..182652e907ed3 100644
--- a/api_docs/kbn_kibana_manifest_schema.mdx
+++ b/api_docs/kbn_kibana_manifest_schema.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-kibana-manifest-schema
 title: "@kbn/kibana-manifest-schema"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/kibana-manifest-schema plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/kibana-manifest-schema']
 ---
 import kbnKibanaManifestSchemaObj from './kbn_kibana_manifest_schema.devdocs.json';
diff --git a/api_docs/kbn_language_documentation.mdx b/api_docs/kbn_language_documentation.mdx
index 89f31cc1b7d5b..e1b71f857240f 100644
--- a/api_docs/kbn_language_documentation.mdx
+++ b/api_docs/kbn_language_documentation.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-language-documentation
 title: "@kbn/language-documentation"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/language-documentation plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/language-documentation']
 ---
 import kbnLanguageDocumentationObj from './kbn_language_documentation.devdocs.json';
diff --git a/api_docs/kbn_lens_embeddable_utils.mdx b/api_docs/kbn_lens_embeddable_utils.mdx
index 1ac19ac1a8fca..ec71831756f93 100644
--- a/api_docs/kbn_lens_embeddable_utils.mdx
+++ b/api_docs/kbn_lens_embeddable_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-lens-embeddable-utils
 title: "@kbn/lens-embeddable-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/lens-embeddable-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/lens-embeddable-utils']
 ---
 import kbnLensEmbeddableUtilsObj from './kbn_lens_embeddable_utils.devdocs.json';
diff --git a/api_docs/kbn_lens_formula_docs.mdx b/api_docs/kbn_lens_formula_docs.mdx
index 5ecc1c889d35d..6d439f06718db 100644
--- a/api_docs/kbn_lens_formula_docs.mdx
+++ b/api_docs/kbn_lens_formula_docs.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-lens-formula-docs
 title: "@kbn/lens-formula-docs"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/lens-formula-docs plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/lens-formula-docs']
 ---
 import kbnLensFormulaDocsObj from './kbn_lens_formula_docs.devdocs.json';
diff --git a/api_docs/kbn_logging.mdx b/api_docs/kbn_logging.mdx
index f5a4b6d3c6bd2..991080f313bbb 100644
--- a/api_docs/kbn_logging.mdx
+++ b/api_docs/kbn_logging.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-logging
 title: "@kbn/logging"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/logging plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/logging']
 ---
 import kbnLoggingObj from './kbn_logging.devdocs.json';
diff --git a/api_docs/kbn_logging_mocks.mdx b/api_docs/kbn_logging_mocks.mdx
index 87e4efb1bf651..d7b907937c708 100644
--- a/api_docs/kbn_logging_mocks.mdx
+++ b/api_docs/kbn_logging_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-logging-mocks
 title: "@kbn/logging-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/logging-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/logging-mocks']
 ---
 import kbnLoggingMocksObj from './kbn_logging_mocks.devdocs.json';
diff --git a/api_docs/kbn_managed_content_badge.mdx b/api_docs/kbn_managed_content_badge.mdx
index 285dae6be64f0..fada64b55d592 100644
--- a/api_docs/kbn_managed_content_badge.mdx
+++ b/api_docs/kbn_managed_content_badge.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-managed-content-badge
 title: "@kbn/managed-content-badge"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/managed-content-badge plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/managed-content-badge']
 ---
 import kbnManagedContentBadgeObj from './kbn_managed_content_badge.devdocs.json';
diff --git a/api_docs/kbn_managed_vscode_config.mdx b/api_docs/kbn_managed_vscode_config.mdx
index 098e7e4280303..e090a83df9907 100644
--- a/api_docs/kbn_managed_vscode_config.mdx
+++ b/api_docs/kbn_managed_vscode_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-managed-vscode-config
 title: "@kbn/managed-vscode-config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/managed-vscode-config plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/managed-vscode-config']
 ---
 import kbnManagedVscodeConfigObj from './kbn_managed_vscode_config.devdocs.json';
diff --git a/api_docs/kbn_management_cards_navigation.mdx b/api_docs/kbn_management_cards_navigation.mdx
index b63b44202755d..6eec59b49b526 100644
--- a/api_docs/kbn_management_cards_navigation.mdx
+++ b/api_docs/kbn_management_cards_navigation.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-management-cards-navigation
 title: "@kbn/management-cards-navigation"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/management-cards-navigation plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/management-cards-navigation']
 ---
 import kbnManagementCardsNavigationObj from './kbn_management_cards_navigation.devdocs.json';
diff --git a/api_docs/kbn_management_settings_application.mdx b/api_docs/kbn_management_settings_application.mdx
index 0e2ba50365558..3e59b5946e88d 100644
--- a/api_docs/kbn_management_settings_application.mdx
+++ b/api_docs/kbn_management_settings_application.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-management-settings-application
 title: "@kbn/management-settings-application"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/management-settings-application plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/management-settings-application']
 ---
 import kbnManagementSettingsApplicationObj from './kbn_management_settings_application.devdocs.json';
diff --git a/api_docs/kbn_management_settings_components_field_category.mdx b/api_docs/kbn_management_settings_components_field_category.mdx
index 560399c823fdf..1afe091f929fe 100644
--- a/api_docs/kbn_management_settings_components_field_category.mdx
+++ b/api_docs/kbn_management_settings_components_field_category.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-management-settings-components-field-category
 title: "@kbn/management-settings-components-field-category"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/management-settings-components-field-category plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/management-settings-components-field-category']
 ---
 import kbnManagementSettingsComponentsFieldCategoryObj from './kbn_management_settings_components_field_category.devdocs.json';
diff --git a/api_docs/kbn_management_settings_components_field_input.mdx b/api_docs/kbn_management_settings_components_field_input.mdx
index 251dc221a67cf..d95ff88d4993d 100644
--- a/api_docs/kbn_management_settings_components_field_input.mdx
+++ b/api_docs/kbn_management_settings_components_field_input.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-management-settings-components-field-input
 title: "@kbn/management-settings-components-field-input"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/management-settings-components-field-input plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/management-settings-components-field-input']
 ---
 import kbnManagementSettingsComponentsFieldInputObj from './kbn_management_settings_components_field_input.devdocs.json';
diff --git a/api_docs/kbn_management_settings_components_field_row.mdx b/api_docs/kbn_management_settings_components_field_row.mdx
index 9cfe45be0d4af..112042b946c46 100644
--- a/api_docs/kbn_management_settings_components_field_row.mdx
+++ b/api_docs/kbn_management_settings_components_field_row.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-management-settings-components-field-row
 title: "@kbn/management-settings-components-field-row"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/management-settings-components-field-row plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/management-settings-components-field-row']
 ---
 import kbnManagementSettingsComponentsFieldRowObj from './kbn_management_settings_components_field_row.devdocs.json';
diff --git a/api_docs/kbn_management_settings_components_form.mdx b/api_docs/kbn_management_settings_components_form.mdx
index b40c4c5d9f383..d60cbd8b5ff13 100644
--- a/api_docs/kbn_management_settings_components_form.mdx
+++ b/api_docs/kbn_management_settings_components_form.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-management-settings-components-form
 title: "@kbn/management-settings-components-form"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/management-settings-components-form plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/management-settings-components-form']
 ---
 import kbnManagementSettingsComponentsFormObj from './kbn_management_settings_components_form.devdocs.json';
diff --git a/api_docs/kbn_management_settings_field_definition.mdx b/api_docs/kbn_management_settings_field_definition.mdx
index 29105b8933756..06b724bc9289d 100644
--- a/api_docs/kbn_management_settings_field_definition.mdx
+++ b/api_docs/kbn_management_settings_field_definition.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-management-settings-field-definition
 title: "@kbn/management-settings-field-definition"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/management-settings-field-definition plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/management-settings-field-definition']
 ---
 import kbnManagementSettingsFieldDefinitionObj from './kbn_management_settings_field_definition.devdocs.json';
diff --git a/api_docs/kbn_management_settings_ids.mdx b/api_docs/kbn_management_settings_ids.mdx
index 43461c5db8689..db2fd258aa270 100644
--- a/api_docs/kbn_management_settings_ids.mdx
+++ b/api_docs/kbn_management_settings_ids.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-management-settings-ids
 title: "@kbn/management-settings-ids"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/management-settings-ids plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/management-settings-ids']
 ---
 import kbnManagementSettingsIdsObj from './kbn_management_settings_ids.devdocs.json';
diff --git a/api_docs/kbn_management_settings_section_registry.mdx b/api_docs/kbn_management_settings_section_registry.mdx
index 148b9557c6195..5fc1ccc5beaea 100644
--- a/api_docs/kbn_management_settings_section_registry.mdx
+++ b/api_docs/kbn_management_settings_section_registry.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-management-settings-section-registry
 title: "@kbn/management-settings-section-registry"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/management-settings-section-registry plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/management-settings-section-registry']
 ---
 import kbnManagementSettingsSectionRegistryObj from './kbn_management_settings_section_registry.devdocs.json';
diff --git a/api_docs/kbn_management_settings_types.mdx b/api_docs/kbn_management_settings_types.mdx
index 79c1c6a5f577e..5c14b3a29130e 100644
--- a/api_docs/kbn_management_settings_types.mdx
+++ b/api_docs/kbn_management_settings_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-management-settings-types
 title: "@kbn/management-settings-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/management-settings-types plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/management-settings-types']
 ---
 import kbnManagementSettingsTypesObj from './kbn_management_settings_types.devdocs.json';
diff --git a/api_docs/kbn_management_settings_utilities.mdx b/api_docs/kbn_management_settings_utilities.mdx
index cffd209cfc34f..2695f4101f443 100644
--- a/api_docs/kbn_management_settings_utilities.mdx
+++ b/api_docs/kbn_management_settings_utilities.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-management-settings-utilities
 title: "@kbn/management-settings-utilities"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/management-settings-utilities plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/management-settings-utilities']
 ---
 import kbnManagementSettingsUtilitiesObj from './kbn_management_settings_utilities.devdocs.json';
diff --git a/api_docs/kbn_management_storybook_config.mdx b/api_docs/kbn_management_storybook_config.mdx
index 0ac3ec7f8c115..dc7e70f0c35d4 100644
--- a/api_docs/kbn_management_storybook_config.mdx
+++ b/api_docs/kbn_management_storybook_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-management-storybook-config
 title: "@kbn/management-storybook-config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/management-storybook-config plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/management-storybook-config']
 ---
 import kbnManagementStorybookConfigObj from './kbn_management_storybook_config.devdocs.json';
diff --git a/api_docs/kbn_manifest.mdx b/api_docs/kbn_manifest.mdx
index 0b0b58e811400..5798a65c0886a 100644
--- a/api_docs/kbn_manifest.mdx
+++ b/api_docs/kbn_manifest.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-manifest
 title: "@kbn/manifest"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/manifest plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/manifest']
 ---
 import kbnManifestObj from './kbn_manifest.devdocs.json';
diff --git a/api_docs/kbn_mapbox_gl.mdx b/api_docs/kbn_mapbox_gl.mdx
index add5bcd0ac112..138deec06ffa6 100644
--- a/api_docs/kbn_mapbox_gl.mdx
+++ b/api_docs/kbn_mapbox_gl.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-mapbox-gl
 title: "@kbn/mapbox-gl"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/mapbox-gl plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/mapbox-gl']
 ---
 import kbnMapboxGlObj from './kbn_mapbox_gl.devdocs.json';
diff --git a/api_docs/kbn_maps_vector_tile_utils.mdx b/api_docs/kbn_maps_vector_tile_utils.mdx
index 1e1ac51585924..3cb11a07d83b3 100644
--- a/api_docs/kbn_maps_vector_tile_utils.mdx
+++ b/api_docs/kbn_maps_vector_tile_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-maps-vector-tile-utils
 title: "@kbn/maps-vector-tile-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/maps-vector-tile-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/maps-vector-tile-utils']
 ---
 import kbnMapsVectorTileUtilsObj from './kbn_maps_vector_tile_utils.devdocs.json';
diff --git a/api_docs/kbn_ml_agg_utils.mdx b/api_docs/kbn_ml_agg_utils.mdx
index 76dbf659ab6f9..23b22d1992151 100644
--- a/api_docs/kbn_ml_agg_utils.mdx
+++ b/api_docs/kbn_ml_agg_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-agg-utils
 title: "@kbn/ml-agg-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-agg-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-agg-utils']
 ---
 import kbnMlAggUtilsObj from './kbn_ml_agg_utils.devdocs.json';
diff --git a/api_docs/kbn_ml_anomaly_utils.mdx b/api_docs/kbn_ml_anomaly_utils.mdx
index e9d5ab5151d14..f01f1f6c82810 100644
--- a/api_docs/kbn_ml_anomaly_utils.mdx
+++ b/api_docs/kbn_ml_anomaly_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-anomaly-utils
 title: "@kbn/ml-anomaly-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-anomaly-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-anomaly-utils']
 ---
 import kbnMlAnomalyUtilsObj from './kbn_ml_anomaly_utils.devdocs.json';
diff --git a/api_docs/kbn_ml_cancellable_search.mdx b/api_docs/kbn_ml_cancellable_search.mdx
index d360785b7711a..38502ea9965a4 100644
--- a/api_docs/kbn_ml_cancellable_search.mdx
+++ b/api_docs/kbn_ml_cancellable_search.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-cancellable-search
 title: "@kbn/ml-cancellable-search"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-cancellable-search plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-cancellable-search']
 ---
 import kbnMlCancellableSearchObj from './kbn_ml_cancellable_search.devdocs.json';
diff --git a/api_docs/kbn_ml_category_validator.mdx b/api_docs/kbn_ml_category_validator.mdx
index 698608d6a553a..350fef576c02a 100644
--- a/api_docs/kbn_ml_category_validator.mdx
+++ b/api_docs/kbn_ml_category_validator.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-category-validator
 title: "@kbn/ml-category-validator"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-category-validator plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-category-validator']
 ---
 import kbnMlCategoryValidatorObj from './kbn_ml_category_validator.devdocs.json';
diff --git a/api_docs/kbn_ml_chi2test.mdx b/api_docs/kbn_ml_chi2test.mdx
index 49e071f62828e..78887e54d2a28 100644
--- a/api_docs/kbn_ml_chi2test.mdx
+++ b/api_docs/kbn_ml_chi2test.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-chi2test
 title: "@kbn/ml-chi2test"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-chi2test plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-chi2test']
 ---
 import kbnMlChi2testObj from './kbn_ml_chi2test.devdocs.json';
diff --git a/api_docs/kbn_ml_data_frame_analytics_utils.mdx b/api_docs/kbn_ml_data_frame_analytics_utils.mdx
index 8c9067580760d..b80d391b74b63 100644
--- a/api_docs/kbn_ml_data_frame_analytics_utils.mdx
+++ b/api_docs/kbn_ml_data_frame_analytics_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-data-frame-analytics-utils
 title: "@kbn/ml-data-frame-analytics-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-data-frame-analytics-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-data-frame-analytics-utils']
 ---
 import kbnMlDataFrameAnalyticsUtilsObj from './kbn_ml_data_frame_analytics_utils.devdocs.json';
diff --git a/api_docs/kbn_ml_data_grid.mdx b/api_docs/kbn_ml_data_grid.mdx
index 9e9805b03a1db..50ccf9959abf5 100644
--- a/api_docs/kbn_ml_data_grid.mdx
+++ b/api_docs/kbn_ml_data_grid.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-data-grid
 title: "@kbn/ml-data-grid"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-data-grid plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-data-grid']
 ---
 import kbnMlDataGridObj from './kbn_ml_data_grid.devdocs.json';
diff --git a/api_docs/kbn_ml_date_picker.mdx b/api_docs/kbn_ml_date_picker.mdx
index d9047f8d307bc..2d6e58b94bb81 100644
--- a/api_docs/kbn_ml_date_picker.mdx
+++ b/api_docs/kbn_ml_date_picker.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-date-picker
 title: "@kbn/ml-date-picker"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-date-picker plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-date-picker']
 ---
 import kbnMlDatePickerObj from './kbn_ml_date_picker.devdocs.json';
diff --git a/api_docs/kbn_ml_date_utils.mdx b/api_docs/kbn_ml_date_utils.mdx
index 3bf1632684828..b44dcb8f1a306 100644
--- a/api_docs/kbn_ml_date_utils.mdx
+++ b/api_docs/kbn_ml_date_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-date-utils
 title: "@kbn/ml-date-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-date-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-date-utils']
 ---
 import kbnMlDateUtilsObj from './kbn_ml_date_utils.devdocs.json';
diff --git a/api_docs/kbn_ml_error_utils.mdx b/api_docs/kbn_ml_error_utils.mdx
index b9ce7b69dc6be..5cb274493784e 100644
--- a/api_docs/kbn_ml_error_utils.mdx
+++ b/api_docs/kbn_ml_error_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-error-utils
 title: "@kbn/ml-error-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-error-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-error-utils']
 ---
 import kbnMlErrorUtilsObj from './kbn_ml_error_utils.devdocs.json';
diff --git a/api_docs/kbn_ml_field_stats_flyout.mdx b/api_docs/kbn_ml_field_stats_flyout.mdx
index a5bd542b665d9..b45ea698c03b9 100644
--- a/api_docs/kbn_ml_field_stats_flyout.mdx
+++ b/api_docs/kbn_ml_field_stats_flyout.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-field-stats-flyout
 title: "@kbn/ml-field-stats-flyout"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-field-stats-flyout plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-field-stats-flyout']
 ---
 import kbnMlFieldStatsFlyoutObj from './kbn_ml_field_stats_flyout.devdocs.json';
diff --git a/api_docs/kbn_ml_in_memory_table.mdx b/api_docs/kbn_ml_in_memory_table.mdx
index 4aad4c3840f43..8cdb6b390d6d9 100644
--- a/api_docs/kbn_ml_in_memory_table.mdx
+++ b/api_docs/kbn_ml_in_memory_table.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-in-memory-table
 title: "@kbn/ml-in-memory-table"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-in-memory-table plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-in-memory-table']
 ---
 import kbnMlInMemoryTableObj from './kbn_ml_in_memory_table.devdocs.json';
diff --git a/api_docs/kbn_ml_is_defined.mdx b/api_docs/kbn_ml_is_defined.mdx
index f755ae87515bf..22a2c67e1af87 100644
--- a/api_docs/kbn_ml_is_defined.mdx
+++ b/api_docs/kbn_ml_is_defined.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-is-defined
 title: "@kbn/ml-is-defined"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-is-defined plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-is-defined']
 ---
 import kbnMlIsDefinedObj from './kbn_ml_is_defined.devdocs.json';
diff --git a/api_docs/kbn_ml_is_populated_object.mdx b/api_docs/kbn_ml_is_populated_object.mdx
index b9ec6e7255882..9a03f03b8112c 100644
--- a/api_docs/kbn_ml_is_populated_object.mdx
+++ b/api_docs/kbn_ml_is_populated_object.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-is-populated-object
 title: "@kbn/ml-is-populated-object"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-is-populated-object plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-is-populated-object']
 ---
 import kbnMlIsPopulatedObjectObj from './kbn_ml_is_populated_object.devdocs.json';
diff --git a/api_docs/kbn_ml_kibana_theme.mdx b/api_docs/kbn_ml_kibana_theme.mdx
index 5891c6100ed03..d72de4a1887ce 100644
--- a/api_docs/kbn_ml_kibana_theme.mdx
+++ b/api_docs/kbn_ml_kibana_theme.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-kibana-theme
 title: "@kbn/ml-kibana-theme"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-kibana-theme plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-kibana-theme']
 ---
 import kbnMlKibanaThemeObj from './kbn_ml_kibana_theme.devdocs.json';
diff --git a/api_docs/kbn_ml_local_storage.mdx b/api_docs/kbn_ml_local_storage.mdx
index b52d9abc106a0..bd1103651f816 100644
--- a/api_docs/kbn_ml_local_storage.mdx
+++ b/api_docs/kbn_ml_local_storage.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-local-storage
 title: "@kbn/ml-local-storage"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-local-storage plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-local-storage']
 ---
 import kbnMlLocalStorageObj from './kbn_ml_local_storage.devdocs.json';
diff --git a/api_docs/kbn_ml_nested_property.mdx b/api_docs/kbn_ml_nested_property.mdx
index edd6b0c94c1ab..a06796634ac9f 100644
--- a/api_docs/kbn_ml_nested_property.mdx
+++ b/api_docs/kbn_ml_nested_property.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-nested-property
 title: "@kbn/ml-nested-property"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-nested-property plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-nested-property']
 ---
 import kbnMlNestedPropertyObj from './kbn_ml_nested_property.devdocs.json';
diff --git a/api_docs/kbn_ml_number_utils.mdx b/api_docs/kbn_ml_number_utils.mdx
index f32d9ab1a9062..f6714e4d479da 100644
--- a/api_docs/kbn_ml_number_utils.mdx
+++ b/api_docs/kbn_ml_number_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-number-utils
 title: "@kbn/ml-number-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-number-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-number-utils']
 ---
 import kbnMlNumberUtilsObj from './kbn_ml_number_utils.devdocs.json';
diff --git a/api_docs/kbn_ml_parse_interval.mdx b/api_docs/kbn_ml_parse_interval.mdx
index 5971eda11bb47..60ef654e0803c 100644
--- a/api_docs/kbn_ml_parse_interval.mdx
+++ b/api_docs/kbn_ml_parse_interval.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-parse-interval
 title: "@kbn/ml-parse-interval"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-parse-interval plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-parse-interval']
 ---
 import kbnMlParseIntervalObj from './kbn_ml_parse_interval.devdocs.json';
diff --git a/api_docs/kbn_ml_query_utils.mdx b/api_docs/kbn_ml_query_utils.mdx
index 4ae1ff638d2af..66710ab44c901 100644
--- a/api_docs/kbn_ml_query_utils.mdx
+++ b/api_docs/kbn_ml_query_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-query-utils
 title: "@kbn/ml-query-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-query-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-query-utils']
 ---
 import kbnMlQueryUtilsObj from './kbn_ml_query_utils.devdocs.json';
diff --git a/api_docs/kbn_ml_random_sampler_utils.mdx b/api_docs/kbn_ml_random_sampler_utils.mdx
index abd5808a292c2..5dc1ff5a6453d 100644
--- a/api_docs/kbn_ml_random_sampler_utils.mdx
+++ b/api_docs/kbn_ml_random_sampler_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-random-sampler-utils
 title: "@kbn/ml-random-sampler-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-random-sampler-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-random-sampler-utils']
 ---
 import kbnMlRandomSamplerUtilsObj from './kbn_ml_random_sampler_utils.devdocs.json';
diff --git a/api_docs/kbn_ml_route_utils.mdx b/api_docs/kbn_ml_route_utils.mdx
index 3f119fa3cb06a..9278642e89eef 100644
--- a/api_docs/kbn_ml_route_utils.mdx
+++ b/api_docs/kbn_ml_route_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-route-utils
 title: "@kbn/ml-route-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-route-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-route-utils']
 ---
 import kbnMlRouteUtilsObj from './kbn_ml_route_utils.devdocs.json';
diff --git a/api_docs/kbn_ml_runtime_field_utils.mdx b/api_docs/kbn_ml_runtime_field_utils.mdx
index 1c02d86192f94..ea1ab3a1f10cf 100644
--- a/api_docs/kbn_ml_runtime_field_utils.mdx
+++ b/api_docs/kbn_ml_runtime_field_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-runtime-field-utils
 title: "@kbn/ml-runtime-field-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-runtime-field-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-runtime-field-utils']
 ---
 import kbnMlRuntimeFieldUtilsObj from './kbn_ml_runtime_field_utils.devdocs.json';
diff --git a/api_docs/kbn_ml_string_hash.mdx b/api_docs/kbn_ml_string_hash.mdx
index 152dc97d38233..4c36e5b868c5f 100644
--- a/api_docs/kbn_ml_string_hash.mdx
+++ b/api_docs/kbn_ml_string_hash.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-string-hash
 title: "@kbn/ml-string-hash"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-string-hash plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-string-hash']
 ---
 import kbnMlStringHashObj from './kbn_ml_string_hash.devdocs.json';
diff --git a/api_docs/kbn_ml_time_buckets.mdx b/api_docs/kbn_ml_time_buckets.mdx
index 99edea504de5b..7ccbebd315fa1 100644
--- a/api_docs/kbn_ml_time_buckets.mdx
+++ b/api_docs/kbn_ml_time_buckets.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-time-buckets
 title: "@kbn/ml-time-buckets"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-time-buckets plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-time-buckets']
 ---
 import kbnMlTimeBucketsObj from './kbn_ml_time_buckets.devdocs.json';
diff --git a/api_docs/kbn_ml_trained_models_utils.mdx b/api_docs/kbn_ml_trained_models_utils.mdx
index 2097abba01e14..32e65c952f3b8 100644
--- a/api_docs/kbn_ml_trained_models_utils.mdx
+++ b/api_docs/kbn_ml_trained_models_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-trained-models-utils
 title: "@kbn/ml-trained-models-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-trained-models-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-trained-models-utils']
 ---
 import kbnMlTrainedModelsUtilsObj from './kbn_ml_trained_models_utils.devdocs.json';
diff --git a/api_docs/kbn_ml_ui_actions.mdx b/api_docs/kbn_ml_ui_actions.mdx
index 05da7971e3f1d..f5bcf9fb81ef1 100644
--- a/api_docs/kbn_ml_ui_actions.mdx
+++ b/api_docs/kbn_ml_ui_actions.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-ui-actions
 title: "@kbn/ml-ui-actions"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-ui-actions plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-ui-actions']
 ---
 import kbnMlUiActionsObj from './kbn_ml_ui_actions.devdocs.json';
diff --git a/api_docs/kbn_ml_url_state.mdx b/api_docs/kbn_ml_url_state.mdx
index 1d7dce7bab503..811be8f46b8a8 100644
--- a/api_docs/kbn_ml_url_state.mdx
+++ b/api_docs/kbn_ml_url_state.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-url-state
 title: "@kbn/ml-url-state"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-url-state plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-url-state']
 ---
 import kbnMlUrlStateObj from './kbn_ml_url_state.devdocs.json';
diff --git a/api_docs/kbn_ml_validators.mdx b/api_docs/kbn_ml_validators.mdx
index 10becee027cee..c6d4fc1bd36d1 100644
--- a/api_docs/kbn_ml_validators.mdx
+++ b/api_docs/kbn_ml_validators.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-validators
 title: "@kbn/ml-validators"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-validators plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-validators']
 ---
 import kbnMlValidatorsObj from './kbn_ml_validators.devdocs.json';
diff --git a/api_docs/kbn_mock_idp_utils.mdx b/api_docs/kbn_mock_idp_utils.mdx
index 84b8ae23e76a1..a8d2d95d11fa5 100644
--- a/api_docs/kbn_mock_idp_utils.mdx
+++ b/api_docs/kbn_mock_idp_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-mock-idp-utils
 title: "@kbn/mock-idp-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/mock-idp-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/mock-idp-utils']
 ---
 import kbnMockIdpUtilsObj from './kbn_mock_idp_utils.devdocs.json';
diff --git a/api_docs/kbn_monaco.mdx b/api_docs/kbn_monaco.mdx
index 8f09a70d05d14..ad5711b585208 100644
--- a/api_docs/kbn_monaco.mdx
+++ b/api_docs/kbn_monaco.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-monaco
 title: "@kbn/monaco"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/monaco plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/monaco']
 ---
 import kbnMonacoObj from './kbn_monaco.devdocs.json';
diff --git a/api_docs/kbn_object_versioning.mdx b/api_docs/kbn_object_versioning.mdx
index c7384fa4982bb..8e1fb05537294 100644
--- a/api_docs/kbn_object_versioning.mdx
+++ b/api_docs/kbn_object_versioning.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-object-versioning
 title: "@kbn/object-versioning"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/object-versioning plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/object-versioning']
 ---
 import kbnObjectVersioningObj from './kbn_object_versioning.devdocs.json';
diff --git a/api_docs/kbn_object_versioning_utils.mdx b/api_docs/kbn_object_versioning_utils.mdx
index 457f21c173466..5e03b5002b3f3 100644
--- a/api_docs/kbn_object_versioning_utils.mdx
+++ b/api_docs/kbn_object_versioning_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-object-versioning-utils
 title: "@kbn/object-versioning-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/object-versioning-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/object-versioning-utils']
 ---
 import kbnObjectVersioningUtilsObj from './kbn_object_versioning_utils.devdocs.json';
diff --git a/api_docs/kbn_observability_alert_details.mdx b/api_docs/kbn_observability_alert_details.mdx
index 3d59ec1e25b11..552cff52b0eca 100644
--- a/api_docs/kbn_observability_alert_details.mdx
+++ b/api_docs/kbn_observability_alert_details.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-observability-alert-details
 title: "@kbn/observability-alert-details"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/observability-alert-details plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/observability-alert-details']
 ---
 import kbnObservabilityAlertDetailsObj from './kbn_observability_alert_details.devdocs.json';
diff --git a/api_docs/kbn_observability_alerting_rule_utils.mdx b/api_docs/kbn_observability_alerting_rule_utils.mdx
index 98cf4dcd91b60..eaa129e1b2b87 100644
--- a/api_docs/kbn_observability_alerting_rule_utils.mdx
+++ b/api_docs/kbn_observability_alerting_rule_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-observability-alerting-rule-utils
 title: "@kbn/observability-alerting-rule-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/observability-alerting-rule-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/observability-alerting-rule-utils']
 ---
 import kbnObservabilityAlertingRuleUtilsObj from './kbn_observability_alerting_rule_utils.devdocs.json';
diff --git a/api_docs/kbn_observability_alerting_test_data.mdx b/api_docs/kbn_observability_alerting_test_data.mdx
index ad12355b3826d..efa5f371cc0c1 100644
--- a/api_docs/kbn_observability_alerting_test_data.mdx
+++ b/api_docs/kbn_observability_alerting_test_data.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-observability-alerting-test-data
 title: "@kbn/observability-alerting-test-data"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/observability-alerting-test-data plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/observability-alerting-test-data']
 ---
 import kbnObservabilityAlertingTestDataObj from './kbn_observability_alerting_test_data.devdocs.json';
diff --git a/api_docs/kbn_observability_get_padded_alert_time_range_util.mdx b/api_docs/kbn_observability_get_padded_alert_time_range_util.mdx
index 40b1a8c5b6746..c6128aefcd6f4 100644
--- a/api_docs/kbn_observability_get_padded_alert_time_range_util.mdx
+++ b/api_docs/kbn_observability_get_padded_alert_time_range_util.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-observability-get-padded-alert-time-range-util
 title: "@kbn/observability-get-padded-alert-time-range-util"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/observability-get-padded-alert-time-range-util plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/observability-get-padded-alert-time-range-util']
 ---
 import kbnObservabilityGetPaddedAlertTimeRangeUtilObj from './kbn_observability_get_padded_alert_time_range_util.devdocs.json';
diff --git a/api_docs/kbn_observability_logs_overview.mdx b/api_docs/kbn_observability_logs_overview.mdx
index 7a5cba8022041..3a2cba60f8320 100644
--- a/api_docs/kbn_observability_logs_overview.mdx
+++ b/api_docs/kbn_observability_logs_overview.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-observability-logs-overview
 title: "@kbn/observability-logs-overview"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/observability-logs-overview plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/observability-logs-overview']
 ---
 import kbnObservabilityLogsOverviewObj from './kbn_observability_logs_overview.devdocs.json';
diff --git a/api_docs/kbn_observability_synthetics_test_data.mdx b/api_docs/kbn_observability_synthetics_test_data.mdx
index 6e5c5af77d6fd..568193b17df42 100644
--- a/api_docs/kbn_observability_synthetics_test_data.mdx
+++ b/api_docs/kbn_observability_synthetics_test_data.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-observability-synthetics-test-data
 title: "@kbn/observability-synthetics-test-data"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/observability-synthetics-test-data plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/observability-synthetics-test-data']
 ---
 import kbnObservabilitySyntheticsTestDataObj from './kbn_observability_synthetics_test_data.devdocs.json';
diff --git a/api_docs/kbn_openapi_bundler.mdx b/api_docs/kbn_openapi_bundler.mdx
index 70e22d810db29..49cbfdf2383de 100644
--- a/api_docs/kbn_openapi_bundler.mdx
+++ b/api_docs/kbn_openapi_bundler.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-openapi-bundler
 title: "@kbn/openapi-bundler"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/openapi-bundler plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/openapi-bundler']
 ---
 import kbnOpenapiBundlerObj from './kbn_openapi_bundler.devdocs.json';
diff --git a/api_docs/kbn_openapi_generator.mdx b/api_docs/kbn_openapi_generator.mdx
index a3db1df4c1644..774632738ab8a 100644
--- a/api_docs/kbn_openapi_generator.mdx
+++ b/api_docs/kbn_openapi_generator.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-openapi-generator
 title: "@kbn/openapi-generator"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/openapi-generator plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/openapi-generator']
 ---
 import kbnOpenapiGeneratorObj from './kbn_openapi_generator.devdocs.json';
diff --git a/api_docs/kbn_optimizer.mdx b/api_docs/kbn_optimizer.mdx
index 7c79bc4e5a624..98fbbfe96f794 100644
--- a/api_docs/kbn_optimizer.mdx
+++ b/api_docs/kbn_optimizer.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-optimizer
 title: "@kbn/optimizer"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/optimizer plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/optimizer']
 ---
 import kbnOptimizerObj from './kbn_optimizer.devdocs.json';
diff --git a/api_docs/kbn_optimizer_webpack_helpers.mdx b/api_docs/kbn_optimizer_webpack_helpers.mdx
index da1d105f9e58d..8e7f0d97defed 100644
--- a/api_docs/kbn_optimizer_webpack_helpers.mdx
+++ b/api_docs/kbn_optimizer_webpack_helpers.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-optimizer-webpack-helpers
 title: "@kbn/optimizer-webpack-helpers"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/optimizer-webpack-helpers plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/optimizer-webpack-helpers']
 ---
 import kbnOptimizerWebpackHelpersObj from './kbn_optimizer_webpack_helpers.devdocs.json';
diff --git a/api_docs/kbn_osquery_io_ts_types.mdx b/api_docs/kbn_osquery_io_ts_types.mdx
index 44f61726ce680..e41a9fc3a5b5e 100644
--- a/api_docs/kbn_osquery_io_ts_types.mdx
+++ b/api_docs/kbn_osquery_io_ts_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-osquery-io-ts-types
 title: "@kbn/osquery-io-ts-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/osquery-io-ts-types plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/osquery-io-ts-types']
 ---
 import kbnOsqueryIoTsTypesObj from './kbn_osquery_io_ts_types.devdocs.json';
diff --git a/api_docs/kbn_panel_loader.mdx b/api_docs/kbn_panel_loader.mdx
index 1bd3f7898f84c..f074b5067f503 100644
--- a/api_docs/kbn_panel_loader.mdx
+++ b/api_docs/kbn_panel_loader.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-panel-loader
 title: "@kbn/panel-loader"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/panel-loader plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/panel-loader']
 ---
 import kbnPanelLoaderObj from './kbn_panel_loader.devdocs.json';
diff --git a/api_docs/kbn_performance_testing_dataset_extractor.mdx b/api_docs/kbn_performance_testing_dataset_extractor.mdx
index 365f9bce8bd8b..7d8e486829016 100644
--- a/api_docs/kbn_performance_testing_dataset_extractor.mdx
+++ b/api_docs/kbn_performance_testing_dataset_extractor.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-performance-testing-dataset-extractor
 title: "@kbn/performance-testing-dataset-extractor"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/performance-testing-dataset-extractor plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/performance-testing-dataset-extractor']
 ---
 import kbnPerformanceTestingDatasetExtractorObj from './kbn_performance_testing_dataset_extractor.devdocs.json';
diff --git a/api_docs/kbn_plugin_check.mdx b/api_docs/kbn_plugin_check.mdx
index a79f5c38b46a9..97d6d8574d38e 100644
--- a/api_docs/kbn_plugin_check.mdx
+++ b/api_docs/kbn_plugin_check.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-plugin-check
 title: "@kbn/plugin-check"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/plugin-check plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/plugin-check']
 ---
 import kbnPluginCheckObj from './kbn_plugin_check.devdocs.json';
diff --git a/api_docs/kbn_plugin_generator.mdx b/api_docs/kbn_plugin_generator.mdx
index 8cc84dfa82b41..7576cd0d6d25e 100644
--- a/api_docs/kbn_plugin_generator.mdx
+++ b/api_docs/kbn_plugin_generator.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-plugin-generator
 title: "@kbn/plugin-generator"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/plugin-generator plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/plugin-generator']
 ---
 import kbnPluginGeneratorObj from './kbn_plugin_generator.devdocs.json';
diff --git a/api_docs/kbn_plugin_helpers.mdx b/api_docs/kbn_plugin_helpers.mdx
index 1e3fc71268a6a..2fb44219332cc 100644
--- a/api_docs/kbn_plugin_helpers.mdx
+++ b/api_docs/kbn_plugin_helpers.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-plugin-helpers
 title: "@kbn/plugin-helpers"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/plugin-helpers plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/plugin-helpers']
 ---
 import kbnPluginHelpersObj from './kbn_plugin_helpers.devdocs.json';
diff --git a/api_docs/kbn_presentation_containers.mdx b/api_docs/kbn_presentation_containers.mdx
index 60d27e1cdca57..09cd0e3e15b77 100644
--- a/api_docs/kbn_presentation_containers.mdx
+++ b/api_docs/kbn_presentation_containers.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-presentation-containers
 title: "@kbn/presentation-containers"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/presentation-containers plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/presentation-containers']
 ---
 import kbnPresentationContainersObj from './kbn_presentation_containers.devdocs.json';
diff --git a/api_docs/kbn_presentation_publishing.mdx b/api_docs/kbn_presentation_publishing.mdx
index c9d286d7daec5..d00f48dd41560 100644
--- a/api_docs/kbn_presentation_publishing.mdx
+++ b/api_docs/kbn_presentation_publishing.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-presentation-publishing
 title: "@kbn/presentation-publishing"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/presentation-publishing plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/presentation-publishing']
 ---
 import kbnPresentationPublishingObj from './kbn_presentation_publishing.devdocs.json';
diff --git a/api_docs/kbn_product_doc_artifact_builder.mdx b/api_docs/kbn_product_doc_artifact_builder.mdx
index 17d04b89d7443..090b4acafe393 100644
--- a/api_docs/kbn_product_doc_artifact_builder.mdx
+++ b/api_docs/kbn_product_doc_artifact_builder.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-product-doc-artifact-builder
 title: "@kbn/product-doc-artifact-builder"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/product-doc-artifact-builder plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/product-doc-artifact-builder']
 ---
 import kbnProductDocArtifactBuilderObj from './kbn_product_doc_artifact_builder.devdocs.json';
diff --git a/api_docs/kbn_profiling_utils.mdx b/api_docs/kbn_profiling_utils.mdx
index 929a683eb45c3..4ae387c197014 100644
--- a/api_docs/kbn_profiling_utils.mdx
+++ b/api_docs/kbn_profiling_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-profiling-utils
 title: "@kbn/profiling-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/profiling-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/profiling-utils']
 ---
 import kbnProfilingUtilsObj from './kbn_profiling_utils.devdocs.json';
diff --git a/api_docs/kbn_random_sampling.mdx b/api_docs/kbn_random_sampling.mdx
index c8396ed6a659b..07e0b4792a6ee 100644
--- a/api_docs/kbn_random_sampling.mdx
+++ b/api_docs/kbn_random_sampling.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-random-sampling
 title: "@kbn/random-sampling"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/random-sampling plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/random-sampling']
 ---
 import kbnRandomSamplingObj from './kbn_random_sampling.devdocs.json';
diff --git a/api_docs/kbn_react_field.mdx b/api_docs/kbn_react_field.mdx
index 18e1f79467004..bbc3b6bf79055 100644
--- a/api_docs/kbn_react_field.mdx
+++ b/api_docs/kbn_react_field.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-react-field
 title: "@kbn/react-field"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/react-field plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/react-field']
 ---
 import kbnReactFieldObj from './kbn_react_field.devdocs.json';
diff --git a/api_docs/kbn_react_hooks.mdx b/api_docs/kbn_react_hooks.mdx
index 81b591870daa5..fa2e0c2e452d4 100644
--- a/api_docs/kbn_react_hooks.mdx
+++ b/api_docs/kbn_react_hooks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-react-hooks
 title: "@kbn/react-hooks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/react-hooks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/react-hooks']
 ---
 import kbnReactHooksObj from './kbn_react_hooks.devdocs.json';
diff --git a/api_docs/kbn_react_kibana_context_common.mdx b/api_docs/kbn_react_kibana_context_common.mdx
index 6f5072997d84c..e98b255416b10 100644
--- a/api_docs/kbn_react_kibana_context_common.mdx
+++ b/api_docs/kbn_react_kibana_context_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-react-kibana-context-common
 title: "@kbn/react-kibana-context-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/react-kibana-context-common plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/react-kibana-context-common']
 ---
 import kbnReactKibanaContextCommonObj from './kbn_react_kibana_context_common.devdocs.json';
diff --git a/api_docs/kbn_react_kibana_context_render.mdx b/api_docs/kbn_react_kibana_context_render.mdx
index 8e03bbf9ac8e8..19ee2f22129d7 100644
--- a/api_docs/kbn_react_kibana_context_render.mdx
+++ b/api_docs/kbn_react_kibana_context_render.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-react-kibana-context-render
 title: "@kbn/react-kibana-context-render"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/react-kibana-context-render plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/react-kibana-context-render']
 ---
 import kbnReactKibanaContextRenderObj from './kbn_react_kibana_context_render.devdocs.json';
diff --git a/api_docs/kbn_react_kibana_context_root.mdx b/api_docs/kbn_react_kibana_context_root.mdx
index dabab5b20e194..fdb740f4af21b 100644
--- a/api_docs/kbn_react_kibana_context_root.mdx
+++ b/api_docs/kbn_react_kibana_context_root.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-react-kibana-context-root
 title: "@kbn/react-kibana-context-root"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/react-kibana-context-root plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/react-kibana-context-root']
 ---
 import kbnReactKibanaContextRootObj from './kbn_react_kibana_context_root.devdocs.json';
diff --git a/api_docs/kbn_react_kibana_context_styled.mdx b/api_docs/kbn_react_kibana_context_styled.mdx
index 227743a3adbe8..433e6740fea4a 100644
--- a/api_docs/kbn_react_kibana_context_styled.mdx
+++ b/api_docs/kbn_react_kibana_context_styled.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-react-kibana-context-styled
 title: "@kbn/react-kibana-context-styled"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/react-kibana-context-styled plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/react-kibana-context-styled']
 ---
 import kbnReactKibanaContextStyledObj from './kbn_react_kibana_context_styled.devdocs.json';
diff --git a/api_docs/kbn_react_kibana_context_theme.mdx b/api_docs/kbn_react_kibana_context_theme.mdx
index f64c3f2df048d..a77c3f909961e 100644
--- a/api_docs/kbn_react_kibana_context_theme.mdx
+++ b/api_docs/kbn_react_kibana_context_theme.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-react-kibana-context-theme
 title: "@kbn/react-kibana-context-theme"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/react-kibana-context-theme plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/react-kibana-context-theme']
 ---
 import kbnReactKibanaContextThemeObj from './kbn_react_kibana_context_theme.devdocs.json';
diff --git a/api_docs/kbn_react_kibana_mount.mdx b/api_docs/kbn_react_kibana_mount.mdx
index 43dec8a304a6d..396053091d04f 100644
--- a/api_docs/kbn_react_kibana_mount.mdx
+++ b/api_docs/kbn_react_kibana_mount.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-react-kibana-mount
 title: "@kbn/react-kibana-mount"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/react-kibana-mount plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/react-kibana-mount']
 ---
 import kbnReactKibanaMountObj from './kbn_react_kibana_mount.devdocs.json';
diff --git a/api_docs/kbn_recently_accessed.mdx b/api_docs/kbn_recently_accessed.mdx
index 3d099844ed385..6356a62f6353d 100644
--- a/api_docs/kbn_recently_accessed.mdx
+++ b/api_docs/kbn_recently_accessed.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-recently-accessed
 title: "@kbn/recently-accessed"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/recently-accessed plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/recently-accessed']
 ---
 import kbnRecentlyAccessedObj from './kbn_recently_accessed.devdocs.json';
diff --git a/api_docs/kbn_repo_file_maps.mdx b/api_docs/kbn_repo_file_maps.mdx
index 6ead7a0093ab3..41d1be123d8fa 100644
--- a/api_docs/kbn_repo_file_maps.mdx
+++ b/api_docs/kbn_repo_file_maps.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-repo-file-maps
 title: "@kbn/repo-file-maps"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/repo-file-maps plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/repo-file-maps']
 ---
 import kbnRepoFileMapsObj from './kbn_repo_file_maps.devdocs.json';
diff --git a/api_docs/kbn_repo_linter.mdx b/api_docs/kbn_repo_linter.mdx
index c66b9d7700352..97e6f4f5e2804 100644
--- a/api_docs/kbn_repo_linter.mdx
+++ b/api_docs/kbn_repo_linter.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-repo-linter
 title: "@kbn/repo-linter"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/repo-linter plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/repo-linter']
 ---
 import kbnRepoLinterObj from './kbn_repo_linter.devdocs.json';
diff --git a/api_docs/kbn_repo_path.mdx b/api_docs/kbn_repo_path.mdx
index d6ab42221cedf..1ebe627393c90 100644
--- a/api_docs/kbn_repo_path.mdx
+++ b/api_docs/kbn_repo_path.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-repo-path
 title: "@kbn/repo-path"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/repo-path plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/repo-path']
 ---
 import kbnRepoPathObj from './kbn_repo_path.devdocs.json';
diff --git a/api_docs/kbn_repo_source_classifier.mdx b/api_docs/kbn_repo_source_classifier.mdx
index 27eb86ac7cf54..a4edec6a9bcb6 100644
--- a/api_docs/kbn_repo_source_classifier.mdx
+++ b/api_docs/kbn_repo_source_classifier.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-repo-source-classifier
 title: "@kbn/repo-source-classifier"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/repo-source-classifier plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/repo-source-classifier']
 ---
 import kbnRepoSourceClassifierObj from './kbn_repo_source_classifier.devdocs.json';
diff --git a/api_docs/kbn_reporting_common.devdocs.json b/api_docs/kbn_reporting_common.devdocs.json
index b7b20c613c82a..be3dfff0ff7f3 100644
--- a/api_docs/kbn_reporting_common.devdocs.json
+++ b/api_docs/kbn_reporting_common.devdocs.json
@@ -1551,17 +1551,6 @@
               }
             ]
           },
-          {
-            "parentPluginId": "@kbn/reporting-common",
-            "id": "def-common.INTERNAL_ROUTES.DOWNLOAD_CSV",
-            "type": "string",
-            "tags": [],
-            "label": "DOWNLOAD_CSV",
-            "description": [],
-            "path": "packages/kbn-reporting/common/routes.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
           {
             "parentPluginId": "@kbn/reporting-common",
             "id": "def-common.INTERNAL_ROUTES.GENERATE_PREFIX",
diff --git a/api_docs/kbn_reporting_common.mdx b/api_docs/kbn_reporting_common.mdx
index 2d427ce35c664..65564d3c80ae2 100644
--- a/api_docs/kbn_reporting_common.mdx
+++ b/api_docs/kbn_reporting_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-reporting-common
 title: "@kbn/reporting-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/reporting-common plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/reporting-common']
 ---
 import kbnReportingCommonObj from './kbn_reporting_common.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sh
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 99 | 0 | 89 | 13 |
+| 98 | 0 | 88 | 13 |
 
 ## Common
 
diff --git a/api_docs/kbn_reporting_csv_share_panel.mdx b/api_docs/kbn_reporting_csv_share_panel.mdx
index afed2c3ec0631..67bb10bbba0de 100644
--- a/api_docs/kbn_reporting_csv_share_panel.mdx
+++ b/api_docs/kbn_reporting_csv_share_panel.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-reporting-csv-share-panel
 title: "@kbn/reporting-csv-share-panel"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/reporting-csv-share-panel plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/reporting-csv-share-panel']
 ---
 import kbnReportingCsvSharePanelObj from './kbn_reporting_csv_share_panel.devdocs.json';
diff --git a/api_docs/kbn_reporting_export_types_csv.devdocs.json b/api_docs/kbn_reporting_export_types_csv.devdocs.json
index 7d14ab99bddba..cab900fc5f388 100644
--- a/api_docs/kbn_reporting_export_types_csv.devdocs.json
+++ b/api_docs/kbn_reporting_export_types_csv.devdocs.json
@@ -405,358 +405,6 @@
         ],
         "initialIsOpen": false
       },
-      {
-        "parentPluginId": "@kbn/reporting-export-types-csv",
-        "id": "def-server.CsvSearchSourceImmediateExportType",
-        "type": "Class",
-        "tags": [
-          "deprecated"
-        ],
-        "label": "CsvSearchSourceImmediateExportType",
-        "description": [],
-        "signature": [
-          {
-            "pluginId": "@kbn/reporting-export-types-csv",
-            "scope": "server",
-            "docId": "kibKbnReportingExportTypesCsvPluginApi",
-            "section": "def-server.CsvSearchSourceImmediateExportType",
-            "text": "CsvSearchSourceImmediateExportType"
-          },
-          " extends ",
-          {
-            "pluginId": "@kbn/reporting-server",
-            "scope": "server",
-            "docId": "kibKbnReportingServerPluginApi",
-            "section": "def-server.ExportType",
-            "text": "ExportType"
-          },
-          "<",
-          {
-            "pluginId": "@kbn/reporting-export-types-csv-common",
-            "scope": "common",
-            "docId": "kibKbnReportingExportTypesCsvCommonPluginApi",
-            "section": "def-common.JobParamsDownloadCSV",
-            "text": "JobParamsDownloadCSV"
-          },
-          ", ",
-          "ImmediateExecuteFn",
-          ", ",
-          {
-            "pluginId": "@kbn/reporting-server",
-            "scope": "server",
-            "docId": "kibKbnReportingServerPluginApi",
-            "section": "def-server.BaseExportTypeSetupDeps",
-            "text": "BaseExportTypeSetupDeps"
-          },
-          ", CsvSearchSourceImmediateExportTypeStartDeps>"
-        ],
-        "path": "packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.ts",
-        "deprecated": true,
-        "trackAdoption": false,
-        "references": [
-          {
-            "plugin": "reporting",
-            "path": "x-pack/plugins/reporting/server/core.ts"
-          },
-          {
-            "plugin": "reporting",
-            "path": "x-pack/plugins/reporting/server/core.ts"
-          }
-        ],
-        "children": [
-          {
-            "parentPluginId": "@kbn/reporting-export-types-csv",
-            "id": "def-server.CsvSearchSourceImmediateExportType.id",
-            "type": "string",
-            "tags": [],
-            "label": "id",
-            "description": [],
-            "path": "packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "@kbn/reporting-export-types-csv",
-            "id": "def-server.CsvSearchSourceImmediateExportType.name",
-            "type": "string",
-            "tags": [],
-            "label": "name",
-            "description": [],
-            "path": "packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "@kbn/reporting-export-types-csv",
-            "id": "def-server.CsvSearchSourceImmediateExportType.jobType",
-            "type": "string",
-            "tags": [],
-            "label": "jobType",
-            "description": [],
-            "path": "packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "@kbn/reporting-export-types-csv",
-            "id": "def-server.CsvSearchSourceImmediateExportType.jobContentEncoding",
-            "type": "string",
-            "tags": [],
-            "label": "jobContentEncoding",
-            "description": [],
-            "signature": [
-              "\"base64\""
-            ],
-            "path": "packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "@kbn/reporting-export-types-csv",
-            "id": "def-server.CsvSearchSourceImmediateExportType.jobContentExtension",
-            "type": "string",
-            "tags": [],
-            "label": "jobContentExtension",
-            "description": [],
-            "signature": [
-              "\"csv\""
-            ],
-            "path": "packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "@kbn/reporting-export-types-csv",
-            "id": "def-server.CsvSearchSourceImmediateExportType.validLicenses",
-            "type": "Array",
-            "tags": [],
-            "label": "validLicenses",
-            "description": [],
-            "signature": [
-              "(\"basic\" | \"standard\" | \"gold\" | \"platinum\" | \"enterprise\" | \"trial\")[]"
-            ],
-            "path": "packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "@kbn/reporting-export-types-csv",
-            "id": "def-server.CsvSearchSourceImmediateExportType.Unnamed",
-            "type": "Function",
-            "tags": [],
-            "label": "Constructor",
-            "description": [],
-            "signature": [
-              "any"
-            ],
-            "path": "packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [
-              {
-                "parentPluginId": "@kbn/reporting-export-types-csv",
-                "id": "def-server.CsvSearchSourceImmediateExportType.Unnamed.$1",
-                "type": "Object",
-                "tags": [],
-                "label": "args",
-                "description": [],
-                "signature": [
-                  "[core: ",
-                  {
-                    "pluginId": "@kbn/core-lifecycle-server",
-                    "scope": "server",
-                    "docId": "kibKbnCoreLifecycleServerPluginApi",
-                    "section": "def-server.CoreSetup",
-                    "text": "CoreSetup"
-                  },
-                  "<object, unknown>, config: Readonly<{ encryptionKey?: string | undefined; } & { enabled: boolean; csv: Readonly<{} & { scroll: Readonly<{} & { size: number; duration: string; strategy: \"scroll\" | \"pit\"; }>; checkForFormulas: boolean; escapeFormulaValues: boolean; enablePanelActionDownload: boolean; maxSizeBytes: number | ",
-                  {
-                    "pluginId": "@kbn/config-schema",
-                    "scope": "common",
-                    "docId": "kibKbnConfigSchemaPluginApi",
-                    "section": "def-common.ByteSizeValue",
-                    "text": "ByteSizeValue"
-                  },
-                  "; useByteOrderMarkEncoding: boolean; maxConcurrentShardRequests: number; }>; capture: Readonly<{} & { maxAttempts: number; }>; roles: Readonly<{} & { enabled: boolean; allow: string[]; }>; kibanaServer: Readonly<{ hostname?: string | undefined; protocol?: string | undefined; port?: number | undefined; } & {}>; queue: Readonly<{} & { timeout: number | moment.Duration; pollInterval: number | moment.Duration; indexInterval: string; pollEnabled: boolean; pollIntervalErrorMultiplier: number; }>; poll: Readonly<{} & { jobCompletionNotifier: Readonly<{} & { interval: number; intervalErrorMultiplier: number; }>; jobsRefresh: Readonly<{} & { interval: number; intervalErrorMultiplier: number; }>; }>; export_types: Readonly<{} & { csv: Readonly<{} & { enabled: boolean; }>; png: Readonly<{} & { enabled: boolean; }>; pdf: Readonly<{} & { enabled: boolean; }>; }>; statefulSettings: Readonly<{} & { enabled: boolean; }>; }>, logger: ",
-                  {
-                    "pluginId": "@kbn/logging",
-                    "scope": "common",
-                    "docId": "kibKbnLoggingPluginApi",
-                    "section": "def-common.Logger",
-                    "text": "Logger"
-                  },
-                  ", context: ",
-                  {
-                    "pluginId": "@kbn/core-plugins-server",
-                    "scope": "server",
-                    "docId": "kibKbnCorePluginsServerPluginApi",
-                    "section": "def-server.PluginInitializerContext",
-                    "text": "PluginInitializerContext"
-                  },
-                  "<Readonly<{ encryptionKey?: string | undefined; } & { enabled: boolean; csv: Readonly<{} & { scroll: Readonly<{} & { size: number; duration: string; strategy: \"scroll\" | \"pit\"; }>; checkForFormulas: boolean; escapeFormulaValues: boolean; enablePanelActionDownload: boolean; maxSizeBytes: number | ",
-                  {
-                    "pluginId": "@kbn/config-schema",
-                    "scope": "common",
-                    "docId": "kibKbnConfigSchemaPluginApi",
-                    "section": "def-common.ByteSizeValue",
-                    "text": "ByteSizeValue"
-                  },
-                  "; useByteOrderMarkEncoding: boolean; maxConcurrentShardRequests: number; }>; capture: Readonly<{} & { maxAttempts: number; }>; roles: Readonly<{} & { enabled: boolean; allow: string[]; }>; kibanaServer: Readonly<{ hostname?: string | undefined; protocol?: string | undefined; port?: number | undefined; } & {}>; queue: Readonly<{} & { timeout: number | moment.Duration; pollInterval: number | moment.Duration; indexInterval: string; pollEnabled: boolean; pollIntervalErrorMultiplier: number; }>; poll: Readonly<{} & { jobCompletionNotifier: Readonly<{} & { interval: number; intervalErrorMultiplier: number; }>; jobsRefresh: Readonly<{} & { interval: number; intervalErrorMultiplier: number; }>; }>; export_types: Readonly<{} & { csv: Readonly<{} & { enabled: boolean; }>; png: Readonly<{} & { enabled: boolean; }>; pdf: Readonly<{} & { enabled: boolean; }>; }>; statefulSettings: Readonly<{} & { enabled: boolean; }>; }>>]"
-                ],
-                "path": "packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              }
-            ],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "@kbn/reporting-export-types-csv",
-            "id": "def-server.CsvSearchSourceImmediateExportType.createJob",
-            "type": "Function",
-            "tags": [],
-            "label": "createJob",
-            "description": [],
-            "signature": [
-              "() => Promise<never>"
-            ],
-            "path": "packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "@kbn/reporting-export-types-csv",
-            "id": "def-server.CsvSearchSourceImmediateExportType.runTask",
-            "type": "Function",
-            "tags": [],
-            "label": "runTask",
-            "description": [],
-            "signature": [
-              "(_jobId: string | null, immediateJobParams: ",
-              {
-                "pluginId": "@kbn/reporting-export-types-csv-common",
-                "scope": "common",
-                "docId": "kibKbnReportingExportTypesCsvCommonPluginApi",
-                "section": "def-common.JobParamsDownloadCSV",
-                "text": "JobParamsDownloadCSV"
-              },
-              ", context: ",
-              "ReportingRequestHandlerContext",
-              ", stream: ",
-              "Writable",
-              ", req: ",
-              {
-                "pluginId": "@kbn/core-http-server",
-                "scope": "server",
-                "docId": "kibKbnCoreHttpServerPluginApi",
-                "section": "def-server.KibanaRequest",
-                "text": "KibanaRequest"
-              },
-              "<unknown, unknown, unknown, any>) => Promise<",
-              "TaskRunResult",
-              ">"
-            ],
-            "path": "packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [
-              {
-                "parentPluginId": "@kbn/reporting-export-types-csv",
-                "id": "def-server.CsvSearchSourceImmediateExportType.runTask.$1",
-                "type": "CompoundType",
-                "tags": [],
-                "label": "_jobId",
-                "description": [],
-                "signature": [
-                  "string | null"
-                ],
-                "path": "packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": false
-              },
-              {
-                "parentPluginId": "@kbn/reporting-export-types-csv",
-                "id": "def-server.CsvSearchSourceImmediateExportType.runTask.$2",
-                "type": "Object",
-                "tags": [],
-                "label": "immediateJobParams",
-                "description": [],
-                "signature": [
-                  {
-                    "pluginId": "@kbn/reporting-export-types-csv-common",
-                    "scope": "common",
-                    "docId": "kibKbnReportingExportTypesCsvCommonPluginApi",
-                    "section": "def-common.JobParamsDownloadCSV",
-                    "text": "JobParamsDownloadCSV"
-                  }
-                ],
-                "path": "packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              },
-              {
-                "parentPluginId": "@kbn/reporting-export-types-csv",
-                "id": "def-server.CsvSearchSourceImmediateExportType.runTask.$3",
-                "type": "CompoundType",
-                "tags": [],
-                "label": "context",
-                "description": [],
-                "signature": [
-                  "ReportingRequestHandlerContext"
-                ],
-                "path": "packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              },
-              {
-                "parentPluginId": "@kbn/reporting-export-types-csv",
-                "id": "def-server.CsvSearchSourceImmediateExportType.runTask.$4",
-                "type": "Object",
-                "tags": [],
-                "label": "stream",
-                "description": [],
-                "signature": [
-                  "Writable"
-                ],
-                "path": "packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              },
-              {
-                "parentPluginId": "@kbn/reporting-export-types-csv",
-                "id": "def-server.CsvSearchSourceImmediateExportType.runTask.$5",
-                "type": "Object",
-                "tags": [],
-                "label": "req",
-                "description": [],
-                "signature": [
-                  {
-                    "pluginId": "@kbn/core-http-server",
-                    "scope": "server",
-                    "docId": "kibKbnCoreHttpServerPluginApi",
-                    "section": "def-server.KibanaRequest",
-                    "text": "KibanaRequest"
-                  },
-                  "<unknown, unknown, unknown, any>"
-                ],
-                "path": "packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              }
-            ],
-            "returnComment": []
-          }
-        ],
-        "initialIsOpen": false
-      },
       {
         "parentPluginId": "@kbn/reporting-export-types-csv",
         "id": "def-server.CsvV2ExportType",
diff --git a/api_docs/kbn_reporting_export_types_csv.mdx b/api_docs/kbn_reporting_export_types_csv.mdx
index 501d9c836b8cf..401345dd96e4c 100644
--- a/api_docs/kbn_reporting_export_types_csv.mdx
+++ b/api_docs/kbn_reporting_export_types_csv.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-reporting-export-types-csv
 title: "@kbn/reporting-export-types-csv"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/reporting-export-types-csv plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/reporting-export-types-csv']
 ---
 import kbnReportingExportTypesCsvObj from './kbn_reporting_export_types_csv.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sh
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 52 | 0 | 52 | 3 |
+| 36 | 0 | 36 | 2 |
 
 ## Server
 
diff --git a/api_docs/kbn_reporting_export_types_csv_common.devdocs.json b/api_docs/kbn_reporting_export_types_csv_common.devdocs.json
index 32f5cd9dda2f0..96975b8370f4e 100644
--- a/api_docs/kbn_reporting_export_types_csv_common.devdocs.json
+++ b/api_docs/kbn_reporting_export_types_csv_common.devdocs.json
@@ -107,176 +107,6 @@
       }
     ],
     "interfaces": [
-      {
-        "parentPluginId": "@kbn/reporting-export-types-csv-common",
-        "id": "def-common.JobParamsDownloadCSV",
-        "type": "Interface",
-        "tags": [
-          "deprecated"
-        ],
-        "label": "JobParamsDownloadCSV",
-        "description": [],
-        "path": "packages/kbn-reporting/export_types/csv_common/index.ts",
-        "deprecated": true,
-        "trackAdoption": false,
-        "references": [
-          {
-            "plugin": "@kbn/reporting-export-types-csv",
-            "path": "packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.ts"
-          },
-          {
-            "plugin": "@kbn/reporting-export-types-csv",
-            "path": "packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.ts"
-          },
-          {
-            "plugin": "@kbn/reporting-export-types-csv",
-            "path": "packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.ts"
-          },
-          {
-            "plugin": "@kbn/reporting-export-types-csv",
-            "path": "packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.ts"
-          },
-          {
-            "plugin": "reporting",
-            "path": "x-pack/plugins/reporting/server/routes/internal/generate/csv_searchsource_immediate.ts"
-          },
-          {
-            "plugin": "reporting",
-            "path": "x-pack/plugins/reporting/server/routes/internal/generate/csv_searchsource_immediate.ts"
-          }
-        ],
-        "children": [
-          {
-            "parentPluginId": "@kbn/reporting-export-types-csv-common",
-            "id": "def-common.JobParamsDownloadCSV.browserTimezone",
-            "type": "string",
-            "tags": [],
-            "label": "browserTimezone",
-            "description": [],
-            "path": "packages/kbn-reporting/export_types/csv_common/index.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "@kbn/reporting-export-types-csv-common",
-            "id": "def-common.JobParamsDownloadCSV.title",
-            "type": "string",
-            "tags": [],
-            "label": "title",
-            "description": [],
-            "path": "packages/kbn-reporting/export_types/csv_common/index.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "@kbn/reporting-export-types-csv-common",
-            "id": "def-common.JobParamsDownloadCSV.searchSource",
-            "type": "Object",
-            "tags": [],
-            "label": "searchSource",
-            "description": [],
-            "signature": [
-              "{ type?: string | undefined; query?: ",
-              {
-                "pluginId": "@kbn/es-query",
-                "scope": "common",
-                "docId": "kibKbnEsQueryPluginApi",
-                "section": "def-common.Query",
-                "text": "Query"
-              },
-              " | ",
-              {
-                "pluginId": "@kbn/es-query",
-                "scope": "common",
-                "docId": "kibKbnEsQueryPluginApi",
-                "section": "def-common.AggregateQuery",
-                "text": "AggregateQuery"
-              },
-              " | undefined; filter?: ",
-              {
-                "pluginId": "@kbn/es-query",
-                "scope": "common",
-                "docId": "kibKbnEsQueryPluginApi",
-                "section": "def-common.Filter",
-                "text": "Filter"
-              },
-              "[] | undefined; sort?: ",
-              {
-                "pluginId": "data",
-                "scope": "common",
-                "docId": "kibDataSearchPluginApi",
-                "section": "def-common.EsQuerySortValue",
-                "text": "EsQuerySortValue"
-              },
-              "[] | undefined; highlight?: ",
-              {
-                "pluginId": "@kbn/utility-types",
-                "scope": "common",
-                "docId": "kibKbnUtilityTypesPluginApi",
-                "section": "def-common.SerializableRecord",
-                "text": "SerializableRecord"
-              },
-              " | undefined; highlightAll?: boolean | undefined; trackTotalHits?: number | boolean | undefined; aggs?: { type: string; enabled?: boolean | undefined; id?: string | undefined; params?: {} | ",
-              {
-                "pluginId": "@kbn/utility-types",
-                "scope": "common",
-                "docId": "kibKbnUtilityTypesPluginApi",
-                "section": "def-common.SerializableRecord",
-                "text": "SerializableRecord"
-              },
-              " | undefined; schema?: string | undefined; }[] | undefined; from?: number | undefined; size?: number | undefined; source?: boolean | ",
-              "Fields",
-              " | undefined; version?: boolean | undefined; fields?: ",
-              {
-                "pluginId": "data",
-                "scope": "common",
-                "docId": "kibDataSearchPluginApi",
-                "section": "def-common.SearchFieldValue",
-                "text": "SearchFieldValue"
-              },
-              "[] | undefined; fieldsFromSource?: ",
-              "Fields",
-              " | undefined; index?: string | ",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataViewSpec",
-                "text": "DataViewSpec"
-              },
-              " | undefined; searchAfter?: ",
-              "SortResults",
-              " | undefined; timeout?: string | undefined; terminate_after?: number | undefined; parent?: ",
-              {
-                "pluginId": "data",
-                "scope": "common",
-                "docId": "kibDataSearchPluginApi",
-                "section": "def-common.SerializedSearchSourceFields",
-                "text": "SerializedSearchSourceFields"
-              },
-              " | undefined; }"
-            ],
-            "path": "packages/kbn-reporting/export_types/csv_common/index.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "@kbn/reporting-export-types-csv-common",
-            "id": "def-common.JobParamsDownloadCSV.columns",
-            "type": "Array",
-            "tags": [],
-            "label": "columns",
-            "description": [],
-            "signature": [
-              "string[] | undefined"
-            ],
-            "path": "packages/kbn-reporting/export_types/csv_common/index.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          }
-        ],
-        "initialIsOpen": false
-      },
       {
         "parentPluginId": "@kbn/reporting-export-types-csv-common",
         "id": "def-common.QueryInspection",
@@ -465,53 +295,6 @@
         "trackAdoption": false,
         "initialIsOpen": false
       },
-      {
-        "parentPluginId": "@kbn/reporting-export-types-csv-common",
-        "id": "def-common.CSV_SEARCHSOURCE_IMMEDIATE_TYPE",
-        "type": "string",
-        "tags": [
-          "deprecated"
-        ],
-        "label": "CSV_SEARCHSOURCE_IMMEDIATE_TYPE",
-        "description": [],
-        "signature": [
-          "\"csv_searchsource_immediate\""
-        ],
-        "path": "packages/kbn-reporting/export_types/csv_common/index.ts",
-        "deprecated": true,
-        "trackAdoption": false,
-        "references": [
-          {
-            "plugin": "@kbn/reporting-export-types-csv",
-            "path": "packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.ts"
-          },
-          {
-            "plugin": "@kbn/reporting-export-types-csv",
-            "path": "packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.ts"
-          },
-          {
-            "plugin": "@kbn/reporting-export-types-csv",
-            "path": "packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.ts"
-          },
-          {
-            "plugin": "@kbn/reporting-export-types-csv",
-            "path": "packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.ts"
-          },
-          {
-            "plugin": "reporting",
-            "path": "x-pack/plugins/reporting/server/routes/internal/generate/csv_searchsource_immediate.ts"
-          },
-          {
-            "plugin": "reporting",
-            "path": "x-pack/plugins/reporting/server/routes/internal/generate/csv_searchsource_immediate.ts"
-          },
-          {
-            "plugin": "reporting",
-            "path": "x-pack/plugins/reporting/server/routes/internal/generate/csv_searchsource_immediate.ts"
-          }
-        ],
-        "initialIsOpen": false
-      },
       {
         "parentPluginId": "@kbn/reporting-export-types-csv-common",
         "id": "def-common.JobAppParamsCSV",
diff --git a/api_docs/kbn_reporting_export_types_csv_common.mdx b/api_docs/kbn_reporting_export_types_csv_common.mdx
index a7dc6b1e2aa2c..c646497a06ee8 100644
--- a/api_docs/kbn_reporting_export_types_csv_common.mdx
+++ b/api_docs/kbn_reporting_export_types_csv_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-reporting-export-types-csv-common
 title: "@kbn/reporting-export-types-csv-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/reporting-export-types-csv-common plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/reporting-export-types-csv-common']
 ---
 import kbnReportingExportTypesCsvCommonObj from './kbn_reporting_export_types_csv_common.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sh
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 25 | 0 | 21 | 0 |
+| 19 | 0 | 15 | 0 |
 
 ## Common
 
diff --git a/api_docs/kbn_reporting_export_types_pdf.mdx b/api_docs/kbn_reporting_export_types_pdf.mdx
index 3ce91456ca214..b7f0ae75e2749 100644
--- a/api_docs/kbn_reporting_export_types_pdf.mdx
+++ b/api_docs/kbn_reporting_export_types_pdf.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-reporting-export-types-pdf
 title: "@kbn/reporting-export-types-pdf"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/reporting-export-types-pdf plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/reporting-export-types-pdf']
 ---
 import kbnReportingExportTypesPdfObj from './kbn_reporting_export_types_pdf.devdocs.json';
diff --git a/api_docs/kbn_reporting_export_types_pdf_common.mdx b/api_docs/kbn_reporting_export_types_pdf_common.mdx
index 772f39d99cdb3..95b0a360c86f9 100644
--- a/api_docs/kbn_reporting_export_types_pdf_common.mdx
+++ b/api_docs/kbn_reporting_export_types_pdf_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-reporting-export-types-pdf-common
 title: "@kbn/reporting-export-types-pdf-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/reporting-export-types-pdf-common plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/reporting-export-types-pdf-common']
 ---
 import kbnReportingExportTypesPdfCommonObj from './kbn_reporting_export_types_pdf_common.devdocs.json';
diff --git a/api_docs/kbn_reporting_export_types_png.mdx b/api_docs/kbn_reporting_export_types_png.mdx
index 56ca2c5d70d4b..21ccfe54aa4d0 100644
--- a/api_docs/kbn_reporting_export_types_png.mdx
+++ b/api_docs/kbn_reporting_export_types_png.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-reporting-export-types-png
 title: "@kbn/reporting-export-types-png"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/reporting-export-types-png plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/reporting-export-types-png']
 ---
 import kbnReportingExportTypesPngObj from './kbn_reporting_export_types_png.devdocs.json';
diff --git a/api_docs/kbn_reporting_export_types_png_common.mdx b/api_docs/kbn_reporting_export_types_png_common.mdx
index cba69558b29a1..9642a3c3a296f 100644
--- a/api_docs/kbn_reporting_export_types_png_common.mdx
+++ b/api_docs/kbn_reporting_export_types_png_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-reporting-export-types-png-common
 title: "@kbn/reporting-export-types-png-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/reporting-export-types-png-common plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/reporting-export-types-png-common']
 ---
 import kbnReportingExportTypesPngCommonObj from './kbn_reporting_export_types_png_common.devdocs.json';
diff --git a/api_docs/kbn_reporting_mocks_server.mdx b/api_docs/kbn_reporting_mocks_server.mdx
index 79b5970274528..bf6b0cffa61d5 100644
--- a/api_docs/kbn_reporting_mocks_server.mdx
+++ b/api_docs/kbn_reporting_mocks_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-reporting-mocks-server
 title: "@kbn/reporting-mocks-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/reporting-mocks-server plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/reporting-mocks-server']
 ---
 import kbnReportingMocksServerObj from './kbn_reporting_mocks_server.devdocs.json';
diff --git a/api_docs/kbn_reporting_public.devdocs.json b/api_docs/kbn_reporting_public.devdocs.json
index 53e89b4395ac6..a57898a72dd7b 100644
--- a/api_docs/kbn_reporting_public.devdocs.json
+++ b/api_docs/kbn_reporting_public.devdocs.json
@@ -1310,60 +1310,6 @@
             ],
             "returnComment": []
           },
-          {
-            "parentPluginId": "@kbn/reporting-public",
-            "id": "def-public.ReportingAPIClient.createImmediateReport",
-            "type": "Function",
-            "tags": [
-              "deprecated"
-            ],
-            "label": "createImmediateReport",
-            "description": [],
-            "signature": [
-              "(baseParams: ",
-              "BaseParams",
-              ") => Promise<",
-              {
-                "pluginId": "@kbn/core-http-browser",
-                "scope": "public",
-                "docId": "kibKbnCoreHttpBrowserPluginApi",
-                "section": "def-public.HttpResponse",
-                "text": "HttpResponse"
-              },
-              "<unknown>>"
-            ],
-            "path": "packages/kbn-reporting/public/reporting_api_client.ts",
-            "deprecated": true,
-            "trackAdoption": false,
-            "references": [
-              {
-                "plugin": "@kbn/reporting-csv-share-panel",
-                "path": "packages/kbn-reporting/get_csv_panel_actions/panel_actions/get_csv_panel_action.tsx"
-              },
-              {
-                "plugin": "@kbn/reporting-csv-share-panel",
-                "path": "packages/kbn-reporting/get_csv_panel_actions/panel_actions/get_csv_panel_action.test.ts"
-              }
-            ],
-            "children": [
-              {
-                "parentPluginId": "@kbn/reporting-public",
-                "id": "def-public.ReportingAPIClient.createImmediateReport.$1",
-                "type": "Object",
-                "tags": [],
-                "label": "baseParams",
-                "description": [],
-                "signature": [
-                  "BaseParams"
-                ],
-                "path": "packages/kbn-reporting/public/reporting_api_client.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              }
-            ],
-            "returnComment": []
-          },
           {
             "parentPluginId": "@kbn/reporting-public",
             "id": "def-public.ReportingAPIClient.getDecoratedJobParams",
@@ -1744,7 +1690,7 @@
             "label": "csv",
             "description": [],
             "signature": [
-              "{ enablePanelActionDownload: boolean; scroll: { duration: string; size: number; }; }"
+              "{ scroll: { duration: string; size: number; }; }"
             ],
             "path": "packages/kbn-reporting/public/types.ts",
             "deprecated": false,
diff --git a/api_docs/kbn_reporting_public.mdx b/api_docs/kbn_reporting_public.mdx
index 35cac1de18102..a4af4ab62f4a8 100644
--- a/api_docs/kbn_reporting_public.mdx
+++ b/api_docs/kbn_reporting_public.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-reporting-public
 title: "@kbn/reporting-public"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/reporting-public plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/reporting-public']
 ---
 import kbnReportingPublicObj from './kbn_reporting_public.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sh
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 113 | 0 | 106 | 2 |
+| 111 | 0 | 104 | 2 |
 
 ## Client
 
diff --git a/api_docs/kbn_reporting_server.mdx b/api_docs/kbn_reporting_server.mdx
index 100467e072472..11adf4aeb5242 100644
--- a/api_docs/kbn_reporting_server.mdx
+++ b/api_docs/kbn_reporting_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-reporting-server
 title: "@kbn/reporting-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/reporting-server plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/reporting-server']
 ---
 import kbnReportingServerObj from './kbn_reporting_server.devdocs.json';
diff --git a/api_docs/kbn_resizable_layout.mdx b/api_docs/kbn_resizable_layout.mdx
index 1a061e65688c4..33f0e5955e926 100644
--- a/api_docs/kbn_resizable_layout.mdx
+++ b/api_docs/kbn_resizable_layout.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-resizable-layout
 title: "@kbn/resizable-layout"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/resizable-layout plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/resizable-layout']
 ---
 import kbnResizableLayoutObj from './kbn_resizable_layout.devdocs.json';
diff --git a/api_docs/kbn_response_ops_feature_flag_service.mdx b/api_docs/kbn_response_ops_feature_flag_service.mdx
index acc27f1c61389..f239178b56452 100644
--- a/api_docs/kbn_response_ops_feature_flag_service.mdx
+++ b/api_docs/kbn_response_ops_feature_flag_service.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-response-ops-feature-flag-service
 title: "@kbn/response-ops-feature-flag-service"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/response-ops-feature-flag-service plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/response-ops-feature-flag-service']
 ---
 import kbnResponseOpsFeatureFlagServiceObj from './kbn_response_ops_feature_flag_service.devdocs.json';
diff --git a/api_docs/kbn_response_ops_rule_params.mdx b/api_docs/kbn_response_ops_rule_params.mdx
index 6d8e579f12ba4..fcc31fb45b37e 100644
--- a/api_docs/kbn_response_ops_rule_params.mdx
+++ b/api_docs/kbn_response_ops_rule_params.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-response-ops-rule-params
 title: "@kbn/response-ops-rule-params"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/response-ops-rule-params plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/response-ops-rule-params']
 ---
 import kbnResponseOpsRuleParamsObj from './kbn_response_ops_rule_params.devdocs.json';
diff --git a/api_docs/kbn_rison.mdx b/api_docs/kbn_rison.mdx
index 8651aad062b11..79ad58a89a18e 100644
--- a/api_docs/kbn_rison.mdx
+++ b/api_docs/kbn_rison.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-rison
 title: "@kbn/rison"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/rison plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/rison']
 ---
 import kbnRisonObj from './kbn_rison.devdocs.json';
diff --git a/api_docs/kbn_rollup.mdx b/api_docs/kbn_rollup.mdx
index e0f9449525a61..ae1e437615c09 100644
--- a/api_docs/kbn_rollup.mdx
+++ b/api_docs/kbn_rollup.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-rollup
 title: "@kbn/rollup"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/rollup plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/rollup']
 ---
 import kbnRollupObj from './kbn_rollup.devdocs.json';
diff --git a/api_docs/kbn_router_to_openapispec.mdx b/api_docs/kbn_router_to_openapispec.mdx
index abd3858f40020..d1d875570f956 100644
--- a/api_docs/kbn_router_to_openapispec.mdx
+++ b/api_docs/kbn_router_to_openapispec.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-router-to-openapispec
 title: "@kbn/router-to-openapispec"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/router-to-openapispec plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/router-to-openapispec']
 ---
 import kbnRouterToOpenapispecObj from './kbn_router_to_openapispec.devdocs.json';
diff --git a/api_docs/kbn_router_utils.mdx b/api_docs/kbn_router_utils.mdx
index dcc894e9679dc..917994e1faafd 100644
--- a/api_docs/kbn_router_utils.mdx
+++ b/api_docs/kbn_router_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-router-utils
 title: "@kbn/router-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/router-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/router-utils']
 ---
 import kbnRouterUtilsObj from './kbn_router_utils.devdocs.json';
diff --git a/api_docs/kbn_rrule.mdx b/api_docs/kbn_rrule.mdx
index 812ee893cf0e9..938c6582c8d5a 100644
--- a/api_docs/kbn_rrule.mdx
+++ b/api_docs/kbn_rrule.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-rrule
 title: "@kbn/rrule"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/rrule plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/rrule']
 ---
 import kbnRruleObj from './kbn_rrule.devdocs.json';
diff --git a/api_docs/kbn_rule_data_utils.mdx b/api_docs/kbn_rule_data_utils.mdx
index 9945f6db0c452..7be056c5d6383 100644
--- a/api_docs/kbn_rule_data_utils.mdx
+++ b/api_docs/kbn_rule_data_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-rule-data-utils
 title: "@kbn/rule-data-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/rule-data-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/rule-data-utils']
 ---
 import kbnRuleDataUtilsObj from './kbn_rule_data_utils.devdocs.json';
diff --git a/api_docs/kbn_saved_objects_settings.mdx b/api_docs/kbn_saved_objects_settings.mdx
index 5489bbd174ac9..e853cc40e5e51 100644
--- a/api_docs/kbn_saved_objects_settings.mdx
+++ b/api_docs/kbn_saved_objects_settings.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-saved-objects-settings
 title: "@kbn/saved-objects-settings"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/saved-objects-settings plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/saved-objects-settings']
 ---
 import kbnSavedObjectsSettingsObj from './kbn_saved_objects_settings.devdocs.json';
diff --git a/api_docs/kbn_screenshotting_server.mdx b/api_docs/kbn_screenshotting_server.mdx
index f781445d53c01..dd1e78030d2f9 100644
--- a/api_docs/kbn_screenshotting_server.mdx
+++ b/api_docs/kbn_screenshotting_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-screenshotting-server
 title: "@kbn/screenshotting-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/screenshotting-server plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/screenshotting-server']
 ---
 import kbnScreenshottingServerObj from './kbn_screenshotting_server.devdocs.json';
diff --git a/api_docs/kbn_search_api_keys_components.mdx b/api_docs/kbn_search_api_keys_components.mdx
index 0cc797de472d4..289e7bb1a346f 100644
--- a/api_docs/kbn_search_api_keys_components.mdx
+++ b/api_docs/kbn_search_api_keys_components.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-search-api-keys-components
 title: "@kbn/search-api-keys-components"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/search-api-keys-components plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/search-api-keys-components']
 ---
 import kbnSearchApiKeysComponentsObj from './kbn_search_api_keys_components.devdocs.json';
diff --git a/api_docs/kbn_search_api_keys_server.mdx b/api_docs/kbn_search_api_keys_server.mdx
index 5d3034682cbb5..87f7f8118597a 100644
--- a/api_docs/kbn_search_api_keys_server.mdx
+++ b/api_docs/kbn_search_api_keys_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-search-api-keys-server
 title: "@kbn/search-api-keys-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/search-api-keys-server plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/search-api-keys-server']
 ---
 import kbnSearchApiKeysServerObj from './kbn_search_api_keys_server.devdocs.json';
diff --git a/api_docs/kbn_search_api_panels.mdx b/api_docs/kbn_search_api_panels.mdx
index 3259c4e865d15..fb1f31f33ed6f 100644
--- a/api_docs/kbn_search_api_panels.mdx
+++ b/api_docs/kbn_search_api_panels.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-search-api-panels
 title: "@kbn/search-api-panels"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/search-api-panels plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/search-api-panels']
 ---
 import kbnSearchApiPanelsObj from './kbn_search_api_panels.devdocs.json';
diff --git a/api_docs/kbn_search_connectors.devdocs.json b/api_docs/kbn_search_connectors.devdocs.json
index de9957ce4b936..a4721ab941fbd 100644
--- a/api_docs/kbn_search_connectors.devdocs.json
+++ b/api_docs/kbn_search_connectors.devdocs.json
@@ -1338,6 +1338,31 @@
         "returnComment": [],
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "@kbn/search-connectors",
+        "id": "def-common.getConnectorsDict",
+        "type": "Function",
+        "tags": [],
+        "label": "getConnectorsDict",
+        "description": [],
+        "signature": [
+          "() => Record<string, ",
+          {
+            "pluginId": "@kbn/search-connectors",
+            "scope": "common",
+            "docId": "kibKbnSearchConnectorsPluginApi",
+            "section": "def-common.ConnectorClientSideDefinition",
+            "text": "ConnectorClientSideDefinition"
+          },
+          ">"
+        ],
+        "path": "packages/kbn-search-connectors/constants/connectors.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "@kbn/search-connectors",
         "id": "def-common.isCategoryEntry",
@@ -3575,6 +3600,73 @@
         ],
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "@kbn/search-connectors",
+        "id": "def-common.ConnectorClientSideDefinition",
+        "type": "Interface",
+        "tags": [],
+        "label": "ConnectorClientSideDefinition",
+        "description": [],
+        "path": "packages/kbn-search-connectors/types/connector_definition.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/search-connectors",
+            "id": "def-common.ConnectorClientSideDefinition.docsUrl",
+            "type": "string",
+            "tags": [],
+            "label": "docsUrl",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "packages/kbn-search-connectors/types/connector_definition.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/search-connectors",
+            "id": "def-common.ConnectorClientSideDefinition.externalAuthDocsUrl",
+            "type": "string",
+            "tags": [],
+            "label": "externalAuthDocsUrl",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "packages/kbn-search-connectors/types/connector_definition.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/search-connectors",
+            "id": "def-common.ConnectorClientSideDefinition.externalDocsUrl",
+            "type": "string",
+            "tags": [],
+            "label": "externalDocsUrl",
+            "description": [],
+            "path": "packages/kbn-search-connectors/types/connector_definition.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/search-connectors",
+            "id": "def-common.ConnectorClientSideDefinition.platinumOnly",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "platinumOnly",
+            "description": [],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "path": "packages/kbn-search-connectors/types/connector_definition.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "@kbn/search-connectors",
         "id": "def-common.ConnectorConfigCategoryProperties",
@@ -4031,6 +4123,131 @@
         ],
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "@kbn/search-connectors",
+        "id": "def-common.ConnectorServerSideDefinition",
+        "type": "Interface",
+        "tags": [],
+        "label": "ConnectorServerSideDefinition",
+        "description": [],
+        "path": "packages/kbn-search-connectors/types/connector_definition.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/search-connectors",
+            "id": "def-common.ConnectorServerSideDefinition.categories",
+            "type": "Array",
+            "tags": [],
+            "label": "categories",
+            "description": [],
+            "signature": [
+              "string[] | undefined"
+            ],
+            "path": "packages/kbn-search-connectors/types/connector_definition.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/search-connectors",
+            "id": "def-common.ConnectorServerSideDefinition.description",
+            "type": "string",
+            "tags": [],
+            "label": "description",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "packages/kbn-search-connectors/types/connector_definition.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/search-connectors",
+            "id": "def-common.ConnectorServerSideDefinition.iconPath",
+            "type": "string",
+            "tags": [],
+            "label": "iconPath",
+            "description": [],
+            "path": "packages/kbn-search-connectors/types/connector_definition.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/search-connectors",
+            "id": "def-common.ConnectorServerSideDefinition.isBeta",
+            "type": "boolean",
+            "tags": [],
+            "label": "isBeta",
+            "description": [],
+            "path": "packages/kbn-search-connectors/types/connector_definition.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/search-connectors",
+            "id": "def-common.ConnectorServerSideDefinition.isNative",
+            "type": "boolean",
+            "tags": [],
+            "label": "isNative",
+            "description": [],
+            "path": "packages/kbn-search-connectors/types/connector_definition.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/search-connectors",
+            "id": "def-common.ConnectorServerSideDefinition.isTechPreview",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "isTechPreview",
+            "description": [],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "path": "packages/kbn-search-connectors/types/connector_definition.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/search-connectors",
+            "id": "def-common.ConnectorServerSideDefinition.keywords",
+            "type": "Array",
+            "tags": [],
+            "label": "keywords",
+            "description": [],
+            "signature": [
+              "string[]"
+            ],
+            "path": "packages/kbn-search-connectors/types/connector_definition.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/search-connectors",
+            "id": "def-common.ConnectorServerSideDefinition.name",
+            "type": "string",
+            "tags": [],
+            "label": "name",
+            "description": [],
+            "path": "packages/kbn-search-connectors/types/connector_definition.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/search-connectors",
+            "id": "def-common.ConnectorServerSideDefinition.serviceType",
+            "type": "string",
+            "tags": [],
+            "label": "serviceType",
+            "description": [],
+            "path": "packages/kbn-search-connectors/types/connector_definition.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "@kbn/search-connectors",
         "id": "def-common.ConnectorStats",
@@ -6405,6 +6622,28 @@
       }
     ],
     "misc": [
+      {
+        "parentPluginId": "@kbn/search-connectors",
+        "id": "def-common.CONNECTOR_DEFINITIONS",
+        "type": "Array",
+        "tags": [],
+        "label": "CONNECTOR_DEFINITIONS",
+        "description": [],
+        "signature": [
+          {
+            "pluginId": "@kbn/search-connectors",
+            "scope": "common",
+            "docId": "kibKbnSearchConnectorsPluginApi",
+            "section": "def-common.ConnectorServerSideDefinition",
+            "text": "ConnectorServerSideDefinition"
+          },
+          "[]"
+        ],
+        "path": "packages/kbn-search-connectors/constants/connectors.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "@kbn/search-connectors",
         "id": "def-common.ConnectorConfiguration",
@@ -6475,6 +6714,35 @@
         "trackAdoption": false,
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "@kbn/search-connectors",
+        "id": "def-common.ConnectorDefinition",
+        "type": "Type",
+        "tags": [],
+        "label": "ConnectorDefinition",
+        "description": [],
+        "signature": [
+          {
+            "pluginId": "@kbn/search-connectors",
+            "scope": "common",
+            "docId": "kibKbnSearchConnectorsPluginApi",
+            "section": "def-common.ConnectorClientSideDefinition",
+            "text": "ConnectorClientSideDefinition"
+          },
+          " & ",
+          {
+            "pluginId": "@kbn/search-connectors",
+            "scope": "common",
+            "docId": "kibKbnSearchConnectorsPluginApi",
+            "section": "def-common.ConnectorServerSideDefinition",
+            "text": "ConnectorServerSideDefinition"
+          }
+        ],
+        "path": "packages/kbn-search-connectors/types/connector_definition.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "@kbn/search-connectors",
         "id": "def-common.ConnectorDocument",
@@ -6896,6 +7164,21 @@
       }
     ],
     "objects": [
+      {
+        "parentPluginId": "@kbn/search-connectors",
+        "id": "def-common.docLinks",
+        "type": "Object",
+        "tags": [],
+        "label": "docLinks",
+        "description": [],
+        "signature": [
+          "ESDocLinks"
+        ],
+        "path": "packages/kbn-search-connectors/constants/doc_links.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "@kbn/search-connectors",
         "id": "def-common.LicenseContext",
@@ -8364,10 +8647,10 @@
                 "children": [
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.azure_blob_storage.features.FeatureName.SYNC_RULES",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.azure_blob_storage.features.SYNC_RULES",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.SYNC_RULES]",
+                    "label": "[SYNC_RULES]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -8375,7 +8658,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.azure_blob_storage.features.FeatureName.SYNC_RULES.advanced",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.azure_blob_storage.features.SYNC_RULES.advanced",
                         "type": "Object",
                         "tags": [],
                         "label": "advanced",
@@ -8386,7 +8669,7 @@
                         "children": [
                           {
                             "parentPluginId": "@kbn/search-connectors",
-                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.azure_blob_storage.features.FeatureName.SYNC_RULES.advanced.enabled",
+                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.azure_blob_storage.features.SYNC_RULES.advanced.enabled",
                             "type": "boolean",
                             "tags": [],
                             "label": "enabled",
@@ -8402,7 +8685,7 @@
                       },
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.azure_blob_storage.features.FeatureName.SYNC_RULES.basic",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.azure_blob_storage.features.SYNC_RULES.basic",
                         "type": "Object",
                         "tags": [],
                         "label": "basic",
@@ -8413,7 +8696,7 @@
                         "children": [
                           {
                             "parentPluginId": "@kbn/search-connectors",
-                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.azure_blob_storage.features.FeatureName.SYNC_RULES.basic.enabled",
+                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.azure_blob_storage.features.SYNC_RULES.basic.enabled",
                             "type": "boolean",
                             "tags": [],
                             "label": "enabled",
@@ -8431,10 +8714,10 @@
                   },
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.azure_blob_storage.features.FeatureName.INCREMENTAL_SYNC",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.azure_blob_storage.features.INCREMENTAL_SYNC",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.INCREMENTAL_SYNC]",
+                    "label": "[INCREMENTAL_SYNC]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -8442,7 +8725,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.azure_blob_storage.features.FeatureName.INCREMENTAL_SYNC.enabled",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.azure_blob_storage.features.INCREMENTAL_SYNC.enabled",
                         "type": "boolean",
                         "tags": [],
                         "label": "enabled",
@@ -13586,10 +13869,10 @@
                 "children": [
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.confluence.features.FeatureName.SYNC_RULES",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.confluence.features.SYNC_RULES",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.SYNC_RULES]",
+                    "label": "[SYNC_RULES]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -13597,7 +13880,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.confluence.features.FeatureName.SYNC_RULES.advanced",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.confluence.features.SYNC_RULES.advanced",
                         "type": "Object",
                         "tags": [],
                         "label": "advanced",
@@ -13608,7 +13891,7 @@
                         "children": [
                           {
                             "parentPluginId": "@kbn/search-connectors",
-                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.confluence.features.FeatureName.SYNC_RULES.advanced.enabled",
+                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.confluence.features.SYNC_RULES.advanced.enabled",
                             "type": "boolean",
                             "tags": [],
                             "label": "enabled",
@@ -13624,7 +13907,7 @@
                       },
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.confluence.features.FeatureName.SYNC_RULES.basic",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.confluence.features.SYNC_RULES.basic",
                         "type": "Object",
                         "tags": [],
                         "label": "basic",
@@ -13635,7 +13918,7 @@
                         "children": [
                           {
                             "parentPluginId": "@kbn/search-connectors",
-                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.confluence.features.FeatureName.SYNC_RULES.basic.enabled",
+                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.confluence.features.SYNC_RULES.basic.enabled",
                             "type": "boolean",
                             "tags": [],
                             "label": "enabled",
@@ -13653,10 +13936,10 @@
                   },
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.confluence.features.FeatureName.DOCUMENT_LEVEL_SECURITY",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.confluence.features.DOCUMENT_LEVEL_SECURITY",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.DOCUMENT_LEVEL_SECURITY]",
+                    "label": "[DOCUMENT_LEVEL_SECURITY]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -13664,7 +13947,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.confluence.features.FeatureName.DOCUMENT_LEVEL_SECURITY.enabled",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.confluence.features.DOCUMENT_LEVEL_SECURITY.enabled",
                         "type": "boolean",
                         "tags": [],
                         "label": "enabled",
@@ -13680,10 +13963,10 @@
                   },
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.confluence.features.FeatureName.INCREMENTAL_SYNC",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.confluence.features.INCREMENTAL_SYNC",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.INCREMENTAL_SYNC]",
+                    "label": "[INCREMENTAL_SYNC]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -13691,7 +13974,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.confluence.features.FeatureName.INCREMENTAL_SYNC.enabled",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.confluence.features.INCREMENTAL_SYNC.enabled",
                         "type": "boolean",
                         "tags": [],
                         "label": "enabled",
@@ -15570,10 +15853,10 @@
                 "children": [
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.dropbox.features.FeatureName.DOCUMENT_LEVEL_SECURITY",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.dropbox.features.DOCUMENT_LEVEL_SECURITY",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.DOCUMENT_LEVEL_SECURITY]",
+                    "label": "[DOCUMENT_LEVEL_SECURITY]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -15581,7 +15864,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.dropbox.features.FeatureName.DOCUMENT_LEVEL_SECURITY.enabled",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.dropbox.features.DOCUMENT_LEVEL_SECURITY.enabled",
                         "type": "boolean",
                         "tags": [],
                         "label": "enabled",
@@ -15597,10 +15880,10 @@
                   },
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.dropbox.features.FeatureName.SYNC_RULES",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.dropbox.features.SYNC_RULES",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.SYNC_RULES]",
+                    "label": "[SYNC_RULES]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -15608,7 +15891,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.dropbox.features.FeatureName.SYNC_RULES.advanced",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.dropbox.features.SYNC_RULES.advanced",
                         "type": "Object",
                         "tags": [],
                         "label": "advanced",
@@ -15619,7 +15902,7 @@
                         "children": [
                           {
                             "parentPluginId": "@kbn/search-connectors",
-                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.dropbox.features.FeatureName.SYNC_RULES.advanced.enabled",
+                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.dropbox.features.SYNC_RULES.advanced.enabled",
                             "type": "boolean",
                             "tags": [],
                             "label": "enabled",
@@ -15635,7 +15918,7 @@
                       },
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.dropbox.features.FeatureName.SYNC_RULES.basic",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.dropbox.features.SYNC_RULES.basic",
                         "type": "Object",
                         "tags": [],
                         "label": "basic",
@@ -15646,7 +15929,7 @@
                         "children": [
                           {
                             "parentPluginId": "@kbn/search-connectors",
-                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.dropbox.features.FeatureName.SYNC_RULES.basic.enabled",
+                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.dropbox.features.SYNC_RULES.basic.enabled",
                             "type": "boolean",
                             "tags": [],
                             "label": "enabled",
@@ -15664,10 +15947,10 @@
                   },
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.dropbox.features.FeatureName.INCREMENTAL_SYNC",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.dropbox.features.INCREMENTAL_SYNC",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.INCREMENTAL_SYNC]",
+                    "label": "[INCREMENTAL_SYNC]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -15675,7 +15958,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.dropbox.features.FeatureName.INCREMENTAL_SYNC.enabled",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.dropbox.features.INCREMENTAL_SYNC.enabled",
                         "type": "boolean",
                         "tags": [],
                         "label": "enabled",
@@ -18560,10 +18843,10 @@
                 "children": [
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.github.features.FeatureName.SYNC_RULES",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.github.features.SYNC_RULES",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.SYNC_RULES]",
+                    "label": "[SYNC_RULES]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -18571,7 +18854,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.github.features.FeatureName.SYNC_RULES.advanced",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.github.features.SYNC_RULES.advanced",
                         "type": "Object",
                         "tags": [],
                         "label": "advanced",
@@ -18582,7 +18865,7 @@
                         "children": [
                           {
                             "parentPluginId": "@kbn/search-connectors",
-                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.github.features.FeatureName.SYNC_RULES.advanced.enabled",
+                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.github.features.SYNC_RULES.advanced.enabled",
                             "type": "boolean",
                             "tags": [],
                             "label": "enabled",
@@ -18598,7 +18881,7 @@
                       },
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.github.features.FeatureName.SYNC_RULES.basic",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.github.features.SYNC_RULES.basic",
                         "type": "Object",
                         "tags": [],
                         "label": "basic",
@@ -18609,7 +18892,7 @@
                         "children": [
                           {
                             "parentPluginId": "@kbn/search-connectors",
-                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.github.features.FeatureName.SYNC_RULES.basic.enabled",
+                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.github.features.SYNC_RULES.basic.enabled",
                             "type": "boolean",
                             "tags": [],
                             "label": "enabled",
@@ -18627,10 +18910,10 @@
                   },
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.github.features.FeatureName.INCREMENTAL_SYNC",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.github.features.INCREMENTAL_SYNC",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.INCREMENTAL_SYNC]",
+                    "label": "[INCREMENTAL_SYNC]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -18638,7 +18921,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.github.features.FeatureName.INCREMENTAL_SYNC.enabled",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.github.features.INCREMENTAL_SYNC.enabled",
                         "type": "boolean",
                         "tags": [],
                         "label": "enabled",
@@ -19698,10 +19981,10 @@
                 "children": [
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.gmail.features.FeatureName.SYNC_RULES",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.gmail.features.SYNC_RULES",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.SYNC_RULES]",
+                    "label": "[SYNC_RULES]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -19709,7 +19992,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.gmail.features.FeatureName.SYNC_RULES.advanced",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.gmail.features.SYNC_RULES.advanced",
                         "type": "Object",
                         "tags": [],
                         "label": "advanced",
@@ -19720,7 +20003,7 @@
                         "children": [
                           {
                             "parentPluginId": "@kbn/search-connectors",
-                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.gmail.features.FeatureName.SYNC_RULES.advanced.enabled",
+                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.gmail.features.SYNC_RULES.advanced.enabled",
                             "type": "boolean",
                             "tags": [],
                             "label": "enabled",
@@ -19736,7 +20019,7 @@
                       },
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.gmail.features.FeatureName.SYNC_RULES.basic",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.gmail.features.SYNC_RULES.basic",
                         "type": "Object",
                         "tags": [],
                         "label": "basic",
@@ -19747,7 +20030,7 @@
                         "children": [
                           {
                             "parentPluginId": "@kbn/search-connectors",
-                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.gmail.features.FeatureName.SYNC_RULES.basic.enabled",
+                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.gmail.features.SYNC_RULES.basic.enabled",
                             "type": "boolean",
                             "tags": [],
                             "label": "enabled",
@@ -19765,10 +20048,10 @@
                   },
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.gmail.features.FeatureName.DOCUMENT_LEVEL_SECURITY",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.gmail.features.DOCUMENT_LEVEL_SECURITY",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.DOCUMENT_LEVEL_SECURITY]",
+                    "label": "[DOCUMENT_LEVEL_SECURITY]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -19776,7 +20059,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.gmail.features.FeatureName.DOCUMENT_LEVEL_SECURITY.enabled",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.gmail.features.DOCUMENT_LEVEL_SECURITY.enabled",
                         "type": "boolean",
                         "tags": [],
                         "label": "enabled",
@@ -19792,10 +20075,10 @@
                   },
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.gmail.features.FeatureName.INCREMENTAL_SYNC",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.gmail.features.INCREMENTAL_SYNC",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.INCREMENTAL_SYNC]",
+                    "label": "[INCREMENTAL_SYNC]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -19803,7 +20086,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.gmail.features.FeatureName.INCREMENTAL_SYNC.enabled",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.gmail.features.INCREMENTAL_SYNC.enabled",
                         "type": "boolean",
                         "tags": [],
                         "label": "enabled",
@@ -19867,10 +20150,10 @@
                 "children": [
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.google_cloud_storage.features.FeatureName.INCREMENTAL_SYNC",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.google_cloud_storage.features.INCREMENTAL_SYNC",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.INCREMENTAL_SYNC]",
+                    "label": "[INCREMENTAL_SYNC]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -19878,7 +20161,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.google_cloud_storage.features.FeatureName.INCREMENTAL_SYNC.enabled",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.google_cloud_storage.features.INCREMENTAL_SYNC.enabled",
                         "type": "boolean",
                         "tags": [],
                         "label": "enabled",
@@ -22347,10 +22630,10 @@
                 "children": [
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.google_drive.features.FeatureName.DOCUMENT_LEVEL_SECURITY",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.google_drive.features.DOCUMENT_LEVEL_SECURITY",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.DOCUMENT_LEVEL_SECURITY]",
+                    "label": "[DOCUMENT_LEVEL_SECURITY]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -22358,7 +22641,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.google_drive.features.FeatureName.DOCUMENT_LEVEL_SECURITY.enabled",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.google_drive.features.DOCUMENT_LEVEL_SECURITY.enabled",
                         "type": "boolean",
                         "tags": [],
                         "label": "enabled",
@@ -22374,10 +22657,10 @@
                   },
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.google_drive.features.FeatureName.INCREMENTAL_SYNC",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.google_drive.features.INCREMENTAL_SYNC",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.INCREMENTAL_SYNC]",
+                    "label": "[INCREMENTAL_SYNC]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -22385,7 +22668,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.google_drive.features.FeatureName.INCREMENTAL_SYNC.enabled",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.google_drive.features.INCREMENTAL_SYNC.enabled",
                         "type": "boolean",
                         "tags": [],
                         "label": "enabled",
@@ -25475,10 +25758,10 @@
                 "children": [
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.jira.features.FeatureName.SYNC_RULES",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.jira.features.SYNC_RULES",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.SYNC_RULES]",
+                    "label": "[SYNC_RULES]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -25486,7 +25769,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.jira.features.FeatureName.SYNC_RULES.advanced",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.jira.features.SYNC_RULES.advanced",
                         "type": "Object",
                         "tags": [],
                         "label": "advanced",
@@ -25497,7 +25780,7 @@
                         "children": [
                           {
                             "parentPluginId": "@kbn/search-connectors",
-                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.jira.features.FeatureName.SYNC_RULES.advanced.enabled",
+                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.jira.features.SYNC_RULES.advanced.enabled",
                             "type": "boolean",
                             "tags": [],
                             "label": "enabled",
@@ -25513,7 +25796,7 @@
                       },
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.jira.features.FeatureName.SYNC_RULES.basic",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.jira.features.SYNC_RULES.basic",
                         "type": "Object",
                         "tags": [],
                         "label": "basic",
@@ -25524,7 +25807,7 @@
                         "children": [
                           {
                             "parentPluginId": "@kbn/search-connectors",
-                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.jira.features.FeatureName.SYNC_RULES.basic.enabled",
+                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.jira.features.SYNC_RULES.basic.enabled",
                             "type": "boolean",
                             "tags": [],
                             "label": "enabled",
@@ -25542,10 +25825,10 @@
                   },
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.jira.features.FeatureName.DOCUMENT_LEVEL_SECURITY",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.jira.features.DOCUMENT_LEVEL_SECURITY",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.DOCUMENT_LEVEL_SECURITY]",
+                    "label": "[DOCUMENT_LEVEL_SECURITY]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -25553,7 +25836,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.jira.features.FeatureName.DOCUMENT_LEVEL_SECURITY.enabled",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.jira.features.DOCUMENT_LEVEL_SECURITY.enabled",
                         "type": "boolean",
                         "tags": [],
                         "label": "enabled",
@@ -25569,10 +25852,10 @@
                   },
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.jira.features.FeatureName.INCREMENTAL_SYNC",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.jira.features.INCREMENTAL_SYNC",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.INCREMENTAL_SYNC]",
+                    "label": "[INCREMENTAL_SYNC]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -25580,7 +25863,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.jira.features.FeatureName.INCREMENTAL_SYNC.enabled",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.jira.features.INCREMENTAL_SYNC.enabled",
                         "type": "boolean",
                         "tags": [],
                         "label": "enabled",
@@ -28481,10 +28764,10 @@
                 "children": [
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.mongodb.features.FeatureName.FILTERING_ADVANCED_CONFIG",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.mongodb.features.FILTERING_ADVANCED_CONFIG",
                     "type": "boolean",
                     "tags": [],
-                    "label": "[FeatureName.FILTERING_ADVANCED_CONFIG]",
+                    "label": "[FILTERING_ADVANCED_CONFIG]",
                     "description": [],
                     "signature": [
                       "true"
@@ -28495,10 +28778,10 @@
                   },
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.mongodb.features.FeatureName.FILTERING_RULES",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.mongodb.features.FILTERING_RULES",
                     "type": "boolean",
                     "tags": [],
-                    "label": "[FeatureName.FILTERING_RULES]",
+                    "label": "[FILTERING_RULES]",
                     "description": [],
                     "signature": [
                       "true"
@@ -28509,10 +28792,10 @@
                   },
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.mongodb.features.FeatureName.SYNC_RULES",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.mongodb.features.SYNC_RULES",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.SYNC_RULES]",
+                    "label": "[SYNC_RULES]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -28520,7 +28803,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.mongodb.features.FeatureName.SYNC_RULES.advanced",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.mongodb.features.SYNC_RULES.advanced",
                         "type": "Object",
                         "tags": [],
                         "label": "advanced",
@@ -28531,7 +28814,7 @@
                         "children": [
                           {
                             "parentPluginId": "@kbn/search-connectors",
-                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.mongodb.features.FeatureName.SYNC_RULES.advanced.enabled",
+                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.mongodb.features.SYNC_RULES.advanced.enabled",
                             "type": "boolean",
                             "tags": [],
                             "label": "enabled",
@@ -28547,7 +28830,7 @@
                       },
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.mongodb.features.FeatureName.SYNC_RULES.basic",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.mongodb.features.SYNC_RULES.basic",
                         "type": "Object",
                         "tags": [],
                         "label": "basic",
@@ -28558,7 +28841,7 @@
                         "children": [
                           {
                             "parentPluginId": "@kbn/search-connectors",
-                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.mongodb.features.FeatureName.SYNC_RULES.basic.enabled",
+                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.mongodb.features.SYNC_RULES.basic.enabled",
                             "type": "boolean",
                             "tags": [],
                             "label": "enabled",
@@ -30980,10 +31263,10 @@
                 "children": [
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.mssql.features.FeatureName.SYNC_RULES",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.mssql.features.SYNC_RULES",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.SYNC_RULES]",
+                    "label": "[SYNC_RULES]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -30991,7 +31274,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.mssql.features.FeatureName.SYNC_RULES.advanced",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.mssql.features.SYNC_RULES.advanced",
                         "type": "Object",
                         "tags": [],
                         "label": "advanced",
@@ -31002,7 +31285,7 @@
                         "children": [
                           {
                             "parentPluginId": "@kbn/search-connectors",
-                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.mssql.features.FeatureName.SYNC_RULES.advanced.enabled",
+                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.mssql.features.SYNC_RULES.advanced.enabled",
                             "type": "boolean",
                             "tags": [],
                             "label": "enabled",
@@ -31018,7 +31301,7 @@
                       },
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.mssql.features.FeatureName.SYNC_RULES.basic",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.mssql.features.SYNC_RULES.basic",
                         "type": "Object",
                         "tags": [],
                         "label": "basic",
@@ -31029,7 +31312,7 @@
                         "children": [
                           {
                             "parentPluginId": "@kbn/search-connectors",
-                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.mssql.features.FeatureName.SYNC_RULES.basic.enabled",
+                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.mssql.features.SYNC_RULES.basic.enabled",
                             "type": "boolean",
                             "tags": [],
                             "label": "enabled",
@@ -33057,10 +33340,10 @@
                 "children": [
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.mysql.features.FeatureName.SYNC_RULES",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.mysql.features.SYNC_RULES",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.SYNC_RULES]",
+                    "label": "[SYNC_RULES]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -33068,7 +33351,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.mysql.features.FeatureName.SYNC_RULES.advanced",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.mysql.features.SYNC_RULES.advanced",
                         "type": "Object",
                         "tags": [],
                         "label": "advanced",
@@ -33079,7 +33362,7 @@
                         "children": [
                           {
                             "parentPluginId": "@kbn/search-connectors",
-                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.mysql.features.FeatureName.SYNC_RULES.advanced.enabled",
+                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.mysql.features.SYNC_RULES.advanced.enabled",
                             "type": "boolean",
                             "tags": [],
                             "label": "enabled",
@@ -33095,7 +33378,7 @@
                       },
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.mysql.features.FeatureName.SYNC_RULES.basic",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.mysql.features.SYNC_RULES.basic",
                         "type": "Object",
                         "tags": [],
                         "label": "basic",
@@ -33106,7 +33389,7 @@
                         "children": [
                           {
                             "parentPluginId": "@kbn/search-connectors",
-                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.mysql.features.FeatureName.SYNC_RULES.basic.enabled",
+                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.mysql.features.SYNC_RULES.basic.enabled",
                             "type": "boolean",
                             "tags": [],
                             "label": "enabled",
@@ -34392,10 +34675,10 @@
                 "children": [
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.network_drive.features.FeatureName.SYNC_RULES",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.network_drive.features.SYNC_RULES",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.SYNC_RULES]",
+                    "label": "[SYNC_RULES]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -34403,7 +34686,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.network_drive.features.FeatureName.SYNC_RULES.advanced",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.network_drive.features.SYNC_RULES.advanced",
                         "type": "Object",
                         "tags": [],
                         "label": "advanced",
@@ -34414,7 +34697,7 @@
                         "children": [
                           {
                             "parentPluginId": "@kbn/search-connectors",
-                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.network_drive.features.FeatureName.SYNC_RULES.advanced.enabled",
+                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.network_drive.features.SYNC_RULES.advanced.enabled",
                             "type": "boolean",
                             "tags": [],
                             "label": "enabled",
@@ -34430,7 +34713,7 @@
                       },
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.network_drive.features.FeatureName.SYNC_RULES.basic",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.network_drive.features.SYNC_RULES.basic",
                         "type": "Object",
                         "tags": [],
                         "label": "basic",
@@ -34441,7 +34724,7 @@
                         "children": [
                           {
                             "parentPluginId": "@kbn/search-connectors",
-                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.network_drive.features.FeatureName.SYNC_RULES.basic.enabled",
+                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.network_drive.features.SYNC_RULES.basic.enabled",
                             "type": "boolean",
                             "tags": [],
                             "label": "enabled",
@@ -34459,10 +34742,10 @@
                   },
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.network_drive.features.FeatureName.INCREMENTAL_SYNC",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.network_drive.features.INCREMENTAL_SYNC",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.INCREMENTAL_SYNC]",
+                    "label": "[INCREMENTAL_SYNC]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -34470,7 +34753,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.network_drive.features.FeatureName.INCREMENTAL_SYNC.enabled",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.network_drive.features.INCREMENTAL_SYNC.enabled",
                         "type": "boolean",
                         "tags": [],
                         "label": "enabled",
@@ -35532,10 +35815,10 @@
                 "children": [
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.notion.features.FeatureName.SYNC_RULES",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.notion.features.SYNC_RULES",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.SYNC_RULES]",
+                    "label": "[SYNC_RULES]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -35543,7 +35826,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.notion.features.FeatureName.SYNC_RULES.advanced",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.notion.features.SYNC_RULES.advanced",
                         "type": "Object",
                         "tags": [],
                         "label": "advanced",
@@ -35554,7 +35837,7 @@
                         "children": [
                           {
                             "parentPluginId": "@kbn/search-connectors",
-                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.notion.features.FeatureName.SYNC_RULES.advanced.enabled",
+                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.notion.features.SYNC_RULES.advanced.enabled",
                             "type": "boolean",
                             "tags": [],
                             "label": "enabled",
@@ -35570,7 +35853,7 @@
                       },
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.notion.features.FeatureName.SYNC_RULES.basic",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.notion.features.SYNC_RULES.basic",
                         "type": "Object",
                         "tags": [],
                         "label": "basic",
@@ -35581,7 +35864,7 @@
                         "children": [
                           {
                             "parentPluginId": "@kbn/search-connectors",
-                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.notion.features.FeatureName.SYNC_RULES.basic.enabled",
+                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.notion.features.SYNC_RULES.basic.enabled",
                             "type": "boolean",
                             "tags": [],
                             "label": "enabled",
@@ -37065,10 +37348,10 @@
                 "children": [
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.onedrive.features.FeatureName.SYNC_RULES",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.onedrive.features.SYNC_RULES",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.SYNC_RULES]",
+                    "label": "[SYNC_RULES]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -37076,7 +37359,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.onedrive.features.FeatureName.SYNC_RULES.advanced",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.onedrive.features.SYNC_RULES.advanced",
                         "type": "Object",
                         "tags": [],
                         "label": "advanced",
@@ -37087,7 +37370,7 @@
                         "children": [
                           {
                             "parentPluginId": "@kbn/search-connectors",
-                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.onedrive.features.FeatureName.SYNC_RULES.advanced.enabled",
+                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.onedrive.features.SYNC_RULES.advanced.enabled",
                             "type": "boolean",
                             "tags": [],
                             "label": "enabled",
@@ -37103,7 +37386,7 @@
                       },
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.onedrive.features.FeatureName.SYNC_RULES.basic",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.onedrive.features.SYNC_RULES.basic",
                         "type": "Object",
                         "tags": [],
                         "label": "basic",
@@ -37114,7 +37397,7 @@
                         "children": [
                           {
                             "parentPluginId": "@kbn/search-connectors",
-                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.onedrive.features.FeatureName.SYNC_RULES.basic.enabled",
+                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.onedrive.features.SYNC_RULES.basic.enabled",
                             "type": "boolean",
                             "tags": [],
                             "label": "enabled",
@@ -37132,10 +37415,10 @@
                   },
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.onedrive.features.FeatureName.DOCUMENT_LEVEL_SECURITY",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.onedrive.features.DOCUMENT_LEVEL_SECURITY",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.DOCUMENT_LEVEL_SECURITY]",
+                    "label": "[DOCUMENT_LEVEL_SECURITY]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -37143,7 +37426,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.onedrive.features.FeatureName.DOCUMENT_LEVEL_SECURITY.enabled",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.onedrive.features.DOCUMENT_LEVEL_SECURITY.enabled",
                         "type": "boolean",
                         "tags": [],
                         "label": "enabled",
@@ -37159,10 +37442,10 @@
                   },
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.onedrive.features.FeatureName.INCREMENTAL_SYNC",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.onedrive.features.INCREMENTAL_SYNC",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.INCREMENTAL_SYNC]",
+                    "label": "[INCREMENTAL_SYNC]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -37170,7 +37453,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.onedrive.features.FeatureName.INCREMENTAL_SYNC.enabled",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.onedrive.features.INCREMENTAL_SYNC.enabled",
                         "type": "boolean",
                         "tags": [],
                         "label": "enabled",
@@ -39373,10 +39656,10 @@
                 "children": [
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.oracle.features.FeatureName.SYNC_RULES",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.oracle.features.SYNC_RULES",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.SYNC_RULES]",
+                    "label": "[SYNC_RULES]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -39384,7 +39667,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.oracle.features.FeatureName.SYNC_RULES.advanced",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.oracle.features.SYNC_RULES.advanced",
                         "type": "Object",
                         "tags": [],
                         "label": "advanced",
@@ -39395,7 +39678,7 @@
                         "children": [
                           {
                             "parentPluginId": "@kbn/search-connectors",
-                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.oracle.features.FeatureName.SYNC_RULES.advanced.enabled",
+                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.oracle.features.SYNC_RULES.advanced.enabled",
                             "type": "boolean",
                             "tags": [],
                             "label": "enabled",
@@ -39411,7 +39694,7 @@
                       },
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.oracle.features.FeatureName.SYNC_RULES.basic",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.oracle.features.SYNC_RULES.basic",
                         "type": "Object",
                         "tags": [],
                         "label": "basic",
@@ -39422,7 +39705,7 @@
                         "children": [
                           {
                             "parentPluginId": "@kbn/search-connectors",
-                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.oracle.features.FeatureName.SYNC_RULES.basic.enabled",
+                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.oracle.features.SYNC_RULES.basic.enabled",
                             "type": "boolean",
                             "tags": [],
                             "label": "enabled",
@@ -42095,10 +42378,10 @@
                 "children": [
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.outlook.features.FeatureName.SYNC_RULES",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.outlook.features.SYNC_RULES",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.SYNC_RULES]",
+                    "label": "[SYNC_RULES]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -42106,7 +42389,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.outlook.features.FeatureName.SYNC_RULES.advanced",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.outlook.features.SYNC_RULES.advanced",
                         "type": "Object",
                         "tags": [],
                         "label": "advanced",
@@ -42117,7 +42400,7 @@
                         "children": [
                           {
                             "parentPluginId": "@kbn/search-connectors",
-                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.outlook.features.FeatureName.SYNC_RULES.advanced.enabled",
+                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.outlook.features.SYNC_RULES.advanced.enabled",
                             "type": "boolean",
                             "tags": [],
                             "label": "enabled",
@@ -42133,7 +42416,7 @@
                       },
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.outlook.features.FeatureName.SYNC_RULES.basic",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.outlook.features.SYNC_RULES.basic",
                         "type": "Object",
                         "tags": [],
                         "label": "basic",
@@ -42144,7 +42427,7 @@
                         "children": [
                           {
                             "parentPluginId": "@kbn/search-connectors",
-                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.outlook.features.FeatureName.SYNC_RULES.basic.enabled",
+                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.outlook.features.SYNC_RULES.basic.enabled",
                             "type": "boolean",
                             "tags": [],
                             "label": "enabled",
@@ -42162,10 +42445,10 @@
                   },
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.outlook.features.FeatureName.DOCUMENT_LEVEL_SECURITY",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.outlook.features.DOCUMENT_LEVEL_SECURITY",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.DOCUMENT_LEVEL_SECURITY]",
+                    "label": "[DOCUMENT_LEVEL_SECURITY]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -42173,7 +42456,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.outlook.features.FeatureName.DOCUMENT_LEVEL_SECURITY.enabled",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.outlook.features.DOCUMENT_LEVEL_SECURITY.enabled",
                         "type": "boolean",
                         "tags": [],
                         "label": "enabled",
@@ -42189,10 +42472,10 @@
                   },
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.outlook.features.FeatureName.INCREMENTAL_SYNC",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.outlook.features.INCREMENTAL_SYNC",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.INCREMENTAL_SYNC]",
+                    "label": "[INCREMENTAL_SYNC]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -42200,7 +42483,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.outlook.features.FeatureName.INCREMENTAL_SYNC.enabled",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.outlook.features.INCREMENTAL_SYNC.enabled",
                         "type": "boolean",
                         "tags": [],
                         "label": "enabled",
@@ -44420,10 +44703,10 @@
                 "children": [
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.postgresql.features.FeatureName.SYNC_RULES",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.postgresql.features.SYNC_RULES",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.SYNC_RULES]",
+                    "label": "[SYNC_RULES]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -44431,7 +44714,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.postgresql.features.FeatureName.SYNC_RULES.advanced",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.postgresql.features.SYNC_RULES.advanced",
                         "type": "Object",
                         "tags": [],
                         "label": "advanced",
@@ -44442,7 +44725,7 @@
                         "children": [
                           {
                             "parentPluginId": "@kbn/search-connectors",
-                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.postgresql.features.FeatureName.SYNC_RULES.advanced.enabled",
+                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.postgresql.features.SYNC_RULES.advanced.enabled",
                             "type": "boolean",
                             "tags": [],
                             "label": "enabled",
@@ -44458,7 +44741,7 @@
                       },
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.postgresql.features.FeatureName.SYNC_RULES.basic",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.postgresql.features.SYNC_RULES.basic",
                         "type": "Object",
                         "tags": [],
                         "label": "basic",
@@ -44469,7 +44752,7 @@
                         "children": [
                           {
                             "parentPluginId": "@kbn/search-connectors",
-                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.postgresql.features.FeatureName.SYNC_RULES.basic.enabled",
+                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.postgresql.features.SYNC_RULES.basic.enabled",
                             "type": "boolean",
                             "tags": [],
                             "label": "enabled",
@@ -46133,10 +46416,10 @@
                 "children": [
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.s3.features.FeatureName.SYNC_RULES",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.s3.features.SYNC_RULES",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.SYNC_RULES]",
+                    "label": "[SYNC_RULES]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -46144,7 +46427,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.s3.features.FeatureName.SYNC_RULES.advanced",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.s3.features.SYNC_RULES.advanced",
                         "type": "Object",
                         "tags": [],
                         "label": "advanced",
@@ -46155,7 +46438,7 @@
                         "children": [
                           {
                             "parentPluginId": "@kbn/search-connectors",
-                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.s3.features.FeatureName.SYNC_RULES.advanced.enabled",
+                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.s3.features.SYNC_RULES.advanced.enabled",
                             "type": "boolean",
                             "tags": [],
                             "label": "enabled",
@@ -46171,7 +46454,7 @@
                       },
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.s3.features.FeatureName.SYNC_RULES.basic",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.s3.features.SYNC_RULES.basic",
                         "type": "Object",
                         "tags": [],
                         "label": "basic",
@@ -46182,7 +46465,7 @@
                         "children": [
                           {
                             "parentPluginId": "@kbn/search-connectors",
-                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.s3.features.FeatureName.SYNC_RULES.basic.enabled",
+                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.s3.features.SYNC_RULES.basic.enabled",
                             "type": "boolean",
                             "tags": [],
                             "label": "enabled",
@@ -46248,10 +46531,10 @@
                 "children": [
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.salesforce.features.FeatureName.SYNC_RULES",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.salesforce.features.SYNC_RULES",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.SYNC_RULES]",
+                    "label": "[SYNC_RULES]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -46259,7 +46542,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.salesforce.features.FeatureName.SYNC_RULES.advanced",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.salesforce.features.SYNC_RULES.advanced",
                         "type": "Object",
                         "tags": [],
                         "label": "advanced",
@@ -46270,7 +46553,7 @@
                         "children": [
                           {
                             "parentPluginId": "@kbn/search-connectors",
-                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.salesforce.features.FeatureName.SYNC_RULES.advanced.enabled",
+                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.salesforce.features.SYNC_RULES.advanced.enabled",
                             "type": "boolean",
                             "tags": [],
                             "label": "enabled",
@@ -46286,7 +46569,7 @@
                       },
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.salesforce.features.FeatureName.SYNC_RULES.basic",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.salesforce.features.SYNC_RULES.basic",
                         "type": "Object",
                         "tags": [],
                         "label": "basic",
@@ -46297,7 +46580,7 @@
                         "children": [
                           {
                             "parentPluginId": "@kbn/search-connectors",
-                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.salesforce.features.FeatureName.SYNC_RULES.basic.enabled",
+                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.salesforce.features.SYNC_RULES.basic.enabled",
                             "type": "boolean",
                             "tags": [],
                             "label": "enabled",
@@ -46315,10 +46598,10 @@
                   },
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.salesforce.features.FeatureName.INCREMENTAL_SYNC",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.salesforce.features.INCREMENTAL_SYNC",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.INCREMENTAL_SYNC]",
+                    "label": "[INCREMENTAL_SYNC]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -46326,7 +46609,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.salesforce.features.FeatureName.INCREMENTAL_SYNC.enabled",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.salesforce.features.INCREMENTAL_SYNC.enabled",
                         "type": "boolean",
                         "tags": [],
                         "label": "enabled",
@@ -48998,10 +49281,10 @@
                 "children": [
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.servicenow.features.FeatureName.SYNC_RULES",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.servicenow.features.SYNC_RULES",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.SYNC_RULES]",
+                    "label": "[SYNC_RULES]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -49009,7 +49292,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.servicenow.features.FeatureName.SYNC_RULES.advanced",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.servicenow.features.SYNC_RULES.advanced",
                         "type": "Object",
                         "tags": [],
                         "label": "advanced",
@@ -49020,7 +49303,7 @@
                         "children": [
                           {
                             "parentPluginId": "@kbn/search-connectors",
-                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.servicenow.features.FeatureName.SYNC_RULES.advanced.enabled",
+                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.servicenow.features.SYNC_RULES.advanced.enabled",
                             "type": "boolean",
                             "tags": [],
                             "label": "enabled",
@@ -49036,7 +49319,7 @@
                       },
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.servicenow.features.FeatureName.SYNC_RULES.basic",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.servicenow.features.SYNC_RULES.basic",
                         "type": "Object",
                         "tags": [],
                         "label": "basic",
@@ -49047,7 +49330,7 @@
                         "children": [
                           {
                             "parentPluginId": "@kbn/search-connectors",
-                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.servicenow.features.FeatureName.SYNC_RULES.basic.enabled",
+                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.servicenow.features.SYNC_RULES.basic.enabled",
                             "type": "boolean",
                             "tags": [],
                             "label": "enabled",
@@ -49065,10 +49348,10 @@
                   },
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.servicenow.features.FeatureName.INCREMENTAL_SYNC",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.servicenow.features.INCREMENTAL_SYNC",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.INCREMENTAL_SYNC]",
+                    "label": "[INCREMENTAL_SYNC]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -49076,7 +49359,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.servicenow.features.FeatureName.INCREMENTAL_SYNC.enabled",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.servicenow.features.INCREMENTAL_SYNC.enabled",
                         "type": "boolean",
                         "tags": [],
                         "label": "enabled",
@@ -51738,10 +52021,10 @@
                 "children": [
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.sharepoint_online.features.FeatureName.SYNC_RULES",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.sharepoint_online.features.SYNC_RULES",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.SYNC_RULES]",
+                    "label": "[SYNC_RULES]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -51749,7 +52032,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.sharepoint_online.features.FeatureName.SYNC_RULES.advanced",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.sharepoint_online.features.SYNC_RULES.advanced",
                         "type": "Object",
                         "tags": [],
                         "label": "advanced",
@@ -51760,7 +52043,7 @@
                         "children": [
                           {
                             "parentPluginId": "@kbn/search-connectors",
-                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.sharepoint_online.features.FeatureName.SYNC_RULES.advanced.enabled",
+                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.sharepoint_online.features.SYNC_RULES.advanced.enabled",
                             "type": "boolean",
                             "tags": [],
                             "label": "enabled",
@@ -51776,7 +52059,7 @@
                       },
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.sharepoint_online.features.FeatureName.SYNC_RULES.basic",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.sharepoint_online.features.SYNC_RULES.basic",
                         "type": "Object",
                         "tags": [],
                         "label": "basic",
@@ -51787,7 +52070,7 @@
                         "children": [
                           {
                             "parentPluginId": "@kbn/search-connectors",
-                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.sharepoint_online.features.FeatureName.SYNC_RULES.basic.enabled",
+                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.sharepoint_online.features.SYNC_RULES.basic.enabled",
                             "type": "boolean",
                             "tags": [],
                             "label": "enabled",
@@ -51805,10 +52088,10 @@
                   },
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.sharepoint_online.features.FeatureName.DOCUMENT_LEVEL_SECURITY",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.sharepoint_online.features.DOCUMENT_LEVEL_SECURITY",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.DOCUMENT_LEVEL_SECURITY]",
+                    "label": "[DOCUMENT_LEVEL_SECURITY]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -51816,7 +52099,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.sharepoint_online.features.FeatureName.DOCUMENT_LEVEL_SECURITY.enabled",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.sharepoint_online.features.DOCUMENT_LEVEL_SECURITY.enabled",
                         "type": "boolean",
                         "tags": [],
                         "label": "enabled",
@@ -51832,10 +52115,10 @@
                   },
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.sharepoint_online.features.FeatureName.INCREMENTAL_SYNC",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.sharepoint_online.features.INCREMENTAL_SYNC",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.INCREMENTAL_SYNC]",
+                    "label": "[INCREMENTAL_SYNC]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -51843,7 +52126,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.sharepoint_online.features.FeatureName.INCREMENTAL_SYNC.enabled",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.sharepoint_online.features.INCREMENTAL_SYNC.enabled",
                         "type": "boolean",
                         "tags": [],
                         "label": "enabled",
@@ -54308,10 +54591,10 @@
                 "children": [
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.sharepoint_server.features.FeatureName.SYNC_RULES",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.sharepoint_server.features.SYNC_RULES",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.SYNC_RULES]",
+                    "label": "[SYNC_RULES]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -54319,7 +54602,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.sharepoint_server.features.FeatureName.SYNC_RULES.advanced",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.sharepoint_server.features.SYNC_RULES.advanced",
                         "type": "Object",
                         "tags": [],
                         "label": "advanced",
@@ -54330,7 +54613,7 @@
                         "children": [
                           {
                             "parentPluginId": "@kbn/search-connectors",
-                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.sharepoint_server.features.FeatureName.SYNC_RULES.advanced.enabled",
+                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.sharepoint_server.features.SYNC_RULES.advanced.enabled",
                             "type": "boolean",
                             "tags": [],
                             "label": "enabled",
@@ -54346,7 +54629,7 @@
                       },
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.sharepoint_server.features.FeatureName.SYNC_RULES.basic",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.sharepoint_server.features.SYNC_RULES.basic",
                         "type": "Object",
                         "tags": [],
                         "label": "basic",
@@ -54357,7 +54640,7 @@
                         "children": [
                           {
                             "parentPluginId": "@kbn/search-connectors",
-                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.sharepoint_server.features.FeatureName.SYNC_RULES.basic.enabled",
+                            "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.sharepoint_server.features.SYNC_RULES.basic.enabled",
                             "type": "boolean",
                             "tags": [],
                             "label": "enabled",
@@ -54375,10 +54658,10 @@
                   },
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.sharepoint_server.features.FeatureName.DOCUMENT_LEVEL_SECURITY",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.sharepoint_server.features.DOCUMENT_LEVEL_SECURITY",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.DOCUMENT_LEVEL_SECURITY]",
+                    "label": "[DOCUMENT_LEVEL_SECURITY]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -54386,7 +54669,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.sharepoint_server.features.FeatureName.DOCUMENT_LEVEL_SECURITY.enabled",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.sharepoint_server.features.DOCUMENT_LEVEL_SECURITY.enabled",
                         "type": "boolean",
                         "tags": [],
                         "label": "enabled",
@@ -54402,10 +54685,10 @@
                   },
                   {
                     "parentPluginId": "@kbn/search-connectors",
-                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.sharepoint_server.features.FeatureName.INCREMENTAL_SYNC",
+                    "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.sharepoint_server.features.INCREMENTAL_SYNC",
                     "type": "Object",
                     "tags": [],
-                    "label": "[FeatureName.INCREMENTAL_SYNC]",
+                    "label": "[INCREMENTAL_SYNC]",
                     "description": [],
                     "path": "packages/kbn-search-connectors/types/native_connectors.ts",
                     "deprecated": false,
@@ -54413,7 +54696,7 @@
                     "children": [
                       {
                         "parentPluginId": "@kbn/search-connectors",
-                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.sharepoint_server.features.FeatureName.INCREMENTAL_SYNC.enabled",
+                        "id": "def-common.NATIVE_CONNECTOR_DEFINITIONS.sharepoint_server.features.INCREMENTAL_SYNC.enabled",
                         "type": "boolean",
                         "tags": [],
                         "label": "enabled",
diff --git a/api_docs/kbn_search_connectors.mdx b/api_docs/kbn_search_connectors.mdx
index c8b6916ebdb62..0ea453c0f3d70 100644
--- a/api_docs/kbn_search_connectors.mdx
+++ b/api_docs/kbn_search_connectors.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-search-connectors
 title: "@kbn/search-connectors"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/search-connectors plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/search-connectors']
 ---
 import kbnSearchConnectorsObj from './kbn_search_connectors.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/search-kibana](https://github.com/orgs/elastic/teams/search-ki
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 3929 | 0 | 3929 | 0 |
+| 3948 | 0 | 3948 | 0 |
 
 ## Common
 
diff --git a/api_docs/kbn_search_errors.mdx b/api_docs/kbn_search_errors.mdx
index d369ed514a92b..ce08b72057587 100644
--- a/api_docs/kbn_search_errors.mdx
+++ b/api_docs/kbn_search_errors.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-search-errors
 title: "@kbn/search-errors"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/search-errors plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/search-errors']
 ---
 import kbnSearchErrorsObj from './kbn_search_errors.devdocs.json';
diff --git a/api_docs/kbn_search_index_documents.mdx b/api_docs/kbn_search_index_documents.mdx
index d530e76851f2a..43164052d7f74 100644
--- a/api_docs/kbn_search_index_documents.mdx
+++ b/api_docs/kbn_search_index_documents.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-search-index-documents
 title: "@kbn/search-index-documents"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/search-index-documents plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/search-index-documents']
 ---
 import kbnSearchIndexDocumentsObj from './kbn_search_index_documents.devdocs.json';
diff --git a/api_docs/kbn_search_response_warnings.mdx b/api_docs/kbn_search_response_warnings.mdx
index 869368f466daa..28a1a3ddc980b 100644
--- a/api_docs/kbn_search_response_warnings.mdx
+++ b/api_docs/kbn_search_response_warnings.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-search-response-warnings
 title: "@kbn/search-response-warnings"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/search-response-warnings plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/search-response-warnings']
 ---
 import kbnSearchResponseWarningsObj from './kbn_search_response_warnings.devdocs.json';
diff --git a/api_docs/kbn_search_shared_ui.mdx b/api_docs/kbn_search_shared_ui.mdx
index dc136dda17461..8c1e8c67b4c5b 100644
--- a/api_docs/kbn_search_shared_ui.mdx
+++ b/api_docs/kbn_search_shared_ui.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-search-shared-ui
 title: "@kbn/search-shared-ui"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/search-shared-ui plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/search-shared-ui']
 ---
 import kbnSearchSharedUiObj from './kbn_search_shared_ui.devdocs.json';
diff --git a/api_docs/kbn_search_types.mdx b/api_docs/kbn_search_types.mdx
index 481fbfd5375cd..63f8267d4da15 100644
--- a/api_docs/kbn_search_types.mdx
+++ b/api_docs/kbn_search_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-search-types
 title: "@kbn/search-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/search-types plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/search-types']
 ---
 import kbnSearchTypesObj from './kbn_search_types.devdocs.json';
diff --git a/api_docs/kbn_security_api_key_management.mdx b/api_docs/kbn_security_api_key_management.mdx
index 96931f0fea706..99728af92d2aa 100644
--- a/api_docs/kbn_security_api_key_management.mdx
+++ b/api_docs/kbn_security_api_key_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-security-api-key-management
 title: "@kbn/security-api-key-management"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/security-api-key-management plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/security-api-key-management']
 ---
 import kbnSecurityApiKeyManagementObj from './kbn_security_api_key_management.devdocs.json';
diff --git a/api_docs/kbn_security_authorization_core.mdx b/api_docs/kbn_security_authorization_core.mdx
index c6b3bd4d39261..a72209cc0e470 100644
--- a/api_docs/kbn_security_authorization_core.mdx
+++ b/api_docs/kbn_security_authorization_core.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-security-authorization-core
 title: "@kbn/security-authorization-core"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/security-authorization-core plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/security-authorization-core']
 ---
 import kbnSecurityAuthorizationCoreObj from './kbn_security_authorization_core.devdocs.json';
diff --git a/api_docs/kbn_security_authorization_core_common.mdx b/api_docs/kbn_security_authorization_core_common.mdx
index f44a8d3599bbd..95e029a2b41c5 100644
--- a/api_docs/kbn_security_authorization_core_common.mdx
+++ b/api_docs/kbn_security_authorization_core_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-security-authorization-core-common
 title: "@kbn/security-authorization-core-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/security-authorization-core-common plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/security-authorization-core-common']
 ---
 import kbnSecurityAuthorizationCoreCommonObj from './kbn_security_authorization_core_common.devdocs.json';
diff --git a/api_docs/kbn_security_form_components.mdx b/api_docs/kbn_security_form_components.mdx
index 3c4c44c30733b..86e4a937103b4 100644
--- a/api_docs/kbn_security_form_components.mdx
+++ b/api_docs/kbn_security_form_components.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-security-form-components
 title: "@kbn/security-form-components"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/security-form-components plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/security-form-components']
 ---
 import kbnSecurityFormComponentsObj from './kbn_security_form_components.devdocs.json';
diff --git a/api_docs/kbn_security_hardening.mdx b/api_docs/kbn_security_hardening.mdx
index 6a154e01e6bb7..229550a07dbac 100644
--- a/api_docs/kbn_security_hardening.mdx
+++ b/api_docs/kbn_security_hardening.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-security-hardening
 title: "@kbn/security-hardening"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/security-hardening plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/security-hardening']
 ---
 import kbnSecurityHardeningObj from './kbn_security_hardening.devdocs.json';
diff --git a/api_docs/kbn_security_plugin_types_common.mdx b/api_docs/kbn_security_plugin_types_common.mdx
index 5be1f300704a7..26925eb820750 100644
--- a/api_docs/kbn_security_plugin_types_common.mdx
+++ b/api_docs/kbn_security_plugin_types_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-security-plugin-types-common
 title: "@kbn/security-plugin-types-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/security-plugin-types-common plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/security-plugin-types-common']
 ---
 import kbnSecurityPluginTypesCommonObj from './kbn_security_plugin_types_common.devdocs.json';
diff --git a/api_docs/kbn_security_plugin_types_public.mdx b/api_docs/kbn_security_plugin_types_public.mdx
index 6e425733fa92f..78878d6d4d74a 100644
--- a/api_docs/kbn_security_plugin_types_public.mdx
+++ b/api_docs/kbn_security_plugin_types_public.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-security-plugin-types-public
 title: "@kbn/security-plugin-types-public"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/security-plugin-types-public plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/security-plugin-types-public']
 ---
 import kbnSecurityPluginTypesPublicObj from './kbn_security_plugin_types_public.devdocs.json';
diff --git a/api_docs/kbn_security_plugin_types_server.devdocs.json b/api_docs/kbn_security_plugin_types_server.devdocs.json
index 4f11b25ee54f1..3594642ab41a3 100644
--- a/api_docs/kbn_security_plugin_types_server.devdocs.json
+++ b/api_docs/kbn_security_plugin_types_server.devdocs.json
@@ -4893,6 +4893,18 @@
                 "plugin": "entityManager",
                 "path": "x-pack/plugins/entity_manager/server/routes/enablement/disable.ts"
               },
+              {
+                "plugin": "apm",
+                "path": "x-pack/plugins/observability_solution/apm/server/lib/helpers/get_random_sampler/index.ts"
+              },
+              {
+                "plugin": "apm",
+                "path": "x-pack/plugins/observability_solution/apm/server/routes/agent_keys/get_agent_keys_privileges.ts"
+              },
+              {
+                "plugin": "apm",
+                "path": "x-pack/plugins/observability_solution/apm/server/routes/fleet/is_superuser.ts"
+              },
               {
                 "plugin": "serverlessSearch",
                 "path": "x-pack/plugins/serverless_search/server/routes/api_key_routes.ts"
@@ -4913,18 +4925,6 @@
                 "plugin": "upgradeAssistant",
                 "path": "x-pack/plugins/upgrade_assistant/server/lib/reindexing/credential_store.ts"
               },
-              {
-                "plugin": "apm",
-                "path": "x-pack/plugins/observability_solution/apm/server/lib/helpers/get_random_sampler/index.ts"
-              },
-              {
-                "plugin": "apm",
-                "path": "x-pack/plugins/observability_solution/apm/server/routes/agent_keys/get_agent_keys_privileges.ts"
-              },
-              {
-                "plugin": "apm",
-                "path": "x-pack/plugins/observability_solution/apm/server/routes/fleet/is_superuser.ts"
-              },
               {
                 "plugin": "synthetics",
                 "path": "x-pack/plugins/observability_solution/synthetics/server/synthetics_service/get_api_key.ts"
diff --git a/api_docs/kbn_security_plugin_types_server.mdx b/api_docs/kbn_security_plugin_types_server.mdx
index 400dd93aa8bc0..c50c8a6ec69c9 100644
--- a/api_docs/kbn_security_plugin_types_server.mdx
+++ b/api_docs/kbn_security_plugin_types_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-security-plugin-types-server
 title: "@kbn/security-plugin-types-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/security-plugin-types-server plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/security-plugin-types-server']
 ---
 import kbnSecurityPluginTypesServerObj from './kbn_security_plugin_types_server.devdocs.json';
diff --git a/api_docs/kbn_security_role_management_model.mdx b/api_docs/kbn_security_role_management_model.mdx
index 40a1a68029630..0844579025715 100644
--- a/api_docs/kbn_security_role_management_model.mdx
+++ b/api_docs/kbn_security_role_management_model.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-security-role-management-model
 title: "@kbn/security-role-management-model"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/security-role-management-model plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/security-role-management-model']
 ---
 import kbnSecurityRoleManagementModelObj from './kbn_security_role_management_model.devdocs.json';
diff --git a/api_docs/kbn_security_solution_distribution_bar.mdx b/api_docs/kbn_security_solution_distribution_bar.mdx
index 6adbc3609f422..4809d28d886c8 100644
--- a/api_docs/kbn_security_solution_distribution_bar.mdx
+++ b/api_docs/kbn_security_solution_distribution_bar.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-security-solution-distribution-bar
 title: "@kbn/security-solution-distribution-bar"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/security-solution-distribution-bar plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/security-solution-distribution-bar']
 ---
 import kbnSecuritySolutionDistributionBarObj from './kbn_security_solution_distribution_bar.devdocs.json';
diff --git a/api_docs/kbn_security_solution_features.mdx b/api_docs/kbn_security_solution_features.mdx
index 9d72a9eb57fff..8b0b3ef9b497c 100644
--- a/api_docs/kbn_security_solution_features.mdx
+++ b/api_docs/kbn_security_solution_features.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-security-solution-features
 title: "@kbn/security-solution-features"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/security-solution-features plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/security-solution-features']
 ---
 import kbnSecuritySolutionFeaturesObj from './kbn_security_solution_features.devdocs.json';
diff --git a/api_docs/kbn_security_solution_navigation.mdx b/api_docs/kbn_security_solution_navigation.mdx
index 6eafdf73a63cc..77b79630ace35 100644
--- a/api_docs/kbn_security_solution_navigation.mdx
+++ b/api_docs/kbn_security_solution_navigation.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-security-solution-navigation
 title: "@kbn/security-solution-navigation"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/security-solution-navigation plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/security-solution-navigation']
 ---
 import kbnSecuritySolutionNavigationObj from './kbn_security_solution_navigation.devdocs.json';
diff --git a/api_docs/kbn_security_solution_side_nav.mdx b/api_docs/kbn_security_solution_side_nav.mdx
index 377d20c278ead..3bf7a243ba575 100644
--- a/api_docs/kbn_security_solution_side_nav.mdx
+++ b/api_docs/kbn_security_solution_side_nav.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-security-solution-side-nav
 title: "@kbn/security-solution-side-nav"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/security-solution-side-nav plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/security-solution-side-nav']
 ---
 import kbnSecuritySolutionSideNavObj from './kbn_security_solution_side_nav.devdocs.json';
diff --git a/api_docs/kbn_security_solution_storybook_config.mdx b/api_docs/kbn_security_solution_storybook_config.mdx
index 35d22a6270ee1..d3e4ea856ad2c 100644
--- a/api_docs/kbn_security_solution_storybook_config.mdx
+++ b/api_docs/kbn_security_solution_storybook_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-security-solution-storybook-config
 title: "@kbn/security-solution-storybook-config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/security-solution-storybook-config plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/security-solution-storybook-config']
 ---
 import kbnSecuritySolutionStorybookConfigObj from './kbn_security_solution_storybook_config.devdocs.json';
diff --git a/api_docs/kbn_security_ui_components.mdx b/api_docs/kbn_security_ui_components.mdx
index 75135bcfbdd16..06e1333005051 100644
--- a/api_docs/kbn_security_ui_components.mdx
+++ b/api_docs/kbn_security_ui_components.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-security-ui-components
 title: "@kbn/security-ui-components"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/security-ui-components plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/security-ui-components']
 ---
 import kbnSecurityUiComponentsObj from './kbn_security_ui_components.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_autocomplete.mdx b/api_docs/kbn_securitysolution_autocomplete.mdx
index dbfc948ee9098..8865deb710438 100644
--- a/api_docs/kbn_securitysolution_autocomplete.mdx
+++ b/api_docs/kbn_securitysolution_autocomplete.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-autocomplete
 title: "@kbn/securitysolution-autocomplete"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-autocomplete plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-autocomplete']
 ---
 import kbnSecuritysolutionAutocompleteObj from './kbn_securitysolution_autocomplete.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_data_table.mdx b/api_docs/kbn_securitysolution_data_table.mdx
index c0c8cdbfc6603..76602b1431a6f 100644
--- a/api_docs/kbn_securitysolution_data_table.mdx
+++ b/api_docs/kbn_securitysolution_data_table.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-data-table
 title: "@kbn/securitysolution-data-table"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-data-table plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-data-table']
 ---
 import kbnSecuritysolutionDataTableObj from './kbn_securitysolution_data_table.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_ecs.mdx b/api_docs/kbn_securitysolution_ecs.mdx
index 83fc583bce93b..532ee0f8eb03e 100644
--- a/api_docs/kbn_securitysolution_ecs.mdx
+++ b/api_docs/kbn_securitysolution_ecs.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-ecs
 title: "@kbn/securitysolution-ecs"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-ecs plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-ecs']
 ---
 import kbnSecuritysolutionEcsObj from './kbn_securitysolution_ecs.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_es_utils.mdx b/api_docs/kbn_securitysolution_es_utils.mdx
index 3f0fd5c701c95..f7f65c15822cb 100644
--- a/api_docs/kbn_securitysolution_es_utils.mdx
+++ b/api_docs/kbn_securitysolution_es_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-es-utils
 title: "@kbn/securitysolution-es-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-es-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-es-utils']
 ---
 import kbnSecuritysolutionEsUtilsObj from './kbn_securitysolution_es_utils.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_exception_list_components.mdx b/api_docs/kbn_securitysolution_exception_list_components.mdx
index 1028bb381817b..726e95acea96f 100644
--- a/api_docs/kbn_securitysolution_exception_list_components.mdx
+++ b/api_docs/kbn_securitysolution_exception_list_components.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-exception-list-components
 title: "@kbn/securitysolution-exception-list-components"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-exception-list-components plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-exception-list-components']
 ---
 import kbnSecuritysolutionExceptionListComponentsObj from './kbn_securitysolution_exception_list_components.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_hook_utils.mdx b/api_docs/kbn_securitysolution_hook_utils.mdx
index 4bcfb6c90f2a0..c1ec3cb5e2123 100644
--- a/api_docs/kbn_securitysolution_hook_utils.mdx
+++ b/api_docs/kbn_securitysolution_hook_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-hook-utils
 title: "@kbn/securitysolution-hook-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-hook-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-hook-utils']
 ---
 import kbnSecuritysolutionHookUtilsObj from './kbn_securitysolution_hook_utils.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_io_ts_alerting_types.mdx b/api_docs/kbn_securitysolution_io_ts_alerting_types.mdx
index 0ae565cddeb47..6ecbef36bf272 100644
--- a/api_docs/kbn_securitysolution_io_ts_alerting_types.mdx
+++ b/api_docs/kbn_securitysolution_io_ts_alerting_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-io-ts-alerting-types
 title: "@kbn/securitysolution-io-ts-alerting-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-io-ts-alerting-types plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-io-ts-alerting-types']
 ---
 import kbnSecuritysolutionIoTsAlertingTypesObj from './kbn_securitysolution_io_ts_alerting_types.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_io_ts_list_types.mdx b/api_docs/kbn_securitysolution_io_ts_list_types.mdx
index 61d41965abe64..839c9906ab0e2 100644
--- a/api_docs/kbn_securitysolution_io_ts_list_types.mdx
+++ b/api_docs/kbn_securitysolution_io_ts_list_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-io-ts-list-types
 title: "@kbn/securitysolution-io-ts-list-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-io-ts-list-types plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-io-ts-list-types']
 ---
 import kbnSecuritysolutionIoTsListTypesObj from './kbn_securitysolution_io_ts_list_types.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_io_ts_types.mdx b/api_docs/kbn_securitysolution_io_ts_types.mdx
index 4cc35362ecf0a..031d4a39a8493 100644
--- a/api_docs/kbn_securitysolution_io_ts_types.mdx
+++ b/api_docs/kbn_securitysolution_io_ts_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-io-ts-types
 title: "@kbn/securitysolution-io-ts-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-io-ts-types plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-io-ts-types']
 ---
 import kbnSecuritysolutionIoTsTypesObj from './kbn_securitysolution_io_ts_types.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_io_ts_utils.mdx b/api_docs/kbn_securitysolution_io_ts_utils.mdx
index 976f83ddc0c37..d83faffb055da 100644
--- a/api_docs/kbn_securitysolution_io_ts_utils.mdx
+++ b/api_docs/kbn_securitysolution_io_ts_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-io-ts-utils
 title: "@kbn/securitysolution-io-ts-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-io-ts-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-io-ts-utils']
 ---
 import kbnSecuritysolutionIoTsUtilsObj from './kbn_securitysolution_io_ts_utils.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_list_api.mdx b/api_docs/kbn_securitysolution_list_api.mdx
index 855c71e98b92d..c0ee15b2dea4d 100644
--- a/api_docs/kbn_securitysolution_list_api.mdx
+++ b/api_docs/kbn_securitysolution_list_api.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-list-api
 title: "@kbn/securitysolution-list-api"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-list-api plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-list-api']
 ---
 import kbnSecuritysolutionListApiObj from './kbn_securitysolution_list_api.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_list_constants.mdx b/api_docs/kbn_securitysolution_list_constants.mdx
index 759611721e017..80f5dd5133780 100644
--- a/api_docs/kbn_securitysolution_list_constants.mdx
+++ b/api_docs/kbn_securitysolution_list_constants.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-list-constants
 title: "@kbn/securitysolution-list-constants"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-list-constants plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-list-constants']
 ---
 import kbnSecuritysolutionListConstantsObj from './kbn_securitysolution_list_constants.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_list_hooks.mdx b/api_docs/kbn_securitysolution_list_hooks.mdx
index 6241e6c6fb2e0..deeafbd80ced0 100644
--- a/api_docs/kbn_securitysolution_list_hooks.mdx
+++ b/api_docs/kbn_securitysolution_list_hooks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-list-hooks
 title: "@kbn/securitysolution-list-hooks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-list-hooks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-list-hooks']
 ---
 import kbnSecuritysolutionListHooksObj from './kbn_securitysolution_list_hooks.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_list_utils.mdx b/api_docs/kbn_securitysolution_list_utils.mdx
index ca7aecda1a625..c3bb70b698051 100644
--- a/api_docs/kbn_securitysolution_list_utils.mdx
+++ b/api_docs/kbn_securitysolution_list_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-list-utils
 title: "@kbn/securitysolution-list-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-list-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-list-utils']
 ---
 import kbnSecuritysolutionListUtilsObj from './kbn_securitysolution_list_utils.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_rules.mdx b/api_docs/kbn_securitysolution_rules.mdx
index 3ddce42840850..2313e3c5493ad 100644
--- a/api_docs/kbn_securitysolution_rules.mdx
+++ b/api_docs/kbn_securitysolution_rules.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-rules
 title: "@kbn/securitysolution-rules"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-rules plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-rules']
 ---
 import kbnSecuritysolutionRulesObj from './kbn_securitysolution_rules.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_t_grid.mdx b/api_docs/kbn_securitysolution_t_grid.mdx
index 035ab489bd772..c9977d9282618 100644
--- a/api_docs/kbn_securitysolution_t_grid.mdx
+++ b/api_docs/kbn_securitysolution_t_grid.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-t-grid
 title: "@kbn/securitysolution-t-grid"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-t-grid plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-t-grid']
 ---
 import kbnSecuritysolutionTGridObj from './kbn_securitysolution_t_grid.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_utils.mdx b/api_docs/kbn_securitysolution_utils.mdx
index c46d0c4b15897..2525cb03fd9f5 100644
--- a/api_docs/kbn_securitysolution_utils.mdx
+++ b/api_docs/kbn_securitysolution_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-utils
 title: "@kbn/securitysolution-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-utils']
 ---
 import kbnSecuritysolutionUtilsObj from './kbn_securitysolution_utils.devdocs.json';
diff --git a/api_docs/kbn_server_http_tools.mdx b/api_docs/kbn_server_http_tools.mdx
index 3a0a2fa8f40bc..5f6832896561b 100644
--- a/api_docs/kbn_server_http_tools.mdx
+++ b/api_docs/kbn_server_http_tools.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-server-http-tools
 title: "@kbn/server-http-tools"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/server-http-tools plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/server-http-tools']
 ---
 import kbnServerHttpToolsObj from './kbn_server_http_tools.devdocs.json';
diff --git a/api_docs/kbn_server_route_repository.mdx b/api_docs/kbn_server_route_repository.mdx
index 41b597ed16dd7..ece8a7f44b81c 100644
--- a/api_docs/kbn_server_route_repository.mdx
+++ b/api_docs/kbn_server_route_repository.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-server-route-repository
 title: "@kbn/server-route-repository"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/server-route-repository plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/server-route-repository']
 ---
 import kbnServerRouteRepositoryObj from './kbn_server_route_repository.devdocs.json';
diff --git a/api_docs/kbn_server_route_repository_client.mdx b/api_docs/kbn_server_route_repository_client.mdx
index 7f951a2310f41..660b9b365ba63 100644
--- a/api_docs/kbn_server_route_repository_client.mdx
+++ b/api_docs/kbn_server_route_repository_client.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-server-route-repository-client
 title: "@kbn/server-route-repository-client"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/server-route-repository-client plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/server-route-repository-client']
 ---
 import kbnServerRouteRepositoryClientObj from './kbn_server_route_repository_client.devdocs.json';
diff --git a/api_docs/kbn_server_route_repository_utils.mdx b/api_docs/kbn_server_route_repository_utils.mdx
index 19e80a910578f..8ccc2bcbc308d 100644
--- a/api_docs/kbn_server_route_repository_utils.mdx
+++ b/api_docs/kbn_server_route_repository_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-server-route-repository-utils
 title: "@kbn/server-route-repository-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/server-route-repository-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/server-route-repository-utils']
 ---
 import kbnServerRouteRepositoryUtilsObj from './kbn_server_route_repository_utils.devdocs.json';
diff --git a/api_docs/kbn_serverless_common_settings.mdx b/api_docs/kbn_serverless_common_settings.mdx
index 69a691e2cd737..98ca8ec263c5c 100644
--- a/api_docs/kbn_serverless_common_settings.mdx
+++ b/api_docs/kbn_serverless_common_settings.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-serverless-common-settings
 title: "@kbn/serverless-common-settings"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/serverless-common-settings plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/serverless-common-settings']
 ---
 import kbnServerlessCommonSettingsObj from './kbn_serverless_common_settings.devdocs.json';
diff --git a/api_docs/kbn_serverless_observability_settings.mdx b/api_docs/kbn_serverless_observability_settings.mdx
index 84e00c6b9ab6b..16ebbbbd53f62 100644
--- a/api_docs/kbn_serverless_observability_settings.mdx
+++ b/api_docs/kbn_serverless_observability_settings.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-serverless-observability-settings
 title: "@kbn/serverless-observability-settings"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/serverless-observability-settings plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/serverless-observability-settings']
 ---
 import kbnServerlessObservabilitySettingsObj from './kbn_serverless_observability_settings.devdocs.json';
diff --git a/api_docs/kbn_serverless_project_switcher.mdx b/api_docs/kbn_serverless_project_switcher.mdx
index 15bfaeba3fd1a..9b2859e130be5 100644
--- a/api_docs/kbn_serverless_project_switcher.mdx
+++ b/api_docs/kbn_serverless_project_switcher.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-serverless-project-switcher
 title: "@kbn/serverless-project-switcher"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/serverless-project-switcher plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/serverless-project-switcher']
 ---
 import kbnServerlessProjectSwitcherObj from './kbn_serverless_project_switcher.devdocs.json';
diff --git a/api_docs/kbn_serverless_search_settings.mdx b/api_docs/kbn_serverless_search_settings.mdx
index afdb4a89c3180..1a5f60e43478a 100644
--- a/api_docs/kbn_serverless_search_settings.mdx
+++ b/api_docs/kbn_serverless_search_settings.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-serverless-search-settings
 title: "@kbn/serverless-search-settings"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/serverless-search-settings plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/serverless-search-settings']
 ---
 import kbnServerlessSearchSettingsObj from './kbn_serverless_search_settings.devdocs.json';
diff --git a/api_docs/kbn_serverless_security_settings.mdx b/api_docs/kbn_serverless_security_settings.mdx
index 5123a940060ed..84805aece36d5 100644
--- a/api_docs/kbn_serverless_security_settings.mdx
+++ b/api_docs/kbn_serverless_security_settings.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-serverless-security-settings
 title: "@kbn/serverless-security-settings"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/serverless-security-settings plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/serverless-security-settings']
 ---
 import kbnServerlessSecuritySettingsObj from './kbn_serverless_security_settings.devdocs.json';
diff --git a/api_docs/kbn_serverless_storybook_config.mdx b/api_docs/kbn_serverless_storybook_config.mdx
index 7c9645ac3490e..5627c32199958 100644
--- a/api_docs/kbn_serverless_storybook_config.mdx
+++ b/api_docs/kbn_serverless_storybook_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-serverless-storybook-config
 title: "@kbn/serverless-storybook-config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/serverless-storybook-config plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/serverless-storybook-config']
 ---
 import kbnServerlessStorybookConfigObj from './kbn_serverless_storybook_config.devdocs.json';
diff --git a/api_docs/kbn_shared_svg.mdx b/api_docs/kbn_shared_svg.mdx
index 4b94e71039846..f9a0bbe1facb5 100644
--- a/api_docs/kbn_shared_svg.mdx
+++ b/api_docs/kbn_shared_svg.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-svg
 title: "@kbn/shared-svg"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-svg plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-svg']
 ---
 import kbnSharedSvgObj from './kbn_shared_svg.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_avatar_solution.mdx b/api_docs/kbn_shared_ux_avatar_solution.mdx
index db6c2f408a58d..1c99a51b54882 100644
--- a/api_docs/kbn_shared_ux_avatar_solution.mdx
+++ b/api_docs/kbn_shared_ux_avatar_solution.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-avatar-solution
 title: "@kbn/shared-ux-avatar-solution"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-avatar-solution plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-avatar-solution']
 ---
 import kbnSharedUxAvatarSolutionObj from './kbn_shared_ux_avatar_solution.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_button_exit_full_screen.mdx b/api_docs/kbn_shared_ux_button_exit_full_screen.mdx
index 94bc572325e5a..91f2fc1e7d50f 100644
--- a/api_docs/kbn_shared_ux_button_exit_full_screen.mdx
+++ b/api_docs/kbn_shared_ux_button_exit_full_screen.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-button-exit-full-screen
 title: "@kbn/shared-ux-button-exit-full-screen"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-button-exit-full-screen plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-button-exit-full-screen']
 ---
 import kbnSharedUxButtonExitFullScreenObj from './kbn_shared_ux_button_exit_full_screen.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_button_toolbar.mdx b/api_docs/kbn_shared_ux_button_toolbar.mdx
index 88b20f452e3be..850148d8c2bdc 100644
--- a/api_docs/kbn_shared_ux_button_toolbar.mdx
+++ b/api_docs/kbn_shared_ux_button_toolbar.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-button-toolbar
 title: "@kbn/shared-ux-button-toolbar"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-button-toolbar plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-button-toolbar']
 ---
 import kbnSharedUxButtonToolbarObj from './kbn_shared_ux_button_toolbar.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_card_no_data.mdx b/api_docs/kbn_shared_ux_card_no_data.mdx
index 344476d7df5a6..e4e11a1a8784c 100644
--- a/api_docs/kbn_shared_ux_card_no_data.mdx
+++ b/api_docs/kbn_shared_ux_card_no_data.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-card-no-data
 title: "@kbn/shared-ux-card-no-data"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-card-no-data plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-card-no-data']
 ---
 import kbnSharedUxCardNoDataObj from './kbn_shared_ux_card_no_data.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_card_no_data_mocks.mdx b/api_docs/kbn_shared_ux_card_no_data_mocks.mdx
index e519675c45674..200cbfd26df9c 100644
--- a/api_docs/kbn_shared_ux_card_no_data_mocks.mdx
+++ b/api_docs/kbn_shared_ux_card_no_data_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-card-no-data-mocks
 title: "@kbn/shared-ux-card-no-data-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-card-no-data-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-card-no-data-mocks']
 ---
 import kbnSharedUxCardNoDataMocksObj from './kbn_shared_ux_card_no_data_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_chrome_navigation.mdx b/api_docs/kbn_shared_ux_chrome_navigation.mdx
index a52d43012c3d9..1685fe6df0b53 100644
--- a/api_docs/kbn_shared_ux_chrome_navigation.mdx
+++ b/api_docs/kbn_shared_ux_chrome_navigation.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-chrome-navigation
 title: "@kbn/shared-ux-chrome-navigation"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-chrome-navigation plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-chrome-navigation']
 ---
 import kbnSharedUxChromeNavigationObj from './kbn_shared_ux_chrome_navigation.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_error_boundary.mdx b/api_docs/kbn_shared_ux_error_boundary.mdx
index 4fa9c5672463e..6dbe0b5a39e44 100644
--- a/api_docs/kbn_shared_ux_error_boundary.mdx
+++ b/api_docs/kbn_shared_ux_error_boundary.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-error-boundary
 title: "@kbn/shared-ux-error-boundary"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-error-boundary plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-error-boundary']
 ---
 import kbnSharedUxErrorBoundaryObj from './kbn_shared_ux_error_boundary.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_file_context.mdx b/api_docs/kbn_shared_ux_file_context.mdx
index ae27ff8ac0083..27a35b4210b7d 100644
--- a/api_docs/kbn_shared_ux_file_context.mdx
+++ b/api_docs/kbn_shared_ux_file_context.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-file-context
 title: "@kbn/shared-ux-file-context"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-file-context plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-file-context']
 ---
 import kbnSharedUxFileContextObj from './kbn_shared_ux_file_context.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_file_image.mdx b/api_docs/kbn_shared_ux_file_image.mdx
index bd5812d9dfcee..29d1952fb3e80 100644
--- a/api_docs/kbn_shared_ux_file_image.mdx
+++ b/api_docs/kbn_shared_ux_file_image.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-file-image
 title: "@kbn/shared-ux-file-image"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-file-image plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-file-image']
 ---
 import kbnSharedUxFileImageObj from './kbn_shared_ux_file_image.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_file_image_mocks.mdx b/api_docs/kbn_shared_ux_file_image_mocks.mdx
index 937eddd875908..4b1359de3b7ce 100644
--- a/api_docs/kbn_shared_ux_file_image_mocks.mdx
+++ b/api_docs/kbn_shared_ux_file_image_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-file-image-mocks
 title: "@kbn/shared-ux-file-image-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-file-image-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-file-image-mocks']
 ---
 import kbnSharedUxFileImageMocksObj from './kbn_shared_ux_file_image_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_file_mocks.mdx b/api_docs/kbn_shared_ux_file_mocks.mdx
index 29b25087063db..e4a13498b25af 100644
--- a/api_docs/kbn_shared_ux_file_mocks.mdx
+++ b/api_docs/kbn_shared_ux_file_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-file-mocks
 title: "@kbn/shared-ux-file-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-file-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-file-mocks']
 ---
 import kbnSharedUxFileMocksObj from './kbn_shared_ux_file_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_file_picker.mdx b/api_docs/kbn_shared_ux_file_picker.mdx
index 70f7bec5e123f..9186b2b11ed89 100644
--- a/api_docs/kbn_shared_ux_file_picker.mdx
+++ b/api_docs/kbn_shared_ux_file_picker.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-file-picker
 title: "@kbn/shared-ux-file-picker"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-file-picker plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-file-picker']
 ---
 import kbnSharedUxFilePickerObj from './kbn_shared_ux_file_picker.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_file_types.mdx b/api_docs/kbn_shared_ux_file_types.mdx
index 8636050cd9488..14dc7acac1d6e 100644
--- a/api_docs/kbn_shared_ux_file_types.mdx
+++ b/api_docs/kbn_shared_ux_file_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-file-types
 title: "@kbn/shared-ux-file-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-file-types plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-file-types']
 ---
 import kbnSharedUxFileTypesObj from './kbn_shared_ux_file_types.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_file_upload.mdx b/api_docs/kbn_shared_ux_file_upload.mdx
index a8e80dbe66eae..77afd36e42195 100644
--- a/api_docs/kbn_shared_ux_file_upload.mdx
+++ b/api_docs/kbn_shared_ux_file_upload.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-file-upload
 title: "@kbn/shared-ux-file-upload"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-file-upload plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-file-upload']
 ---
 import kbnSharedUxFileUploadObj from './kbn_shared_ux_file_upload.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_file_util.mdx b/api_docs/kbn_shared_ux_file_util.mdx
index c569f3cf369e2..93aba535ea91f 100644
--- a/api_docs/kbn_shared_ux_file_util.mdx
+++ b/api_docs/kbn_shared_ux_file_util.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-file-util
 title: "@kbn/shared-ux-file-util"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-file-util plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-file-util']
 ---
 import kbnSharedUxFileUtilObj from './kbn_shared_ux_file_util.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_link_redirect_app.mdx b/api_docs/kbn_shared_ux_link_redirect_app.mdx
index 2ddd4eb7103ee..d9e6d2326533a 100644
--- a/api_docs/kbn_shared_ux_link_redirect_app.mdx
+++ b/api_docs/kbn_shared_ux_link_redirect_app.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-link-redirect-app
 title: "@kbn/shared-ux-link-redirect-app"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-link-redirect-app plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-link-redirect-app']
 ---
 import kbnSharedUxLinkRedirectAppObj from './kbn_shared_ux_link_redirect_app.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_link_redirect_app_mocks.mdx b/api_docs/kbn_shared_ux_link_redirect_app_mocks.mdx
index 1e6d2f7b466c2..e42fec678c829 100644
--- a/api_docs/kbn_shared_ux_link_redirect_app_mocks.mdx
+++ b/api_docs/kbn_shared_ux_link_redirect_app_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-link-redirect-app-mocks
 title: "@kbn/shared-ux-link-redirect-app-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-link-redirect-app-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-link-redirect-app-mocks']
 ---
 import kbnSharedUxLinkRedirectAppMocksObj from './kbn_shared_ux_link_redirect_app_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_markdown.mdx b/api_docs/kbn_shared_ux_markdown.mdx
index 53afc6aaf71fd..9df5a51b49712 100644
--- a/api_docs/kbn_shared_ux_markdown.mdx
+++ b/api_docs/kbn_shared_ux_markdown.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-markdown
 title: "@kbn/shared-ux-markdown"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-markdown plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-markdown']
 ---
 import kbnSharedUxMarkdownObj from './kbn_shared_ux_markdown.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_markdown_mocks.mdx b/api_docs/kbn_shared_ux_markdown_mocks.mdx
index 6a6e4d64a47ef..fb2f5a8671648 100644
--- a/api_docs/kbn_shared_ux_markdown_mocks.mdx
+++ b/api_docs/kbn_shared_ux_markdown_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-markdown-mocks
 title: "@kbn/shared-ux-markdown-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-markdown-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-markdown-mocks']
 ---
 import kbnSharedUxMarkdownMocksObj from './kbn_shared_ux_markdown_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_analytics_no_data.mdx b/api_docs/kbn_shared_ux_page_analytics_no_data.mdx
index 8e79713a94a19..47e864568a72e 100644
--- a/api_docs/kbn_shared_ux_page_analytics_no_data.mdx
+++ b/api_docs/kbn_shared_ux_page_analytics_no_data.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-analytics-no-data
 title: "@kbn/shared-ux-page-analytics-no-data"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-analytics-no-data plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-analytics-no-data']
 ---
 import kbnSharedUxPageAnalyticsNoDataObj from './kbn_shared_ux_page_analytics_no_data.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_analytics_no_data_mocks.mdx b/api_docs/kbn_shared_ux_page_analytics_no_data_mocks.mdx
index b15884536e734..8f6e3ed4ff207 100644
--- a/api_docs/kbn_shared_ux_page_analytics_no_data_mocks.mdx
+++ b/api_docs/kbn_shared_ux_page_analytics_no_data_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-analytics-no-data-mocks
 title: "@kbn/shared-ux-page-analytics-no-data-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-analytics-no-data-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-analytics-no-data-mocks']
 ---
 import kbnSharedUxPageAnalyticsNoDataMocksObj from './kbn_shared_ux_page_analytics_no_data_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_kibana_no_data.mdx b/api_docs/kbn_shared_ux_page_kibana_no_data.mdx
index e69890fa9cd50..8d72cc1e23c0e 100644
--- a/api_docs/kbn_shared_ux_page_kibana_no_data.mdx
+++ b/api_docs/kbn_shared_ux_page_kibana_no_data.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-kibana-no-data
 title: "@kbn/shared-ux-page-kibana-no-data"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-kibana-no-data plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-kibana-no-data']
 ---
 import kbnSharedUxPageKibanaNoDataObj from './kbn_shared_ux_page_kibana_no_data.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_kibana_no_data_mocks.mdx b/api_docs/kbn_shared_ux_page_kibana_no_data_mocks.mdx
index 792613dfd5f2c..6587331d5e073 100644
--- a/api_docs/kbn_shared_ux_page_kibana_no_data_mocks.mdx
+++ b/api_docs/kbn_shared_ux_page_kibana_no_data_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-kibana-no-data-mocks
 title: "@kbn/shared-ux-page-kibana-no-data-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-kibana-no-data-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-kibana-no-data-mocks']
 ---
 import kbnSharedUxPageKibanaNoDataMocksObj from './kbn_shared_ux_page_kibana_no_data_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_kibana_template.mdx b/api_docs/kbn_shared_ux_page_kibana_template.mdx
index f24be08232cac..19b6d03ea8d8a 100644
--- a/api_docs/kbn_shared_ux_page_kibana_template.mdx
+++ b/api_docs/kbn_shared_ux_page_kibana_template.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-kibana-template
 title: "@kbn/shared-ux-page-kibana-template"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-kibana-template plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-kibana-template']
 ---
 import kbnSharedUxPageKibanaTemplateObj from './kbn_shared_ux_page_kibana_template.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_kibana_template_mocks.mdx b/api_docs/kbn_shared_ux_page_kibana_template_mocks.mdx
index 63acf1a59daaf..f360173b1f49d 100644
--- a/api_docs/kbn_shared_ux_page_kibana_template_mocks.mdx
+++ b/api_docs/kbn_shared_ux_page_kibana_template_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-kibana-template-mocks
 title: "@kbn/shared-ux-page-kibana-template-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-kibana-template-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-kibana-template-mocks']
 ---
 import kbnSharedUxPageKibanaTemplateMocksObj from './kbn_shared_ux_page_kibana_template_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_no_data.mdx b/api_docs/kbn_shared_ux_page_no_data.mdx
index d53e2ac453477..7f6c48e33035e 100644
--- a/api_docs/kbn_shared_ux_page_no_data.mdx
+++ b/api_docs/kbn_shared_ux_page_no_data.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-no-data
 title: "@kbn/shared-ux-page-no-data"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-no-data plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-no-data']
 ---
 import kbnSharedUxPageNoDataObj from './kbn_shared_ux_page_no_data.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_no_data_config.mdx b/api_docs/kbn_shared_ux_page_no_data_config.mdx
index e1e84bd59d253..b5f7bfecd1f95 100644
--- a/api_docs/kbn_shared_ux_page_no_data_config.mdx
+++ b/api_docs/kbn_shared_ux_page_no_data_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-no-data-config
 title: "@kbn/shared-ux-page-no-data-config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-no-data-config plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-no-data-config']
 ---
 import kbnSharedUxPageNoDataConfigObj from './kbn_shared_ux_page_no_data_config.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_no_data_config_mocks.mdx b/api_docs/kbn_shared_ux_page_no_data_config_mocks.mdx
index 79d1118a07eb5..8bb1e177bd7ad 100644
--- a/api_docs/kbn_shared_ux_page_no_data_config_mocks.mdx
+++ b/api_docs/kbn_shared_ux_page_no_data_config_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-no-data-config-mocks
 title: "@kbn/shared-ux-page-no-data-config-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-no-data-config-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-no-data-config-mocks']
 ---
 import kbnSharedUxPageNoDataConfigMocksObj from './kbn_shared_ux_page_no_data_config_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_no_data_mocks.mdx b/api_docs/kbn_shared_ux_page_no_data_mocks.mdx
index c9c1cfc96348e..cbe7b05cffaca 100644
--- a/api_docs/kbn_shared_ux_page_no_data_mocks.mdx
+++ b/api_docs/kbn_shared_ux_page_no_data_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-no-data-mocks
 title: "@kbn/shared-ux-page-no-data-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-no-data-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-no-data-mocks']
 ---
 import kbnSharedUxPageNoDataMocksObj from './kbn_shared_ux_page_no_data_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_solution_nav.mdx b/api_docs/kbn_shared_ux_page_solution_nav.mdx
index 275385b079840..cca298bb6c02c 100644
--- a/api_docs/kbn_shared_ux_page_solution_nav.mdx
+++ b/api_docs/kbn_shared_ux_page_solution_nav.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-solution-nav
 title: "@kbn/shared-ux-page-solution-nav"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-solution-nav plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-solution-nav']
 ---
 import kbnSharedUxPageSolutionNavObj from './kbn_shared_ux_page_solution_nav.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_prompt_no_data_views.mdx b/api_docs/kbn_shared_ux_prompt_no_data_views.mdx
index 35d1edf7e71c7..81597792a6ac1 100644
--- a/api_docs/kbn_shared_ux_prompt_no_data_views.mdx
+++ b/api_docs/kbn_shared_ux_prompt_no_data_views.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-prompt-no-data-views
 title: "@kbn/shared-ux-prompt-no-data-views"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-prompt-no-data-views plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-prompt-no-data-views']
 ---
 import kbnSharedUxPromptNoDataViewsObj from './kbn_shared_ux_prompt_no_data_views.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_prompt_no_data_views_mocks.mdx b/api_docs/kbn_shared_ux_prompt_no_data_views_mocks.mdx
index d45d34513665d..543eeee99a4c0 100644
--- a/api_docs/kbn_shared_ux_prompt_no_data_views_mocks.mdx
+++ b/api_docs/kbn_shared_ux_prompt_no_data_views_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-prompt-no-data-views-mocks
 title: "@kbn/shared-ux-prompt-no-data-views-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-prompt-no-data-views-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-prompt-no-data-views-mocks']
 ---
 import kbnSharedUxPromptNoDataViewsMocksObj from './kbn_shared_ux_prompt_no_data_views_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_prompt_not_found.mdx b/api_docs/kbn_shared_ux_prompt_not_found.mdx
index 4b344e472c7d1..bb5d4cc055c26 100644
--- a/api_docs/kbn_shared_ux_prompt_not_found.mdx
+++ b/api_docs/kbn_shared_ux_prompt_not_found.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-prompt-not-found
 title: "@kbn/shared-ux-prompt-not-found"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-prompt-not-found plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-prompt-not-found']
 ---
 import kbnSharedUxPromptNotFoundObj from './kbn_shared_ux_prompt_not_found.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_router.mdx b/api_docs/kbn_shared_ux_router.mdx
index 3c49b24d9151b..986e761335a66 100644
--- a/api_docs/kbn_shared_ux_router.mdx
+++ b/api_docs/kbn_shared_ux_router.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-router
 title: "@kbn/shared-ux-router"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-router plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-router']
 ---
 import kbnSharedUxRouterObj from './kbn_shared_ux_router.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_router_mocks.mdx b/api_docs/kbn_shared_ux_router_mocks.mdx
index d9976ed9238cc..f8e5f70e8be40 100644
--- a/api_docs/kbn_shared_ux_router_mocks.mdx
+++ b/api_docs/kbn_shared_ux_router_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-router-mocks
 title: "@kbn/shared-ux-router-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-router-mocks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-router-mocks']
 ---
 import kbnSharedUxRouterMocksObj from './kbn_shared_ux_router_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_storybook_config.mdx b/api_docs/kbn_shared_ux_storybook_config.mdx
index 3eb303b58deac..1610998176034 100644
--- a/api_docs/kbn_shared_ux_storybook_config.mdx
+++ b/api_docs/kbn_shared_ux_storybook_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-storybook-config
 title: "@kbn/shared-ux-storybook-config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-storybook-config plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-storybook-config']
 ---
 import kbnSharedUxStorybookConfigObj from './kbn_shared_ux_storybook_config.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_storybook_mock.mdx b/api_docs/kbn_shared_ux_storybook_mock.mdx
index 703da897352ad..e89fe76048fde 100644
--- a/api_docs/kbn_shared_ux_storybook_mock.mdx
+++ b/api_docs/kbn_shared_ux_storybook_mock.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-storybook-mock
 title: "@kbn/shared-ux-storybook-mock"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-storybook-mock plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-storybook-mock']
 ---
 import kbnSharedUxStorybookMockObj from './kbn_shared_ux_storybook_mock.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_tabbed_modal.mdx b/api_docs/kbn_shared_ux_tabbed_modal.mdx
index 73cb850091537..65914ffccc541 100644
--- a/api_docs/kbn_shared_ux_tabbed_modal.mdx
+++ b/api_docs/kbn_shared_ux_tabbed_modal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-tabbed-modal
 title: "@kbn/shared-ux-tabbed-modal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-tabbed-modal plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-tabbed-modal']
 ---
 import kbnSharedUxTabbedModalObj from './kbn_shared_ux_tabbed_modal.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_table_persist.mdx b/api_docs/kbn_shared_ux_table_persist.mdx
index ff955a49e0ffc..15088513dc195 100644
--- a/api_docs/kbn_shared_ux_table_persist.mdx
+++ b/api_docs/kbn_shared_ux_table_persist.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-table-persist
 title: "@kbn/shared-ux-table-persist"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-table-persist plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-table-persist']
 ---
 import kbnSharedUxTablePersistObj from './kbn_shared_ux_table_persist.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_utility.mdx b/api_docs/kbn_shared_ux_utility.mdx
index cf61470901ca4..0788864ed8d3e 100644
--- a/api_docs/kbn_shared_ux_utility.mdx
+++ b/api_docs/kbn_shared_ux_utility.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-utility
 title: "@kbn/shared-ux-utility"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-utility plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-utility']
 ---
 import kbnSharedUxUtilityObj from './kbn_shared_ux_utility.devdocs.json';
diff --git a/api_docs/kbn_slo_schema.mdx b/api_docs/kbn_slo_schema.mdx
index 014c96554d12e..d1d79ae053ff6 100644
--- a/api_docs/kbn_slo_schema.mdx
+++ b/api_docs/kbn_slo_schema.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-slo-schema
 title: "@kbn/slo-schema"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/slo-schema plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/slo-schema']
 ---
 import kbnSloSchemaObj from './kbn_slo_schema.devdocs.json';
diff --git a/api_docs/kbn_some_dev_log.mdx b/api_docs/kbn_some_dev_log.mdx
index 84501ccbf4bb2..dc38124051ed0 100644
--- a/api_docs/kbn_some_dev_log.mdx
+++ b/api_docs/kbn_some_dev_log.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-some-dev-log
 title: "@kbn/some-dev-log"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/some-dev-log plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/some-dev-log']
 ---
 import kbnSomeDevLogObj from './kbn_some_dev_log.devdocs.json';
diff --git a/api_docs/kbn_sort_predicates.mdx b/api_docs/kbn_sort_predicates.mdx
index 15bdf61685850..7288966eb1b6d 100644
--- a/api_docs/kbn_sort_predicates.mdx
+++ b/api_docs/kbn_sort_predicates.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-sort-predicates
 title: "@kbn/sort-predicates"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/sort-predicates plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/sort-predicates']
 ---
 import kbnSortPredicatesObj from './kbn_sort_predicates.devdocs.json';
diff --git a/api_docs/kbn_sse_utils.mdx b/api_docs/kbn_sse_utils.mdx
index 787bd7e7a7240..4e21f743a021c 100644
--- a/api_docs/kbn_sse_utils.mdx
+++ b/api_docs/kbn_sse_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-sse-utils
 title: "@kbn/sse-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/sse-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/sse-utils']
 ---
 import kbnSseUtilsObj from './kbn_sse_utils.devdocs.json';
diff --git a/api_docs/kbn_sse_utils_client.mdx b/api_docs/kbn_sse_utils_client.mdx
index f02ccb725fc4e..3d62099c4c9a4 100644
--- a/api_docs/kbn_sse_utils_client.mdx
+++ b/api_docs/kbn_sse_utils_client.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-sse-utils-client
 title: "@kbn/sse-utils-client"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/sse-utils-client plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/sse-utils-client']
 ---
 import kbnSseUtilsClientObj from './kbn_sse_utils_client.devdocs.json';
diff --git a/api_docs/kbn_sse_utils_server.mdx b/api_docs/kbn_sse_utils_server.mdx
index 7d38924787b72..eb1370a0ac9fd 100644
--- a/api_docs/kbn_sse_utils_server.mdx
+++ b/api_docs/kbn_sse_utils_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-sse-utils-server
 title: "@kbn/sse-utils-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/sse-utils-server plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/sse-utils-server']
 ---
 import kbnSseUtilsServerObj from './kbn_sse_utils_server.devdocs.json';
diff --git a/api_docs/kbn_std.mdx b/api_docs/kbn_std.mdx
index bff6fb3c03370..09be8f8a125e8 100644
--- a/api_docs/kbn_std.mdx
+++ b/api_docs/kbn_std.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-std
 title: "@kbn/std"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/std plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/std']
 ---
 import kbnStdObj from './kbn_std.devdocs.json';
diff --git a/api_docs/kbn_stdio_dev_helpers.mdx b/api_docs/kbn_stdio_dev_helpers.mdx
index 6c10290d71ab6..8cf6c6fe2b9fc 100644
--- a/api_docs/kbn_stdio_dev_helpers.mdx
+++ b/api_docs/kbn_stdio_dev_helpers.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-stdio-dev-helpers
 title: "@kbn/stdio-dev-helpers"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/stdio-dev-helpers plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/stdio-dev-helpers']
 ---
 import kbnStdioDevHelpersObj from './kbn_stdio_dev_helpers.devdocs.json';
diff --git a/api_docs/kbn_storybook.mdx b/api_docs/kbn_storybook.mdx
index c0db1b750245d..3b3923cde982b 100644
--- a/api_docs/kbn_storybook.mdx
+++ b/api_docs/kbn_storybook.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-storybook
 title: "@kbn/storybook"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/storybook plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/storybook']
 ---
 import kbnStorybookObj from './kbn_storybook.devdocs.json';
diff --git a/api_docs/kbn_synthetics_e2e.mdx b/api_docs/kbn_synthetics_e2e.mdx
index 113e214660f61..986d197a62e88 100644
--- a/api_docs/kbn_synthetics_e2e.mdx
+++ b/api_docs/kbn_synthetics_e2e.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-synthetics-e2e
 title: "@kbn/synthetics-e2e"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/synthetics-e2e plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/synthetics-e2e']
 ---
 import kbnSyntheticsE2eObj from './kbn_synthetics_e2e.devdocs.json';
diff --git a/api_docs/kbn_synthetics_private_location.mdx b/api_docs/kbn_synthetics_private_location.mdx
index d2da29691f711..80af7cd7b0acb 100644
--- a/api_docs/kbn_synthetics_private_location.mdx
+++ b/api_docs/kbn_synthetics_private_location.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-synthetics-private-location
 title: "@kbn/synthetics-private-location"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/synthetics-private-location plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/synthetics-private-location']
 ---
 import kbnSyntheticsPrivateLocationObj from './kbn_synthetics_private_location.devdocs.json';
diff --git a/api_docs/kbn_telemetry_tools.mdx b/api_docs/kbn_telemetry_tools.mdx
index 98bb7de4622d6..44aa932936480 100644
--- a/api_docs/kbn_telemetry_tools.mdx
+++ b/api_docs/kbn_telemetry_tools.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-telemetry-tools
 title: "@kbn/telemetry-tools"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/telemetry-tools plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/telemetry-tools']
 ---
 import kbnTelemetryToolsObj from './kbn_telemetry_tools.devdocs.json';
diff --git a/api_docs/kbn_test.devdocs.json b/api_docs/kbn_test.devdocs.json
index 3407196ddb81b..f00d113bde3f0 100644
--- a/api_docs/kbn_test.devdocs.json
+++ b/api_docs/kbn_test.devdocs.json
@@ -1711,7 +1711,15 @@
             "label": "getApiCredentialsForRole",
             "description": [],
             "signature": [
-              "(role: string) => Promise<{ Cookie: string; }>"
+              "(role: string, options?: ",
+              {
+                "pluginId": "@kbn/test",
+                "scope": "common",
+                "docId": "kibKbnTestPluginApi",
+                "section": "def-common.GetCookieOptions",
+                "text": "GetCookieOptions"
+              },
+              " | undefined) => Promise<{ Cookie: string; }>"
             ],
             "path": "packages/kbn-test/src/auth/session_manager.ts",
             "deprecated": false,
@@ -1731,6 +1739,28 @@
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
+              },
+              {
+                "parentPluginId": "@kbn/test",
+                "id": "def-common.SamlSessionManager.getApiCredentialsForRole.$2",
+                "type": "Object",
+                "tags": [],
+                "label": "options",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/test",
+                    "scope": "common",
+                    "docId": "kibKbnTestPluginApi",
+                    "section": "def-common.GetCookieOptions",
+                    "text": "GetCookieOptions"
+                  },
+                  " | undefined"
+                ],
+                "path": "packages/kbn-test/src/auth/session_manager.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": false
               }
             ],
             "returnComment": []
@@ -1743,7 +1773,15 @@
             "label": "getInteractiveUserSessionCookieWithRoleScope",
             "description": [],
             "signature": [
-              "(role: string) => Promise<string>"
+              "(role: string, options?: ",
+              {
+                "pluginId": "@kbn/test",
+                "scope": "common",
+                "docId": "kibKbnTestPluginApi",
+                "section": "def-common.GetCookieOptions",
+                "text": "GetCookieOptions"
+              },
+              " | undefined) => Promise<string>"
             ],
             "path": "packages/kbn-test/src/auth/session_manager.ts",
             "deprecated": false,
@@ -1763,6 +1801,28 @@
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
+              },
+              {
+                "parentPluginId": "@kbn/test",
+                "id": "def-common.SamlSessionManager.getInteractiveUserSessionCookieWithRoleScope.$2",
+                "type": "Object",
+                "tags": [],
+                "label": "options",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/test",
+                    "scope": "common",
+                    "docId": "kibKbnTestPluginApi",
+                    "section": "def-common.GetCookieOptions",
+                    "text": "GetCookieOptions"
+                  },
+                  " | undefined"
+                ],
+                "path": "packages/kbn-test/src/auth/session_manager.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": false
               }
             ],
             "returnComment": []
@@ -4722,6 +4782,31 @@
         ],
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "@kbn/test",
+        "id": "def-common.GetCookieOptions",
+        "type": "Interface",
+        "tags": [],
+        "label": "GetCookieOptions",
+        "description": [],
+        "path": "packages/kbn-test/src/auth/session_manager.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/test",
+            "id": "def-common.GetCookieOptions.forceNewSession",
+            "type": "boolean",
+            "tags": [],
+            "label": "forceNewSession",
+            "description": [],
+            "path": "packages/kbn-test/src/auth/session_manager.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "@kbn/test",
         "id": "def-common.HostOptions",
diff --git a/api_docs/kbn_test.mdx b/api_docs/kbn_test.mdx
index b2bf2f84ea7af..1c1aa5c3b3076 100644
--- a/api_docs/kbn_test.mdx
+++ b/api_docs/kbn_test.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-test
 title: "@kbn/test"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/test plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/test']
 ---
 import kbnTestObj from './kbn_test.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kiban
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 316 | 4 | 268 | 14 |
+| 320 | 4 | 272 | 14 |
 
 ## Common
 
diff --git a/api_docs/kbn_test_eui_helpers.mdx b/api_docs/kbn_test_eui_helpers.mdx
index be6eab235f934..228f483e50ff9 100644
--- a/api_docs/kbn_test_eui_helpers.mdx
+++ b/api_docs/kbn_test_eui_helpers.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-test-eui-helpers
 title: "@kbn/test-eui-helpers"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/test-eui-helpers plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/test-eui-helpers']
 ---
 import kbnTestEuiHelpersObj from './kbn_test_eui_helpers.devdocs.json';
diff --git a/api_docs/kbn_test_jest_helpers.mdx b/api_docs/kbn_test_jest_helpers.mdx
index 4ca1d612b4103..72a618e9eaec9 100644
--- a/api_docs/kbn_test_jest_helpers.mdx
+++ b/api_docs/kbn_test_jest_helpers.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-test-jest-helpers
 title: "@kbn/test-jest-helpers"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/test-jest-helpers plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/test-jest-helpers']
 ---
 import kbnTestJestHelpersObj from './kbn_test_jest_helpers.devdocs.json';
diff --git a/api_docs/kbn_test_subj_selector.mdx b/api_docs/kbn_test_subj_selector.mdx
index d51d23b46d7f0..7ae24981d3bfb 100644
--- a/api_docs/kbn_test_subj_selector.mdx
+++ b/api_docs/kbn_test_subj_selector.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-test-subj-selector
 title: "@kbn/test-subj-selector"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/test-subj-selector plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/test-subj-selector']
 ---
 import kbnTestSubjSelectorObj from './kbn_test_subj_selector.devdocs.json';
diff --git a/api_docs/kbn_timerange.mdx b/api_docs/kbn_timerange.mdx
index a655353f317d9..d4f887c2924d8 100644
--- a/api_docs/kbn_timerange.mdx
+++ b/api_docs/kbn_timerange.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-timerange
 title: "@kbn/timerange"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/timerange plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/timerange']
 ---
 import kbnTimerangeObj from './kbn_timerange.devdocs.json';
diff --git a/api_docs/kbn_tooling_log.mdx b/api_docs/kbn_tooling_log.mdx
index 87a7a675a694d..43a64bc6d5b7e 100644
--- a/api_docs/kbn_tooling_log.mdx
+++ b/api_docs/kbn_tooling_log.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-tooling-log
 title: "@kbn/tooling-log"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/tooling-log plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/tooling-log']
 ---
 import kbnToolingLogObj from './kbn_tooling_log.devdocs.json';
diff --git a/api_docs/kbn_transpose_utils.mdx b/api_docs/kbn_transpose_utils.mdx
index 37015ba3adf25..876fd3ab07a7d 100644
--- a/api_docs/kbn_transpose_utils.mdx
+++ b/api_docs/kbn_transpose_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-transpose-utils
 title: "@kbn/transpose-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/transpose-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/transpose-utils']
 ---
 import kbnTransposeUtilsObj from './kbn_transpose_utils.devdocs.json';
diff --git a/api_docs/kbn_triggers_actions_ui_types.mdx b/api_docs/kbn_triggers_actions_ui_types.mdx
index c6439b05e5ac9..4bdf53ff77900 100644
--- a/api_docs/kbn_triggers_actions_ui_types.mdx
+++ b/api_docs/kbn_triggers_actions_ui_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-triggers-actions-ui-types
 title: "@kbn/triggers-actions-ui-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/triggers-actions-ui-types plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/triggers-actions-ui-types']
 ---
 import kbnTriggersActionsUiTypesObj from './kbn_triggers_actions_ui_types.devdocs.json';
diff --git a/api_docs/kbn_try_in_console.mdx b/api_docs/kbn_try_in_console.mdx
index 0e94c6bcce747..19ba7841b9693 100644
--- a/api_docs/kbn_try_in_console.mdx
+++ b/api_docs/kbn_try_in_console.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-try-in-console
 title: "@kbn/try-in-console"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/try-in-console plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/try-in-console']
 ---
 import kbnTryInConsoleObj from './kbn_try_in_console.devdocs.json';
diff --git a/api_docs/kbn_ts_projects.mdx b/api_docs/kbn_ts_projects.mdx
index f090b3e0a61cf..8f4894062398d 100644
--- a/api_docs/kbn_ts_projects.mdx
+++ b/api_docs/kbn_ts_projects.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ts-projects
 title: "@kbn/ts-projects"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ts-projects plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ts-projects']
 ---
 import kbnTsProjectsObj from './kbn_ts_projects.devdocs.json';
diff --git a/api_docs/kbn_typed_react_router_config.mdx b/api_docs/kbn_typed_react_router_config.mdx
index a5e1d44c25100..70bfa8464df64 100644
--- a/api_docs/kbn_typed_react_router_config.mdx
+++ b/api_docs/kbn_typed_react_router_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-typed-react-router-config
 title: "@kbn/typed-react-router-config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/typed-react-router-config plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/typed-react-router-config']
 ---
 import kbnTypedReactRouterConfigObj from './kbn_typed_react_router_config.devdocs.json';
diff --git a/api_docs/kbn_ui_actions_browser.mdx b/api_docs/kbn_ui_actions_browser.mdx
index 06dd654cfabd7..0cd5fb11165bf 100644
--- a/api_docs/kbn_ui_actions_browser.mdx
+++ b/api_docs/kbn_ui_actions_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ui-actions-browser
 title: "@kbn/ui-actions-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ui-actions-browser plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ui-actions-browser']
 ---
 import kbnUiActionsBrowserObj from './kbn_ui_actions_browser.devdocs.json';
diff --git a/api_docs/kbn_ui_shared_deps_src.mdx b/api_docs/kbn_ui_shared_deps_src.mdx
index 35df61c2e3b86..34c5accb8542a 100644
--- a/api_docs/kbn_ui_shared_deps_src.mdx
+++ b/api_docs/kbn_ui_shared_deps_src.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ui-shared-deps-src
 title: "@kbn/ui-shared-deps-src"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ui-shared-deps-src plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ui-shared-deps-src']
 ---
 import kbnUiSharedDepsSrcObj from './kbn_ui_shared_deps_src.devdocs.json';
diff --git a/api_docs/kbn_ui_theme.mdx b/api_docs/kbn_ui_theme.mdx
index f1ecfa3987c4d..1a9051805b78e 100644
--- a/api_docs/kbn_ui_theme.mdx
+++ b/api_docs/kbn_ui_theme.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ui-theme
 title: "@kbn/ui-theme"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ui-theme plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ui-theme']
 ---
 import kbnUiThemeObj from './kbn_ui_theme.devdocs.json';
diff --git a/api_docs/kbn_unified_data_table.devdocs.json b/api_docs/kbn_unified_data_table.devdocs.json
index 14e8c0fc8d959..3c035dc025739 100644
--- a/api_docs/kbn_unified_data_table.devdocs.json
+++ b/api_docs/kbn_unified_data_table.devdocs.json
@@ -823,7 +823,7 @@
         "label": "UnifiedDataTable",
         "description": [],
         "signature": [
-          "({ ariaLabelledBy, columns, columnsMeta, showColumnTokens, configHeaderRowHeight, headerRowHeightState, onUpdateHeaderRowHeight, controlColumnIds, rowAdditionalLeadingControls, dataView, loadingState, onFilter, onResize, onSetColumns, onSort, rows, searchDescription, searchTitle, settings, showTimeCol, showFullScreenButton, sort, useNewFieldsApi, isSortEnabled, isPaginationEnabled, cellActionsTriggerId, cellActionsMetadata, cellActionsHandling, visibleCellActions, className, rowHeightState, onUpdateRowHeight, maxAllowedSampleSize, sampleSizeState, onUpdateSampleSize, isPlainRecord, rowsPerPageState, onUpdateRowsPerPage, onFieldEdited, services, renderCustomGridBody, renderCustomToolbar, externalControlColumns, trailingControlColumns, totalHits, onFetchMoreRecords, renderDocumentView, setExpandedDoc, expandedDoc, configRowHeight, showMultiFields, maxDocFieldsDisplayed, externalAdditionalControls, rowsPerPageOptions, externalCustomRenderers, additionalFieldGroups, consumer, componentsTourSteps, gridStyleOverride, rowLineHeightOverride, customGridColumnsConfiguration, enableComparisonMode, cellContext, renderCellPopover, getRowIndicator, dataGridDensityState, onUpdateDataGridDensity, }: ",
+          "({ ariaLabelledBy, columns, columnsMeta, showColumnTokens, canDragAndDropColumns, configHeaderRowHeight, headerRowHeightState, onUpdateHeaderRowHeight, controlColumnIds, rowAdditionalLeadingControls, dataView, loadingState, onFilter, onResize, onSetColumns, onSort, rows, searchDescription, searchTitle, settings, showTimeCol, showFullScreenButton, sort, useNewFieldsApi, isSortEnabled, isPaginationEnabled, cellActionsTriggerId, cellActionsMetadata, cellActionsHandling, visibleCellActions, className, rowHeightState, onUpdateRowHeight, maxAllowedSampleSize, sampleSizeState, onUpdateSampleSize, isPlainRecord, rowsPerPageState, onUpdateRowsPerPage, onFieldEdited, services, renderCustomGridBody, renderCustomToolbar, externalControlColumns, trailingControlColumns, totalHits, onFetchMoreRecords, renderDocumentView, setExpandedDoc, expandedDoc, configRowHeight, showMultiFields, maxDocFieldsDisplayed, externalAdditionalControls, rowsPerPageOptions, externalCustomRenderers, additionalFieldGroups, consumer, componentsTourSteps, gridStyleOverride, rowLineHeightOverride, customGridColumnsConfiguration, enableComparisonMode, cellContext, renderCellPopover, getRowIndicator, dataGridDensityState, onUpdateDataGridDensity, }: ",
           {
             "pluginId": "@kbn/unified-data-table",
             "scope": "public",
@@ -842,7 +842,7 @@
             "id": "def-public.UnifiedDataTable.$1",
             "type": "Object",
             "tags": [],
-            "label": "{\n  ariaLabelledBy,\n  columns,\n  columnsMeta,\n  showColumnTokens,\n  configHeaderRowHeight,\n  headerRowHeightState,\n  onUpdateHeaderRowHeight,\n  controlColumnIds = CONTROL_COLUMN_IDS_DEFAULT,\n  rowAdditionalLeadingControls,\n  dataView,\n  loadingState,\n  onFilter,\n  onResize,\n  onSetColumns,\n  onSort,\n  rows,\n  searchDescription,\n  searchTitle,\n  settings,\n  showTimeCol,\n  showFullScreenButton = true,\n  sort,\n  useNewFieldsApi,\n  isSortEnabled = true,\n  isPaginationEnabled = true,\n  cellActionsTriggerId,\n  cellActionsMetadata,\n  cellActionsHandling = 'replace',\n  visibleCellActions,\n  className,\n  rowHeightState,\n  onUpdateRowHeight,\n  maxAllowedSampleSize,\n  sampleSizeState,\n  onUpdateSampleSize,\n  isPlainRecord = false,\n  rowsPerPageState,\n  onUpdateRowsPerPage,\n  onFieldEdited,\n  services,\n  renderCustomGridBody,\n  renderCustomToolbar,\n  externalControlColumns, // TODO: deprecate in favor of rowAdditionalLeadingControls\n  trailingControlColumns, // TODO: deprecate in favor of rowAdditionalLeadingControls\n  totalHits,\n  onFetchMoreRecords,\n  renderDocumentView,\n  setExpandedDoc,\n  expandedDoc,\n  configRowHeight,\n  showMultiFields = true,\n  maxDocFieldsDisplayed = 50,\n  externalAdditionalControls,\n  rowsPerPageOptions,\n  externalCustomRenderers,\n  additionalFieldGroups,\n  consumer = 'discover',\n  componentsTourSteps,\n  gridStyleOverride,\n  rowLineHeightOverride,\n  customGridColumnsConfiguration,\n  enableComparisonMode,\n  cellContext,\n  renderCellPopover,\n  getRowIndicator,\n  dataGridDensityState,\n  onUpdateDataGridDensity,\n}",
+            "label": "{\n  ariaLabelledBy,\n  columns,\n  columnsMeta,\n  showColumnTokens,\n  canDragAndDropColumns,\n  configHeaderRowHeight,\n  headerRowHeightState,\n  onUpdateHeaderRowHeight,\n  controlColumnIds = CONTROL_COLUMN_IDS_DEFAULT,\n  rowAdditionalLeadingControls,\n  dataView,\n  loadingState,\n  onFilter,\n  onResize,\n  onSetColumns,\n  onSort,\n  rows,\n  searchDescription,\n  searchTitle,\n  settings,\n  showTimeCol,\n  showFullScreenButton = true,\n  sort,\n  useNewFieldsApi,\n  isSortEnabled = true,\n  isPaginationEnabled = true,\n  cellActionsTriggerId,\n  cellActionsMetadata,\n  cellActionsHandling = 'replace',\n  visibleCellActions,\n  className,\n  rowHeightState,\n  onUpdateRowHeight,\n  maxAllowedSampleSize,\n  sampleSizeState,\n  onUpdateSampleSize,\n  isPlainRecord = false,\n  rowsPerPageState,\n  onUpdateRowsPerPage,\n  onFieldEdited,\n  services,\n  renderCustomGridBody,\n  renderCustomToolbar,\n  externalControlColumns, // TODO: deprecate in favor of rowAdditionalLeadingControls\n  trailingControlColumns, // TODO: deprecate in favor of rowAdditionalLeadingControls\n  totalHits,\n  onFetchMoreRecords,\n  renderDocumentView,\n  setExpandedDoc,\n  expandedDoc,\n  configRowHeight,\n  showMultiFields = true,\n  maxDocFieldsDisplayed = 50,\n  externalAdditionalControls,\n  rowsPerPageOptions,\n  externalCustomRenderers,\n  additionalFieldGroups,\n  consumer = 'discover',\n  componentsTourSteps,\n  gridStyleOverride,\n  rowLineHeightOverride,\n  customGridColumnsConfiguration,\n  enableComparisonMode,\n  cellContext,\n  renderCellPopover,\n  getRowIndicator,\n  dataGridDensityState,\n  onUpdateDataGridDensity,\n}",
             "description": [],
             "signature": [
               {
@@ -1213,6 +1213,22 @@
             "deprecated": false,
             "trackAdoption": false
           },
+          {
+            "parentPluginId": "@kbn/unified-data-table",
+            "id": "def-public.UnifiedDataTableProps.canDragAndDropColumns",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "canDragAndDropColumns",
+            "description": [
+              "\nSet to true to allow users to drag and drop columns for reordering"
+            ],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "path": "packages/kbn-unified-data-table/src/components/data_table.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
           {
             "parentPluginId": "@kbn/unified-data-table",
             "id": "def-public.UnifiedDataTableProps.configHeaderRowHeight",
diff --git a/api_docs/kbn_unified_data_table.mdx b/api_docs/kbn_unified_data_table.mdx
index 650eb2bab3b9a..c92437c8db59e 100644
--- a/api_docs/kbn_unified_data_table.mdx
+++ b/api_docs/kbn_unified_data_table.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-unified-data-table
 title: "@kbn/unified-data-table"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/unified-data-table plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/unified-data-table']
 ---
 import kbnUnifiedDataTableObj from './kbn_unified_data_table.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/k
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 183 | 0 | 108 | 1 |
+| 184 | 0 | 108 | 1 |
 
 ## Client
 
diff --git a/api_docs/kbn_unified_doc_viewer.mdx b/api_docs/kbn_unified_doc_viewer.mdx
index 4145f49b277ba..e313bcca8f801 100644
--- a/api_docs/kbn_unified_doc_viewer.mdx
+++ b/api_docs/kbn_unified_doc_viewer.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-unified-doc-viewer
 title: "@kbn/unified-doc-viewer"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/unified-doc-viewer plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/unified-doc-viewer']
 ---
 import kbnUnifiedDocViewerObj from './kbn_unified_doc_viewer.devdocs.json';
diff --git a/api_docs/kbn_unified_field_list.mdx b/api_docs/kbn_unified_field_list.mdx
index f37a081d13764..808a482d65544 100644
--- a/api_docs/kbn_unified_field_list.mdx
+++ b/api_docs/kbn_unified_field_list.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-unified-field-list
 title: "@kbn/unified-field-list"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/unified-field-list plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/unified-field-list']
 ---
 import kbnUnifiedFieldListObj from './kbn_unified_field_list.devdocs.json';
diff --git a/api_docs/kbn_unsaved_changes_badge.mdx b/api_docs/kbn_unsaved_changes_badge.mdx
index e0543eb96f6ba..fa2d6545c8af6 100644
--- a/api_docs/kbn_unsaved_changes_badge.mdx
+++ b/api_docs/kbn_unsaved_changes_badge.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-unsaved-changes-badge
 title: "@kbn/unsaved-changes-badge"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/unsaved-changes-badge plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/unsaved-changes-badge']
 ---
 import kbnUnsavedChangesBadgeObj from './kbn_unsaved_changes_badge.devdocs.json';
diff --git a/api_docs/kbn_unsaved_changes_prompt.mdx b/api_docs/kbn_unsaved_changes_prompt.mdx
index b94d001924736..c8942763a3801 100644
--- a/api_docs/kbn_unsaved_changes_prompt.mdx
+++ b/api_docs/kbn_unsaved_changes_prompt.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-unsaved-changes-prompt
 title: "@kbn/unsaved-changes-prompt"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/unsaved-changes-prompt plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/unsaved-changes-prompt']
 ---
 import kbnUnsavedChangesPromptObj from './kbn_unsaved_changes_prompt.devdocs.json';
diff --git a/api_docs/kbn_use_tracked_promise.mdx b/api_docs/kbn_use_tracked_promise.mdx
index b06df74b90772..22ccf23b54d01 100644
--- a/api_docs/kbn_use_tracked_promise.mdx
+++ b/api_docs/kbn_use_tracked_promise.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-use-tracked-promise
 title: "@kbn/use-tracked-promise"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/use-tracked-promise plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/use-tracked-promise']
 ---
 import kbnUseTrackedPromiseObj from './kbn_use_tracked_promise.devdocs.json';
diff --git a/api_docs/kbn_user_profile_components.mdx b/api_docs/kbn_user_profile_components.mdx
index cabdbd99612c1..75df82d917f71 100644
--- a/api_docs/kbn_user_profile_components.mdx
+++ b/api_docs/kbn_user_profile_components.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-user-profile-components
 title: "@kbn/user-profile-components"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/user-profile-components plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/user-profile-components']
 ---
 import kbnUserProfileComponentsObj from './kbn_user_profile_components.devdocs.json';
diff --git a/api_docs/kbn_utility_types.mdx b/api_docs/kbn_utility_types.mdx
index 96a2cc1b64a6f..1baf9a228f11e 100644
--- a/api_docs/kbn_utility_types.mdx
+++ b/api_docs/kbn_utility_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-utility-types
 title: "@kbn/utility-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/utility-types plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/utility-types']
 ---
 import kbnUtilityTypesObj from './kbn_utility_types.devdocs.json';
diff --git a/api_docs/kbn_utility_types_jest.mdx b/api_docs/kbn_utility_types_jest.mdx
index 69d0b2b819d8a..21ddc090d7281 100644
--- a/api_docs/kbn_utility_types_jest.mdx
+++ b/api_docs/kbn_utility_types_jest.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-utility-types-jest
 title: "@kbn/utility-types-jest"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/utility-types-jest plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/utility-types-jest']
 ---
 import kbnUtilityTypesJestObj from './kbn_utility_types_jest.devdocs.json';
diff --git a/api_docs/kbn_utils.mdx b/api_docs/kbn_utils.mdx
index d5b777063a087..3020718609c3b 100644
--- a/api_docs/kbn_utils.mdx
+++ b/api_docs/kbn_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-utils
 title: "@kbn/utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/utils']
 ---
 import kbnUtilsObj from './kbn_utils.devdocs.json';
diff --git a/api_docs/kbn_visualization_ui_components.mdx b/api_docs/kbn_visualization_ui_components.mdx
index 303902fc86a3a..ba7dc9b23f3ee 100644
--- a/api_docs/kbn_visualization_ui_components.mdx
+++ b/api_docs/kbn_visualization_ui_components.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-visualization-ui-components
 title: "@kbn/visualization-ui-components"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/visualization-ui-components plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/visualization-ui-components']
 ---
 import kbnVisualizationUiComponentsObj from './kbn_visualization_ui_components.devdocs.json';
diff --git a/api_docs/kbn_visualization_utils.mdx b/api_docs/kbn_visualization_utils.mdx
index 9cab2b9cde26d..227dc0259fc51 100644
--- a/api_docs/kbn_visualization_utils.mdx
+++ b/api_docs/kbn_visualization_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-visualization-utils
 title: "@kbn/visualization-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/visualization-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/visualization-utils']
 ---
 import kbnVisualizationUtilsObj from './kbn_visualization_utils.devdocs.json';
diff --git a/api_docs/kbn_xstate_utils.mdx b/api_docs/kbn_xstate_utils.mdx
index 9cc4d8e66e355..33ce06234a9e3 100644
--- a/api_docs/kbn_xstate_utils.mdx
+++ b/api_docs/kbn_xstate_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-xstate-utils
 title: "@kbn/xstate-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/xstate-utils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/xstate-utils']
 ---
 import kbnXstateUtilsObj from './kbn_xstate_utils.devdocs.json';
diff --git a/api_docs/kbn_yarn_lock_validator.mdx b/api_docs/kbn_yarn_lock_validator.mdx
index 74716e5f5e8b4..3532956e9d99f 100644
--- a/api_docs/kbn_yarn_lock_validator.mdx
+++ b/api_docs/kbn_yarn_lock_validator.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-yarn-lock-validator
 title: "@kbn/yarn-lock-validator"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/yarn-lock-validator plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/yarn-lock-validator']
 ---
 import kbnYarnLockValidatorObj from './kbn_yarn_lock_validator.devdocs.json';
diff --git a/api_docs/kbn_zod.mdx b/api_docs/kbn_zod.mdx
index 1796f20e7f45c..b83490fe0fbb7 100644
--- a/api_docs/kbn_zod.mdx
+++ b/api_docs/kbn_zod.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-zod
 title: "@kbn/zod"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/zod plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/zod']
 ---
 import kbnZodObj from './kbn_zod.devdocs.json';
diff --git a/api_docs/kbn_zod_helpers.mdx b/api_docs/kbn_zod_helpers.mdx
index c61dd7533672a..0b2ec24312d25 100644
--- a/api_docs/kbn_zod_helpers.mdx
+++ b/api_docs/kbn_zod_helpers.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-zod-helpers
 title: "@kbn/zod-helpers"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/zod-helpers plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/zod-helpers']
 ---
 import kbnZodHelpersObj from './kbn_zod_helpers.devdocs.json';
diff --git a/api_docs/kibana_overview.mdx b/api_docs/kibana_overview.mdx
index e794f43781d51..6c934cfc26209 100644
--- a/api_docs/kibana_overview.mdx
+++ b/api_docs/kibana_overview.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kibanaOverview
 title: "kibanaOverview"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the kibanaOverview plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'kibanaOverview']
 ---
 import kibanaOverviewObj from './kibana_overview.devdocs.json';
diff --git a/api_docs/kibana_react.mdx b/api_docs/kibana_react.mdx
index 979a41b307945..7f3756e0d9a82 100644
--- a/api_docs/kibana_react.mdx
+++ b/api_docs/kibana_react.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kibanaReact
 title: "kibanaReact"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the kibanaReact plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'kibanaReact']
 ---
 import kibanaReactObj from './kibana_react.devdocs.json';
diff --git a/api_docs/kibana_utils.mdx b/api_docs/kibana_utils.mdx
index 782e2f3529d1d..683385496f269 100644
--- a/api_docs/kibana_utils.mdx
+++ b/api_docs/kibana_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kibanaUtils
 title: "kibanaUtils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the kibanaUtils plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'kibanaUtils']
 ---
 import kibanaUtilsObj from './kibana_utils.devdocs.json';
diff --git a/api_docs/kubernetes_security.mdx b/api_docs/kubernetes_security.mdx
index f618cb5ef5f16..e79e20cf38109 100644
--- a/api_docs/kubernetes_security.mdx
+++ b/api_docs/kubernetes_security.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kubernetesSecurity
 title: "kubernetesSecurity"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the kubernetesSecurity plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'kubernetesSecurity']
 ---
 import kubernetesSecurityObj from './kubernetes_security.devdocs.json';
diff --git a/api_docs/lens.mdx b/api_docs/lens.mdx
index 60d19031aef00..2a3bbfb7c413c 100644
--- a/api_docs/lens.mdx
+++ b/api_docs/lens.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/lens
 title: "lens"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the lens plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'lens']
 ---
 import lensObj from './lens.devdocs.json';
diff --git a/api_docs/license_api_guard.mdx b/api_docs/license_api_guard.mdx
index bfb00afbdd0f2..44ae89ccf41df 100644
--- a/api_docs/license_api_guard.mdx
+++ b/api_docs/license_api_guard.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/licenseApiGuard
 title: "licenseApiGuard"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the licenseApiGuard plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'licenseApiGuard']
 ---
 import licenseApiGuardObj from './license_api_guard.devdocs.json';
diff --git a/api_docs/license_management.mdx b/api_docs/license_management.mdx
index 7b9ba410c53d5..5e4816eba20ea 100644
--- a/api_docs/license_management.mdx
+++ b/api_docs/license_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/licenseManagement
 title: "licenseManagement"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the licenseManagement plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'licenseManagement']
 ---
 import licenseManagementObj from './license_management.devdocs.json';
diff --git a/api_docs/licensing.mdx b/api_docs/licensing.mdx
index c66d1c2669c65..a3612ed79dd49 100644
--- a/api_docs/licensing.mdx
+++ b/api_docs/licensing.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/licensing
 title: "licensing"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the licensing plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'licensing']
 ---
 import licensingObj from './licensing.devdocs.json';
diff --git a/api_docs/links.mdx b/api_docs/links.mdx
index 2e863af240572..892def387a105 100644
--- a/api_docs/links.mdx
+++ b/api_docs/links.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/links
 title: "links"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the links plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'links']
 ---
 import linksObj from './links.devdocs.json';
diff --git a/api_docs/lists.mdx b/api_docs/lists.mdx
index 5fffe0aeee4b2..0c09dd4cc9777 100644
--- a/api_docs/lists.mdx
+++ b/api_docs/lists.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/lists
 title: "lists"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the lists plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'lists']
 ---
 import listsObj from './lists.devdocs.json';
diff --git a/api_docs/logs_data_access.mdx b/api_docs/logs_data_access.mdx
index 54be8b1afaaf8..5d1338c2126b3 100644
--- a/api_docs/logs_data_access.mdx
+++ b/api_docs/logs_data_access.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/logsDataAccess
 title: "logsDataAccess"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the logsDataAccess plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'logsDataAccess']
 ---
 import logsDataAccessObj from './logs_data_access.devdocs.json';
diff --git a/api_docs/logs_explorer.mdx b/api_docs/logs_explorer.mdx
index 9abf89c9eb96d..4e9b53a2e035c 100644
--- a/api_docs/logs_explorer.mdx
+++ b/api_docs/logs_explorer.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/logsExplorer
 title: "logsExplorer"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the logsExplorer plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'logsExplorer']
 ---
 import logsExplorerObj from './logs_explorer.devdocs.json';
diff --git a/api_docs/logs_shared.mdx b/api_docs/logs_shared.mdx
index 9579d2ec68489..cba291de26fc1 100644
--- a/api_docs/logs_shared.mdx
+++ b/api_docs/logs_shared.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/logsShared
 title: "logsShared"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the logsShared plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'logsShared']
 ---
 import logsSharedObj from './logs_shared.devdocs.json';
diff --git a/api_docs/management.mdx b/api_docs/management.mdx
index 7616d057cf382..7d037d015c055 100644
--- a/api_docs/management.mdx
+++ b/api_docs/management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/management
 title: "management"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the management plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'management']
 ---
 import managementObj from './management.devdocs.json';
diff --git a/api_docs/maps.mdx b/api_docs/maps.mdx
index 6192bae32ca7f..4e4c434290695 100644
--- a/api_docs/maps.mdx
+++ b/api_docs/maps.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/maps
 title: "maps"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the maps plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'maps']
 ---
 import mapsObj from './maps.devdocs.json';
diff --git a/api_docs/maps_ems.mdx b/api_docs/maps_ems.mdx
index 85c70d0a18bbe..bc4635aa8ce10 100644
--- a/api_docs/maps_ems.mdx
+++ b/api_docs/maps_ems.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/mapsEms
 title: "mapsEms"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the mapsEms plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'mapsEms']
 ---
 import mapsEmsObj from './maps_ems.devdocs.json';
diff --git a/api_docs/metrics_data_access.mdx b/api_docs/metrics_data_access.mdx
index 4d4da23be530f..aaf447535c012 100644
--- a/api_docs/metrics_data_access.mdx
+++ b/api_docs/metrics_data_access.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/metricsDataAccess
 title: "metricsDataAccess"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the metricsDataAccess plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'metricsDataAccess']
 ---
 import metricsDataAccessObj from './metrics_data_access.devdocs.json';
diff --git a/api_docs/ml.mdx b/api_docs/ml.mdx
index 9d8c2f793bf3c..d4cbc73af4e1a 100644
--- a/api_docs/ml.mdx
+++ b/api_docs/ml.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/ml
 title: "ml"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the ml plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'ml']
 ---
 import mlObj from './ml.devdocs.json';
diff --git a/api_docs/mock_idp_plugin.mdx b/api_docs/mock_idp_plugin.mdx
index 74078ab2e451d..5578c77bd9722 100644
--- a/api_docs/mock_idp_plugin.mdx
+++ b/api_docs/mock_idp_plugin.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/mockIdpPlugin
 title: "mockIdpPlugin"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the mockIdpPlugin plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'mockIdpPlugin']
 ---
 import mockIdpPluginObj from './mock_idp_plugin.devdocs.json';
diff --git a/api_docs/monitoring.mdx b/api_docs/monitoring.mdx
index 9f958b56fff8c..b640561229136 100644
--- a/api_docs/monitoring.mdx
+++ b/api_docs/monitoring.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/monitoring
 title: "monitoring"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the monitoring plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'monitoring']
 ---
 import monitoringObj from './monitoring.devdocs.json';
diff --git a/api_docs/monitoring_collection.mdx b/api_docs/monitoring_collection.mdx
index 7b683320a63ed..61852c3988478 100644
--- a/api_docs/monitoring_collection.mdx
+++ b/api_docs/monitoring_collection.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/monitoringCollection
 title: "monitoringCollection"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the monitoringCollection plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'monitoringCollection']
 ---
 import monitoringCollectionObj from './monitoring_collection.devdocs.json';
diff --git a/api_docs/navigation.mdx b/api_docs/navigation.mdx
index cecfb562d2d5c..da5907797de5b 100644
--- a/api_docs/navigation.mdx
+++ b/api_docs/navigation.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/navigation
 title: "navigation"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the navigation plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'navigation']
 ---
 import navigationObj from './navigation.devdocs.json';
diff --git a/api_docs/newsfeed.mdx b/api_docs/newsfeed.mdx
index 9efa28ee1c1c4..2577e592f43ba 100644
--- a/api_docs/newsfeed.mdx
+++ b/api_docs/newsfeed.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/newsfeed
 title: "newsfeed"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the newsfeed plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'newsfeed']
 ---
 import newsfeedObj from './newsfeed.devdocs.json';
diff --git a/api_docs/no_data_page.mdx b/api_docs/no_data_page.mdx
index d2cab58efdfcd..cf40b258b0e28 100644
--- a/api_docs/no_data_page.mdx
+++ b/api_docs/no_data_page.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/noDataPage
 title: "noDataPage"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the noDataPage plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'noDataPage']
 ---
 import noDataPageObj from './no_data_page.devdocs.json';
diff --git a/api_docs/notifications.mdx b/api_docs/notifications.mdx
index c1da942ff5b2e..a45c143119d28 100644
--- a/api_docs/notifications.mdx
+++ b/api_docs/notifications.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/notifications
 title: "notifications"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the notifications plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'notifications']
 ---
 import notificationsObj from './notifications.devdocs.json';
diff --git a/api_docs/observability.mdx b/api_docs/observability.mdx
index 3814295b9108a..200929f1d91c6 100644
--- a/api_docs/observability.mdx
+++ b/api_docs/observability.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/observability
 title: "observability"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the observability plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'observability']
 ---
 import observabilityObj from './observability.devdocs.json';
diff --git a/api_docs/observability_a_i_assistant.mdx b/api_docs/observability_a_i_assistant.mdx
index d4a4ddb92a777..444e08846b21a 100644
--- a/api_docs/observability_a_i_assistant.mdx
+++ b/api_docs/observability_a_i_assistant.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/observabilityAIAssistant
 title: "observabilityAIAssistant"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the observabilityAIAssistant plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'observabilityAIAssistant']
 ---
 import observabilityAIAssistantObj from './observability_a_i_assistant.devdocs.json';
diff --git a/api_docs/observability_a_i_assistant_app.mdx b/api_docs/observability_a_i_assistant_app.mdx
index ada4cd32ecd45..8b2e72715e3d3 100644
--- a/api_docs/observability_a_i_assistant_app.mdx
+++ b/api_docs/observability_a_i_assistant_app.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/observabilityAIAssistantApp
 title: "observabilityAIAssistantApp"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the observabilityAIAssistantApp plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'observabilityAIAssistantApp']
 ---
 import observabilityAIAssistantAppObj from './observability_a_i_assistant_app.devdocs.json';
diff --git a/api_docs/observability_ai_assistant_management.mdx b/api_docs/observability_ai_assistant_management.mdx
index 362c7695e4cfa..9553e2421a476 100644
--- a/api_docs/observability_ai_assistant_management.mdx
+++ b/api_docs/observability_ai_assistant_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/observabilityAiAssistantManagement
 title: "observabilityAiAssistantManagement"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the observabilityAiAssistantManagement plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'observabilityAiAssistantManagement']
 ---
 import observabilityAiAssistantManagementObj from './observability_ai_assistant_management.devdocs.json';
diff --git a/api_docs/observability_logs_explorer.mdx b/api_docs/observability_logs_explorer.mdx
index 0cad810a19993..256ce442626a3 100644
--- a/api_docs/observability_logs_explorer.mdx
+++ b/api_docs/observability_logs_explorer.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/observabilityLogsExplorer
 title: "observabilityLogsExplorer"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the observabilityLogsExplorer plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'observabilityLogsExplorer']
 ---
 import observabilityLogsExplorerObj from './observability_logs_explorer.devdocs.json';
diff --git a/api_docs/observability_onboarding.mdx b/api_docs/observability_onboarding.mdx
index 756e138bac135..3f50b9e0823d7 100644
--- a/api_docs/observability_onboarding.mdx
+++ b/api_docs/observability_onboarding.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/observabilityOnboarding
 title: "observabilityOnboarding"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the observabilityOnboarding plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'observabilityOnboarding']
 ---
 import observabilityOnboardingObj from './observability_onboarding.devdocs.json';
diff --git a/api_docs/observability_shared.mdx b/api_docs/observability_shared.mdx
index 24f7e049dc911..80e92f8468d9d 100644
--- a/api_docs/observability_shared.mdx
+++ b/api_docs/observability_shared.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/observabilityShared
 title: "observabilityShared"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the observabilityShared plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'observabilityShared']
 ---
 import observabilitySharedObj from './observability_shared.devdocs.json';
diff --git a/api_docs/osquery.mdx b/api_docs/osquery.mdx
index ed0dc7a0b1745..277dc27487138 100644
--- a/api_docs/osquery.mdx
+++ b/api_docs/osquery.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/osquery
 title: "osquery"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the osquery plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'osquery']
 ---
 import osqueryObj from './osquery.devdocs.json';
diff --git a/api_docs/painless_lab.mdx b/api_docs/painless_lab.mdx
index cc356c2e2b9cc..538bcddb0daba 100644
--- a/api_docs/painless_lab.mdx
+++ b/api_docs/painless_lab.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/painlessLab
 title: "painlessLab"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the painlessLab plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'painlessLab']
 ---
 import painlessLabObj from './painless_lab.devdocs.json';
diff --git a/api_docs/plugin_directory.mdx b/api_docs/plugin_directory.mdx
index e6a7b1e388fcd..b315788800045 100644
--- a/api_docs/plugin_directory.mdx
+++ b/api_docs/plugin_directory.mdx
@@ -7,7 +7,7 @@ id: kibDevDocsPluginDirectory
 slug: /kibana-dev-docs/api-meta/plugin-api-directory
 title: Directory
 description: Directory of public APIs available through plugins or packages.
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana']
 ---
 
@@ -15,13 +15,13 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 
 | Count | Plugins or Packages with a <br /> public API | Number of teams |
 |--------------|----------|------------------------|
-| 878 | 751 | 45 |
+| 878 | 750 | 45 |
 
 ### Public API health stats
 
 | API Count | Any Count | Missing comments | Missing exports |
 |--------------|----------|-----------------|--------|
-| 54167 | 240 | 40658 | 2004 |
+| 54147 | 240 | 40637 | 2000 |
 
 ## Plugin Directory
 
@@ -103,7 +103,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibFileUploadPluginApi" text="fileUpload"/> | [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | The file upload plugin contains components and services for uploading a file, analyzing its data, and then importing the data into an Elasticsearch index. Supported file types include CSV, TSV, newline-delimited JSON and GeoJSON. | 89 | 0 | 89 | 8 |
 | <DocLink id="kibFilesPluginApi" text="files"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | File upload, download, sharing, and serving over HTTP implementation in Kibana. | 240 | 0 | 24 | 9 |
 | <DocLink id="kibFilesManagementPluginApi" text="filesManagement"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | Simple UI for managing files in Kibana | 3 | 0 | 3 | 0 |
-| <DocLink id="kibFleetPluginApi" text="fleet"/> | [@elastic/fleet](https://github.com/orgs/elastic/teams/fleet) | - | 1426 | 5 | 1303 | 81 |
+| <DocLink id="kibFleetPluginApi" text="fleet"/> | [@elastic/fleet](https://github.com/orgs/elastic/teams/fleet) | - | 1418 | 5 | 1295 | 81 |
 | ftrApis | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 0 | 0 | 0 | 0 |
 | <DocLink id="kibGlobalSearchPluginApi" text="globalSearch"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 72 | 0 | 14 | 5 |
 | globalSearchBar | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 0 | 0 | 0 | 0 |
@@ -179,7 +179,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibScreenshotModePluginApi" text="screenshotMode"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 32 | 0 | 13 | 0 |
 | <DocLink id="kibScreenshottingPluginApi" text="screenshotting"/> | [@elastic/kibana-reporting-services](https://github.com/orgs/elastic/teams/kibana-reporting-services) | Kibana Screenshotting Plugin | 32 | 0 | 8 | 3 |
 | <DocLink id="kibSearchAssistantPluginApi" text="searchAssistant"/> | [@elastic/search-kibana](https://github.com/orgs/elastic/teams/search-kibana) | AI Assistant for Search | 6 | 0 | 6 | 0 |
-| <DocLink id="kibSearchConnectorsPluginApi" text="searchConnectors"/> | [@elastic/search-kibana](https://github.com/orgs/elastic/teams/search-kibana) | Plugin hosting shared features for connectors | 19 | 0 | 19 | 3 |
+| <DocLink id="kibSearchConnectorsPluginApi" text="searchConnectors"/> | [@elastic/search-kibana](https://github.com/orgs/elastic/teams/search-kibana) | Plugin hosting shared features for connectors | 7 | 0 | 7 | 0 |
 | <DocLink id="kibSearchHomepagePluginApi" text="searchHomepage"/> | [@elastic/search-kibana](https://github.com/orgs/elastic/teams/search-kibana) | - | 18 | 0 | 10 | 0 |
 | <DocLink id="kibSearchIndicesPluginApi" text="searchIndices"/> | [@elastic/search-kibana](https://github.com/orgs/elastic/teams/search-kibana) | - | 18 | 0 | 18 | 0 |
 | <DocLink id="kibSearchInferenceEndpointsPluginApi" text="searchInferenceEndpoints"/> | [@elastic/search-kibana](https://github.com/orgs/elastic/teams/search-kibana) | - | 11 | 0 | 7 | 1 |
@@ -187,7 +187,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibSearchPlaygroundPluginApi" text="searchPlayground"/> | [@elastic/search-kibana](https://github.com/orgs/elastic/teams/search-kibana) | - | 21 | 0 | 15 | 1 |
 | searchprofiler | [@elastic/kibana-management](https://github.com/orgs/elastic/teams/kibana-management) | - | 0 | 0 | 0 | 0 |
 | <DocLink id="kibSecurityPluginApi" text="security"/> | [@elastic/kibana-security](https://github.com/orgs/elastic/teams/kibana-security) | This plugin provides authentication and authorization features, and exposes functionality to understand the capabilities of the currently authenticated user. | 455 | 0 | 238 | 0 |
-| <DocLink id="kibSecuritySolutionPluginApi" text="securitySolution"/> | [@elastic/security-solution](https://github.com/orgs/elastic/teams/security-solution) | - | 186 | 0 | 118 | 33 |
+| <DocLink id="kibSecuritySolutionPluginApi" text="securitySolution"/> | [@elastic/security-solution](https://github.com/orgs/elastic/teams/security-solution) | - | 188 | 0 | 120 | 33 |
 | <DocLink id="kibSecuritySolutionEssPluginApi" text="securitySolutionEss"/> | [@elastic/security-solution](https://github.com/orgs/elastic/teams/security-solution) | ESS customizations for Security Solution. | 6 | 0 | 6 | 0 |
 | <DocLink id="kibSecuritySolutionServerlessPluginApi" text="securitySolutionServerless"/> | [@elastic/security-solution](https://github.com/orgs/elastic/teams/security-solution) | Serverless customizations for security. | 7 | 0 | 7 | 0 |
 | <DocLink id="kibServerlessPluginApi" text="serverless"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | The core Serverless plugin, providing APIs to Serverless Project plugins. | 25 | 0 | 24 | 0 |
@@ -204,7 +204,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibTaskManagerPluginApi" text="taskManager"/> | [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-ops) | - | 108 | 0 | 64 | 7 |
 | <DocLink id="kibTelemetryPluginApi" text="telemetry"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 45 | 0 | 1 | 0 |
 | <DocLink id="kibTelemetryCollectionManagerPluginApi" text="telemetryCollectionManager"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 31 | 0 | 26 | 6 |
-| <DocLink id="kibTelemetryCollectionXpackPluginApi" text="telemetryCollectionXpack"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 1 | 0 | 1 | 0 |
+| telemetryCollectionXpack | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 0 | 0 | 0 | 0 |
 | <DocLink id="kibTelemetryManagementSectionPluginApi" text="telemetryManagementSection"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 6 | 0 | 0 | 0 |
 | <DocLink id="kibThreatIntelligencePluginApi" text="threatIntelligence"/> | [@elastic/security-threat-hunting-investigations](https://github.com/orgs/elastic/teams/security-threat-hunting-investigations) | Elastic threat intelligence helps you see if you are open to or have been subject to current or historical known threats | 30 | 0 | 14 | 4 |
 | <DocLink id="kibTimelinesPluginApi" text="timelines"/> | [@elastic/security-threat-hunting-investigations](https://github.com/orgs/elastic/teams/security-threat-hunting-investigations) | - | 226 | 1 | 182 | 17 |
@@ -650,16 +650,16 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibKbnRepoLinterPluginApi" text="@kbn/repo-linter"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 40 | 0 | 38 | 5 |
 | <DocLink id="kibKbnRepoPathPluginApi" text="@kbn/repo-path"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 13 | 0 | 9 | 0 |
 | <DocLink id="kibKbnRepoSourceClassifierPluginApi" text="@kbn/repo-source-classifier"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 6 | 0 | 6 | 1 |
-| <DocLink id="kibKbnReportingCommonPluginApi" text="@kbn/reporting-common"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 99 | 0 | 89 | 13 |
+| <DocLink id="kibKbnReportingCommonPluginApi" text="@kbn/reporting-common"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 98 | 0 | 88 | 13 |
 | <DocLink id="kibKbnReportingCsvSharePanelPluginApi" text="@kbn/reporting-csv-share-panel"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 13 | 0 | 13 | 0 |
-| <DocLink id="kibKbnReportingExportTypesCsvPluginApi" text="@kbn/reporting-export-types-csv"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 52 | 0 | 52 | 3 |
-| <DocLink id="kibKbnReportingExportTypesCsvCommonPluginApi" text="@kbn/reporting-export-types-csv-common"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 25 | 0 | 21 | 0 |
+| <DocLink id="kibKbnReportingExportTypesCsvPluginApi" text="@kbn/reporting-export-types-csv"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 36 | 0 | 36 | 2 |
+| <DocLink id="kibKbnReportingExportTypesCsvCommonPluginApi" text="@kbn/reporting-export-types-csv-common"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 19 | 0 | 15 | 0 |
 | <DocLink id="kibKbnReportingExportTypesPdfPluginApi" text="@kbn/reporting-export-types-pdf"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 34 | 0 | 33 | 0 |
 | <DocLink id="kibKbnReportingExportTypesPdfCommonPluginApi" text="@kbn/reporting-export-types-pdf-common"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 14 | 0 | 11 | 0 |
 | <DocLink id="kibKbnReportingExportTypesPngPluginApi" text="@kbn/reporting-export-types-png"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 17 | 0 | 16 | 0 |
 | <DocLink id="kibKbnReportingExportTypesPngCommonPluginApi" text="@kbn/reporting-export-types-png-common"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 11 | 0 | 9 | 0 |
 | <DocLink id="kibKbnReportingMocksServerPluginApi" text="@kbn/reporting-mocks-server"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 2 | 0 | 2 | 0 |
-| <DocLink id="kibKbnReportingPublicPluginApi" text="@kbn/reporting-public"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 113 | 0 | 106 | 2 |
+| <DocLink id="kibKbnReportingPublicPluginApi" text="@kbn/reporting-public"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 111 | 0 | 104 | 2 |
 | <DocLink id="kibKbnReportingServerPluginApi" text="@kbn/reporting-server"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 92 | 0 | 91 | 0 |
 | <DocLink id="kibKbnResizableLayoutPluginApi" text="@kbn/resizable-layout"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | A component for creating resizable layouts containing a fixed width panel and a flexible panel, with support for horizontal and vertical layouts. | 18 | 0 | 5 | 0 |
 | <DocLink id="kibKbnResponseOpsFeatureFlagServicePluginApi" text="@kbn/response-ops-feature-flag-service"/> | [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-ops) | - | 3 | 0 | 3 | 0 |
@@ -675,7 +675,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibKbnSearchApiKeysComponentsPluginApi" text="@kbn/search-api-keys-components"/> | [@elastic/search-kibana](https://github.com/orgs/elastic/teams/search-kibana) | - | 8 | 0 | 8 | 1 |
 | <DocLink id="kibKbnSearchApiKeysServerPluginApi" text="@kbn/search-api-keys-server"/> | [@elastic/search-kibana](https://github.com/orgs/elastic/teams/search-kibana) | - | 3 | 0 | 3 | 0 |
 | <DocLink id="kibKbnSearchApiPanelsPluginApi" text="@kbn/search-api-panels"/> | [@elastic/search-kibana](https://github.com/orgs/elastic/teams/search-kibana) | - | 76 | 0 | 76 | 0 |
-| <DocLink id="kibKbnSearchConnectorsPluginApi" text="@kbn/search-connectors"/> | [@elastic/search-kibana](https://github.com/orgs/elastic/teams/search-kibana) | - | 3929 | 0 | 3929 | 0 |
+| <DocLink id="kibKbnSearchConnectorsPluginApi" text="@kbn/search-connectors"/> | [@elastic/search-kibana](https://github.com/orgs/elastic/teams/search-kibana) | - | 3948 | 0 | 3948 | 0 |
 | <DocLink id="kibKbnSearchErrorsPluginApi" text="@kbn/search-errors"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | - | 18 | 1 | 17 | 1 |
 | <DocLink id="kibKbnSearchIndexDocumentsPluginApi" text="@kbn/search-index-documents"/> | [@elastic/search-kibana](https://github.com/orgs/elastic/teams/search-kibana) | - | 36 | 0 | 34 | 3 |
 | <DocLink id="kibKbnSearchResponseWarningsPluginApi" text="@kbn/search-response-warnings"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | - | 20 | 0 | 18 | 1 |
@@ -776,7 +776,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibKbnSyntheticsE2ePluginApi" text="@kbn/synthetics-e2e"/> | [@elastic/obs-ux-management-team](https://github.com/orgs/elastic/teams/obs-ux-management-team) | - | 32 | 2 | 32 | 0 |
 | <DocLink id="kibKbnSyntheticsPrivateLocationPluginApi" text="@kbn/synthetics-private-location"/> | [@elastic/obs-ux-management-team](https://github.com/orgs/elastic/teams/obs-ux-management-team) | - | 19 | 0 | 19 | 0 |
 | <DocLink id="kibKbnTelemetryToolsPluginApi" text="@kbn/telemetry-tools"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 7 | 0 | 5 | 1 |
-| <DocLink id="kibKbnTestPluginApi" text="@kbn/test"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 316 | 4 | 268 | 14 |
+| <DocLink id="kibKbnTestPluginApi" text="@kbn/test"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 320 | 4 | 272 | 14 |
 | <DocLink id="kibKbnTestEuiHelpersPluginApi" text="@kbn/test-eui-helpers"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | - | 37 | 1 | 19 | 0 |
 | <DocLink id="kibKbnTestJestHelpersPluginApi" text="@kbn/test-jest-helpers"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 131 | 3 | 98 | 2 |
 | <DocLink id="kibKbnTestSubjSelectorPluginApi" text="@kbn/test-subj-selector"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 2 | 0 | 1 | 0 |
@@ -790,7 +790,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibKbnUiActionsBrowserPluginApi" text="@kbn/ui-actions-browser"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 42 | 0 | 28 | 0 |
 | <DocLink id="kibKbnUiSharedDepsSrcPluginApi" text="@kbn/ui-shared-deps-src"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 59 | 0 | 50 | 0 |
 | <DocLink id="kibKbnUiThemePluginApi" text="@kbn/ui-theme"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 9 | 0 | 8 | 0 |
-| <DocLink id="kibKbnUnifiedDataTablePluginApi" text="@kbn/unified-data-table"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | Contains functionality for the unified data table which can be integrated into apps | 183 | 0 | 108 | 1 |
+| <DocLink id="kibKbnUnifiedDataTablePluginApi" text="@kbn/unified-data-table"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | Contains functionality for the unified data table which can be integrated into apps | 184 | 0 | 108 | 1 |
 | <DocLink id="kibKbnUnifiedDocViewerPluginApi" text="@kbn/unified-doc-viewer"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | - | 18 | 0 | 17 | 5 |
 | <DocLink id="kibKbnUnifiedFieldListPluginApi" text="@kbn/unified-field-list"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | Contains functionality for the field list and field stats which can be integrated into apps | 315 | 0 | 286 | 8 |
 | <DocLink id="kibKbnUnsavedChangesBadgePluginApi" text="@kbn/unsaved-changes-badge"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | - | 13 | 0 | 9 | 0 |
diff --git a/api_docs/presentation_panel.mdx b/api_docs/presentation_panel.mdx
index f54dde9f3dcda..f9ca699cd1e21 100644
--- a/api_docs/presentation_panel.mdx
+++ b/api_docs/presentation_panel.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/presentationPanel
 title: "presentationPanel"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the presentationPanel plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'presentationPanel']
 ---
 import presentationPanelObj from './presentation_panel.devdocs.json';
diff --git a/api_docs/presentation_util.mdx b/api_docs/presentation_util.mdx
index fc6990b984af1..24303eb3715e5 100644
--- a/api_docs/presentation_util.mdx
+++ b/api_docs/presentation_util.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/presentationUtil
 title: "presentationUtil"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the presentationUtil plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'presentationUtil']
 ---
 import presentationUtilObj from './presentation_util.devdocs.json';
diff --git a/api_docs/profiling.mdx b/api_docs/profiling.mdx
index 7df685ad6e496..48cd2425e741a 100644
--- a/api_docs/profiling.mdx
+++ b/api_docs/profiling.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/profiling
 title: "profiling"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the profiling plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'profiling']
 ---
 import profilingObj from './profiling.devdocs.json';
diff --git a/api_docs/profiling_data_access.mdx b/api_docs/profiling_data_access.mdx
index edc9cd4ac9b86..5a70c4cd56978 100644
--- a/api_docs/profiling_data_access.mdx
+++ b/api_docs/profiling_data_access.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/profilingDataAccess
 title: "profilingDataAccess"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the profilingDataAccess plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'profilingDataAccess']
 ---
 import profilingDataAccessObj from './profiling_data_access.devdocs.json';
diff --git a/api_docs/remote_clusters.mdx b/api_docs/remote_clusters.mdx
index 495773da464e1..06a196d175581 100644
--- a/api_docs/remote_clusters.mdx
+++ b/api_docs/remote_clusters.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/remoteClusters
 title: "remoteClusters"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the remoteClusters plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'remoteClusters']
 ---
 import remoteClustersObj from './remote_clusters.devdocs.json';
diff --git a/api_docs/reporting.mdx b/api_docs/reporting.mdx
index ec961837b098b..591672f94009c 100644
--- a/api_docs/reporting.mdx
+++ b/api_docs/reporting.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/reporting
 title: "reporting"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the reporting plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'reporting']
 ---
 import reportingObj from './reporting.devdocs.json';
diff --git a/api_docs/rollup.mdx b/api_docs/rollup.mdx
index 81c275e80aec8..b2db34296a7b2 100644
--- a/api_docs/rollup.mdx
+++ b/api_docs/rollup.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/rollup
 title: "rollup"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the rollup plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'rollup']
 ---
 import rollupObj from './rollup.devdocs.json';
diff --git a/api_docs/rule_registry.mdx b/api_docs/rule_registry.mdx
index 35aff09472ec0..2763aa48cc3ae 100644
--- a/api_docs/rule_registry.mdx
+++ b/api_docs/rule_registry.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/ruleRegistry
 title: "ruleRegistry"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the ruleRegistry plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'ruleRegistry']
 ---
 import ruleRegistryObj from './rule_registry.devdocs.json';
diff --git a/api_docs/runtime_fields.mdx b/api_docs/runtime_fields.mdx
index ad1c236e6f578..df0cd9e35df15 100644
--- a/api_docs/runtime_fields.mdx
+++ b/api_docs/runtime_fields.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/runtimeFields
 title: "runtimeFields"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the runtimeFields plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'runtimeFields']
 ---
 import runtimeFieldsObj from './runtime_fields.devdocs.json';
diff --git a/api_docs/saved_objects.mdx b/api_docs/saved_objects.mdx
index 1100f6c155878..d2732a6825201 100644
--- a/api_docs/saved_objects.mdx
+++ b/api_docs/saved_objects.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedObjects
 title: "savedObjects"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the savedObjects plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'savedObjects']
 ---
 import savedObjectsObj from './saved_objects.devdocs.json';
diff --git a/api_docs/saved_objects_finder.mdx b/api_docs/saved_objects_finder.mdx
index 358e480ec0b06..e479957d6effb 100644
--- a/api_docs/saved_objects_finder.mdx
+++ b/api_docs/saved_objects_finder.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedObjectsFinder
 title: "savedObjectsFinder"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the savedObjectsFinder plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'savedObjectsFinder']
 ---
 import savedObjectsFinderObj from './saved_objects_finder.devdocs.json';
diff --git a/api_docs/saved_objects_management.mdx b/api_docs/saved_objects_management.mdx
index b8fbeb9d04014..12b713a5ea269 100644
--- a/api_docs/saved_objects_management.mdx
+++ b/api_docs/saved_objects_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedObjectsManagement
 title: "savedObjectsManagement"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the savedObjectsManagement plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'savedObjectsManagement']
 ---
 import savedObjectsManagementObj from './saved_objects_management.devdocs.json';
diff --git a/api_docs/saved_objects_tagging.mdx b/api_docs/saved_objects_tagging.mdx
index 9771b77adaba6..36b61b0984a4e 100644
--- a/api_docs/saved_objects_tagging.mdx
+++ b/api_docs/saved_objects_tagging.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedObjectsTagging
 title: "savedObjectsTagging"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the savedObjectsTagging plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'savedObjectsTagging']
 ---
 import savedObjectsTaggingObj from './saved_objects_tagging.devdocs.json';
diff --git a/api_docs/saved_objects_tagging_oss.mdx b/api_docs/saved_objects_tagging_oss.mdx
index 23bf042487001..7cd18794a1292 100644
--- a/api_docs/saved_objects_tagging_oss.mdx
+++ b/api_docs/saved_objects_tagging_oss.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedObjectsTaggingOss
 title: "savedObjectsTaggingOss"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the savedObjectsTaggingOss plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'savedObjectsTaggingOss']
 ---
 import savedObjectsTaggingOssObj from './saved_objects_tagging_oss.devdocs.json';
diff --git a/api_docs/saved_search.mdx b/api_docs/saved_search.mdx
index a18c3a9a6f79d..4e536426939e8 100644
--- a/api_docs/saved_search.mdx
+++ b/api_docs/saved_search.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedSearch
 title: "savedSearch"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the savedSearch plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'savedSearch']
 ---
 import savedSearchObj from './saved_search.devdocs.json';
diff --git a/api_docs/screenshot_mode.mdx b/api_docs/screenshot_mode.mdx
index 752d84ce921f0..080613104c97c 100644
--- a/api_docs/screenshot_mode.mdx
+++ b/api_docs/screenshot_mode.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/screenshotMode
 title: "screenshotMode"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the screenshotMode plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'screenshotMode']
 ---
 import screenshotModeObj from './screenshot_mode.devdocs.json';
diff --git a/api_docs/screenshotting.mdx b/api_docs/screenshotting.mdx
index 2eacc96fbf71c..39600bacc4b64 100644
--- a/api_docs/screenshotting.mdx
+++ b/api_docs/screenshotting.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/screenshotting
 title: "screenshotting"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the screenshotting plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'screenshotting']
 ---
 import screenshottingObj from './screenshotting.devdocs.json';
diff --git a/api_docs/search_assistant.mdx b/api_docs/search_assistant.mdx
index 70e09994214a8..a1c59825e45de 100644
--- a/api_docs/search_assistant.mdx
+++ b/api_docs/search_assistant.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/searchAssistant
 title: "searchAssistant"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the searchAssistant plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'searchAssistant']
 ---
 import searchAssistantObj from './search_assistant.devdocs.json';
diff --git a/api_docs/search_connectors.devdocs.json b/api_docs/search_connectors.devdocs.json
index ae37858d47495..2a7fc789e21b0 100644
--- a/api_docs/search_connectors.devdocs.json
+++ b/api_docs/search_connectors.devdocs.json
@@ -5,25 +5,7 @@
     "functions": [],
     "interfaces": [],
     "enums": [],
-    "misc": [
-      {
-        "parentPluginId": "searchConnectors",
-        "id": "def-public.ConnectorDefinition",
-        "type": "Type",
-        "tags": [],
-        "label": "ConnectorDefinition",
-        "description": [],
-        "signature": [
-          "ConnectorClientSideDefinition",
-          " & ",
-          "ConnectorServerSideDefinition"
-        ],
-        "path": "x-pack/plugins/search_connectors/common/types.ts",
-        "deprecated": false,
-        "trackAdoption": false,
-        "initialIsOpen": false
-      }
-    ],
+    "misc": [],
     "objects": [],
     "setup": {
       "parentPluginId": "searchConnectors",
@@ -45,7 +27,13 @@
           "description": [],
           "signature": [
             "() => ",
-            "ConnectorServerSideDefinition",
+            {
+              "pluginId": "@kbn/search-connectors",
+              "scope": "common",
+              "docId": "kibKbnSearchConnectorsPluginApi",
+              "section": "def-common.ConnectorServerSideDefinition",
+              "text": "ConnectorServerSideDefinition"
+            },
             "[]"
           ],
           "path": "x-pack/plugins/search_connectors/public/types.ts",
@@ -78,7 +66,13 @@
           "description": [],
           "signature": [
             "() => ",
-            "ConnectorDefinition",
+            {
+              "pluginId": "@kbn/search-connectors",
+              "scope": "common",
+              "docId": "kibKbnSearchConnectorsPluginApi",
+              "section": "def-common.ConnectorDefinition",
+              "text": "ConnectorDefinition"
+            },
             "[]"
           ],
           "path": "x-pack/plugins/search_connectors/public/types.ts",
@@ -95,152 +89,9 @@
   "server": {
     "classes": [],
     "functions": [],
-    "interfaces": [
-      {
-        "parentPluginId": "searchConnectors",
-        "id": "def-server.ConnectorServerSideDefinition",
-        "type": "Interface",
-        "tags": [],
-        "label": "ConnectorServerSideDefinition",
-        "description": [],
-        "path": "x-pack/plugins/search_connectors/common/connectors.ts",
-        "deprecated": false,
-        "trackAdoption": false,
-        "children": [
-          {
-            "parentPluginId": "searchConnectors",
-            "id": "def-server.ConnectorServerSideDefinition.categories",
-            "type": "Array",
-            "tags": [],
-            "label": "categories",
-            "description": [],
-            "signature": [
-              "string[] | undefined"
-            ],
-            "path": "x-pack/plugins/search_connectors/common/connectors.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "searchConnectors",
-            "id": "def-server.ConnectorServerSideDefinition.description",
-            "type": "string",
-            "tags": [],
-            "label": "description",
-            "description": [],
-            "signature": [
-              "string | undefined"
-            ],
-            "path": "x-pack/plugins/search_connectors/common/connectors.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "searchConnectors",
-            "id": "def-server.ConnectorServerSideDefinition.iconPath",
-            "type": "string",
-            "tags": [],
-            "label": "iconPath",
-            "description": [],
-            "path": "x-pack/plugins/search_connectors/common/connectors.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "searchConnectors",
-            "id": "def-server.ConnectorServerSideDefinition.isBeta",
-            "type": "boolean",
-            "tags": [],
-            "label": "isBeta",
-            "description": [],
-            "path": "x-pack/plugins/search_connectors/common/connectors.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "searchConnectors",
-            "id": "def-server.ConnectorServerSideDefinition.isNative",
-            "type": "boolean",
-            "tags": [],
-            "label": "isNative",
-            "description": [],
-            "path": "x-pack/plugins/search_connectors/common/connectors.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "searchConnectors",
-            "id": "def-server.ConnectorServerSideDefinition.isTechPreview",
-            "type": "CompoundType",
-            "tags": [],
-            "label": "isTechPreview",
-            "description": [],
-            "signature": [
-              "boolean | undefined"
-            ],
-            "path": "x-pack/plugins/search_connectors/common/connectors.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "searchConnectors",
-            "id": "def-server.ConnectorServerSideDefinition.keywords",
-            "type": "Array",
-            "tags": [],
-            "label": "keywords",
-            "description": [],
-            "signature": [
-              "string[]"
-            ],
-            "path": "x-pack/plugins/search_connectors/common/connectors.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "searchConnectors",
-            "id": "def-server.ConnectorServerSideDefinition.name",
-            "type": "string",
-            "tags": [],
-            "label": "name",
-            "description": [],
-            "path": "x-pack/plugins/search_connectors/common/connectors.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "searchConnectors",
-            "id": "def-server.ConnectorServerSideDefinition.serviceType",
-            "type": "string",
-            "tags": [],
-            "label": "serviceType",
-            "description": [],
-            "path": "x-pack/plugins/search_connectors/common/connectors.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          }
-        ],
-        "initialIsOpen": false
-      }
-    ],
+    "interfaces": [],
     "enums": [],
-    "misc": [
-      {
-        "parentPluginId": "searchConnectors",
-        "id": "def-server.CONNECTOR_DEFINITIONS",
-        "type": "Array",
-        "tags": [],
-        "label": "CONNECTOR_DEFINITIONS",
-        "description": [],
-        "signature": [
-          "ConnectorServerSideDefinition",
-          "[]"
-        ],
-        "path": "x-pack/plugins/search_connectors/common/connectors.ts",
-        "deprecated": false,
-        "trackAdoption": false,
-        "initialIsOpen": false
-      }
-    ],
+    "misc": [],
     "objects": [],
     "setup": {
       "parentPluginId": "searchConnectors",
@@ -262,7 +113,13 @@
           "description": [],
           "signature": [
             "() => ",
-            "ConnectorServerSideDefinition",
+            {
+              "pluginId": "@kbn/search-connectors",
+              "scope": "common",
+              "docId": "kibKbnSearchConnectorsPluginApi",
+              "section": "def-common.ConnectorServerSideDefinition",
+              "text": "ConnectorServerSideDefinition"
+            },
             "[]"
           ],
           "path": "x-pack/plugins/search_connectors/server/types.ts",
diff --git a/api_docs/search_connectors.mdx b/api_docs/search_connectors.mdx
index 5cb60b3745c4a..3d162cdd0f3a4 100644
--- a/api_docs/search_connectors.mdx
+++ b/api_docs/search_connectors.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/searchConnectors
 title: "searchConnectors"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the searchConnectors plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'searchConnectors']
 ---
 import searchConnectorsObj from './search_connectors.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/search-kibana](https://github.com/orgs/elastic/teams/search-ki
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 19 | 0 | 19 | 3 |
+| 7 | 0 | 7 | 0 |
 
 ## Client
 
@@ -31,9 +31,6 @@ Contact [@elastic/search-kibana](https://github.com/orgs/elastic/teams/search-ki
 ### Start
 <DocDefinitionList data={[searchConnectorsObj.client.start]}/>
 
-### Consts, variables and types
-<DocDefinitionList data={searchConnectorsObj.client.misc}/>
-
 ## Server
 
 ### Setup
@@ -42,9 +39,3 @@ Contact [@elastic/search-kibana](https://github.com/orgs/elastic/teams/search-ki
 ### Start
 <DocDefinitionList data={[searchConnectorsObj.server.start]}/>
 
-### Interfaces
-<DocDefinitionList data={searchConnectorsObj.server.interfaces}/>
-
-### Consts, variables and types
-<DocDefinitionList data={searchConnectorsObj.server.misc}/>
-
diff --git a/api_docs/search_homepage.mdx b/api_docs/search_homepage.mdx
index b2c0a5be8c6dc..1d5014d13affc 100644
--- a/api_docs/search_homepage.mdx
+++ b/api_docs/search_homepage.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/searchHomepage
 title: "searchHomepage"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the searchHomepage plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'searchHomepage']
 ---
 import searchHomepageObj from './search_homepage.devdocs.json';
diff --git a/api_docs/search_indices.mdx b/api_docs/search_indices.mdx
index 2cbe439eb665a..45011048bcece 100644
--- a/api_docs/search_indices.mdx
+++ b/api_docs/search_indices.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/searchIndices
 title: "searchIndices"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the searchIndices plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'searchIndices']
 ---
 import searchIndicesObj from './search_indices.devdocs.json';
diff --git a/api_docs/search_inference_endpoints.mdx b/api_docs/search_inference_endpoints.mdx
index 78b171a020035..78d183fca5218 100644
--- a/api_docs/search_inference_endpoints.mdx
+++ b/api_docs/search_inference_endpoints.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/searchInferenceEndpoints
 title: "searchInferenceEndpoints"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the searchInferenceEndpoints plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'searchInferenceEndpoints']
 ---
 import searchInferenceEndpointsObj from './search_inference_endpoints.devdocs.json';
diff --git a/api_docs/search_notebooks.mdx b/api_docs/search_notebooks.mdx
index 0dc1a3bb31be8..39676b6cdeb14 100644
--- a/api_docs/search_notebooks.mdx
+++ b/api_docs/search_notebooks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/searchNotebooks
 title: "searchNotebooks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the searchNotebooks plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'searchNotebooks']
 ---
 import searchNotebooksObj from './search_notebooks.devdocs.json';
diff --git a/api_docs/search_playground.mdx b/api_docs/search_playground.mdx
index 28916e9199c3f..9f2319e6d03f0 100644
--- a/api_docs/search_playground.mdx
+++ b/api_docs/search_playground.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/searchPlayground
 title: "searchPlayground"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the searchPlayground plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'searchPlayground']
 ---
 import searchPlaygroundObj from './search_playground.devdocs.json';
diff --git a/api_docs/security.devdocs.json b/api_docs/security.devdocs.json
index 18274d63075c1..06d005330608b 100644
--- a/api_docs/security.devdocs.json
+++ b/api_docs/security.devdocs.json
@@ -6501,6 +6501,18 @@
               "plugin": "entityManager",
               "path": "x-pack/plugins/entity_manager/server/routes/enablement/disable.ts"
             },
+            {
+              "plugin": "apm",
+              "path": "x-pack/plugins/observability_solution/apm/server/lib/helpers/get_random_sampler/index.ts"
+            },
+            {
+              "plugin": "apm",
+              "path": "x-pack/plugins/observability_solution/apm/server/routes/agent_keys/get_agent_keys_privileges.ts"
+            },
+            {
+              "plugin": "apm",
+              "path": "x-pack/plugins/observability_solution/apm/server/routes/fleet/is_superuser.ts"
+            },
             {
               "plugin": "serverlessSearch",
               "path": "x-pack/plugins/serverless_search/server/routes/api_key_routes.ts"
@@ -6521,18 +6533,6 @@
               "plugin": "upgradeAssistant",
               "path": "x-pack/plugins/upgrade_assistant/server/lib/reindexing/credential_store.ts"
             },
-            {
-              "plugin": "apm",
-              "path": "x-pack/plugins/observability_solution/apm/server/lib/helpers/get_random_sampler/index.ts"
-            },
-            {
-              "plugin": "apm",
-              "path": "x-pack/plugins/observability_solution/apm/server/routes/agent_keys/get_agent_keys_privileges.ts"
-            },
-            {
-              "plugin": "apm",
-              "path": "x-pack/plugins/observability_solution/apm/server/routes/fleet/is_superuser.ts"
-            },
             {
               "plugin": "synthetics",
               "path": "x-pack/plugins/observability_solution/synthetics/server/synthetics_service/get_api_key.ts"
diff --git a/api_docs/security.mdx b/api_docs/security.mdx
index 0dfe337c1261c..df1aac1a5f90e 100644
--- a/api_docs/security.mdx
+++ b/api_docs/security.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/security
 title: "security"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the security plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'security']
 ---
 import securityObj from './security.devdocs.json';
diff --git a/api_docs/security_solution.devdocs.json b/api_docs/security_solution.devdocs.json
index d155268affcdb..608baf2669dfc 100644
--- a/api_docs/security_solution.devdocs.json
+++ b/api_docs/security_solution.devdocs.json
@@ -2778,6 +2778,29 @@
             "children": [],
             "returnComment": []
           },
+          {
+            "parentPluginId": "securitySolution",
+            "id": "def-server.SecuritySolutionApiRequestHandlerContext.getDataViewsService",
+            "type": "Function",
+            "tags": [],
+            "label": "getDataViewsService",
+            "description": [],
+            "signature": [
+              "() => ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewsService",
+                "text": "DataViewsService"
+              }
+            ],
+            "path": "x-pack/plugins/security_solution/server/types.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [],
+            "returnComment": []
+          },
           {
             "parentPluginId": "securitySolution",
             "id": "def-server.SecuritySolutionApiRequestHandlerContext.getExceptionListClient",
@@ -2889,14 +2912,37 @@
           },
           {
             "parentPluginId": "securitySolution",
-            "id": "def-server.SecuritySolutionApiRequestHandlerContext.getSiemMigrationsClient",
+            "id": "def-server.SecuritySolutionApiRequestHandlerContext.getSiemRuleMigrationsClient",
             "type": "Function",
             "tags": [],
-            "label": "getSiemMigrationsClient",
+            "label": "getSiemRuleMigrationsClient",
             "description": [],
             "signature": [
               "() => ",
-              "SiemMigrationsClient"
+              "SiemRuleMigrationsClient"
+            ],
+            "path": "x-pack/plugins/security_solution/server/types.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "securitySolution",
+            "id": "def-server.SecuritySolutionApiRequestHandlerContext.getInferenceClient",
+            "type": "Function",
+            "tags": [],
+            "label": "getInferenceClient",
+            "description": [],
+            "signature": [
+              "() => ",
+              {
+                "pluginId": "inference",
+                "scope": "server",
+                "docId": "kibInferencePluginApi",
+                "section": "def-server.InferenceClient",
+                "text": "InferenceClient"
+              }
             ],
             "path": "x-pack/plugins/security_solution/server/types.ts",
             "deprecated": false,
diff --git a/api_docs/security_solution.mdx b/api_docs/security_solution.mdx
index dc1b9a3d66c99..0d6069e9c0efe 100644
--- a/api_docs/security_solution.mdx
+++ b/api_docs/security_solution.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/securitySolution
 title: "securitySolution"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the securitySolution plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'securitySolution']
 ---
 import securitySolutionObj from './security_solution.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/security-solution](https://github.com/orgs/elastic/teams/secur
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 186 | 0 | 118 | 33 |
+| 188 | 0 | 120 | 33 |
 
 ## Client
 
diff --git a/api_docs/security_solution_ess.mdx b/api_docs/security_solution_ess.mdx
index c253b80d8b916..3ab334c418f20 100644
--- a/api_docs/security_solution_ess.mdx
+++ b/api_docs/security_solution_ess.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/securitySolutionEss
 title: "securitySolutionEss"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the securitySolutionEss plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'securitySolutionEss']
 ---
 import securitySolutionEssObj from './security_solution_ess.devdocs.json';
diff --git a/api_docs/security_solution_serverless.mdx b/api_docs/security_solution_serverless.mdx
index be48339ece392..e7eba49502280 100644
--- a/api_docs/security_solution_serverless.mdx
+++ b/api_docs/security_solution_serverless.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/securitySolutionServerless
 title: "securitySolutionServerless"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the securitySolutionServerless plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'securitySolutionServerless']
 ---
 import securitySolutionServerlessObj from './security_solution_serverless.devdocs.json';
diff --git a/api_docs/serverless.mdx b/api_docs/serverless.mdx
index d1db5c8c6efde..9a381cb7f7d0d 100644
--- a/api_docs/serverless.mdx
+++ b/api_docs/serverless.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/serverless
 title: "serverless"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the serverless plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'serverless']
 ---
 import serverlessObj from './serverless.devdocs.json';
diff --git a/api_docs/serverless_observability.mdx b/api_docs/serverless_observability.mdx
index 2f0e3bd1df6fb..3671cd24cb624 100644
--- a/api_docs/serverless_observability.mdx
+++ b/api_docs/serverless_observability.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/serverlessObservability
 title: "serverlessObservability"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the serverlessObservability plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'serverlessObservability']
 ---
 import serverlessObservabilityObj from './serverless_observability.devdocs.json';
diff --git a/api_docs/serverless_search.mdx b/api_docs/serverless_search.mdx
index 6e16bebce8de6..0dd7a45b74c55 100644
--- a/api_docs/serverless_search.mdx
+++ b/api_docs/serverless_search.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/serverlessSearch
 title: "serverlessSearch"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the serverlessSearch plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'serverlessSearch']
 ---
 import serverlessSearchObj from './serverless_search.devdocs.json';
diff --git a/api_docs/session_view.mdx b/api_docs/session_view.mdx
index a43fc1a693105..0773e489357ab 100644
--- a/api_docs/session_view.mdx
+++ b/api_docs/session_view.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/sessionView
 title: "sessionView"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the sessionView plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'sessionView']
 ---
 import sessionViewObj from './session_view.devdocs.json';
diff --git a/api_docs/share.mdx b/api_docs/share.mdx
index a09c4d37729af..8872998047d41 100644
--- a/api_docs/share.mdx
+++ b/api_docs/share.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/share
 title: "share"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the share plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'share']
 ---
 import shareObj from './share.devdocs.json';
diff --git a/api_docs/slo.mdx b/api_docs/slo.mdx
index 920a755b40943..2f8be21aa22c6 100644
--- a/api_docs/slo.mdx
+++ b/api_docs/slo.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/slo
 title: "slo"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the slo plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'slo']
 ---
 import sloObj from './slo.devdocs.json';
diff --git a/api_docs/snapshot_restore.mdx b/api_docs/snapshot_restore.mdx
index 81913419ea126..d1bb484c5f7ce 100644
--- a/api_docs/snapshot_restore.mdx
+++ b/api_docs/snapshot_restore.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/snapshotRestore
 title: "snapshotRestore"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the snapshotRestore plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'snapshotRestore']
 ---
 import snapshotRestoreObj from './snapshot_restore.devdocs.json';
diff --git a/api_docs/spaces.mdx b/api_docs/spaces.mdx
index d5b2cb390f073..04aa7ad6384b4 100644
--- a/api_docs/spaces.mdx
+++ b/api_docs/spaces.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/spaces
 title: "spaces"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the spaces plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'spaces']
 ---
 import spacesObj from './spaces.devdocs.json';
diff --git a/api_docs/stack_alerts.mdx b/api_docs/stack_alerts.mdx
index 301e0da105ceb..33a1314a5b98c 100644
--- a/api_docs/stack_alerts.mdx
+++ b/api_docs/stack_alerts.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/stackAlerts
 title: "stackAlerts"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the stackAlerts plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'stackAlerts']
 ---
 import stackAlertsObj from './stack_alerts.devdocs.json';
diff --git a/api_docs/stack_connectors.mdx b/api_docs/stack_connectors.mdx
index 43263b1cf9272..bc8512a0d85f6 100644
--- a/api_docs/stack_connectors.mdx
+++ b/api_docs/stack_connectors.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/stackConnectors
 title: "stackConnectors"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the stackConnectors plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'stackConnectors']
 ---
 import stackConnectorsObj from './stack_connectors.devdocs.json';
diff --git a/api_docs/task_manager.mdx b/api_docs/task_manager.mdx
index d33fea0e5a927..5baccfaa7e5e4 100644
--- a/api_docs/task_manager.mdx
+++ b/api_docs/task_manager.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/taskManager
 title: "taskManager"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the taskManager plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'taskManager']
 ---
 import taskManagerObj from './task_manager.devdocs.json';
diff --git a/api_docs/telemetry.mdx b/api_docs/telemetry.mdx
index d897dc412ddda..cb49acdaf1568 100644
--- a/api_docs/telemetry.mdx
+++ b/api_docs/telemetry.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/telemetry
 title: "telemetry"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the telemetry plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'telemetry']
 ---
 import telemetryObj from './telemetry.devdocs.json';
diff --git a/api_docs/telemetry_collection_manager.mdx b/api_docs/telemetry_collection_manager.mdx
index a7bb5c57965e4..ecd351844dfc0 100644
--- a/api_docs/telemetry_collection_manager.mdx
+++ b/api_docs/telemetry_collection_manager.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/telemetryCollectionManager
 title: "telemetryCollectionManager"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the telemetryCollectionManager plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'telemetryCollectionManager']
 ---
 import telemetryCollectionManagerObj from './telemetry_collection_manager.devdocs.json';
diff --git a/api_docs/telemetry_management_section.mdx b/api_docs/telemetry_management_section.mdx
index ab641ee07336b..8a0609952de9b 100644
--- a/api_docs/telemetry_management_section.mdx
+++ b/api_docs/telemetry_management_section.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/telemetryManagementSection
 title: "telemetryManagementSection"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the telemetryManagementSection plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'telemetryManagementSection']
 ---
 import telemetryManagementSectionObj from './telemetry_management_section.devdocs.json';
diff --git a/api_docs/threat_intelligence.mdx b/api_docs/threat_intelligence.mdx
index b44f8bdf3a616..7ceb069ec87b6 100644
--- a/api_docs/threat_intelligence.mdx
+++ b/api_docs/threat_intelligence.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/threatIntelligence
 title: "threatIntelligence"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the threatIntelligence plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'threatIntelligence']
 ---
 import threatIntelligenceObj from './threat_intelligence.devdocs.json';
diff --git a/api_docs/timelines.mdx b/api_docs/timelines.mdx
index 534feb8f261bd..02f37e72749e8 100644
--- a/api_docs/timelines.mdx
+++ b/api_docs/timelines.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/timelines
 title: "timelines"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the timelines plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'timelines']
 ---
 import timelinesObj from './timelines.devdocs.json';
diff --git a/api_docs/transform.mdx b/api_docs/transform.mdx
index f140bf24539ef..6672f0d70103b 100644
--- a/api_docs/transform.mdx
+++ b/api_docs/transform.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/transform
 title: "transform"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the transform plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'transform']
 ---
 import transformObj from './transform.devdocs.json';
diff --git a/api_docs/triggers_actions_ui.mdx b/api_docs/triggers_actions_ui.mdx
index 5b28484e4bf49..93bcad236bbc5 100644
--- a/api_docs/triggers_actions_ui.mdx
+++ b/api_docs/triggers_actions_ui.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/triggersActionsUi
 title: "triggersActionsUi"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the triggersActionsUi plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'triggersActionsUi']
 ---
 import triggersActionsUiObj from './triggers_actions_ui.devdocs.json';
diff --git a/api_docs/ui_actions.mdx b/api_docs/ui_actions.mdx
index 1ed25f057a02c..3d004b9dc208d 100644
--- a/api_docs/ui_actions.mdx
+++ b/api_docs/ui_actions.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/uiActions
 title: "uiActions"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the uiActions plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'uiActions']
 ---
 import uiActionsObj from './ui_actions.devdocs.json';
diff --git a/api_docs/ui_actions_enhanced.mdx b/api_docs/ui_actions_enhanced.mdx
index 516401a39a671..2ddbb61bb4e9d 100644
--- a/api_docs/ui_actions_enhanced.mdx
+++ b/api_docs/ui_actions_enhanced.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/uiActionsEnhanced
 title: "uiActionsEnhanced"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the uiActionsEnhanced plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'uiActionsEnhanced']
 ---
 import uiActionsEnhancedObj from './ui_actions_enhanced.devdocs.json';
diff --git a/api_docs/unified_doc_viewer.mdx b/api_docs/unified_doc_viewer.mdx
index 463f7e2fb4543..04c275082e787 100644
--- a/api_docs/unified_doc_viewer.mdx
+++ b/api_docs/unified_doc_viewer.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/unifiedDocViewer
 title: "unifiedDocViewer"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the unifiedDocViewer plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'unifiedDocViewer']
 ---
 import unifiedDocViewerObj from './unified_doc_viewer.devdocs.json';
diff --git a/api_docs/unified_histogram.mdx b/api_docs/unified_histogram.mdx
index 83c7f132f7d2f..0958859dbe7ca 100644
--- a/api_docs/unified_histogram.mdx
+++ b/api_docs/unified_histogram.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/unifiedHistogram
 title: "unifiedHistogram"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the unifiedHistogram plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'unifiedHistogram']
 ---
 import unifiedHistogramObj from './unified_histogram.devdocs.json';
diff --git a/api_docs/unified_search.mdx b/api_docs/unified_search.mdx
index 2b2f0de1fc9cc..9cbc5065d1928 100644
--- a/api_docs/unified_search.mdx
+++ b/api_docs/unified_search.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/unifiedSearch
 title: "unifiedSearch"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the unifiedSearch plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'unifiedSearch']
 ---
 import unifiedSearchObj from './unified_search.devdocs.json';
diff --git a/api_docs/unified_search_autocomplete.mdx b/api_docs/unified_search_autocomplete.mdx
index 3031aa5aad761..2e8d17696fab4 100644
--- a/api_docs/unified_search_autocomplete.mdx
+++ b/api_docs/unified_search_autocomplete.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/unifiedSearch-autocomplete
 title: "unifiedSearch.autocomplete"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the unifiedSearch.autocomplete plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'unifiedSearch.autocomplete']
 ---
 import unifiedSearchAutocompleteObj from './unified_search_autocomplete.devdocs.json';
diff --git a/api_docs/uptime.mdx b/api_docs/uptime.mdx
index 4194639a9ec90..9d0b3845b02d7 100644
--- a/api_docs/uptime.mdx
+++ b/api_docs/uptime.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/uptime
 title: "uptime"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the uptime plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'uptime']
 ---
 import uptimeObj from './uptime.devdocs.json';
diff --git a/api_docs/url_forwarding.mdx b/api_docs/url_forwarding.mdx
index 2360492503926..902073e9d4519 100644
--- a/api_docs/url_forwarding.mdx
+++ b/api_docs/url_forwarding.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/urlForwarding
 title: "urlForwarding"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the urlForwarding plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'urlForwarding']
 ---
 import urlForwardingObj from './url_forwarding.devdocs.json';
diff --git a/api_docs/usage_collection.mdx b/api_docs/usage_collection.mdx
index af7c54eba79e7..5184e0929974f 100644
--- a/api_docs/usage_collection.mdx
+++ b/api_docs/usage_collection.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/usageCollection
 title: "usageCollection"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the usageCollection plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'usageCollection']
 ---
 import usageCollectionObj from './usage_collection.devdocs.json';
diff --git a/api_docs/ux.mdx b/api_docs/ux.mdx
index 00a283e192b5b..ec8b555fe5d51 100644
--- a/api_docs/ux.mdx
+++ b/api_docs/ux.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/ux
 title: "ux"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the ux plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'ux']
 ---
 import uxObj from './ux.devdocs.json';
diff --git a/api_docs/vis_default_editor.mdx b/api_docs/vis_default_editor.mdx
index 6f59dff990989..3aa52b906ba6c 100644
--- a/api_docs/vis_default_editor.mdx
+++ b/api_docs/vis_default_editor.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visDefaultEditor
 title: "visDefaultEditor"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visDefaultEditor plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visDefaultEditor']
 ---
 import visDefaultEditorObj from './vis_default_editor.devdocs.json';
diff --git a/api_docs/vis_type_gauge.mdx b/api_docs/vis_type_gauge.mdx
index 04519c6de8a97..1f4c7e841e349 100644
--- a/api_docs/vis_type_gauge.mdx
+++ b/api_docs/vis_type_gauge.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeGauge
 title: "visTypeGauge"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypeGauge plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeGauge']
 ---
 import visTypeGaugeObj from './vis_type_gauge.devdocs.json';
diff --git a/api_docs/vis_type_heatmap.mdx b/api_docs/vis_type_heatmap.mdx
index 220a9dc753cac..99c6463362937 100644
--- a/api_docs/vis_type_heatmap.mdx
+++ b/api_docs/vis_type_heatmap.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeHeatmap
 title: "visTypeHeatmap"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypeHeatmap plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeHeatmap']
 ---
 import visTypeHeatmapObj from './vis_type_heatmap.devdocs.json';
diff --git a/api_docs/vis_type_pie.mdx b/api_docs/vis_type_pie.mdx
index 93a2b93d3657e..32b798bf3590d 100644
--- a/api_docs/vis_type_pie.mdx
+++ b/api_docs/vis_type_pie.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypePie
 title: "visTypePie"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypePie plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypePie']
 ---
 import visTypePieObj from './vis_type_pie.devdocs.json';
diff --git a/api_docs/vis_type_table.mdx b/api_docs/vis_type_table.mdx
index d33bdf75f78be..4d4697d81f9d0 100644
--- a/api_docs/vis_type_table.mdx
+++ b/api_docs/vis_type_table.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeTable
 title: "visTypeTable"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypeTable plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeTable']
 ---
 import visTypeTableObj from './vis_type_table.devdocs.json';
diff --git a/api_docs/vis_type_timelion.mdx b/api_docs/vis_type_timelion.mdx
index 1ef84aca7478d..2cbf56e52f6c5 100644
--- a/api_docs/vis_type_timelion.mdx
+++ b/api_docs/vis_type_timelion.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeTimelion
 title: "visTypeTimelion"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypeTimelion plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeTimelion']
 ---
 import visTypeTimelionObj from './vis_type_timelion.devdocs.json';
diff --git a/api_docs/vis_type_timeseries.mdx b/api_docs/vis_type_timeseries.mdx
index 178c2d2f41917..5c7cf2db5ef06 100644
--- a/api_docs/vis_type_timeseries.mdx
+++ b/api_docs/vis_type_timeseries.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeTimeseries
 title: "visTypeTimeseries"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypeTimeseries plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeTimeseries']
 ---
 import visTypeTimeseriesObj from './vis_type_timeseries.devdocs.json';
diff --git a/api_docs/vis_type_vega.mdx b/api_docs/vis_type_vega.mdx
index d2955034fa375..11088d474a3aa 100644
--- a/api_docs/vis_type_vega.mdx
+++ b/api_docs/vis_type_vega.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeVega
 title: "visTypeVega"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypeVega plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeVega']
 ---
 import visTypeVegaObj from './vis_type_vega.devdocs.json';
diff --git a/api_docs/vis_type_vislib.mdx b/api_docs/vis_type_vislib.mdx
index 2ab7000de0c5f..e96e2d7233846 100644
--- a/api_docs/vis_type_vislib.mdx
+++ b/api_docs/vis_type_vislib.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeVislib
 title: "visTypeVislib"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypeVislib plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeVislib']
 ---
 import visTypeVislibObj from './vis_type_vislib.devdocs.json';
diff --git a/api_docs/vis_type_xy.mdx b/api_docs/vis_type_xy.mdx
index 15efbe2e78720..525bfb1534297 100644
--- a/api_docs/vis_type_xy.mdx
+++ b/api_docs/vis_type_xy.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeXy
 title: "visTypeXy"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypeXy plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeXy']
 ---
 import visTypeXyObj from './vis_type_xy.devdocs.json';
diff --git a/api_docs/visualizations.mdx b/api_docs/visualizations.mdx
index 7547731225759..402835f4c6c87 100644
--- a/api_docs/visualizations.mdx
+++ b/api_docs/visualizations.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visualizations
 title: "visualizations"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visualizations plugin
-date: 2024-11-06
+date: 2024-11-07
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visualizations']
 ---
 import visualizationsObj from './visualizations.devdocs.json';
diff --git a/dev_docs/nav-kibana-dev.docnav.json b/dev_docs/nav-kibana-dev.docnav.json
index 289593aaf159c..141af7984adf8 100644
--- a/dev_docs/nav-kibana-dev.docnav.json
+++ b/dev_docs/nav-kibana-dev.docnav.json
@@ -624,9 +624,6 @@
         {
           "id": "kibTelemetryCollectionManagerPluginApi"
         },
-        {
-          "id": "kibTelemetryCollectionXpackPluginApi"
-        },
         {
           "id": "kibTelemetryManagementSectionPluginApi"
         },
diff --git a/docs/CHANGELOG.asciidoc b/docs/CHANGELOG.asciidoc
index 22d5aaa2877c3..f030de4645e3f 100644
--- a/docs/CHANGELOG.asciidoc
+++ b/docs/CHANGELOG.asciidoc
@@ -11,6 +11,7 @@
 Review important information about the {kib} 8.x releases.
 
 * <<release-notes-8.16.0>>
+* <<release-notes-8.15.4>>
 * <<release-notes-8.15.3>>
 * <<release-notes-8.15.2>>
 * <<release-notes-8.15.1>>
@@ -430,6 +431,33 @@ Management::
 * Fixes the pagination of the source documents data grid in Transforms ({kibana-pull}196119[#196119]).
 * Fixes autocomplete suggestions after a comma in Console ({kibana-pull}189656[#189656]).
 
+[[release-notes-8.15.4]]
+== {kib} 8.15.4
+
+The 8.15.4 release includes the following bug fixes.
+
+[float]
+[[fixes-v8.15.4]]
+=== Bug fixes
+Dashboards and visualizations::
+* Fixes incomplete string escaping and encoding in *TSVB* ({kibana-pull}196248[#196248]).
+* Adds scroll margin to panels ({kibana-pull}193430[#193430]).
+* Fixes an issue where label truncation in heat map legends was not working properly in *Lens* ({kibana-pull}195928[#195928]).
+Discover::
+* Fixes the width for saved object Type column ({kibana-pull}194388[#194388]).
+Elastic Observability solution::
+* Changes the slice outcome from bad to good whenever there is no data during the slice window ({kibana-pull}196942[#196942]).
+Elastic Search solution::
+* Fixes a bug with the {ref}/es-connectors-network-drive.html[Network Drive connector] where advanced configuration fields were not displayed for CSV file role mappings with `Drive Type: Linux` selected ({kibana-pull}195567[#195567]).
+Elastic Security solution::
+For the Elastic Security 8.15.4 release information, refer to {security-guide}/release-notes.html[_Elastic Security Solution Release Notes_].
+Kibana platform::
+* Fixes an issue causing the wrong date to show in the header of a report when generated from a relative date ({kibana-pull}197027[#197027]).
+* Fixes an issue with the export options for PNG/PDF reports in a dashboard ({kibana-pull}192530[#192530]).
+Machine Learning::
+* Fixes an issue preventing Anomaly swim lane panels from updating on query changes ({kibana-pull}195090[#195090]).
+Management::
+* Fixes the pagination of the source documents data grid in Transforms ({kibana-pull}196119[#196119]).
 
 [[release-notes-8.15.3]]
 == {kib} 8.15.3
@@ -456,7 +484,6 @@ Elastic Security solution::
 For the Elastic Security 8.15.3 release information, refer to {security-guide}/release-notes.html[_Elastic Security Solution Release Notes_].
 Kibana security::
 * Automatic Import no longer asks the LLM to map fields to reserved ECS fields ({kibana-pull}195168[#195168]).
-* Automatic Import no longer returns an "Invalid ECS field" message when the ECS mapping slightly differs from the expected format. For example `date_format` instead of `date_formats` ({kibana-pull}195167[#195167]).
 * Fixes an issue that was causing the Grok processor to return non-ECS compatible fields when processing structured or unstructured syslog samples in Automatic Import ({kibana-pull}194727[#194727]).
 * Fixes the integrationName when uploading a new version of an existing integration using a ZIP upload ({kibana-pull}194298[#194298]).
 * Fixes a bug that caused the Deploy step of Automatic Import to fail after a pipeline was edited and saved ({kibana-pull}194203[#194203]).
diff --git a/docs/api/synthetics/monitors/delete-monitor-api.asciidoc b/docs/api/synthetics/monitors/delete-monitor-api.asciidoc
index 70861fcd60a36..74798b40830b7 100644
--- a/docs/api/synthetics/monitors/delete-monitor-api.asciidoc
+++ b/docs/api/synthetics/monitors/delete-monitor-api.asciidoc
@@ -17,9 +17,6 @@ Deletes one or more monitors from the Synthetics app.
 You must have `all` privileges for the *Synthetics* feature in the *{observability}* section of the
 <<kibana-feature-privileges,{kib} feature privileges>>.
 
-You must have `all` privileges for the *Synthetics* feature in the *{observability}* section of the
-<<kibana-feature-privileges,{kib} feature privileges>>.
-
 
 [[delete-monitor-api-path-params]]
 === {api-path-parms-title}
@@ -27,7 +24,6 @@ You must have `all` privileges for the *Synthetics* feature in the *{observabili
 `config_id`::
 (Required, string) The ID of the monitor that you want to delete.
 
-
 Here is an example of a DELETE request to delete a monitor by ID:
 
 [source,sh]
@@ -37,7 +33,7 @@ DELETE /api/synthetics/monitors/monitor1-id
 
 ==== Bulk Delete Monitors
 
-You can delete multiple monitors by sending a list of config ids to a DELETE request to the `/api/synthetics/monitors` endpoint.
+You can delete multiple monitors by sending a list of config ids to a POST request to the `/api/synthetics/monitors/_bulk_delete` endpoint.
 
 
 [[monitors-delete-request-body]]
@@ -49,11 +45,11 @@ The request body should contain an array of monitors IDs that you want to delete
 (Required, array of strings) An array of monitor IDs to delete.
 
 
-Here is an example of a DELETE request to delete a list of monitors by ID:
+Here is an example of a POST request to delete a list of monitors by ID:
 
 [source,sh]
 --------------------------------------------------
-DELETE /api/synthetics/monitors
+POST /api/synthetics/monitors/_bulk_delete
 {
   "ids": [
     "monitor1-id",
diff --git a/docs/api/synthetics/params/delete-param.asciidoc b/docs/api/synthetics/params/delete-param.asciidoc
index 4c7d7911ec180..031a47501a8a8 100644
--- a/docs/api/synthetics/params/delete-param.asciidoc
+++ b/docs/api/synthetics/params/delete-param.asciidoc
@@ -8,9 +8,9 @@ Deletes one or more parameters from the Synthetics app.
 
 === {api-request-title}
 
-`DELETE <kibana host>:<port>/api/synthetics/params`
+`DELETE <kibana host>:<port>/api/synthetics/params/<param_id>`
 
-`DELETE <kibana host>:<port>/s/<space_id>/api/synthetics/params`
+`DELETE <kibana host>:<port>/s/<space_id>/api/synthetics/params/<param_id>`
 
 === {api-prereq-title}
 
@@ -20,26 +20,19 @@ You must have `all` privileges for the *Synthetics* feature in the *{observabili
 You must have `all` privileges for the *Synthetics* feature in the *{observability}* section of the
 <<kibana-feature-privileges,{kib} feature privileges>>.
 
-[[parameters-delete-request-body]]
-==== Request Body
+[[parameters-delete-path-param]]
+==== Path Parameters
 
 The request body should contain an array of parameter IDs that you want to delete.
 
-`ids`::
-(Required, array of strings) An array of parameter IDs to delete.
+`param_id`::
+(Required, string) An id of parameter to delete.
 
-
-Here is an example of a DELETE request to delete a list of parameters by ID:
+Here is an example of a DELETE request to delete a parameter by its ID:
 
 [source,sh]
 --------------------------------------------------
-DELETE /api/synthetics/params
-{
-  "ids": [
-    "param1-id",
-    "param2-id"
-  ]
-}
+DELETE /api/synthetics/params/param_id1
 --------------------------------------------------
 
 [[parameters-delete-response-example]]
@@ -58,10 +51,21 @@ Here's an example response for deleting multiple parameters:
   {
     "id": "param1-id",
     "deleted": true
-  },
-  {
-    "id": "param2-id",
-    "deleted": true
   }
 ]
---------------------------------------------------
\ No newline at end of file
+--------------------------------------------------
+
+==== Bulk delete parameters
+To delete multiple parameters, you can send a POST request to `/api/synthetics/params/_bulk_delete`  with an array of parameter IDs to delete via body.
+
+Here is an example of a POST request to delete multiple parameters:
+
+[source,sh]
+--------------------------------------------------
+POST /api/synthetics/params/_bulk_delete
+{
+  "ids": ["param1-id", "param2-id"]
+}
+--------------------------------------------------
+
+
diff --git a/oas_docs/bundle.json b/oas_docs/bundle.json
index 743d6ae6e422a..19094b82be094 100644
--- a/oas_docs/bundle.json
+++ b/oas_docs/bundle.json
@@ -16887,176 +16887,6 @@
         ]
       }
     },
-    "/api/fleet/enrollment-api-keys": {
-      "get": {
-        "operationId": "get-fleet-enrollment-api-keys-2",
-        "parameters": [
-          {
-            "description": "The version of the API to use",
-            "in": "header",
-            "name": "elastic-api-version",
-            "schema": {
-              "default": "2023-10-31",
-              "enum": [
-                "2023-10-31"
-              ],
-              "type": "string"
-            }
-          },
-          {
-            "in": "query",
-            "name": "page",
-            "required": false,
-            "schema": {
-              "default": 1,
-              "type": "number"
-            }
-          },
-          {
-            "in": "query",
-            "name": "perPage",
-            "required": false,
-            "schema": {
-              "default": 20,
-              "type": "number"
-            }
-          },
-          {
-            "in": "query",
-            "name": "kuery",
-            "required": false,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {},
-        "summary": "",
-        "tags": []
-      },
-      "post": {
-        "operationId": "post-fleet-enrollment-api-keys-2",
-        "parameters": [
-          {
-            "description": "The version of the API to use",
-            "in": "header",
-            "name": "elastic-api-version",
-            "schema": {
-              "default": "2023-10-31",
-              "enum": [
-                "2023-10-31"
-              ],
-              "type": "string"
-            }
-          },
-          {
-            "description": "A required header to protect against CSRF attacks",
-            "in": "header",
-            "name": "kbn-xsrf",
-            "required": true,
-            "schema": {
-              "example": "true",
-              "type": "string"
-            }
-          }
-        ],
-        "requestBody": {
-          "content": {
-            "application/json; Elastic-Api-Version=2023-10-31": {
-              "schema": {
-                "additionalProperties": false,
-                "properties": {
-                  "expiration": {
-                    "type": "string"
-                  },
-                  "name": {
-                    "type": "string"
-                  },
-                  "policy_id": {
-                    "type": "string"
-                  }
-                },
-                "required": [
-                  "policy_id"
-                ],
-                "type": "object"
-              }
-            }
-          }
-        },
-        "responses": {},
-        "summary": "",
-        "tags": []
-      }
-    },
-    "/api/fleet/enrollment-api-keys/{keyId}": {
-      "delete": {
-        "operationId": "delete-fleet-enrollment-api-keys-keyid-2",
-        "parameters": [
-          {
-            "description": "The version of the API to use",
-            "in": "header",
-            "name": "elastic-api-version",
-            "schema": {
-              "default": "2023-10-31",
-              "enum": [
-                "2023-10-31"
-              ],
-              "type": "string"
-            }
-          },
-          {
-            "description": "A required header to protect against CSRF attacks",
-            "in": "header",
-            "name": "kbn-xsrf",
-            "required": true,
-            "schema": {
-              "example": "true",
-              "type": "string"
-            }
-          },
-          {
-            "in": "path",
-            "name": "keyId",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {},
-        "summary": "",
-        "tags": []
-      },
-      "get": {
-        "operationId": "get-fleet-enrollment-api-keys-keyid-2",
-        "parameters": [
-          {
-            "description": "The version of the API to use",
-            "in": "header",
-            "name": "elastic-api-version",
-            "schema": {
-              "default": "2023-10-31",
-              "enum": [
-                "2023-10-31"
-              ],
-              "type": "string"
-            }
-          },
-          {
-            "in": "path",
-            "name": "keyId",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {},
-        "summary": "",
-        "tags": []
-      }
-    },
     "/api/fleet/enrollment_api_keys": {
       "get": {
         "description": "List enrollment API keys",
@@ -17150,49 +16980,6 @@
                       },
                       "type": "array"
                     },
-                    "list": {
-                      "deprecated": true,
-                      "items": {
-                        "additionalProperties": false,
-                        "properties": {
-                          "active": {
-                            "description": "When false, the enrollment API key is revoked and cannot be used for enrolling Elastic Agents.",
-                            "type": "boolean"
-                          },
-                          "api_key": {
-                            "description": "The enrollment API key (token) used for enrolling Elastic Agents.",
-                            "type": "string"
-                          },
-                          "api_key_id": {
-                            "description": "The ID of the API key in the Security API.",
-                            "type": "string"
-                          },
-                          "created_at": {
-                            "type": "string"
-                          },
-                          "id": {
-                            "type": "string"
-                          },
-                          "name": {
-                            "description": "The name of the enrollment API key.",
-                            "type": "string"
-                          },
-                          "policy_id": {
-                            "description": "The ID of the agent policy the Elastic Agent will be enrolled in.",
-                            "type": "string"
-                          }
-                        },
-                        "required": [
-                          "id",
-                          "api_key_id",
-                          "api_key",
-                          "active",
-                          "created_at"
-                        ],
-                        "type": "object"
-                      },
-                      "type": "array"
-                    },
                     "page": {
                       "type": "number"
                     },
@@ -17207,8 +16994,7 @@
                     "items",
                     "total",
                     "page",
-                    "perPage",
-                    "list"
+                    "perPage"
                   ],
                   "type": "object"
                 }
@@ -17768,14 +17554,6 @@
               "type": "boolean"
             }
           },
-          {
-            "in": "query",
-            "name": "experimental",
-            "required": false,
-            "schema": {
-              "type": "boolean"
-            }
-          },
           {
             "in": "query",
             "name": "include_policy_templates",
@@ -17820,36 +17598,6 @@
                         "type": "object"
                       },
                       "type": "array"
-                    },
-                    "response": {
-                      "items": {
-                        "additionalProperties": false,
-                        "deprecated": true,
-                        "properties": {
-                          "count": {
-                            "type": "number"
-                          },
-                          "id": {
-                            "type": "string"
-                          },
-                          "parent_id": {
-                            "type": "string"
-                          },
-                          "parent_title": {
-                            "type": "string"
-                          },
-                          "title": {
-                            "type": "string"
-                          }
-                        },
-                        "required": [
-                          "id",
-                          "title",
-                          "count"
-                        ],
-                        "type": "object"
-                      },
-                      "type": "array"
                     }
                   },
                   "required": [
@@ -18058,79 +17806,6 @@
                         ]
                       },
                       "type": "array"
-                    },
-                    "response": {
-                      "deprecated": true,
-                      "items": {
-                        "anyOf": [
-                          {
-                            "additionalProperties": false,
-                            "properties": {
-                              "id": {
-                                "type": "string"
-                              },
-                              "originId": {
-                                "type": "string"
-                              },
-                              "type": {
-                                "enum": [
-                                  "dashboard",
-                                  "lens",
-                                  "visualization",
-                                  "search",
-                                  "index-pattern",
-                                  "map",
-                                  "ml-module",
-                                  "security-rule",
-                                  "csp-rule-template",
-                                  "osquery-pack-asset",
-                                  "osquery-saved-query",
-                                  "tag"
-                                ],
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "id",
-                              "type"
-                            ],
-                            "type": "object"
-                          },
-                          {
-                            "additionalProperties": false,
-                            "properties": {
-                              "deferred": {
-                                "type": "boolean"
-                              },
-                              "id": {
-                                "type": "string"
-                              },
-                              "type": {
-                                "enum": [
-                                  "index",
-                                  "index_template",
-                                  "component_template",
-                                  "ingest_pipeline",
-                                  "ilm_policy",
-                                  "data_stream_ilm_policy",
-                                  "transform",
-                                  "ml_model"
-                                ],
-                                "type": "string"
-                              },
-                              "version": {
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "id",
-                              "type"
-                            ],
-                            "type": "object"
-                          }
-                        ]
-                      },
-                      "type": "array"
                     }
                   },
                   "required": [
@@ -18333,14 +18008,6 @@
               "type": "boolean"
             }
           },
-          {
-            "in": "query",
-            "name": "experimental",
-            "required": false,
-            "schema": {
-              "type": "boolean"
-            }
-          },
           {
             "in": "query",
             "name": "excludeInstallStatus",
@@ -18791,7 +18458,6 @@
                             ],
                             "type": "string"
                           },
-                          "savedObject": {},
                           "signature_path": {
                             "type": "string"
                           },
@@ -18833,7 +18499,6 @@
                           }
                         },
                         "required": [
-                          "savedObject",
                           "name",
                           "version",
                           "title",
@@ -18842,497 +18507,197 @@
                         "type": "object"
                       },
                       "type": "array"
+                    }
+                  },
+                  "required": [
+                    "items"
+                  ],
+                  "type": "object"
+                }
+              }
+            }
+          },
+          "400": {
+            "content": {
+              "application/json; Elastic-Api-Version=2023-10-31": {
+                "schema": {
+                  "additionalProperties": false,
+                  "description": "Generic Error",
+                  "properties": {
+                    "error": {
+                      "type": "string"
                     },
-                    "response": {
+                    "message": {
+                      "type": "string"
+                    },
+                    "statusCode": {
+                      "type": "number"
+                    }
+                  },
+                  "required": [
+                    "message"
+                  ],
+                  "type": "object"
+                }
+              }
+            }
+          }
+        },
+        "summary": "",
+        "tags": [
+          "Elastic Package Manager (EPM)"
+        ]
+      },
+      "post": {
+        "description": "Install package by upload",
+        "operationId": "post-fleet-epm-packages",
+        "parameters": [
+          {
+            "description": "The version of the API to use",
+            "in": "header",
+            "name": "elastic-api-version",
+            "schema": {
+              "default": "2023-10-31",
+              "enum": [
+                "2023-10-31"
+              ],
+              "type": "string"
+            }
+          },
+          {
+            "description": "A required header to protect against CSRF attacks",
+            "in": "header",
+            "name": "kbn-xsrf",
+            "required": true,
+            "schema": {
+              "example": "true",
+              "type": "string"
+            }
+          },
+          {
+            "in": "query",
+            "name": "ignoreMappingUpdateErrors",
+            "required": false,
+            "schema": {
+              "default": false,
+              "type": "boolean"
+            }
+          },
+          {
+            "in": "query",
+            "name": "skipDataStreamRollover",
+            "required": false,
+            "schema": {
+              "default": false,
+              "type": "boolean"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/gzip; application/zip; Elastic-Api-Version=2023-10-31": {
+              "schema": {
+                "format": "binary",
+                "type": "string"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "content": {
+              "application/gzip; application/zip; Elastic-Api-Version=2023-10-31": {
+                "schema": {
+                  "additionalProperties": false,
+                  "properties": {
+                    "_meta": {
+                      "additionalProperties": false,
+                      "properties": {
+                        "install_source": {
+                          "type": "string"
+                        }
+                      },
+                      "required": [
+                        "install_source"
+                      ],
+                      "type": "object"
+                    },
+                    "items": {
                       "items": {
-                        "additionalProperties": true,
-                        "deprecated": true,
-                        "properties": {
-                          "categories": {
-                            "items": {
-                              "type": "string"
-                            },
-                            "type": "array"
-                          },
-                          "conditions": {
-                            "additionalProperties": true,
+                        "anyOf": [
+                          {
+                            "additionalProperties": false,
                             "properties": {
-                              "elastic": {
-                                "additionalProperties": true,
-                                "properties": {
-                                  "capabilities": {
-                                    "items": {
-                                      "type": "string"
-                                    },
-                                    "type": "array"
-                                  },
-                                  "subscription": {
-                                    "type": "string"
-                                  }
-                                },
-                                "type": "object"
+                              "id": {
+                                "type": "string"
                               },
-                              "kibana": {
-                                "additionalProperties": true,
-                                "properties": {
-                                  "version": {
-                                    "type": "string"
-                                  }
-                                },
-                                "type": "object"
+                              "originId": {
+                                "type": "string"
+                              },
+                              "type": {
+                                "enum": [
+                                  "dashboard",
+                                  "lens",
+                                  "visualization",
+                                  "search",
+                                  "index-pattern",
+                                  "map",
+                                  "ml-module",
+                                  "security-rule",
+                                  "csp-rule-template",
+                                  "osquery-pack-asset",
+                                  "osquery-saved-query",
+                                  "tag"
+                                ],
+                                "type": "string"
                               }
                             },
+                            "required": [
+                              "id",
+                              "type"
+                            ],
                             "type": "object"
                           },
-                          "data_streams": {
-                            "items": {
-                              "additionalProperties": {},
-                              "type": "object"
-                            },
-                            "type": "array"
-                          },
-                          "description": {
-                            "type": "string"
-                          },
-                          "discovery": {
-                            "additionalProperties": true,
-                            "properties": {
-                              "fields": {
-                                "items": {
-                                  "additionalProperties": true,
-                                  "properties": {
-                                    "name": {
-                                      "type": "string"
-                                    }
-                                  },
-                                  "required": [
-                                    "name"
-                                  ],
-                                  "type": "object"
-                                },
-                                "type": "array"
-                              }
-                            },
-                            "type": "object"
-                          },
-                          "download": {
-                            "type": "string"
-                          },
-                          "format_version": {
-                            "type": "string"
-                          },
-                          "icons": {
-                            "items": {
-                              "additionalProperties": true,
-                              "properties": {
-                                "dark_mode": {
-                                  "type": "boolean"
-                                },
-                                "path": {
-                                  "type": "string"
-                                },
-                                "size": {
-                                  "type": "string"
-                                },
-                                "src": {
-                                  "type": "string"
-                                },
-                                "title": {
-                                  "type": "string"
-                                },
-                                "type": {
-                                  "type": "string"
-                                }
-                              },
-                              "required": [
-                                "src"
-                              ],
-                              "type": "object"
-                            },
-                            "type": "array"
-                          },
-                          "id": {
-                            "type": "string"
-                          },
-                          "installationInfo": {
-                            "additionalProperties": true,
+                          {
+                            "additionalProperties": false,
                             "properties": {
-                              "additional_spaces_installed_kibana": {
-                                "additionalProperties": {
-                                  "items": {
-                                    "additionalProperties": true,
-                                    "properties": {
-                                      "id": {
-                                        "type": "string"
-                                      },
-                                      "originId": {
-                                        "type": "string"
-                                      },
-                                      "type": {
-                                        "enum": [
-                                          "dashboard",
-                                          "lens",
-                                          "visualization",
-                                          "search",
-                                          "index-pattern",
-                                          "map",
-                                          "ml-module",
-                                          "security-rule",
-                                          "csp-rule-template",
-                                          "osquery-pack-asset",
-                                          "osquery-saved-query",
-                                          "tag"
-                                        ],
-                                        "type": "string"
-                                      }
-                                    },
-                                    "required": [
-                                      "id",
-                                      "type"
-                                    ],
-                                    "type": "object"
-                                  },
-                                  "type": "array"
-                                },
-                                "type": "object"
-                              },
-                              "created_at": {
-                                "type": "string"
-                              },
-                              "experimental_data_stream_features": {
-                                "items": {
-                                  "additionalProperties": true,
-                                  "properties": {
-                                    "data_stream": {
-                                      "type": "string"
-                                    },
-                                    "features": {
-                                      "additionalProperties": true,
-                                      "properties": {
-                                        "doc_value_only_numeric": {
-                                          "type": "boolean"
-                                        },
-                                        "doc_value_only_other": {
-                                          "type": "boolean"
-                                        },
-                                        "synthetic_source": {
-                                          "type": "boolean"
-                                        },
-                                        "tsdb": {
-                                          "type": "boolean"
-                                        }
-                                      },
-                                      "type": "object"
-                                    }
-                                  },
-                                  "required": [
-                                    "data_stream",
-                                    "features"
-                                  ],
-                                  "type": "object"
-                                },
-                                "type": "array"
-                              },
-                              "install_format_schema_version": {
-                                "type": "string"
+                              "deferred": {
+                                "type": "boolean"
                               },
-                              "install_source": {
-                                "enum": [
-                                  "registry",
-                                  "upload",
-                                  "bundled",
-                                  "custom"
-                                ],
+                              "id": {
                                 "type": "string"
                               },
-                              "install_status": {
+                              "type": {
                                 "enum": [
-                                  "installed",
-                                  "installing",
-                                  "install_failed"
+                                  "index",
+                                  "index_template",
+                                  "component_template",
+                                  "ingest_pipeline",
+                                  "ilm_policy",
+                                  "data_stream_ilm_policy",
+                                  "transform",
+                                  "ml_model"
                                 ],
                                 "type": "string"
                               },
-                              "installed_es": {
-                                "items": {
-                                  "additionalProperties": true,
-                                  "properties": {
-                                    "deferred": {
-                                      "type": "boolean"
-                                    },
-                                    "id": {
-                                      "type": "string"
-                                    },
-                                    "type": {
-                                      "enum": [
-                                        "index",
-                                        "index_template",
-                                        "component_template",
-                                        "ingest_pipeline",
-                                        "ilm_policy",
-                                        "data_stream_ilm_policy",
-                                        "transform",
-                                        "ml_model"
-                                      ],
-                                      "type": "string"
-                                    },
-                                    "version": {
-                                      "type": "string"
-                                    }
-                                  },
-                                  "required": [
-                                    "id",
-                                    "type"
-                                  ],
-                                  "type": "object"
-                                },
-                                "type": "array"
-                              },
-                              "installed_kibana": {
-                                "items": {
-                                  "additionalProperties": true,
-                                  "properties": {
-                                    "id": {
-                                      "type": "string"
-                                    },
-                                    "originId": {
-                                      "type": "string"
-                                    },
-                                    "type": {
-                                      "enum": [
-                                        "dashboard",
-                                        "lens",
-                                        "visualization",
-                                        "search",
-                                        "index-pattern",
-                                        "map",
-                                        "ml-module",
-                                        "security-rule",
-                                        "csp-rule-template",
-                                        "osquery-pack-asset",
-                                        "osquery-saved-query",
-                                        "tag"
-                                      ],
-                                      "type": "string"
-                                    }
-                                  },
-                                  "required": [
-                                    "id",
-                                    "type"
-                                  ],
-                                  "type": "object"
-                                },
-                                "type": "array"
-                              },
-                              "installed_kibana_space_id": {
-                                "type": "string"
-                              },
-                              "latest_executed_state": {
-                                "additionalProperties": true,
-                                "properties": {
-                                  "error": {
-                                    "type": "string"
-                                  },
-                                  "name": {
-                                    "type": "string"
-                                  },
-                                  "started_at": {
-                                    "type": "string"
-                                  }
-                                },
-                                "required": [
-                                  "name",
-                                  "started_at"
-                                ],
-                                "type": "object"
-                              },
-                              "latest_install_failed_attempts": {
-                                "items": {
-                                  "additionalProperties": true,
-                                  "properties": {
-                                    "created_at": {
-                                      "type": "string"
-                                    },
-                                    "error": {
-                                      "additionalProperties": true,
-                                      "properties": {
-                                        "message": {
-                                          "type": "string"
-                                        },
-                                        "name": {
-                                          "type": "string"
-                                        },
-                                        "stack": {
-                                          "type": "string"
-                                        }
-                                      },
-                                      "required": [
-                                        "name",
-                                        "message"
-                                      ],
-                                      "type": "object"
-                                    },
-                                    "target_version": {
-                                      "type": "string"
-                                    }
-                                  },
-                                  "required": [
-                                    "created_at",
-                                    "target_version",
-                                    "error"
-                                  ],
-                                  "type": "object"
-                                },
-                                "type": "array"
-                              },
-                              "name": {
-                                "type": "string"
-                              },
-                              "namespaces": {
-                                "items": {
-                                  "type": "string"
-                                },
-                                "type": "array"
-                              },
-                              "type": {
-                                "type": "string"
-                              },
-                              "updated_at": {
-                                "type": "string"
-                              },
-                              "verification_key_id": {
-                                "nullable": true,
-                                "type": "string"
-                              },
-                              "verification_status": {
-                                "enum": [
-                                  "unverified",
-                                  "verified",
-                                  "unknown"
-                                ],
-                                "type": "string"
-                              },
-                              "version": {
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "type",
-                              "installed_kibana",
-                              "installed_es",
-                              "name",
-                              "version",
-                              "install_status",
-                              "install_source",
-                              "verification_status"
-                            ],
-                            "type": "object"
-                          },
-                          "integration": {
-                            "type": "string"
-                          },
-                          "internal": {
-                            "type": "boolean"
-                          },
-                          "latestVersion": {
-                            "type": "string"
-                          },
-                          "name": {
-                            "type": "string"
-                          },
-                          "owner": {
-                            "additionalProperties": true,
-                            "properties": {
-                              "github": {
-                                "type": "string"
-                              },
-                              "type": {
-                                "enum": [
-                                  "elastic",
-                                  "partner",
-                                  "community"
-                                ],
-                                "type": "string"
-                              }
-                            },
-                            "type": "object"
-                          },
-                          "path": {
-                            "type": "string"
-                          },
-                          "policy_templates": {
-                            "items": {
-                              "additionalProperties": {},
-                              "type": "object"
-                            },
-                            "type": "array"
-                          },
-                          "readme": {
-                            "type": "string"
-                          },
-                          "release": {
-                            "enum": [
-                              "ga",
-                              "beta",
-                              "experimental"
-                            ],
-                            "type": "string"
-                          },
-                          "savedObject": {},
-                          "signature_path": {
-                            "type": "string"
-                          },
-                          "source": {
-                            "additionalProperties": true,
-                            "properties": {
-                              "license": {
+                              "version": {
                                 "type": "string"
                               }
                             },
                             "required": [
-                              "license"
+                              "id",
+                              "type"
                             ],
                             "type": "object"
-                          },
-                          "status": {
-                            "type": "string"
-                          },
-                          "title": {
-                            "type": "string"
-                          },
-                          "type": {
-                            "enum": [
-                              "integration",
-                              "input",
-                              "content"
-                            ],
-                            "type": "string"
-                          },
-                          "vars": {
-                            "items": {
-                              "additionalProperties": {},
-                              "type": "object"
-                            },
-                            "type": "array"
-                          },
-                          "version": {
-                            "type": "string"
                           }
-                        },
-                        "required": [
-                          "savedObject",
-                          "name",
-                          "version",
-                          "title",
-                          "id"
-                        ],
-                        "type": "object"
+                        ]
                       },
                       "type": "array"
                     }
                   },
                   "required": [
-                    "items"
+                    "items",
+                    "_meta"
                   ],
                   "type": "object"
                 }
@@ -19341,7 +18706,7 @@
           },
           "400": {
             "content": {
-              "application/json; Elastic-Api-Version=2023-10-31": {
+              "application/gzip; application/zip; Elastic-Api-Version=2023-10-31": {
                 "schema": {
                   "additionalProperties": false,
                   "description": "Generic Error",
@@ -19369,10 +18734,12 @@
         "tags": [
           "Elastic Package Manager (EPM)"
         ]
-      },
+      }
+    },
+    "/api/fleet/epm/packages/_bulk": {
       "post": {
-        "description": "Install package by upload",
-        "operationId": "post-fleet-epm-packages",
+        "description": "Bulk install packages",
+        "operationId": "post-fleet-epm-packages-bulk",
         "parameters": [
           {
             "description": "The version of the API to use",
@@ -19398,29 +18765,58 @@
           },
           {
             "in": "query",
-            "name": "ignoreMappingUpdateErrors",
-            "required": false,
-            "schema": {
-              "default": false,
-              "type": "boolean"
-            }
-          },
-          {
-            "in": "query",
-            "name": "skipDataStreamRollover",
+            "name": "prerelease",
             "required": false,
             "schema": {
-              "default": false,
               "type": "boolean"
             }
           }
         ],
         "requestBody": {
           "content": {
-            "application/gzip; application/zip; Elastic-Api-Version=2023-10-31": {
+            "application/json; Elastic-Api-Version=2023-10-31": {
               "schema": {
-                "format": "binary",
-                "type": "string"
+                "additionalProperties": false,
+                "properties": {
+                  "force": {
+                    "default": false,
+                    "type": "boolean"
+                  },
+                  "packages": {
+                    "items": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "additionalProperties": false,
+                          "properties": {
+                            "name": {
+                              "type": "string"
+                            },
+                            "prerelease": {
+                              "type": "boolean"
+                            },
+                            "version": {
+                              "type": "string"
+                            }
+                          },
+                          "required": [
+                            "name",
+                            "version"
+                          ],
+                          "type": "object"
+                        }
+                      ]
+                    },
+                    "minItems": 1,
+                    "type": "array"
+                  }
+                },
+                "required": [
+                  "packages"
+                ],
+                "type": "object"
               }
             }
           }
@@ -19428,160 +18824,148 @@
         "responses": {
           "200": {
             "content": {
-              "application/gzip; application/zip; Elastic-Api-Version=2023-10-31": {
+              "application/json; Elastic-Api-Version=2023-10-31": {
                 "schema": {
                   "additionalProperties": false,
                   "properties": {
-                    "_meta": {
-                      "additionalProperties": false,
-                      "properties": {
-                        "install_source": {
-                          "type": "string"
-                        }
-                      },
-                      "required": [
-                        "install_source"
-                      ],
-                      "type": "object"
-                    },
                     "items": {
                       "items": {
                         "anyOf": [
                           {
                             "additionalProperties": false,
                             "properties": {
-                              "id": {
-                                "type": "string"
-                              },
-                              "originId": {
-                                "type": "string"
-                              },
-                              "type": {
-                                "enum": [
-                                  "dashboard",
-                                  "lens",
-                                  "visualization",
-                                  "search",
-                                  "index-pattern",
-                                  "map",
-                                  "ml-module",
-                                  "security-rule",
-                                  "csp-rule-template",
-                                  "osquery-pack-asset",
-                                  "osquery-saved-query",
-                                  "tag"
-                                ],
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "id",
-                              "type"
-                            ],
-                            "type": "object"
-                          },
-                          {
-                            "additionalProperties": false,
-                            "properties": {
-                              "deferred": {
-                                "type": "boolean"
-                              },
-                              "id": {
+                              "name": {
                                 "type": "string"
                               },
-                              "type": {
-                                "enum": [
-                                  "index",
-                                  "index_template",
-                                  "component_template",
-                                  "ingest_pipeline",
-                                  "ilm_policy",
-                                  "data_stream_ilm_policy",
-                                  "transform",
-                                  "ml_model"
+                              "result": {
+                                "additionalProperties": false,
+                                "properties": {
+                                  "assets": {
+                                    "items": {
+                                      "anyOf": [
+                                        {
+                                          "additionalProperties": false,
+                                          "properties": {
+                                            "id": {
+                                              "type": "string"
+                                            },
+                                            "originId": {
+                                              "type": "string"
+                                            },
+                                            "type": {
+                                              "enum": [
+                                                "dashboard",
+                                                "lens",
+                                                "visualization",
+                                                "search",
+                                                "index-pattern",
+                                                "map",
+                                                "ml-module",
+                                                "security-rule",
+                                                "csp-rule-template",
+                                                "osquery-pack-asset",
+                                                "osquery-saved-query",
+                                                "tag"
+                                              ],
+                                              "type": "string"
+                                            }
+                                          },
+                                          "required": [
+                                            "id",
+                                            "type"
+                                          ],
+                                          "type": "object"
+                                        },
+                                        {
+                                          "additionalProperties": false,
+                                          "properties": {
+                                            "deferred": {
+                                              "type": "boolean"
+                                            },
+                                            "id": {
+                                              "type": "string"
+                                            },
+                                            "type": {
+                                              "enum": [
+                                                "index",
+                                                "index_template",
+                                                "component_template",
+                                                "ingest_pipeline",
+                                                "ilm_policy",
+                                                "data_stream_ilm_policy",
+                                                "transform",
+                                                "ml_model"
+                                              ],
+                                              "type": "string"
+                                            },
+                                            "version": {
+                                              "type": "string"
+                                            }
+                                          },
+                                          "required": [
+                                            "id",
+                                            "type"
+                                          ],
+                                          "type": "object"
+                                        }
+                                      ]
+                                    },
+                                    "type": "array"
+                                  },
+                                  "error": {},
+                                  "installSource": {
+                                    "type": "string"
+                                  },
+                                  "installType": {
+                                    "type": "string"
+                                  },
+                                  "status": {
+                                    "enum": [
+                                      "installed",
+                                      "already_installed"
+                                    ],
+                                    "type": "string"
+                                  }
+                                },
+                                "required": [
+                                  "error",
+                                  "installType"
                                 ],
-                                "type": "string"
+                                "type": "object"
                               },
                               "version": {
                                 "type": "string"
                               }
                             },
                             "required": [
-                              "id",
-                              "type"
-                            ],
-                            "type": "object"
-                          }
-                        ]
-                      },
-                      "type": "array"
-                    },
-                    "response": {
-                      "deprecated": true,
-                      "items": {
-                        "anyOf": [
-                          {
-                            "additionalProperties": false,
-                            "properties": {
-                              "id": {
-                                "type": "string"
-                              },
-                              "originId": {
-                                "type": "string"
-                              },
-                              "type": {
-                                "enum": [
-                                  "dashboard",
-                                  "lens",
-                                  "visualization",
-                                  "search",
-                                  "index-pattern",
-                                  "map",
-                                  "ml-module",
-                                  "security-rule",
-                                  "csp-rule-template",
-                                  "osquery-pack-asset",
-                                  "osquery-saved-query",
-                                  "tag"
-                                ],
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "id",
-                              "type"
+                              "name",
+                              "version",
+                              "result"
                             ],
                             "type": "object"
                           },
                           {
                             "additionalProperties": false,
                             "properties": {
-                              "deferred": {
-                                "type": "boolean"
-                              },
-                              "id": {
-                                "type": "string"
+                              "error": {
+                                "anyOf": [
+                                  {
+                                    "type": "string"
+                                  },
+                                  {}
+                                ]
                               },
-                              "type": {
-                                "enum": [
-                                  "index",
-                                  "index_template",
-                                  "component_template",
-                                  "ingest_pipeline",
-                                  "ilm_policy",
-                                  "data_stream_ilm_policy",
-                                  "transform",
-                                  "ml_model"
-                                ],
+                              "name": {
                                 "type": "string"
                               },
-                              "version": {
-                                "type": "string"
+                              "statusCode": {
+                                "type": "number"
                               }
                             },
                             "required": [
-                              "id",
-                              "type"
+                              "name",
+                              "statusCode",
+                              "error"
                             ],
                             "type": "object"
                           }
@@ -19591,8 +18975,7 @@
                     }
                   },
                   "required": [
-                    "items",
-                    "_meta"
+                    "items"
                   ],
                   "type": "object"
                 }
@@ -19601,7 +18984,7 @@
           },
           "400": {
             "content": {
-              "application/gzip; application/zip; Elastic-Api-Version=2023-10-31": {
+              "application/json; Elastic-Api-Version=2023-10-31": {
                 "schema": {
                   "additionalProperties": false,
                   "description": "Generic Error",
@@ -19631,10 +19014,10 @@
         ]
       }
     },
-    "/api/fleet/epm/packages/_bulk": {
-      "post": {
-        "description": "Bulk install packages",
-        "operationId": "post-fleet-epm-packages-bulk",
+    "/api/fleet/epm/packages/installed": {
+      "get": {
+        "description": "Get installed packages",
+        "operationId": "get-fleet-epm-packages-installed",
         "parameters": [
           {
             "description": "The version of the API to use",
@@ -19649,73 +19032,247 @@
             }
           },
           {
-            "description": "A required header to protect against CSRF attacks",
-            "in": "header",
-            "name": "kbn-xsrf",
-            "required": true,
+            "in": "query",
+            "name": "dataStreamType",
+            "required": false,
             "schema": {
-              "example": "true",
+              "enum": [
+                "logs",
+                "metrics",
+                "traces",
+                "synthetics",
+                "profiling"
+              ],
               "type": "string"
             }
           },
           {
             "in": "query",
-            "name": "prerelease",
+            "name": "showOnlyActiveDataStreams",
             "required": false,
             "schema": {
               "type": "boolean"
             }
+          },
+          {
+            "in": "query",
+            "name": "nameQuery",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "query",
+            "name": "searchAfter",
+            "required": false,
+            "schema": {
+              "items": {
+                "anyOf": [
+                  {
+                    "type": "string"
+                  },
+                  {
+                    "type": "number"
+                  }
+                ]
+              },
+              "type": "array"
+            }
+          },
+          {
+            "in": "query",
+            "name": "perPage",
+            "required": false,
+            "schema": {
+              "default": 15,
+              "type": "number"
+            }
+          },
+          {
+            "in": "query",
+            "name": "sortOrder",
+            "required": false,
+            "schema": {
+              "default": "asc",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            }
           }
         ],
-        "requestBody": {
-          "content": {
-            "application/json; Elastic-Api-Version=2023-10-31": {
-              "schema": {
-                "additionalProperties": false,
-                "properties": {
-                  "force": {
-                    "default": false,
-                    "type": "boolean"
-                  },
-                  "packages": {
+        "responses": {
+          "200": {
+            "content": {
+              "application/json; Elastic-Api-Version=2023-10-31": {
+                "schema": {
+                  "additionalProperties": false,
+                  "properties": {
                     "items": {
-                      "anyOf": [
-                        {
-                          "type": "string"
-                        },
-                        {
-                          "additionalProperties": false,
-                          "properties": {
-                            "name": {
-                              "type": "string"
+                      "items": {
+                        "additionalProperties": false,
+                        "properties": {
+                          "dataStreams": {
+                            "items": {
+                              "additionalProperties": false,
+                              "properties": {
+                                "name": {
+                                  "type": "string"
+                                },
+                                "title": {
+                                  "type": "string"
+                                }
+                              },
+                              "required": [
+                                "name",
+                                "title"
+                              ],
+                              "type": "object"
                             },
-                            "prerelease": {
-                              "type": "boolean"
+                            "type": "array"
+                          },
+                          "description": {
+                            "type": "string"
+                          },
+                          "icons": {
+                            "items": {
+                              "additionalProperties": false,
+                              "properties": {
+                                "dark_mode": {
+                                  "type": "boolean"
+                                },
+                                "path": {
+                                  "type": "string"
+                                },
+                                "size": {
+                                  "type": "string"
+                                },
+                                "src": {
+                                  "type": "string"
+                                },
+                                "title": {
+                                  "type": "string"
+                                },
+                                "type": {
+                                  "type": "string"
+                                }
+                              },
+                              "required": [
+                                "src"
+                              ],
+                              "type": "object"
                             },
-                            "version": {
-                              "type": "string"
-                            }
+                            "type": "array"
                           },
-                          "required": [
-                            "name",
-                            "version"
-                          ],
-                          "type": "object"
-                        }
-                      ]
+                          "name": {
+                            "type": "string"
+                          },
+                          "status": {
+                            "type": "string"
+                          },
+                          "title": {
+                            "type": "string"
+                          },
+                          "version": {
+                            "type": "string"
+                          }
+                        },
+                        "required": [
+                          "name",
+                          "version",
+                          "status",
+                          "dataStreams"
+                        ],
+                        "type": "object"
+                      },
+                      "type": "array"
                     },
-                    "minItems": 1,
-                    "type": "array"
-                  }
-                },
-                "required": [
-                  "packages"
-                ],
-                "type": "object"
+                    "searchAfter": {
+                      "items": {
+                        "anyOf": [
+                          {
+                            "type": "string"
+                          },
+                          {
+                            "type": "number"
+                          },
+                          {
+                            "type": "boolean"
+                          },
+                          {
+                            "enum": [],
+                            "nullable": true
+                          },
+                          {}
+                        ]
+                      },
+                      "type": "array"
+                    },
+                    "total": {
+                      "type": "number"
+                    }
+                  },
+                  "required": [
+                    "items",
+                    "total"
+                  ],
+                  "type": "object"
+                }
+              }
+            }
+          },
+          "400": {
+            "content": {
+              "application/json; Elastic-Api-Version=2023-10-31": {
+                "schema": {
+                  "additionalProperties": false,
+                  "description": "Generic Error",
+                  "properties": {
+                    "error": {
+                      "type": "string"
+                    },
+                    "message": {
+                      "type": "string"
+                    },
+                    "statusCode": {
+                      "type": "number"
+                    }
+                  },
+                  "required": [
+                    "message"
+                  ],
+                  "type": "object"
+                }
               }
             }
           }
         },
+        "summary": "",
+        "tags": [
+          "Elastic Package Manager (EPM)"
+        ]
+      }
+    },
+    "/api/fleet/epm/packages/limited": {
+      "get": {
+        "description": "Get limited package list",
+        "operationId": "get-fleet-epm-packages-limited",
+        "parameters": [
+          {
+            "description": "The version of the API to use",
+            "in": "header",
+            "name": "elastic-api-version",
+            "schema": {
+              "default": "2023-10-31",
+              "enum": [
+                "2023-10-31"
+              ],
+              "type": "string"
+            }
+          }
+        ],
         "responses": {
           "200": {
             "content": {
@@ -19725,298 +19282,99 @@
                   "properties": {
                     "items": {
                       "items": {
-                        "anyOf": [
-                          {
-                            "additionalProperties": false,
-                            "properties": {
-                              "name": {
-                                "type": "string"
-                              },
-                              "result": {
-                                "additionalProperties": false,
-                                "properties": {
-                                  "assets": {
-                                    "items": {
-                                      "anyOf": [
-                                        {
-                                          "additionalProperties": false,
-                                          "properties": {
-                                            "id": {
-                                              "type": "string"
-                                            },
-                                            "originId": {
-                                              "type": "string"
-                                            },
-                                            "type": {
-                                              "enum": [
-                                                "dashboard",
-                                                "lens",
-                                                "visualization",
-                                                "search",
-                                                "index-pattern",
-                                                "map",
-                                                "ml-module",
-                                                "security-rule",
-                                                "csp-rule-template",
-                                                "osquery-pack-asset",
-                                                "osquery-saved-query",
-                                                "tag"
-                                              ],
-                                              "type": "string"
-                                            }
-                                          },
-                                          "required": [
-                                            "id",
-                                            "type"
-                                          ],
-                                          "type": "object"
-                                        },
-                                        {
-                                          "additionalProperties": false,
-                                          "properties": {
-                                            "deferred": {
-                                              "type": "boolean"
-                                            },
-                                            "id": {
-                                              "type": "string"
-                                            },
-                                            "type": {
-                                              "enum": [
-                                                "index",
-                                                "index_template",
-                                                "component_template",
-                                                "ingest_pipeline",
-                                                "ilm_policy",
-                                                "data_stream_ilm_policy",
-                                                "transform",
-                                                "ml_model"
-                                              ],
-                                              "type": "string"
-                                            },
-                                            "version": {
-                                              "type": "string"
-                                            }
-                                          },
-                                          "required": [
-                                            "id",
-                                            "type"
-                                          ],
-                                          "type": "object"
-                                        }
-                                      ]
-                                    },
-                                    "type": "array"
-                                  },
-                                  "error": {},
-                                  "installSource": {
-                                    "type": "string"
-                                  },
-                                  "installType": {
-                                    "type": "string"
-                                  },
-                                  "status": {
-                                    "enum": [
-                                      "installed",
-                                      "already_installed"
-                                    ],
-                                    "type": "string"
-                                  }
-                                },
-                                "required": [
-                                  "error",
-                                  "installType"
-                                ],
-                                "type": "object"
-                              },
-                              "version": {
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "name",
-                              "version",
-                              "result"
-                            ],
-                            "type": "object"
-                          },
-                          {
-                            "additionalProperties": false,
-                            "properties": {
-                              "error": {
-                                "anyOf": [
-                                  {
-                                    "type": "string"
-                                  },
-                                  {}
-                                ]
-                              },
-                              "name": {
-                                "type": "string"
-                              },
-                              "statusCode": {
-                                "type": "number"
-                              }
-                            },
-                            "required": [
-                              "name",
-                              "statusCode",
-                              "error"
-                            ],
-                            "type": "object"
-                          }
-                        ]
+                        "type": "string"
                       },
                       "type": "array"
+                    }
+                  },
+                  "required": [
+                    "items"
+                  ],
+                  "type": "object"
+                }
+              }
+            }
+          },
+          "400": {
+            "content": {
+              "application/json; Elastic-Api-Version=2023-10-31": {
+                "schema": {
+                  "additionalProperties": false,
+                  "description": "Generic Error",
+                  "properties": {
+                    "error": {
+                      "type": "string"
+                    },
+                    "message": {
+                      "type": "string"
                     },
+                    "statusCode": {
+                      "type": "number"
+                    }
+                  },
+                  "required": [
+                    "message"
+                  ],
+                  "type": "object"
+                }
+              }
+            }
+          }
+        },
+        "summary": "",
+        "tags": [
+          "Elastic Package Manager (EPM)"
+        ]
+      }
+    },
+    "/api/fleet/epm/packages/{pkgName}/stats": {
+      "get": {
+        "description": "Get package stats",
+        "operationId": "get-fleet-epm-packages-pkgname-stats",
+        "parameters": [
+          {
+            "description": "The version of the API to use",
+            "in": "header",
+            "name": "elastic-api-version",
+            "schema": {
+              "default": "2023-10-31",
+              "enum": [
+                "2023-10-31"
+              ],
+              "type": "string"
+            }
+          },
+          {
+            "in": "path",
+            "name": "pkgName",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "content": {
+              "application/json; Elastic-Api-Version=2023-10-31": {
+                "schema": {
+                  "additionalProperties": false,
+                  "properties": {
                     "response": {
-                      "deprecated": true,
-                      "items": {
-                        "anyOf": [
-                          {
-                            "additionalProperties": false,
-                            "properties": {
-                              "name": {
-                                "type": "string"
-                              },
-                              "result": {
-                                "additionalProperties": false,
-                                "properties": {
-                                  "assets": {
-                                    "items": {
-                                      "anyOf": [
-                                        {
-                                          "additionalProperties": false,
-                                          "properties": {
-                                            "id": {
-                                              "type": "string"
-                                            },
-                                            "originId": {
-                                              "type": "string"
-                                            },
-                                            "type": {
-                                              "enum": [
-                                                "dashboard",
-                                                "lens",
-                                                "visualization",
-                                                "search",
-                                                "index-pattern",
-                                                "map",
-                                                "ml-module",
-                                                "security-rule",
-                                                "csp-rule-template",
-                                                "osquery-pack-asset",
-                                                "osquery-saved-query",
-                                                "tag"
-                                              ],
-                                              "type": "string"
-                                            }
-                                          },
-                                          "required": [
-                                            "id",
-                                            "type"
-                                          ],
-                                          "type": "object"
-                                        },
-                                        {
-                                          "additionalProperties": false,
-                                          "properties": {
-                                            "deferred": {
-                                              "type": "boolean"
-                                            },
-                                            "id": {
-                                              "type": "string"
-                                            },
-                                            "type": {
-                                              "enum": [
-                                                "index",
-                                                "index_template",
-                                                "component_template",
-                                                "ingest_pipeline",
-                                                "ilm_policy",
-                                                "data_stream_ilm_policy",
-                                                "transform",
-                                                "ml_model"
-                                              ],
-                                              "type": "string"
-                                            },
-                                            "version": {
-                                              "type": "string"
-                                            }
-                                          },
-                                          "required": [
-                                            "id",
-                                            "type"
-                                          ],
-                                          "type": "object"
-                                        }
-                                      ]
-                                    },
-                                    "type": "array"
-                                  },
-                                  "error": {},
-                                  "installSource": {
-                                    "type": "string"
-                                  },
-                                  "installType": {
-                                    "type": "string"
-                                  },
-                                  "status": {
-                                    "enum": [
-                                      "installed",
-                                      "already_installed"
-                                    ],
-                                    "type": "string"
-                                  }
-                                },
-                                "required": [
-                                  "error",
-                                  "installType"
-                                ],
-                                "type": "object"
-                              },
-                              "version": {
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "name",
-                              "version",
-                              "result"
-                            ],
-                            "type": "object"
-                          },
-                          {
-                            "additionalProperties": false,
-                            "properties": {
-                              "error": {
-                                "anyOf": [
-                                  {
-                                    "type": "string"
-                                  },
-                                  {}
-                                ]
-                              },
-                              "name": {
-                                "type": "string"
-                              },
-                              "statusCode": {
-                                "type": "number"
-                              }
-                            },
-                            "required": [
-                              "name",
-                              "statusCode",
-                              "error"
-                            ],
-                            "type": "object"
-                          }
-                        ]
+                      "additionalProperties": false,
+                      "properties": {
+                        "agent_policy_count": {
+                          "type": "number"
+                        }
                       },
-                      "type": "array"
+                      "required": [
+                        "agent_policy_count"
+                      ],
+                      "type": "object"
                     }
                   },
                   "required": [
-                    "items"
+                    "response"
                   ],
                   "type": "object"
                 }
@@ -20055,10 +19413,10 @@
         ]
       }
     },
-    "/api/fleet/epm/packages/installed": {
-      "get": {
-        "description": "Get installed packages",
-        "operationId": "get-fleet-epm-packages-installed",
+    "/api/fleet/epm/packages/{pkgName}/{pkgVersion}": {
+      "delete": {
+        "description": "Delete package",
+        "operationId": "delete-fleet-epm-packages-pkgname-pkgversion",
         "parameters": [
           {
             "description": "The version of the API to use",
@@ -20073,74 +19431,37 @@
             }
           },
           {
-            "in": "query",
-            "name": "dataStreamType",
-            "required": false,
+            "description": "A required header to protect against CSRF attacks",
+            "in": "header",
+            "name": "kbn-xsrf",
+            "required": true,
             "schema": {
-              "enum": [
-                "logs",
-                "metrics",
-                "traces",
-                "synthetics",
-                "profiling"
-              ],
+              "example": "true",
               "type": "string"
             }
           },
           {
-            "in": "query",
-            "name": "showOnlyActiveDataStreams",
-            "required": false,
-            "schema": {
-              "type": "boolean"
-            }
-          },
-          {
-            "in": "query",
-            "name": "nameQuery",
-            "required": false,
+            "in": "path",
+            "name": "pkgName",
+            "required": true,
             "schema": {
               "type": "string"
             }
           },
           {
-            "in": "query",
-            "name": "searchAfter",
-            "required": false,
-            "schema": {
-              "items": {
-                "anyOf": [
-                  {
-                    "type": "string"
-                  },
-                  {
-                    "type": "number"
-                  }
-                ]
-              },
-              "type": "array"
-            }
-          },
-          {
-            "in": "query",
-            "name": "perPage",
+            "in": "path",
+            "name": "pkgVersion",
             "required": false,
             "schema": {
-              "default": 15,
-              "type": "number"
+              "type": "string"
             }
           },
           {
             "in": "query",
-            "name": "sortOrder",
+            "name": "force",
             "required": false,
             "schema": {
-              "default": "asc",
-              "enum": [
-                "asc",
-                "desc"
-              ],
-              "type": "string"
+              "type": "boolean"
             }
           }
         ],
@@ -20153,186 +19474,75 @@
                   "properties": {
                     "items": {
                       "items": {
-                        "additionalProperties": false,
-                        "properties": {
-                          "dataStreams": {
-                            "items": {
-                              "additionalProperties": false,
-                              "properties": {
-                                "name": {
-                                  "type": "string"
-                                },
-                                "title": {
-                                  "type": "string"
-                                }
+                        "anyOf": [
+                          {
+                            "additionalProperties": false,
+                            "properties": {
+                              "id": {
+                                "type": "string"
                               },
-                              "required": [
-                                "name",
-                                "title"
-                              ],
-                              "type": "object"
-                            },
-                            "type": "array"
-                          },
-                          "description": {
-                            "type": "string"
-                          },
-                          "icons": {
-                            "items": {
-                              "additionalProperties": false,
-                              "properties": {
-                                "dark_mode": {
-                                  "type": "boolean"
-                                },
-                                "path": {
-                                  "type": "string"
-                                },
-                                "size": {
-                                  "type": "string"
-                                },
-                                "src": {
-                                  "type": "string"
-                                },
-                                "title": {
-                                  "type": "string"
-                                },
-                                "type": {
-                                  "type": "string"
-                                }
+                              "originId": {
+                                "type": "string"
                               },
-                              "required": [
-                                "src"
-                              ],
-                              "type": "object"
+                              "type": {
+                                "enum": [
+                                  "dashboard",
+                                  "lens",
+                                  "visualization",
+                                  "search",
+                                  "index-pattern",
+                                  "map",
+                                  "ml-module",
+                                  "security-rule",
+                                  "csp-rule-template",
+                                  "osquery-pack-asset",
+                                  "osquery-saved-query",
+                                  "tag"
+                                ],
+                                "type": "string"
+                              }
                             },
-                            "type": "array"
-                          },
-                          "name": {
-                            "type": "string"
-                          },
-                          "status": {
-                            "type": "string"
-                          },
-                          "title": {
-                            "type": "string"
-                          },
-                          "version": {
-                            "type": "string"
-                          }
-                        },
-                        "required": [
-                          "name",
-                          "version",
-                          "status",
-                          "dataStreams"
-                        ],
-                        "type": "object"
-                      },
-                      "type": "array"
-                    },
-                    "searchAfter": {
-                      "items": {
-                        "anyOf": [
-                          {
-                            "type": "string"
-                          },
-                          {
-                            "type": "number"
-                          },
-                          {
-                            "type": "boolean"
+                            "required": [
+                              "id",
+                              "type"
+                            ],
+                            "type": "object"
                           },
                           {
-                            "enum": [],
-                            "nullable": true
-                          },
-                          {}
+                            "additionalProperties": false,
+                            "properties": {
+                              "deferred": {
+                                "type": "boolean"
+                              },
+                              "id": {
+                                "type": "string"
+                              },
+                              "type": {
+                                "enum": [
+                                  "index",
+                                  "index_template",
+                                  "component_template",
+                                  "ingest_pipeline",
+                                  "ilm_policy",
+                                  "data_stream_ilm_policy",
+                                  "transform",
+                                  "ml_model"
+                                ],
+                                "type": "string"
+                              },
+                              "version": {
+                                "type": "string"
+                              }
+                            },
+                            "required": [
+                              "id",
+                              "type"
+                            ],
+                            "type": "object"
+                          }
                         ]
                       },
                       "type": "array"
-                    },
-                    "total": {
-                      "type": "number"
-                    }
-                  },
-                  "required": [
-                    "items",
-                    "total"
-                  ],
-                  "type": "object"
-                }
-              }
-            }
-          },
-          "400": {
-            "content": {
-              "application/json; Elastic-Api-Version=2023-10-31": {
-                "schema": {
-                  "additionalProperties": false,
-                  "description": "Generic Error",
-                  "properties": {
-                    "error": {
-                      "type": "string"
-                    },
-                    "message": {
-                      "type": "string"
-                    },
-                    "statusCode": {
-                      "type": "number"
-                    }
-                  },
-                  "required": [
-                    "message"
-                  ],
-                  "type": "object"
-                }
-              }
-            }
-          }
-        },
-        "summary": "",
-        "tags": [
-          "Elastic Package Manager (EPM)"
-        ]
-      }
-    },
-    "/api/fleet/epm/packages/limited": {
-      "get": {
-        "description": "Get limited package list",
-        "operationId": "get-fleet-epm-packages-limited",
-        "parameters": [
-          {
-            "description": "The version of the API to use",
-            "in": "header",
-            "name": "elastic-api-version",
-            "schema": {
-              "default": "2023-10-31",
-              "enum": [
-                "2023-10-31"
-              ],
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "content": {
-              "application/json; Elastic-Api-Version=2023-10-31": {
-                "schema": {
-                  "additionalProperties": false,
-                  "properties": {
-                    "items": {
-                      "items": {
-                        "type": "string"
-                      },
-                      "type": "array"
-                    },
-                    "response": {
-                      "deprecated": true,
-                      "items": {
-                        "type": "string"
-                      },
-                      "type": "array"
                     }
                   },
                   "required": [
@@ -20373,12 +19583,10 @@
         "tags": [
           "Elastic Package Manager (EPM)"
         ]
-      }
-    },
-    "/api/fleet/epm/packages/{pkgName}/stats": {
+      },
       "get": {
-        "description": "Get package stats",
-        "operationId": "get-fleet-epm-packages-pkgname-stats",
+        "description": "Get package",
+        "operationId": "get-fleet-epm-packages-pkgname-pkgversion",
         "parameters": [
           {
             "description": "The version of the API to use",
@@ -20399,139 +19607,49 @@
             "schema": {
               "type": "string"
             }
-          }
-        ],
-        "responses": {
-          "200": {
-            "content": {
-              "application/json; Elastic-Api-Version=2023-10-31": {
-                "schema": {
-                  "additionalProperties": false,
-                  "properties": {
-                    "response": {
-                      "additionalProperties": false,
-                      "properties": {
-                        "agent_policy_count": {
-                          "type": "number"
-                        }
-                      },
-                      "required": [
-                        "agent_policy_count"
-                      ],
-                      "type": "object"
-                    }
-                  },
-                  "required": [
-                    "response"
-                  ],
-                  "type": "object"
-                }
-              }
-            }
           },
-          "400": {
-            "content": {
-              "application/json; Elastic-Api-Version=2023-10-31": {
-                "schema": {
-                  "additionalProperties": false,
-                  "description": "Generic Error",
-                  "properties": {
-                    "error": {
-                      "type": "string"
-                    },
-                    "message": {
-                      "type": "string"
-                    },
-                    "statusCode": {
-                      "type": "number"
-                    }
-                  },
-                  "required": [
-                    "message"
-                  ],
-                  "type": "object"
-                }
-              }
-            }
-          }
-        },
-        "summary": "",
-        "tags": [
-          "Elastic Package Manager (EPM)"
-        ]
-      }
-    },
-    "/api/fleet/epm/packages/{pkgName}/{pkgVersion}": {
-      "delete": {
-        "description": "Delete package",
-        "operationId": "delete-fleet-epm-packages-pkgname-pkgversion",
-        "parameters": [
           {
-            "description": "The version of the API to use",
-            "in": "header",
-            "name": "elastic-api-version",
+            "in": "path",
+            "name": "pkgVersion",
+            "required": false,
             "schema": {
-              "default": "2023-10-31",
-              "enum": [
-                "2023-10-31"
-              ],
               "type": "string"
             }
           },
           {
-            "description": "A required header to protect against CSRF attacks",
-            "in": "header",
-            "name": "kbn-xsrf",
-            "required": true,
+            "in": "query",
+            "name": "ignoreUnverified",
+            "required": false,
             "schema": {
-              "example": "true",
-              "type": "string"
+              "type": "boolean"
             }
           },
           {
-            "in": "path",
-            "name": "pkgName",
-            "required": true,
+            "in": "query",
+            "name": "prerelease",
+            "required": false,
             "schema": {
-              "type": "string"
+              "type": "boolean"
             }
           },
           {
-            "in": "path",
-            "name": "pkgVersion",
-            "required": true,
+            "in": "query",
+            "name": "full",
+            "required": false,
             "schema": {
-              "type": "string"
+              "type": "boolean"
             }
           },
           {
             "in": "query",
-            "name": "force",
+            "name": "withMetadata",
             "required": false,
             "schema": {
+              "default": false,
               "type": "boolean"
             }
           }
         ],
-        "requestBody": {
-          "content": {
-            "application/json; Elastic-Api-Version=2023-10-31": {
-              "schema": {
-                "additionalProperties": false,
-                "nullable": true,
-                "properties": {
-                  "force": {
-                    "type": "boolean"
-                  }
-                },
-                "required": [
-                  "force"
-                ],
-                "type": "object"
-              }
-            }
-          }
-        },
         "responses": {
           "200": {
             "content": {
@@ -20539,466 +19657,208 @@
                 "schema": {
                   "additionalProperties": false,
                   "properties": {
-                    "items": {
-                      "items": {
-                        "anyOf": [
-                          {
+                    "item": {
+                      "additionalProperties": true,
+                      "properties": {
+                        "agent": {
+                          "additionalProperties": false,
+                          "properties": {
+                            "privileges": {
+                              "additionalProperties": false,
+                              "properties": {
+                                "root": {
+                                  "type": "boolean"
+                                }
+                              },
+                              "type": "object"
+                            }
+                          },
+                          "type": "object"
+                        },
+                        "asset_tags": {
+                          "items": {
                             "additionalProperties": false,
                             "properties": {
-                              "id": {
-                                "type": "string"
+                              "asset_ids": {
+                                "items": {
+                                  "type": "string"
+                                },
+                                "type": "array"
                               },
-                              "originId": {
-                                "type": "string"
+                              "asset_types": {
+                                "items": {
+                                  "type": "string"
+                                },
+                                "type": "array"
                               },
-                              "type": {
-                                "enum": [
-                                  "dashboard",
-                                  "lens",
-                                  "visualization",
-                                  "search",
-                                  "index-pattern",
-                                  "map",
-                                  "ml-module",
-                                  "security-rule",
-                                  "csp-rule-template",
-                                  "osquery-pack-asset",
-                                  "osquery-saved-query",
-                                  "tag"
-                                ],
+                              "text": {
                                 "type": "string"
                               }
                             },
                             "required": [
-                              "id",
-                              "type"
+                              "text"
                             ],
                             "type": "object"
                           },
-                          {
-                            "additionalProperties": false,
+                          "type": "array"
+                        },
+                        "assets": {
+                          "additionalProperties": {},
+                          "type": "object"
+                        },
+                        "categories": {
+                          "items": {
+                            "type": "string"
+                          },
+                          "type": "array"
+                        },
+                        "conditions": {
+                          "additionalProperties": true,
+                          "properties": {
+                            "elastic": {
+                              "additionalProperties": true,
+                              "properties": {
+                                "capabilities": {
+                                  "items": {
+                                    "type": "string"
+                                  },
+                                  "type": "array"
+                                },
+                                "subscription": {
+                                  "type": "string"
+                                }
+                              },
+                              "type": "object"
+                            },
+                            "kibana": {
+                              "additionalProperties": true,
+                              "properties": {
+                                "version": {
+                                  "type": "string"
+                                }
+                              },
+                              "type": "object"
+                            }
+                          },
+                          "type": "object"
+                        },
+                        "data_streams": {
+                          "items": {
+                            "additionalProperties": {},
+                            "type": "object"
+                          },
+                          "type": "array"
+                        },
+                        "description": {
+                          "type": "string"
+                        },
+                        "discovery": {
+                          "additionalProperties": true,
+                          "properties": {
+                            "fields": {
+                              "items": {
+                                "additionalProperties": true,
+                                "properties": {
+                                  "name": {
+                                    "type": "string"
+                                  }
+                                },
+                                "required": [
+                                  "name"
+                                ],
+                                "type": "object"
+                              },
+                              "type": "array"
+                            }
+                          },
+                          "type": "object"
+                        },
+                        "download": {
+                          "type": "string"
+                        },
+                        "elasticsearch": {
+                          "additionalProperties": {},
+                          "type": "object"
+                        },
+                        "format_version": {
+                          "type": "string"
+                        },
+                        "icons": {
+                          "items": {
+                            "additionalProperties": true,
                             "properties": {
-                              "deferred": {
+                              "dark_mode": {
                                 "type": "boolean"
                               },
-                              "id": {
+                              "path": {
                                 "type": "string"
                               },
-                              "type": {
-                                "enum": [
-                                  "index",
-                                  "index_template",
-                                  "component_template",
-                                  "ingest_pipeline",
-                                  "ilm_policy",
-                                  "data_stream_ilm_policy",
-                                  "transform",
-                                  "ml_model"
-                                ],
+                              "size": {
                                 "type": "string"
                               },
-                              "version": {
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "id",
-                              "type"
-                            ],
-                            "type": "object"
-                          }
-                        ]
-                      },
-                      "type": "array"
-                    },
-                    "response": {
-                      "deprecated": true,
-                      "items": {
-                        "anyOf": [
-                          {
-                            "additionalProperties": false,
-                            "properties": {
-                              "id": {
+                              "src": {
                                 "type": "string"
                               },
-                              "originId": {
+                              "title": {
                                 "type": "string"
                               },
                               "type": {
-                                "enum": [
-                                  "dashboard",
-                                  "lens",
-                                  "visualization",
-                                  "search",
-                                  "index-pattern",
-                                  "map",
-                                  "ml-module",
-                                  "security-rule",
-                                  "csp-rule-template",
-                                  "osquery-pack-asset",
-                                  "osquery-saved-query",
-                                  "tag"
-                                ],
                                 "type": "string"
                               }
                             },
                             "required": [
-                              "id",
-                              "type"
+                              "src"
                             ],
                             "type": "object"
                           },
-                          {
-                            "additionalProperties": false,
-                            "properties": {
-                              "deferred": {
-                                "type": "boolean"
-                              },
-                              "id": {
-                                "type": "string"
-                              },
-                              "type": {
-                                "enum": [
-                                  "index",
-                                  "index_template",
-                                  "component_template",
-                                  "ingest_pipeline",
-                                  "ilm_policy",
-                                  "data_stream_ilm_policy",
-                                  "transform",
-                                  "ml_model"
-                                ],
-                                "type": "string"
-                              },
-                              "version": {
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "id",
-                              "type"
-                            ],
-                            "type": "object"
-                          }
-                        ]
-                      },
-                      "type": "array"
-                    }
-                  },
-                  "required": [
-                    "items"
-                  ],
-                  "type": "object"
-                }
-              }
-            }
-          },
-          "400": {
-            "content": {
-              "application/json; Elastic-Api-Version=2023-10-31": {
-                "schema": {
-                  "additionalProperties": false,
-                  "description": "Generic Error",
-                  "properties": {
-                    "error": {
-                      "type": "string"
-                    },
-                    "message": {
-                      "type": "string"
-                    },
-                    "statusCode": {
-                      "type": "number"
-                    }
-                  },
-                  "required": [
-                    "message"
-                  ],
-                  "type": "object"
-                }
-              }
-            }
-          }
-        },
-        "summary": "",
-        "tags": [
-          "Elastic Package Manager (EPM)"
-        ]
-      },
-      "get": {
-        "description": "Get package",
-        "operationId": "get-fleet-epm-packages-pkgname-pkgversion",
-        "parameters": [
-          {
-            "description": "The version of the API to use",
-            "in": "header",
-            "name": "elastic-api-version",
-            "schema": {
-              "default": "2023-10-31",
-              "enum": [
-                "2023-10-31"
-              ],
-              "type": "string"
-            }
-          },
-          {
-            "in": "path",
-            "name": "pkgName",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "in": "path",
-            "name": "pkgVersion",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "in": "query",
-            "name": "ignoreUnverified",
-            "required": false,
-            "schema": {
-              "type": "boolean"
-            }
-          },
-          {
-            "in": "query",
-            "name": "prerelease",
-            "required": false,
-            "schema": {
-              "type": "boolean"
-            }
-          },
-          {
-            "in": "query",
-            "name": "full",
-            "required": false,
-            "schema": {
-              "type": "boolean"
-            }
-          },
-          {
-            "in": "query",
-            "name": "withMetadata",
-            "required": false,
-            "schema": {
-              "default": false,
-              "type": "boolean"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "content": {
-              "application/json; Elastic-Api-Version=2023-10-31": {
-                "schema": {
-                  "additionalProperties": false,
-                  "properties": {
-                    "item": {
-                      "additionalProperties": true,
-                      "properties": {
-                        "agent": {
-                          "additionalProperties": false,
-                          "properties": {
-                            "privileges": {
-                              "additionalProperties": false,
-                              "properties": {
-                                "root": {
-                                  "type": "boolean"
-                                }
-                              },
-                              "type": "object"
-                            }
-                          },
-                          "type": "object"
-                        },
-                        "asset_tags": {
-                          "items": {
-                            "additionalProperties": false,
-                            "properties": {
-                              "asset_ids": {
-                                "items": {
-                                  "type": "string"
-                                },
-                                "type": "array"
-                              },
-                              "asset_types": {
-                                "items": {
-                                  "type": "string"
-                                },
-                                "type": "array"
-                              },
-                              "text": {
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "text"
-                            ],
-                            "type": "object"
-                          },
-                          "type": "array"
-                        },
-                        "assets": {
-                          "additionalProperties": {},
-                          "type": "object"
-                        },
-                        "categories": {
-                          "items": {
-                            "type": "string"
-                          },
                           "type": "array"
                         },
-                        "conditions": {
+                        "installationInfo": {
                           "additionalProperties": true,
                           "properties": {
-                            "elastic": {
-                              "additionalProperties": true,
-                              "properties": {
-                                "capabilities": {
-                                  "items": {
-                                    "type": "string"
+                            "additional_spaces_installed_kibana": {
+                              "additionalProperties": {
+                                "items": {
+                                  "additionalProperties": true,
+                                  "properties": {
+                                    "id": {
+                                      "type": "string"
+                                    },
+                                    "originId": {
+                                      "type": "string"
+                                    },
+                                    "type": {
+                                      "enum": [
+                                        "dashboard",
+                                        "lens",
+                                        "visualization",
+                                        "search",
+                                        "index-pattern",
+                                        "map",
+                                        "ml-module",
+                                        "security-rule",
+                                        "csp-rule-template",
+                                        "osquery-pack-asset",
+                                        "osquery-saved-query",
+                                        "tag"
+                                      ],
+                                      "type": "string"
+                                    }
                                   },
-                                  "type": "array"
+                                  "required": [
+                                    "id",
+                                    "type"
+                                  ],
+                                  "type": "object"
                                 },
-                                "subscription": {
-                                  "type": "string"
-                                }
+                                "type": "array"
                               },
                               "type": "object"
                             },
-                            "kibana": {
-                              "additionalProperties": true,
-                              "properties": {
-                                "version": {
-                                  "type": "string"
-                                }
-                              },
-                              "type": "object"
-                            }
-                          },
-                          "type": "object"
-                        },
-                        "data_streams": {
-                          "items": {
-                            "additionalProperties": {},
-                            "type": "object"
-                          },
-                          "type": "array"
-                        },
-                        "description": {
-                          "type": "string"
-                        },
-                        "discovery": {
-                          "additionalProperties": true,
-                          "properties": {
-                            "fields": {
-                              "items": {
-                                "additionalProperties": true,
-                                "properties": {
-                                  "name": {
-                                    "type": "string"
-                                  }
-                                },
-                                "required": [
-                                  "name"
-                                ],
-                                "type": "object"
-                              },
-                              "type": "array"
-                            }
-                          },
-                          "type": "object"
-                        },
-                        "download": {
-                          "type": "string"
-                        },
-                        "elasticsearch": {
-                          "additionalProperties": {},
-                          "type": "object"
-                        },
-                        "format_version": {
-                          "type": "string"
-                        },
-                        "icons": {
-                          "items": {
-                            "additionalProperties": true,
-                            "properties": {
-                              "dark_mode": {
-                                "type": "boolean"
-                              },
-                              "path": {
-                                "type": "string"
-                              },
-                              "size": {
-                                "type": "string"
-                              },
-                              "src": {
-                                "type": "string"
-                              },
-                              "title": {
-                                "type": "string"
-                              },
-                              "type": {
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "src"
-                            ],
-                            "type": "object"
-                          },
-                          "type": "array"
-                        },
-                        "installationInfo": {
-                          "additionalProperties": true,
-                          "properties": {
-                            "additional_spaces_installed_kibana": {
-                              "additionalProperties": {
-                                "items": {
-                                  "additionalProperties": true,
-                                  "properties": {
-                                    "id": {
-                                      "type": "string"
-                                    },
-                                    "originId": {
-                                      "type": "string"
-                                    },
-                                    "type": {
-                                      "enum": [
-                                        "dashboard",
-                                        "lens",
-                                        "visualization",
-                                        "search",
-                                        "index-pattern",
-                                        "map",
-                                        "ml-module",
-                                        "security-rule",
-                                        "csp-rule-template",
-                                        "osquery-pack-asset",
-                                        "osquery-saved-query",
-                                        "tag"
-                                      ],
-                                      "type": "string"
-                                    }
-                                  },
-                                  "required": [
-                                    "id",
-                                    "type"
-                                  ],
-                                  "type": "object"
-                                },
-                                "type": "array"
-                              },
-                              "type": "object"
-                            },
-                            "created_at": {
-                              "type": "string"
-                            },
-                            "experimental_data_stream_features": {
+                            "created_at": {
+                              "type": "string"
+                            },
+                            "experimental_data_stream_features": {
                               "items": {
                                 "additionalProperties": true,
                                 "properties": {
@@ -21286,7 +20146,6 @@
                           ],
                           "type": "string"
                         },
-                        "savedObject": {},
                         "screenshots": {
                           "items": {
                             "additionalProperties": false,
@@ -21358,7 +20217,6 @@
                         }
                       },
                       "required": [
-                        "savedObject",
                         "name",
                         "version",
                         "title",
@@ -21377,23 +20235,352 @@
                         "has_policies"
                       ],
                       "type": "object"
+                    }
+                  },
+                  "required": [
+                    "item"
+                  ],
+                  "type": "object"
+                }
+              }
+            }
+          },
+          "400": {
+            "content": {
+              "application/json; Elastic-Api-Version=2023-10-31": {
+                "schema": {
+                  "additionalProperties": false,
+                  "description": "Generic Error",
+                  "properties": {
+                    "error": {
+                      "type": "string"
                     },
-                    "response": {
-                      "additionalProperties": true,
-                      "deprecated": true,
+                    "message": {
+                      "type": "string"
+                    },
+                    "statusCode": {
+                      "type": "number"
+                    }
+                  },
+                  "required": [
+                    "message"
+                  ],
+                  "type": "object"
+                }
+              }
+            }
+          }
+        },
+        "summary": "",
+        "tags": [
+          "Elastic Package Manager (EPM)"
+        ]
+      },
+      "post": {
+        "description": "Install package from registry",
+        "operationId": "post-fleet-epm-packages-pkgname-pkgversion",
+        "parameters": [
+          {
+            "description": "The version of the API to use",
+            "in": "header",
+            "name": "elastic-api-version",
+            "schema": {
+              "default": "2023-10-31",
+              "enum": [
+                "2023-10-31"
+              ],
+              "type": "string"
+            }
+          },
+          {
+            "description": "A required header to protect against CSRF attacks",
+            "in": "header",
+            "name": "kbn-xsrf",
+            "required": true,
+            "schema": {
+              "example": "true",
+              "type": "string"
+            }
+          },
+          {
+            "in": "path",
+            "name": "pkgName",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "path",
+            "name": "pkgVersion",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "query",
+            "name": "prerelease",
+            "required": false,
+            "schema": {
+              "type": "boolean"
+            }
+          },
+          {
+            "in": "query",
+            "name": "ignoreMappingUpdateErrors",
+            "required": false,
+            "schema": {
+              "default": false,
+              "type": "boolean"
+            }
+          },
+          {
+            "in": "query",
+            "name": "skipDataStreamRollover",
+            "required": false,
+            "schema": {
+              "default": false,
+              "type": "boolean"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json; Elastic-Api-Version=2023-10-31": {
+              "schema": {
+                "additionalProperties": false,
+                "nullable": true,
+                "properties": {
+                  "force": {
+                    "default": false,
+                    "type": "boolean"
+                  },
+                  "ignore_constraints": {
+                    "default": false,
+                    "type": "boolean"
+                  }
+                },
+                "type": "object"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "content": {
+              "application/json; Elastic-Api-Version=2023-10-31": {
+                "schema": {
+                  "additionalProperties": false,
+                  "properties": {
+                    "_meta": {
+                      "additionalProperties": false,
                       "properties": {
-                        "agent": {
-                          "additionalProperties": false,
-                          "properties": {
-                            "privileges": {
-                              "additionalProperties": false,
-                              "properties": {
-                                "root": {
-                                  "type": "boolean"
-                                }
-                              },
-                              "type": "object"
-                            }
+                        "install_source": {
+                          "type": "string"
+                        }
+                      },
+                      "required": [
+                        "install_source"
+                      ],
+                      "type": "object"
+                    },
+                    "items": {
+                      "items": {
+                        "anyOf": [
+                          {
+                            "additionalProperties": false,
+                            "properties": {
+                              "id": {
+                                "type": "string"
+                              },
+                              "originId": {
+                                "type": "string"
+                              },
+                              "type": {
+                                "enum": [
+                                  "dashboard",
+                                  "lens",
+                                  "visualization",
+                                  "search",
+                                  "index-pattern",
+                                  "map",
+                                  "ml-module",
+                                  "security-rule",
+                                  "csp-rule-template",
+                                  "osquery-pack-asset",
+                                  "osquery-saved-query",
+                                  "tag"
+                                ],
+                                "type": "string"
+                              }
+                            },
+                            "required": [
+                              "id",
+                              "type"
+                            ],
+                            "type": "object"
+                          },
+                          {
+                            "additionalProperties": false,
+                            "properties": {
+                              "deferred": {
+                                "type": "boolean"
+                              },
+                              "id": {
+                                "type": "string"
+                              },
+                              "type": {
+                                "enum": [
+                                  "index",
+                                  "index_template",
+                                  "component_template",
+                                  "ingest_pipeline",
+                                  "ilm_policy",
+                                  "data_stream_ilm_policy",
+                                  "transform",
+                                  "ml_model"
+                                ],
+                                "type": "string"
+                              },
+                              "version": {
+                                "type": "string"
+                              }
+                            },
+                            "required": [
+                              "id",
+                              "type"
+                            ],
+                            "type": "object"
+                          }
+                        ]
+                      },
+                      "type": "array"
+                    }
+                  },
+                  "required": [
+                    "items",
+                    "_meta"
+                  ],
+                  "type": "object"
+                }
+              }
+            }
+          },
+          "400": {
+            "content": {
+              "application/json; Elastic-Api-Version=2023-10-31": {
+                "schema": {
+                  "additionalProperties": false,
+                  "description": "Generic Error",
+                  "properties": {
+                    "error": {
+                      "type": "string"
+                    },
+                    "message": {
+                      "type": "string"
+                    },
+                    "statusCode": {
+                      "type": "number"
+                    }
+                  },
+                  "required": [
+                    "message"
+                  ],
+                  "type": "object"
+                }
+              }
+            }
+          }
+        },
+        "summary": "",
+        "tags": [
+          "Elastic Package Manager (EPM)"
+        ]
+      },
+      "put": {
+        "description": "Update package settings",
+        "operationId": "put-fleet-epm-packages-pkgname-pkgversion",
+        "parameters": [
+          {
+            "description": "The version of the API to use",
+            "in": "header",
+            "name": "elastic-api-version",
+            "schema": {
+              "default": "2023-10-31",
+              "enum": [
+                "2023-10-31"
+              ],
+              "type": "string"
+            }
+          },
+          {
+            "description": "A required header to protect against CSRF attacks",
+            "in": "header",
+            "name": "kbn-xsrf",
+            "required": true,
+            "schema": {
+              "example": "true",
+              "type": "string"
+            }
+          },
+          {
+            "in": "path",
+            "name": "pkgName",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "path",
+            "name": "pkgVersion",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json; Elastic-Api-Version=2023-10-31": {
+              "schema": {
+                "additionalProperties": false,
+                "properties": {
+                  "keepPoliciesUpToDate": {
+                    "type": "boolean"
+                  }
+                },
+                "required": [
+                  "keepPoliciesUpToDate"
+                ],
+                "type": "object"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "content": {
+              "application/json; Elastic-Api-Version=2023-10-31": {
+                "schema": {
+                  "additionalProperties": false,
+                  "properties": {
+                    "item": {
+                      "additionalProperties": true,
+                      "properties": {
+                        "agent": {
+                          "additionalProperties": false,
+                          "properties": {
+                            "privileges": {
+                              "additionalProperties": false,
+                              "properties": {
+                                "root": {
+                                  "type": "boolean"
+                                }
+                              },
+                              "type": "object"
+                            }
                           },
                           "type": "object"
                         },
@@ -21868,7 +21055,6 @@
                           ],
                           "type": "string"
                         },
-                        "savedObject": {},
                         "screenshots": {
                           "items": {
                             "additionalProperties": false,
@@ -21936,1948 +21122,62 @@
                           "type": "array"
                         },
                         "version": {
-                          "type": "string"
-                        }
-                      },
-                      "required": [
-                        "savedObject",
-                        "name",
-                        "version",
-                        "title",
-                        "assets"
-                      ],
-                      "type": "object"
-                    }
-                  },
-                  "required": [
-                    "item"
-                  ],
-                  "type": "object"
-                }
-              }
-            }
-          },
-          "400": {
-            "content": {
-              "application/json; Elastic-Api-Version=2023-10-31": {
-                "schema": {
-                  "additionalProperties": false,
-                  "description": "Generic Error",
-                  "properties": {
-                    "error": {
-                      "type": "string"
-                    },
-                    "message": {
-                      "type": "string"
-                    },
-                    "statusCode": {
-                      "type": "number"
-                    }
-                  },
-                  "required": [
-                    "message"
-                  ],
-                  "type": "object"
-                }
-              }
-            }
-          }
-        },
-        "summary": "",
-        "tags": [
-          "Elastic Package Manager (EPM)"
-        ]
-      },
-      "post": {
-        "description": "Install package from registry",
-        "operationId": "post-fleet-epm-packages-pkgname-pkgversion",
-        "parameters": [
-          {
-            "description": "The version of the API to use",
-            "in": "header",
-            "name": "elastic-api-version",
-            "schema": {
-              "default": "2023-10-31",
-              "enum": [
-                "2023-10-31"
-              ],
-              "type": "string"
-            }
-          },
-          {
-            "description": "A required header to protect against CSRF attacks",
-            "in": "header",
-            "name": "kbn-xsrf",
-            "required": true,
-            "schema": {
-              "example": "true",
-              "type": "string"
-            }
-          },
-          {
-            "in": "path",
-            "name": "pkgName",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "in": "path",
-            "name": "pkgVersion",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "in": "query",
-            "name": "prerelease",
-            "required": false,
-            "schema": {
-              "type": "boolean"
-            }
-          },
-          {
-            "in": "query",
-            "name": "ignoreMappingUpdateErrors",
-            "required": false,
-            "schema": {
-              "default": false,
-              "type": "boolean"
-            }
-          },
-          {
-            "in": "query",
-            "name": "skipDataStreamRollover",
-            "required": false,
-            "schema": {
-              "default": false,
-              "type": "boolean"
-            }
-          }
-        ],
-        "requestBody": {
-          "content": {
-            "application/json; Elastic-Api-Version=2023-10-31": {
-              "schema": {
-                "additionalProperties": false,
-                "nullable": true,
-                "properties": {
-                  "force": {
-                    "default": false,
-                    "type": "boolean"
-                  },
-                  "ignore_constraints": {
-                    "default": false,
-                    "type": "boolean"
-                  }
-                },
-                "type": "object"
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "content": {
-              "application/json; Elastic-Api-Version=2023-10-31": {
-                "schema": {
-                  "additionalProperties": false,
-                  "properties": {
-                    "_meta": {
-                      "additionalProperties": false,
-                      "properties": {
-                        "install_source": {
-                          "type": "string"
-                        }
-                      },
-                      "required": [
-                        "install_source"
-                      ],
-                      "type": "object"
-                    },
-                    "items": {
-                      "items": {
-                        "anyOf": [
-                          {
-                            "additionalProperties": false,
-                            "properties": {
-                              "id": {
-                                "type": "string"
-                              },
-                              "originId": {
-                                "type": "string"
-                              },
-                              "type": {
-                                "enum": [
-                                  "dashboard",
-                                  "lens",
-                                  "visualization",
-                                  "search",
-                                  "index-pattern",
-                                  "map",
-                                  "ml-module",
-                                  "security-rule",
-                                  "csp-rule-template",
-                                  "osquery-pack-asset",
-                                  "osquery-saved-query",
-                                  "tag"
-                                ],
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "id",
-                              "type"
-                            ],
-                            "type": "object"
-                          },
-                          {
-                            "additionalProperties": false,
-                            "properties": {
-                              "deferred": {
-                                "type": "boolean"
-                              },
-                              "id": {
-                                "type": "string"
-                              },
-                              "type": {
-                                "enum": [
-                                  "index",
-                                  "index_template",
-                                  "component_template",
-                                  "ingest_pipeline",
-                                  "ilm_policy",
-                                  "data_stream_ilm_policy",
-                                  "transform",
-                                  "ml_model"
-                                ],
-                                "type": "string"
-                              },
-                              "version": {
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "id",
-                              "type"
-                            ],
-                            "type": "object"
-                          }
-                        ]
-                      },
-                      "type": "array"
-                    },
-                    "response": {
-                      "deprecated": true,
-                      "items": {
-                        "anyOf": [
-                          {
-                            "additionalProperties": false,
-                            "properties": {
-                              "id": {
-                                "type": "string"
-                              },
-                              "originId": {
-                                "type": "string"
-                              },
-                              "type": {
-                                "enum": [
-                                  "dashboard",
-                                  "lens",
-                                  "visualization",
-                                  "search",
-                                  "index-pattern",
-                                  "map",
-                                  "ml-module",
-                                  "security-rule",
-                                  "csp-rule-template",
-                                  "osquery-pack-asset",
-                                  "osquery-saved-query",
-                                  "tag"
-                                ],
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "id",
-                              "type"
-                            ],
-                            "type": "object"
-                          },
-                          {
-                            "additionalProperties": false,
-                            "properties": {
-                              "deferred": {
-                                "type": "boolean"
-                              },
-                              "id": {
-                                "type": "string"
-                              },
-                              "type": {
-                                "enum": [
-                                  "index",
-                                  "index_template",
-                                  "component_template",
-                                  "ingest_pipeline",
-                                  "ilm_policy",
-                                  "data_stream_ilm_policy",
-                                  "transform",
-                                  "ml_model"
-                                ],
-                                "type": "string"
-                              },
-                              "version": {
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "id",
-                              "type"
-                            ],
-                            "type": "object"
-                          }
-                        ]
-                      },
-                      "type": "array"
-                    }
-                  },
-                  "required": [
-                    "items",
-                    "_meta"
-                  ],
-                  "type": "object"
-                }
-              }
-            }
-          },
-          "400": {
-            "content": {
-              "application/json; Elastic-Api-Version=2023-10-31": {
-                "schema": {
-                  "additionalProperties": false,
-                  "description": "Generic Error",
-                  "properties": {
-                    "error": {
-                      "type": "string"
-                    },
-                    "message": {
-                      "type": "string"
-                    },
-                    "statusCode": {
-                      "type": "number"
-                    }
-                  },
-                  "required": [
-                    "message"
-                  ],
-                  "type": "object"
-                }
-              }
-            }
-          }
-        },
-        "summary": "",
-        "tags": [
-          "Elastic Package Manager (EPM)"
-        ]
-      },
-      "put": {
-        "description": "Update package settings",
-        "operationId": "put-fleet-epm-packages-pkgname-pkgversion",
-        "parameters": [
-          {
-            "description": "The version of the API to use",
-            "in": "header",
-            "name": "elastic-api-version",
-            "schema": {
-              "default": "2023-10-31",
-              "enum": [
-                "2023-10-31"
-              ],
-              "type": "string"
-            }
-          },
-          {
-            "description": "A required header to protect against CSRF attacks",
-            "in": "header",
-            "name": "kbn-xsrf",
-            "required": true,
-            "schema": {
-              "example": "true",
-              "type": "string"
-            }
-          },
-          {
-            "in": "path",
-            "name": "pkgName",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "in": "path",
-            "name": "pkgVersion",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "requestBody": {
-          "content": {
-            "application/json; Elastic-Api-Version=2023-10-31": {
-              "schema": {
-                "additionalProperties": false,
-                "properties": {
-                  "keepPoliciesUpToDate": {
-                    "type": "boolean"
-                  }
-                },
-                "required": [
-                  "keepPoliciesUpToDate"
-                ],
-                "type": "object"
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "content": {
-              "application/json; Elastic-Api-Version=2023-10-31": {
-                "schema": {
-                  "additionalProperties": false,
-                  "properties": {
-                    "item": {
-                      "additionalProperties": true,
-                      "properties": {
-                        "agent": {
-                          "additionalProperties": false,
-                          "properties": {
-                            "privileges": {
-                              "additionalProperties": false,
-                              "properties": {
-                                "root": {
-                                  "type": "boolean"
-                                }
-                              },
-                              "type": "object"
-                            }
-                          },
-                          "type": "object"
-                        },
-                        "asset_tags": {
-                          "items": {
-                            "additionalProperties": false,
-                            "properties": {
-                              "asset_ids": {
-                                "items": {
-                                  "type": "string"
-                                },
-                                "type": "array"
-                              },
-                              "asset_types": {
-                                "items": {
-                                  "type": "string"
-                                },
-                                "type": "array"
-                              },
-                              "text": {
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "text"
-                            ],
-                            "type": "object"
-                          },
-                          "type": "array"
-                        },
-                        "assets": {
-                          "additionalProperties": {},
-                          "type": "object"
-                        },
-                        "categories": {
-                          "items": {
-                            "type": "string"
-                          },
-                          "type": "array"
-                        },
-                        "conditions": {
-                          "additionalProperties": true,
-                          "properties": {
-                            "elastic": {
-                              "additionalProperties": true,
-                              "properties": {
-                                "capabilities": {
-                                  "items": {
-                                    "type": "string"
-                                  },
-                                  "type": "array"
-                                },
-                                "subscription": {
-                                  "type": "string"
-                                }
-                              },
-                              "type": "object"
-                            },
-                            "kibana": {
-                              "additionalProperties": true,
-                              "properties": {
-                                "version": {
-                                  "type": "string"
-                                }
-                              },
-                              "type": "object"
-                            }
-                          },
-                          "type": "object"
-                        },
-                        "data_streams": {
-                          "items": {
-                            "additionalProperties": {},
-                            "type": "object"
-                          },
-                          "type": "array"
-                        },
-                        "description": {
-                          "type": "string"
-                        },
-                        "discovery": {
-                          "additionalProperties": true,
-                          "properties": {
-                            "fields": {
-                              "items": {
-                                "additionalProperties": true,
-                                "properties": {
-                                  "name": {
-                                    "type": "string"
-                                  }
-                                },
-                                "required": [
-                                  "name"
-                                ],
-                                "type": "object"
-                              },
-                              "type": "array"
-                            }
-                          },
-                          "type": "object"
-                        },
-                        "download": {
-                          "type": "string"
-                        },
-                        "elasticsearch": {
-                          "additionalProperties": {},
-                          "type": "object"
-                        },
-                        "format_version": {
-                          "type": "string"
-                        },
-                        "icons": {
-                          "items": {
-                            "additionalProperties": true,
-                            "properties": {
-                              "dark_mode": {
-                                "type": "boolean"
-                              },
-                              "path": {
-                                "type": "string"
-                              },
-                              "size": {
-                                "type": "string"
-                              },
-                              "src": {
-                                "type": "string"
-                              },
-                              "title": {
-                                "type": "string"
-                              },
-                              "type": {
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "src"
-                            ],
-                            "type": "object"
-                          },
-                          "type": "array"
-                        },
-                        "installationInfo": {
-                          "additionalProperties": true,
-                          "properties": {
-                            "additional_spaces_installed_kibana": {
-                              "additionalProperties": {
-                                "items": {
-                                  "additionalProperties": true,
-                                  "properties": {
-                                    "id": {
-                                      "type": "string"
-                                    },
-                                    "originId": {
-                                      "type": "string"
-                                    },
-                                    "type": {
-                                      "enum": [
-                                        "dashboard",
-                                        "lens",
-                                        "visualization",
-                                        "search",
-                                        "index-pattern",
-                                        "map",
-                                        "ml-module",
-                                        "security-rule",
-                                        "csp-rule-template",
-                                        "osquery-pack-asset",
-                                        "osquery-saved-query",
-                                        "tag"
-                                      ],
-                                      "type": "string"
-                                    }
-                                  },
-                                  "required": [
-                                    "id",
-                                    "type"
-                                  ],
-                                  "type": "object"
-                                },
-                                "type": "array"
-                              },
-                              "type": "object"
-                            },
-                            "created_at": {
-                              "type": "string"
-                            },
-                            "experimental_data_stream_features": {
-                              "items": {
-                                "additionalProperties": true,
-                                "properties": {
-                                  "data_stream": {
-                                    "type": "string"
-                                  },
-                                  "features": {
-                                    "additionalProperties": true,
-                                    "properties": {
-                                      "doc_value_only_numeric": {
-                                        "type": "boolean"
-                                      },
-                                      "doc_value_only_other": {
-                                        "type": "boolean"
-                                      },
-                                      "synthetic_source": {
-                                        "type": "boolean"
-                                      },
-                                      "tsdb": {
-                                        "type": "boolean"
-                                      }
-                                    },
-                                    "type": "object"
-                                  }
-                                },
-                                "required": [
-                                  "data_stream",
-                                  "features"
-                                ],
-                                "type": "object"
-                              },
-                              "type": "array"
-                            },
-                            "install_format_schema_version": {
-                              "type": "string"
-                            },
-                            "install_source": {
-                              "enum": [
-                                "registry",
-                                "upload",
-                                "bundled",
-                                "custom"
-                              ],
-                              "type": "string"
-                            },
-                            "install_status": {
-                              "enum": [
-                                "installed",
-                                "installing",
-                                "install_failed"
-                              ],
-                              "type": "string"
-                            },
-                            "installed_es": {
-                              "items": {
-                                "additionalProperties": true,
-                                "properties": {
-                                  "deferred": {
-                                    "type": "boolean"
-                                  },
-                                  "id": {
-                                    "type": "string"
-                                  },
-                                  "type": {
-                                    "enum": [
-                                      "index",
-                                      "index_template",
-                                      "component_template",
-                                      "ingest_pipeline",
-                                      "ilm_policy",
-                                      "data_stream_ilm_policy",
-                                      "transform",
-                                      "ml_model"
-                                    ],
-                                    "type": "string"
-                                  },
-                                  "version": {
-                                    "type": "string"
-                                  }
-                                },
-                                "required": [
-                                  "id",
-                                  "type"
-                                ],
-                                "type": "object"
-                              },
-                              "type": "array"
-                            },
-                            "installed_kibana": {
-                              "items": {
-                                "additionalProperties": true,
-                                "properties": {
-                                  "id": {
-                                    "type": "string"
-                                  },
-                                  "originId": {
-                                    "type": "string"
-                                  },
-                                  "type": {
-                                    "enum": [
-                                      "dashboard",
-                                      "lens",
-                                      "visualization",
-                                      "search",
-                                      "index-pattern",
-                                      "map",
-                                      "ml-module",
-                                      "security-rule",
-                                      "csp-rule-template",
-                                      "osquery-pack-asset",
-                                      "osquery-saved-query",
-                                      "tag"
-                                    ],
-                                    "type": "string"
-                                  }
-                                },
-                                "required": [
-                                  "id",
-                                  "type"
-                                ],
-                                "type": "object"
-                              },
-                              "type": "array"
-                            },
-                            "installed_kibana_space_id": {
-                              "type": "string"
-                            },
-                            "latest_executed_state": {
-                              "additionalProperties": true,
-                              "properties": {
-                                "error": {
-                                  "type": "string"
-                                },
-                                "name": {
-                                  "type": "string"
-                                },
-                                "started_at": {
-                                  "type": "string"
-                                }
-                              },
-                              "required": [
-                                "name",
-                                "started_at"
-                              ],
-                              "type": "object"
-                            },
-                            "latest_install_failed_attempts": {
-                              "items": {
-                                "additionalProperties": true,
-                                "properties": {
-                                  "created_at": {
-                                    "type": "string"
-                                  },
-                                  "error": {
-                                    "additionalProperties": true,
-                                    "properties": {
-                                      "message": {
-                                        "type": "string"
-                                      },
-                                      "name": {
-                                        "type": "string"
-                                      },
-                                      "stack": {
-                                        "type": "string"
-                                      }
-                                    },
-                                    "required": [
-                                      "name",
-                                      "message"
-                                    ],
-                                    "type": "object"
-                                  },
-                                  "target_version": {
-                                    "type": "string"
-                                  }
-                                },
-                                "required": [
-                                  "created_at",
-                                  "target_version",
-                                  "error"
-                                ],
-                                "type": "object"
-                              },
-                              "type": "array"
-                            },
-                            "name": {
-                              "type": "string"
-                            },
-                            "namespaces": {
-                              "items": {
-                                "type": "string"
-                              },
-                              "type": "array"
-                            },
-                            "type": {
-                              "type": "string"
-                            },
-                            "updated_at": {
-                              "type": "string"
-                            },
-                            "verification_key_id": {
-                              "nullable": true,
-                              "type": "string"
-                            },
-                            "verification_status": {
-                              "enum": [
-                                "unverified",
-                                "verified",
-                                "unknown"
-                              ],
-                              "type": "string"
-                            },
-                            "version": {
-                              "type": "string"
-                            }
-                          },
-                          "required": [
-                            "type",
-                            "installed_kibana",
-                            "installed_es",
-                            "name",
-                            "version",
-                            "install_status",
-                            "install_source",
-                            "verification_status"
-                          ],
-                          "type": "object"
-                        },
-                        "internal": {
-                          "type": "boolean"
-                        },
-                        "keepPoliciesUpToDate": {
-                          "type": "boolean"
-                        },
-                        "latestVersion": {
-                          "type": "string"
-                        },
-                        "license": {
-                          "type": "string"
-                        },
-                        "licensePath": {
-                          "type": "string"
-                        },
-                        "name": {
-                          "type": "string"
-                        },
-                        "notice": {
-                          "type": "string"
-                        },
-                        "owner": {
-                          "additionalProperties": true,
-                          "properties": {
-                            "github": {
-                              "type": "string"
-                            },
-                            "type": {
-                              "enum": [
-                                "elastic",
-                                "partner",
-                                "community"
-                              ],
-                              "type": "string"
-                            }
-                          },
-                          "type": "object"
-                        },
-                        "path": {
-                          "type": "string"
-                        },
-                        "policy_templates": {
-                          "items": {
-                            "additionalProperties": {},
-                            "type": "object"
-                          },
-                          "type": "array"
-                        },
-                        "readme": {
-                          "type": "string"
-                        },
-                        "release": {
-                          "enum": [
-                            "ga",
-                            "beta",
-                            "experimental"
-                          ],
-                          "type": "string"
-                        },
-                        "savedObject": {},
-                        "screenshots": {
-                          "items": {
-                            "additionalProperties": false,
-                            "properties": {
-                              "dark_mode": {
-                                "type": "boolean"
-                              },
-                              "path": {
-                                "type": "string"
-                              },
-                              "size": {
-                                "type": "string"
-                              },
-                              "src": {
-                                "type": "string"
-                              },
-                              "title": {
-                                "type": "string"
-                              },
-                              "type": {
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "src"
-                            ],
-                            "type": "object"
-                          },
-                          "type": "array"
-                        },
-                        "signature_path": {
-                          "type": "string"
-                        },
-                        "source": {
-                          "additionalProperties": true,
-                          "properties": {
-                            "license": {
-                              "type": "string"
-                            }
-                          },
-                          "required": [
-                            "license"
-                          ],
-                          "type": "object"
-                        },
-                        "status": {
-                          "type": "string"
-                        },
-                        "title": {
-                          "type": "string"
-                        },
-                        "type": {
-                          "enum": [
-                            "integration",
-                            "input",
-                            "content"
-                          ],
-                          "type": "string"
-                        },
-                        "vars": {
-                          "items": {
-                            "additionalProperties": {},
-                            "type": "object"
-                          },
-                          "type": "array"
-                        },
-                        "version": {
-                          "type": "string"
-                        }
-                      },
-                      "required": [
-                        "savedObject",
-                        "name",
-                        "version",
-                        "title",
-                        "assets"
-                      ],
-                      "type": "object"
-                    },
-                    "response": {
-                      "additionalProperties": true,
-                      "deprecated": true,
-                      "properties": {
-                        "agent": {
-                          "additionalProperties": false,
-                          "properties": {
-                            "privileges": {
-                              "additionalProperties": false,
-                              "properties": {
-                                "root": {
-                                  "type": "boolean"
-                                }
-                              },
-                              "type": "object"
-                            }
-                          },
-                          "type": "object"
-                        },
-                        "asset_tags": {
-                          "items": {
-                            "additionalProperties": false,
-                            "properties": {
-                              "asset_ids": {
-                                "items": {
-                                  "type": "string"
-                                },
-                                "type": "array"
-                              },
-                              "asset_types": {
-                                "items": {
-                                  "type": "string"
-                                },
-                                "type": "array"
-                              },
-                              "text": {
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "text"
-                            ],
-                            "type": "object"
-                          },
-                          "type": "array"
-                        },
-                        "assets": {
-                          "additionalProperties": {},
-                          "type": "object"
-                        },
-                        "categories": {
-                          "items": {
-                            "type": "string"
-                          },
-                          "type": "array"
-                        },
-                        "conditions": {
-                          "additionalProperties": true,
-                          "properties": {
-                            "elastic": {
-                              "additionalProperties": true,
-                              "properties": {
-                                "capabilities": {
-                                  "items": {
-                                    "type": "string"
-                                  },
-                                  "type": "array"
-                                },
-                                "subscription": {
-                                  "type": "string"
-                                }
-                              },
-                              "type": "object"
-                            },
-                            "kibana": {
-                              "additionalProperties": true,
-                              "properties": {
-                                "version": {
-                                  "type": "string"
-                                }
-                              },
-                              "type": "object"
-                            }
-                          },
-                          "type": "object"
-                        },
-                        "data_streams": {
-                          "items": {
-                            "additionalProperties": {},
-                            "type": "object"
-                          },
-                          "type": "array"
-                        },
-                        "description": {
-                          "type": "string"
-                        },
-                        "discovery": {
-                          "additionalProperties": true,
-                          "properties": {
-                            "fields": {
-                              "items": {
-                                "additionalProperties": true,
-                                "properties": {
-                                  "name": {
-                                    "type": "string"
-                                  }
-                                },
-                                "required": [
-                                  "name"
-                                ],
-                                "type": "object"
-                              },
-                              "type": "array"
-                            }
-                          },
-                          "type": "object"
-                        },
-                        "download": {
-                          "type": "string"
-                        },
-                        "elasticsearch": {
-                          "additionalProperties": {},
-                          "type": "object"
-                        },
-                        "format_version": {
-                          "type": "string"
-                        },
-                        "icons": {
-                          "items": {
-                            "additionalProperties": true,
-                            "properties": {
-                              "dark_mode": {
-                                "type": "boolean"
-                              },
-                              "path": {
-                                "type": "string"
-                              },
-                              "size": {
-                                "type": "string"
-                              },
-                              "src": {
-                                "type": "string"
-                              },
-                              "title": {
-                                "type": "string"
-                              },
-                              "type": {
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "src"
-                            ],
-                            "type": "object"
-                          },
-                          "type": "array"
-                        },
-                        "installationInfo": {
-                          "additionalProperties": true,
-                          "properties": {
-                            "additional_spaces_installed_kibana": {
-                              "additionalProperties": {
-                                "items": {
-                                  "additionalProperties": true,
-                                  "properties": {
-                                    "id": {
-                                      "type": "string"
-                                    },
-                                    "originId": {
-                                      "type": "string"
-                                    },
-                                    "type": {
-                                      "enum": [
-                                        "dashboard",
-                                        "lens",
-                                        "visualization",
-                                        "search",
-                                        "index-pattern",
-                                        "map",
-                                        "ml-module",
-                                        "security-rule",
-                                        "csp-rule-template",
-                                        "osquery-pack-asset",
-                                        "osquery-saved-query",
-                                        "tag"
-                                      ],
-                                      "type": "string"
-                                    }
-                                  },
-                                  "required": [
-                                    "id",
-                                    "type"
-                                  ],
-                                  "type": "object"
-                                },
-                                "type": "array"
-                              },
-                              "type": "object"
-                            },
-                            "created_at": {
-                              "type": "string"
-                            },
-                            "experimental_data_stream_features": {
-                              "items": {
-                                "additionalProperties": true,
-                                "properties": {
-                                  "data_stream": {
-                                    "type": "string"
-                                  },
-                                  "features": {
-                                    "additionalProperties": true,
-                                    "properties": {
-                                      "doc_value_only_numeric": {
-                                        "type": "boolean"
-                                      },
-                                      "doc_value_only_other": {
-                                        "type": "boolean"
-                                      },
-                                      "synthetic_source": {
-                                        "type": "boolean"
-                                      },
-                                      "tsdb": {
-                                        "type": "boolean"
-                                      }
-                                    },
-                                    "type": "object"
-                                  }
-                                },
-                                "required": [
-                                  "data_stream",
-                                  "features"
-                                ],
-                                "type": "object"
-                              },
-                              "type": "array"
-                            },
-                            "install_format_schema_version": {
-                              "type": "string"
-                            },
-                            "install_source": {
-                              "enum": [
-                                "registry",
-                                "upload",
-                                "bundled",
-                                "custom"
-                              ],
-                              "type": "string"
-                            },
-                            "install_status": {
-                              "enum": [
-                                "installed",
-                                "installing",
-                                "install_failed"
-                              ],
-                              "type": "string"
-                            },
-                            "installed_es": {
-                              "items": {
-                                "additionalProperties": true,
-                                "properties": {
-                                  "deferred": {
-                                    "type": "boolean"
-                                  },
-                                  "id": {
-                                    "type": "string"
-                                  },
-                                  "type": {
-                                    "enum": [
-                                      "index",
-                                      "index_template",
-                                      "component_template",
-                                      "ingest_pipeline",
-                                      "ilm_policy",
-                                      "data_stream_ilm_policy",
-                                      "transform",
-                                      "ml_model"
-                                    ],
-                                    "type": "string"
-                                  },
-                                  "version": {
-                                    "type": "string"
-                                  }
-                                },
-                                "required": [
-                                  "id",
-                                  "type"
-                                ],
-                                "type": "object"
-                              },
-                              "type": "array"
-                            },
-                            "installed_kibana": {
-                              "items": {
-                                "additionalProperties": true,
-                                "properties": {
-                                  "id": {
-                                    "type": "string"
-                                  },
-                                  "originId": {
-                                    "type": "string"
-                                  },
-                                  "type": {
-                                    "enum": [
-                                      "dashboard",
-                                      "lens",
-                                      "visualization",
-                                      "search",
-                                      "index-pattern",
-                                      "map",
-                                      "ml-module",
-                                      "security-rule",
-                                      "csp-rule-template",
-                                      "osquery-pack-asset",
-                                      "osquery-saved-query",
-                                      "tag"
-                                    ],
-                                    "type": "string"
-                                  }
-                                },
-                                "required": [
-                                  "id",
-                                  "type"
-                                ],
-                                "type": "object"
-                              },
-                              "type": "array"
-                            },
-                            "installed_kibana_space_id": {
-                              "type": "string"
-                            },
-                            "latest_executed_state": {
-                              "additionalProperties": true,
-                              "properties": {
-                                "error": {
-                                  "type": "string"
-                                },
-                                "name": {
-                                  "type": "string"
-                                },
-                                "started_at": {
-                                  "type": "string"
-                                }
-                              },
-                              "required": [
-                                "name",
-                                "started_at"
-                              ],
-                              "type": "object"
-                            },
-                            "latest_install_failed_attempts": {
-                              "items": {
-                                "additionalProperties": true,
-                                "properties": {
-                                  "created_at": {
-                                    "type": "string"
-                                  },
-                                  "error": {
-                                    "additionalProperties": true,
-                                    "properties": {
-                                      "message": {
-                                        "type": "string"
-                                      },
-                                      "name": {
-                                        "type": "string"
-                                      },
-                                      "stack": {
-                                        "type": "string"
-                                      }
-                                    },
-                                    "required": [
-                                      "name",
-                                      "message"
-                                    ],
-                                    "type": "object"
-                                  },
-                                  "target_version": {
-                                    "type": "string"
-                                  }
-                                },
-                                "required": [
-                                  "created_at",
-                                  "target_version",
-                                  "error"
-                                ],
-                                "type": "object"
-                              },
-                              "type": "array"
-                            },
-                            "name": {
-                              "type": "string"
-                            },
-                            "namespaces": {
-                              "items": {
-                                "type": "string"
-                              },
-                              "type": "array"
-                            },
-                            "type": {
-                              "type": "string"
-                            },
-                            "updated_at": {
-                              "type": "string"
-                            },
-                            "verification_key_id": {
-                              "nullable": true,
-                              "type": "string"
-                            },
-                            "verification_status": {
-                              "enum": [
-                                "unverified",
-                                "verified",
-                                "unknown"
-                              ],
-                              "type": "string"
-                            },
-                            "version": {
-                              "type": "string"
-                            }
-                          },
-                          "required": [
-                            "type",
-                            "installed_kibana",
-                            "installed_es",
-                            "name",
-                            "version",
-                            "install_status",
-                            "install_source",
-                            "verification_status"
-                          ],
-                          "type": "object"
-                        },
-                        "internal": {
-                          "type": "boolean"
-                        },
-                        "keepPoliciesUpToDate": {
-                          "type": "boolean"
-                        },
-                        "latestVersion": {
-                          "type": "string"
-                        },
-                        "license": {
-                          "type": "string"
-                        },
-                        "licensePath": {
-                          "type": "string"
-                        },
-                        "name": {
-                          "type": "string"
-                        },
-                        "notice": {
-                          "type": "string"
-                        },
-                        "owner": {
-                          "additionalProperties": true,
-                          "properties": {
-                            "github": {
-                              "type": "string"
-                            },
-                            "type": {
-                              "enum": [
-                                "elastic",
-                                "partner",
-                                "community"
-                              ],
-                              "type": "string"
-                            }
-                          },
-                          "type": "object"
-                        },
-                        "path": {
-                          "type": "string"
-                        },
-                        "policy_templates": {
-                          "items": {
-                            "additionalProperties": {},
-                            "type": "object"
-                          },
-                          "type": "array"
-                        },
-                        "readme": {
-                          "type": "string"
-                        },
-                        "release": {
-                          "enum": [
-                            "ga",
-                            "beta",
-                            "experimental"
-                          ],
-                          "type": "string"
-                        },
-                        "savedObject": {},
-                        "screenshots": {
-                          "items": {
-                            "additionalProperties": false,
-                            "properties": {
-                              "dark_mode": {
-                                "type": "boolean"
-                              },
-                              "path": {
-                                "type": "string"
-                              },
-                              "size": {
-                                "type": "string"
-                              },
-                              "src": {
-                                "type": "string"
-                              },
-                              "title": {
-                                "type": "string"
-                              },
-                              "type": {
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "src"
-                            ],
-                            "type": "object"
-                          },
-                          "type": "array"
-                        },
-                        "signature_path": {
-                          "type": "string"
-                        },
-                        "source": {
-                          "additionalProperties": true,
-                          "properties": {
-                            "license": {
-                              "type": "string"
-                            }
-                          },
-                          "required": [
-                            "license"
-                          ],
-                          "type": "object"
-                        },
-                        "status": {
-                          "type": "string"
-                        },
-                        "title": {
-                          "type": "string"
-                        },
-                        "type": {
-                          "enum": [
-                            "integration",
-                            "input",
-                            "content"
-                          ],
-                          "type": "string"
-                        },
-                        "vars": {
-                          "items": {
-                            "additionalProperties": {},
-                            "type": "object"
-                          },
-                          "type": "array"
-                        },
-                        "version": {
-                          "type": "string"
-                        }
-                      },
-                      "required": [
-                        "savedObject",
-                        "name",
-                        "version",
-                        "title",
-                        "assets"
-                      ],
-                      "type": "object"
-                    }
-                  },
-                  "required": [
-                    "item"
-                  ],
-                  "type": "object"
-                }
-              }
-            }
-          },
-          "400": {
-            "content": {
-              "application/json; Elastic-Api-Version=2023-10-31": {
-                "schema": {
-                  "additionalProperties": false,
-                  "description": "Generic Error",
-                  "properties": {
-                    "error": {
-                      "type": "string"
-                    },
-                    "message": {
-                      "type": "string"
-                    },
-                    "statusCode": {
-                      "type": "number"
-                    }
-                  },
-                  "required": [
-                    "message"
-                  ],
-                  "type": "object"
-                }
-              }
-            }
-          }
-        },
-        "summary": "",
-        "tags": [
-          "Elastic Package Manager (EPM)"
-        ]
-      }
-    },
-    "/api/fleet/epm/packages/{pkgName}/{pkgVersion}/transforms/authorize": {
-      "post": {
-        "description": "Authorize transforms",
-        "operationId": "post-fleet-epm-packages-pkgname-pkgversion-transforms-authorize",
-        "parameters": [
-          {
-            "description": "The version of the API to use",
-            "in": "header",
-            "name": "elastic-api-version",
-            "schema": {
-              "default": "2023-10-31",
-              "enum": [
-                "2023-10-31"
-              ],
-              "type": "string"
-            }
-          },
-          {
-            "description": "A required header to protect against CSRF attacks",
-            "in": "header",
-            "name": "kbn-xsrf",
-            "required": true,
-            "schema": {
-              "example": "true",
-              "type": "string"
-            }
-          },
-          {
-            "in": "path",
-            "name": "pkgName",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "in": "path",
-            "name": "pkgVersion",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "in": "query",
-            "name": "prerelease",
-            "required": false,
-            "schema": {
-              "type": "boolean"
-            }
-          }
-        ],
-        "requestBody": {
-          "content": {
-            "application/json; Elastic-Api-Version=2023-10-31": {
-              "schema": {
-                "additionalProperties": false,
-                "properties": {
-                  "transforms": {
-                    "items": {
-                      "additionalProperties": false,
-                      "properties": {
-                        "transformId": {
-                          "type": "string"
-                        }
-                      },
-                      "required": [
-                        "transformId"
-                      ],
-                      "type": "object"
-                    },
-                    "type": "array"
-                  }
-                },
-                "required": [
-                  "transforms"
-                ],
-                "type": "object"
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "content": {
-              "application/json; Elastic-Api-Version=2023-10-31": {
-                "schema": {
-                  "items": {
-                    "additionalProperties": false,
-                    "properties": {
-                      "error": {
-                        "nullable": true
-                      },
-                      "success": {
-                        "type": "boolean"
-                      },
-                      "transformId": {
-                        "type": "string"
-                      }
-                    },
-                    "required": [
-                      "transformId",
-                      "success",
-                      "error"
-                    ],
-                    "type": "object"
-                  },
-                  "type": "array"
-                }
-              }
-            }
-          },
-          "400": {
-            "content": {
-              "application/json; Elastic-Api-Version=2023-10-31": {
-                "schema": {
-                  "additionalProperties": false,
-                  "description": "Generic Error",
-                  "properties": {
-                    "error": {
-                      "type": "string"
-                    },
-                    "message": {
-                      "type": "string"
-                    },
-                    "statusCode": {
-                      "type": "number"
-                    }
-                  },
-                  "required": [
-                    "message"
-                  ],
-                  "type": "object"
-                }
-              }
-            }
-          }
-        },
-        "summary": "",
-        "tags": [
-          "Elastic Package Manager (EPM)"
-        ]
-      }
-    },
-    "/api/fleet/epm/packages/{pkgName}/{pkgVersion}/{filePath*}": {
-      "get": {
-        "description": "Get package file",
-        "operationId": "get-fleet-epm-packages-pkgname-pkgversion-filepath",
-        "parameters": [
-          {
-            "description": "The version of the API to use",
-            "in": "header",
-            "name": "elastic-api-version",
-            "schema": {
-              "default": "2023-10-31",
-              "enum": [
-                "2023-10-31"
-              ],
-              "type": "string"
-            }
-          },
-          {
-            "in": "path",
-            "name": "pkgName",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "in": "path",
-            "name": "pkgVersion",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "in": "path",
-            "name": "filePath",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "content": {
-              "application/json; Elastic-Api-Version=2023-10-31": {
-                "schema": {}
-              }
-            }
-          },
-          "400": {
-            "content": {
-              "application/json; Elastic-Api-Version=2023-10-31": {
-                "schema": {
-                  "additionalProperties": false,
-                  "description": "Generic Error",
-                  "properties": {
-                    "error": {
-                      "type": "string"
-                    },
-                    "message": {
-                      "type": "string"
-                    },
-                    "statusCode": {
-                      "type": "number"
-                    }
-                  },
-                  "required": [
-                    "message"
-                  ],
-                  "type": "object"
-                }
-              }
-            }
-          }
-        },
-        "summary": "",
-        "tags": [
-          "Elastic Package Manager (EPM)"
-        ]
-      }
-    },
-    "/api/fleet/epm/packages/{pkgkey}": {
-      "delete": {
-        "operationId": "delete-fleet-epm-packages-pkgkey",
-        "parameters": [
-          {
-            "description": "The version of the API to use",
-            "in": "header",
-            "name": "elastic-api-version",
-            "schema": {
-              "default": "2023-10-31",
-              "enum": [
-                "2023-10-31"
-              ],
-              "type": "string"
-            }
-          },
-          {
-            "description": "A required header to protect against CSRF attacks",
-            "in": "header",
-            "name": "kbn-xsrf",
-            "required": true,
-            "schema": {
-              "example": "true",
-              "type": "string"
-            }
-          },
-          {
-            "in": "path",
-            "name": "pkgkey",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "requestBody": {
-          "content": {
-            "application/json; Elastic-Api-Version=2023-10-31": {
-              "schema": {
-                "additionalProperties": false,
-                "nullable": true,
-                "properties": {
-                  "force": {
-                    "type": "boolean"
-                  }
-                },
-                "required": [
-                  "force"
-                ],
-                "type": "object"
-              }
-            }
-          }
-        },
-        "responses": {},
-        "summary": "",
-        "tags": []
-      },
-      "get": {
-        "operationId": "get-fleet-epm-packages-pkgkey",
-        "parameters": [
-          {
-            "description": "The version of the API to use",
-            "in": "header",
-            "name": "elastic-api-version",
-            "schema": {
-              "default": "2023-10-31",
-              "enum": [
-                "2023-10-31"
-              ],
-              "type": "string"
-            }
-          },
-          {
-            "in": "path",
-            "name": "pkgkey",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "in": "query",
-            "name": "ignoreUnverified",
-            "required": false,
-            "schema": {
-              "type": "boolean"
-            }
-          },
-          {
-            "in": "query",
-            "name": "prerelease",
-            "required": false,
-            "schema": {
-              "type": "boolean"
-            }
-          },
-          {
-            "in": "query",
-            "name": "full",
-            "required": false,
-            "schema": {
-              "type": "boolean"
+                          "type": "string"
+                        }
+                      },
+                      "required": [
+                        "name",
+                        "version",
+                        "title",
+                        "assets"
+                      ],
+                      "type": "object"
+                    }
+                  },
+                  "required": [
+                    "item"
+                  ],
+                  "type": "object"
+                }
+              }
             }
           },
-          {
-            "in": "query",
-            "name": "withMetadata",
-            "required": false,
-            "schema": {
-              "default": false,
-              "type": "boolean"
+          "400": {
+            "content": {
+              "application/json; Elastic-Api-Version=2023-10-31": {
+                "schema": {
+                  "additionalProperties": false,
+                  "description": "Generic Error",
+                  "properties": {
+                    "error": {
+                      "type": "string"
+                    },
+                    "message": {
+                      "type": "string"
+                    },
+                    "statusCode": {
+                      "type": "number"
+                    }
+                  },
+                  "required": [
+                    "message"
+                  ],
+                  "type": "object"
+                }
+              }
             }
           }
-        ],
-        "responses": {},
+        },
         "summary": "",
-        "tags": []
-      },
+        "tags": [
+          "Elastic Package Manager (EPM)"
+        ]
+      }
+    },
+    "/api/fleet/epm/packages/{pkgName}/{pkgVersion}/transforms/authorize": {
       "post": {
-        "operationId": "post-fleet-epm-packages-pkgkey",
+        "description": "Authorize transforms",
+        "operationId": "post-fleet-epm-packages-pkgname-pkgversion-transforms-authorize",
         "parameters": [
           {
             "description": "The version of the API to use",
@@ -23903,35 +21203,25 @@
           },
           {
             "in": "path",
-            "name": "pkgkey",
+            "name": "pkgName",
             "required": true,
             "schema": {
               "type": "string"
             }
           },
           {
-            "in": "query",
-            "name": "prerelease",
-            "required": false,
-            "schema": {
-              "type": "boolean"
-            }
-          },
-          {
-            "in": "query",
-            "name": "ignoreMappingUpdateErrors",
-            "required": false,
+            "in": "path",
+            "name": "pkgVersion",
+            "required": true,
             "schema": {
-              "default": false,
-              "type": "boolean"
+              "type": "string"
             }
           },
           {
             "in": "query",
-            "name": "skipDataStreamRollover",
+            "name": "prerelease",
             "required": false,
             "schema": {
-              "default": false,
               "type": "boolean"
             }
           }
@@ -23941,26 +21231,97 @@
             "application/json; Elastic-Api-Version=2023-10-31": {
               "schema": {
                 "additionalProperties": false,
-                "nullable": true,
                 "properties": {
-                  "force": {
-                    "type": "boolean"
+                  "transforms": {
+                    "items": {
+                      "additionalProperties": false,
+                      "properties": {
+                        "transformId": {
+                          "type": "string"
+                        }
+                      },
+                      "required": [
+                        "transformId"
+                      ],
+                      "type": "object"
+                    },
+                    "type": "array"
                   }
                 },
                 "required": [
-                  "force"
+                  "transforms"
                 ],
                 "type": "object"
               }
             }
           }
         },
-        "responses": {},
+        "responses": {
+          "200": {
+            "content": {
+              "application/json; Elastic-Api-Version=2023-10-31": {
+                "schema": {
+                  "items": {
+                    "additionalProperties": false,
+                    "properties": {
+                      "error": {
+                        "nullable": true
+                      },
+                      "success": {
+                        "type": "boolean"
+                      },
+                      "transformId": {
+                        "type": "string"
+                      }
+                    },
+                    "required": [
+                      "transformId",
+                      "success",
+                      "error"
+                    ],
+                    "type": "object"
+                  },
+                  "type": "array"
+                }
+              }
+            }
+          },
+          "400": {
+            "content": {
+              "application/json; Elastic-Api-Version=2023-10-31": {
+                "schema": {
+                  "additionalProperties": false,
+                  "description": "Generic Error",
+                  "properties": {
+                    "error": {
+                      "type": "string"
+                    },
+                    "message": {
+                      "type": "string"
+                    },
+                    "statusCode": {
+                      "type": "number"
+                    }
+                  },
+                  "required": [
+                    "message"
+                  ],
+                  "type": "object"
+                }
+              }
+            }
+          }
+        },
         "summary": "",
-        "tags": []
-      },
-      "put": {
-        "operationId": "put-fleet-epm-packages-pkgkey",
+        "tags": [
+          "Elastic Package Manager (EPM)"
+        ]
+      }
+    },
+    "/api/fleet/epm/packages/{pkgName}/{pkgVersion}/{filePath*}": {
+      "get": {
+        "description": "Get package file",
+        "operationId": "get-fleet-epm-packages-pkgname-pkgversion-filepath",
         "parameters": [
           {
             "description": "The version of the API to use",
@@ -23975,45 +21336,68 @@
             }
           },
           {
-            "description": "A required header to protect against CSRF attacks",
-            "in": "header",
-            "name": "kbn-xsrf",
+            "in": "path",
+            "name": "pkgName",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "path",
+            "name": "pkgVersion",
             "required": true,
             "schema": {
-              "example": "true",
               "type": "string"
             }
           },
           {
             "in": "path",
-            "name": "pkgkey",
+            "name": "filePath",
             "required": true,
             "schema": {
               "type": "string"
             }
           }
         ],
-        "requestBody": {
-          "content": {
-            "application/json; Elastic-Api-Version=2023-10-31": {
-              "schema": {
-                "additionalProperties": false,
-                "properties": {
-                  "keepPoliciesUpToDate": {
-                    "type": "boolean"
-                  }
-                },
-                "required": [
-                  "keepPoliciesUpToDate"
-                ],
-                "type": "object"
+        "responses": {
+          "200": {
+            "content": {
+              "application/json; Elastic-Api-Version=2023-10-31": {
+                "schema": {}
+              }
+            }
+          },
+          "400": {
+            "content": {
+              "application/json; Elastic-Api-Version=2023-10-31": {
+                "schema": {
+                  "additionalProperties": false,
+                  "description": "Generic Error",
+                  "properties": {
+                    "error": {
+                      "type": "string"
+                    },
+                    "message": {
+                      "type": "string"
+                    },
+                    "statusCode": {
+                      "type": "number"
+                    }
+                  },
+                  "required": [
+                    "message"
+                  ],
+                  "type": "object"
+                }
               }
             }
           }
         },
-        "responses": {},
         "summary": "",
-        "tags": []
+        "tags": [
+          "Elastic Package Manager (EPM)"
+        ]
       }
     },
     "/api/fleet/epm/templates/{pkgName}/{pkgVersion}/inputs": {
@@ -24920,10 +22304,6 @@
               "schema": {
                 "additionalProperties": false,
                 "properties": {
-                  "host": {
-                    "format": "uri",
-                    "type": "string"
-                  },
                   "id": {
                     "type": "string"
                   }
@@ -24943,10 +22323,6 @@
                 "schema": {
                   "additionalProperties": false,
                   "properties": {
-                    "host": {
-                      "deprecated": true,
-                      "type": "string"
-                    },
                     "host_id": {
                       "type": "string"
                     },
@@ -39316,12 +36692,6 @@
                           ],
                           "type": "object"
                         },
-                        "fleet_server_hosts": {
-                          "items": {
-                            "type": "string"
-                          },
-                          "type": "array"
-                        },
                         "has_seen_add_data_notice": {
                           "type": "boolean"
                         },
@@ -39476,13 +36846,6 @@
                     ],
                     "type": "object"
                   },
-                  "fleet_server_hosts": {
-                    "items": {
-                      "format": "uri",
-                      "type": "string"
-                    },
-                    "type": "array"
-                  },
                   "has_seen_add_data_notice": {
                     "type": "boolean"
                   },
@@ -39531,12 +36894,6 @@
                           ],
                           "type": "object"
                         },
-                        "fleet_server_hosts": {
-                          "items": {
-                            "type": "string"
-                          },
-                          "type": "array"
-                        },
                         "has_seen_add_data_notice": {
                           "type": "boolean"
                         },
diff --git a/oas_docs/bundle.serverless.json b/oas_docs/bundle.serverless.json
index f171dadde991a..bc3d45fe67960 100644
--- a/oas_docs/bundle.serverless.json
+++ b/oas_docs/bundle.serverless.json
@@ -16887,176 +16887,6 @@
         ]
       }
     },
-    "/api/fleet/enrollment-api-keys": {
-      "get": {
-        "operationId": "get-fleet-enrollment-api-keys-2",
-        "parameters": [
-          {
-            "description": "The version of the API to use",
-            "in": "header",
-            "name": "elastic-api-version",
-            "schema": {
-              "default": "2023-10-31",
-              "enum": [
-                "2023-10-31"
-              ],
-              "type": "string"
-            }
-          },
-          {
-            "in": "query",
-            "name": "page",
-            "required": false,
-            "schema": {
-              "default": 1,
-              "type": "number"
-            }
-          },
-          {
-            "in": "query",
-            "name": "perPage",
-            "required": false,
-            "schema": {
-              "default": 20,
-              "type": "number"
-            }
-          },
-          {
-            "in": "query",
-            "name": "kuery",
-            "required": false,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {},
-        "summary": "",
-        "tags": []
-      },
-      "post": {
-        "operationId": "post-fleet-enrollment-api-keys-2",
-        "parameters": [
-          {
-            "description": "The version of the API to use",
-            "in": "header",
-            "name": "elastic-api-version",
-            "schema": {
-              "default": "2023-10-31",
-              "enum": [
-                "2023-10-31"
-              ],
-              "type": "string"
-            }
-          },
-          {
-            "description": "A required header to protect against CSRF attacks",
-            "in": "header",
-            "name": "kbn-xsrf",
-            "required": true,
-            "schema": {
-              "example": "true",
-              "type": "string"
-            }
-          }
-        ],
-        "requestBody": {
-          "content": {
-            "application/json; Elastic-Api-Version=2023-10-31": {
-              "schema": {
-                "additionalProperties": false,
-                "properties": {
-                  "expiration": {
-                    "type": "string"
-                  },
-                  "name": {
-                    "type": "string"
-                  },
-                  "policy_id": {
-                    "type": "string"
-                  }
-                },
-                "required": [
-                  "policy_id"
-                ],
-                "type": "object"
-              }
-            }
-          }
-        },
-        "responses": {},
-        "summary": "",
-        "tags": []
-      }
-    },
-    "/api/fleet/enrollment-api-keys/{keyId}": {
-      "delete": {
-        "operationId": "delete-fleet-enrollment-api-keys-keyid-2",
-        "parameters": [
-          {
-            "description": "The version of the API to use",
-            "in": "header",
-            "name": "elastic-api-version",
-            "schema": {
-              "default": "2023-10-31",
-              "enum": [
-                "2023-10-31"
-              ],
-              "type": "string"
-            }
-          },
-          {
-            "description": "A required header to protect against CSRF attacks",
-            "in": "header",
-            "name": "kbn-xsrf",
-            "required": true,
-            "schema": {
-              "example": "true",
-              "type": "string"
-            }
-          },
-          {
-            "in": "path",
-            "name": "keyId",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {},
-        "summary": "",
-        "tags": []
-      },
-      "get": {
-        "operationId": "get-fleet-enrollment-api-keys-keyid-2",
-        "parameters": [
-          {
-            "description": "The version of the API to use",
-            "in": "header",
-            "name": "elastic-api-version",
-            "schema": {
-              "default": "2023-10-31",
-              "enum": [
-                "2023-10-31"
-              ],
-              "type": "string"
-            }
-          },
-          {
-            "in": "path",
-            "name": "keyId",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {},
-        "summary": "",
-        "tags": []
-      }
-    },
     "/api/fleet/enrollment_api_keys": {
       "get": {
         "description": "List enrollment API keys",
@@ -17150,49 +16980,6 @@
                       },
                       "type": "array"
                     },
-                    "list": {
-                      "deprecated": true,
-                      "items": {
-                        "additionalProperties": false,
-                        "properties": {
-                          "active": {
-                            "description": "When false, the enrollment API key is revoked and cannot be used for enrolling Elastic Agents.",
-                            "type": "boolean"
-                          },
-                          "api_key": {
-                            "description": "The enrollment API key (token) used for enrolling Elastic Agents.",
-                            "type": "string"
-                          },
-                          "api_key_id": {
-                            "description": "The ID of the API key in the Security API.",
-                            "type": "string"
-                          },
-                          "created_at": {
-                            "type": "string"
-                          },
-                          "id": {
-                            "type": "string"
-                          },
-                          "name": {
-                            "description": "The name of the enrollment API key.",
-                            "type": "string"
-                          },
-                          "policy_id": {
-                            "description": "The ID of the agent policy the Elastic Agent will be enrolled in.",
-                            "type": "string"
-                          }
-                        },
-                        "required": [
-                          "id",
-                          "api_key_id",
-                          "api_key",
-                          "active",
-                          "created_at"
-                        ],
-                        "type": "object"
-                      },
-                      "type": "array"
-                    },
                     "page": {
                       "type": "number"
                     },
@@ -17207,8 +16994,7 @@
                     "items",
                     "total",
                     "page",
-                    "perPage",
-                    "list"
+                    "perPage"
                   ],
                   "type": "object"
                 }
@@ -17768,14 +17554,6 @@
               "type": "boolean"
             }
           },
-          {
-            "in": "query",
-            "name": "experimental",
-            "required": false,
-            "schema": {
-              "type": "boolean"
-            }
-          },
           {
             "in": "query",
             "name": "include_policy_templates",
@@ -17820,36 +17598,6 @@
                         "type": "object"
                       },
                       "type": "array"
-                    },
-                    "response": {
-                      "items": {
-                        "additionalProperties": false,
-                        "deprecated": true,
-                        "properties": {
-                          "count": {
-                            "type": "number"
-                          },
-                          "id": {
-                            "type": "string"
-                          },
-                          "parent_id": {
-                            "type": "string"
-                          },
-                          "parent_title": {
-                            "type": "string"
-                          },
-                          "title": {
-                            "type": "string"
-                          }
-                        },
-                        "required": [
-                          "id",
-                          "title",
-                          "count"
-                        ],
-                        "type": "object"
-                      },
-                      "type": "array"
                     }
                   },
                   "required": [
@@ -18058,79 +17806,6 @@
                         ]
                       },
                       "type": "array"
-                    },
-                    "response": {
-                      "deprecated": true,
-                      "items": {
-                        "anyOf": [
-                          {
-                            "additionalProperties": false,
-                            "properties": {
-                              "id": {
-                                "type": "string"
-                              },
-                              "originId": {
-                                "type": "string"
-                              },
-                              "type": {
-                                "enum": [
-                                  "dashboard",
-                                  "lens",
-                                  "visualization",
-                                  "search",
-                                  "index-pattern",
-                                  "map",
-                                  "ml-module",
-                                  "security-rule",
-                                  "csp-rule-template",
-                                  "osquery-pack-asset",
-                                  "osquery-saved-query",
-                                  "tag"
-                                ],
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "id",
-                              "type"
-                            ],
-                            "type": "object"
-                          },
-                          {
-                            "additionalProperties": false,
-                            "properties": {
-                              "deferred": {
-                                "type": "boolean"
-                              },
-                              "id": {
-                                "type": "string"
-                              },
-                              "type": {
-                                "enum": [
-                                  "index",
-                                  "index_template",
-                                  "component_template",
-                                  "ingest_pipeline",
-                                  "ilm_policy",
-                                  "data_stream_ilm_policy",
-                                  "transform",
-                                  "ml_model"
-                                ],
-                                "type": "string"
-                              },
-                              "version": {
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "id",
-                              "type"
-                            ],
-                            "type": "object"
-                          }
-                        ]
-                      },
-                      "type": "array"
                     }
                   },
                   "required": [
@@ -18333,14 +18008,6 @@
               "type": "boolean"
             }
           },
-          {
-            "in": "query",
-            "name": "experimental",
-            "required": false,
-            "schema": {
-              "type": "boolean"
-            }
-          },
           {
             "in": "query",
             "name": "excludeInstallStatus",
@@ -18791,7 +18458,6 @@
                             ],
                             "type": "string"
                           },
-                          "savedObject": {},
                           "signature_path": {
                             "type": "string"
                           },
@@ -18833,7 +18499,6 @@
                           }
                         },
                         "required": [
-                          "savedObject",
                           "name",
                           "version",
                           "title",
@@ -18842,497 +18507,197 @@
                         "type": "object"
                       },
                       "type": "array"
+                    }
+                  },
+                  "required": [
+                    "items"
+                  ],
+                  "type": "object"
+                }
+              }
+            }
+          },
+          "400": {
+            "content": {
+              "application/json; Elastic-Api-Version=2023-10-31": {
+                "schema": {
+                  "additionalProperties": false,
+                  "description": "Generic Error",
+                  "properties": {
+                    "error": {
+                      "type": "string"
                     },
-                    "response": {
+                    "message": {
+                      "type": "string"
+                    },
+                    "statusCode": {
+                      "type": "number"
+                    }
+                  },
+                  "required": [
+                    "message"
+                  ],
+                  "type": "object"
+                }
+              }
+            }
+          }
+        },
+        "summary": "",
+        "tags": [
+          "Elastic Package Manager (EPM)"
+        ]
+      },
+      "post": {
+        "description": "Install package by upload",
+        "operationId": "post-fleet-epm-packages",
+        "parameters": [
+          {
+            "description": "The version of the API to use",
+            "in": "header",
+            "name": "elastic-api-version",
+            "schema": {
+              "default": "2023-10-31",
+              "enum": [
+                "2023-10-31"
+              ],
+              "type": "string"
+            }
+          },
+          {
+            "description": "A required header to protect against CSRF attacks",
+            "in": "header",
+            "name": "kbn-xsrf",
+            "required": true,
+            "schema": {
+              "example": "true",
+              "type": "string"
+            }
+          },
+          {
+            "in": "query",
+            "name": "ignoreMappingUpdateErrors",
+            "required": false,
+            "schema": {
+              "default": false,
+              "type": "boolean"
+            }
+          },
+          {
+            "in": "query",
+            "name": "skipDataStreamRollover",
+            "required": false,
+            "schema": {
+              "default": false,
+              "type": "boolean"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/gzip; application/zip; Elastic-Api-Version=2023-10-31": {
+              "schema": {
+                "format": "binary",
+                "type": "string"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "content": {
+              "application/gzip; application/zip; Elastic-Api-Version=2023-10-31": {
+                "schema": {
+                  "additionalProperties": false,
+                  "properties": {
+                    "_meta": {
+                      "additionalProperties": false,
+                      "properties": {
+                        "install_source": {
+                          "type": "string"
+                        }
+                      },
+                      "required": [
+                        "install_source"
+                      ],
+                      "type": "object"
+                    },
+                    "items": {
                       "items": {
-                        "additionalProperties": true,
-                        "deprecated": true,
-                        "properties": {
-                          "categories": {
-                            "items": {
-                              "type": "string"
-                            },
-                            "type": "array"
-                          },
-                          "conditions": {
-                            "additionalProperties": true,
+                        "anyOf": [
+                          {
+                            "additionalProperties": false,
                             "properties": {
-                              "elastic": {
-                                "additionalProperties": true,
-                                "properties": {
-                                  "capabilities": {
-                                    "items": {
-                                      "type": "string"
-                                    },
-                                    "type": "array"
-                                  },
-                                  "subscription": {
-                                    "type": "string"
-                                  }
-                                },
-                                "type": "object"
+                              "id": {
+                                "type": "string"
                               },
-                              "kibana": {
-                                "additionalProperties": true,
-                                "properties": {
-                                  "version": {
-                                    "type": "string"
-                                  }
-                                },
-                                "type": "object"
+                              "originId": {
+                                "type": "string"
+                              },
+                              "type": {
+                                "enum": [
+                                  "dashboard",
+                                  "lens",
+                                  "visualization",
+                                  "search",
+                                  "index-pattern",
+                                  "map",
+                                  "ml-module",
+                                  "security-rule",
+                                  "csp-rule-template",
+                                  "osquery-pack-asset",
+                                  "osquery-saved-query",
+                                  "tag"
+                                ],
+                                "type": "string"
                               }
                             },
+                            "required": [
+                              "id",
+                              "type"
+                            ],
                             "type": "object"
                           },
-                          "data_streams": {
-                            "items": {
-                              "additionalProperties": {},
-                              "type": "object"
-                            },
-                            "type": "array"
-                          },
-                          "description": {
-                            "type": "string"
-                          },
-                          "discovery": {
-                            "additionalProperties": true,
+                          {
+                            "additionalProperties": false,
                             "properties": {
-                              "fields": {
-                                "items": {
-                                  "additionalProperties": true,
-                                  "properties": {
-                                    "name": {
-                                      "type": "string"
-                                    }
-                                  },
-                                  "required": [
-                                    "name"
-                                  ],
-                                  "type": "object"
-                                },
-                                "type": "array"
-                              }
-                            },
-                            "type": "object"
-                          },
-                          "download": {
-                            "type": "string"
-                          },
-                          "format_version": {
-                            "type": "string"
-                          },
-                          "icons": {
-                            "items": {
-                              "additionalProperties": true,
-                              "properties": {
-                                "dark_mode": {
-                                  "type": "boolean"
-                                },
-                                "path": {
-                                  "type": "string"
-                                },
-                                "size": {
-                                  "type": "string"
-                                },
-                                "src": {
-                                  "type": "string"
-                                },
-                                "title": {
-                                  "type": "string"
-                                },
-                                "type": {
-                                  "type": "string"
-                                }
-                              },
-                              "required": [
-                                "src"
-                              ],
-                              "type": "object"
-                            },
-                            "type": "array"
-                          },
-                          "id": {
-                            "type": "string"
-                          },
-                          "installationInfo": {
-                            "additionalProperties": true,
-                            "properties": {
-                              "additional_spaces_installed_kibana": {
-                                "additionalProperties": {
-                                  "items": {
-                                    "additionalProperties": true,
-                                    "properties": {
-                                      "id": {
-                                        "type": "string"
-                                      },
-                                      "originId": {
-                                        "type": "string"
-                                      },
-                                      "type": {
-                                        "enum": [
-                                          "dashboard",
-                                          "lens",
-                                          "visualization",
-                                          "search",
-                                          "index-pattern",
-                                          "map",
-                                          "ml-module",
-                                          "security-rule",
-                                          "csp-rule-template",
-                                          "osquery-pack-asset",
-                                          "osquery-saved-query",
-                                          "tag"
-                                        ],
-                                        "type": "string"
-                                      }
-                                    },
-                                    "required": [
-                                      "id",
-                                      "type"
-                                    ],
-                                    "type": "object"
-                                  },
-                                  "type": "array"
-                                },
-                                "type": "object"
-                              },
-                              "created_at": {
-                                "type": "string"
-                              },
-                              "experimental_data_stream_features": {
-                                "items": {
-                                  "additionalProperties": true,
-                                  "properties": {
-                                    "data_stream": {
-                                      "type": "string"
-                                    },
-                                    "features": {
-                                      "additionalProperties": true,
-                                      "properties": {
-                                        "doc_value_only_numeric": {
-                                          "type": "boolean"
-                                        },
-                                        "doc_value_only_other": {
-                                          "type": "boolean"
-                                        },
-                                        "synthetic_source": {
-                                          "type": "boolean"
-                                        },
-                                        "tsdb": {
-                                          "type": "boolean"
-                                        }
-                                      },
-                                      "type": "object"
-                                    }
-                                  },
-                                  "required": [
-                                    "data_stream",
-                                    "features"
-                                  ],
-                                  "type": "object"
-                                },
-                                "type": "array"
-                              },
-                              "install_format_schema_version": {
-                                "type": "string"
+                              "deferred": {
+                                "type": "boolean"
                               },
-                              "install_source": {
-                                "enum": [
-                                  "registry",
-                                  "upload",
-                                  "bundled",
-                                  "custom"
-                                ],
+                              "id": {
                                 "type": "string"
                               },
-                              "install_status": {
+                              "type": {
                                 "enum": [
-                                  "installed",
-                                  "installing",
-                                  "install_failed"
+                                  "index",
+                                  "index_template",
+                                  "component_template",
+                                  "ingest_pipeline",
+                                  "ilm_policy",
+                                  "data_stream_ilm_policy",
+                                  "transform",
+                                  "ml_model"
                                 ],
                                 "type": "string"
                               },
-                              "installed_es": {
-                                "items": {
-                                  "additionalProperties": true,
-                                  "properties": {
-                                    "deferred": {
-                                      "type": "boolean"
-                                    },
-                                    "id": {
-                                      "type": "string"
-                                    },
-                                    "type": {
-                                      "enum": [
-                                        "index",
-                                        "index_template",
-                                        "component_template",
-                                        "ingest_pipeline",
-                                        "ilm_policy",
-                                        "data_stream_ilm_policy",
-                                        "transform",
-                                        "ml_model"
-                                      ],
-                                      "type": "string"
-                                    },
-                                    "version": {
-                                      "type": "string"
-                                    }
-                                  },
-                                  "required": [
-                                    "id",
-                                    "type"
-                                  ],
-                                  "type": "object"
-                                },
-                                "type": "array"
-                              },
-                              "installed_kibana": {
-                                "items": {
-                                  "additionalProperties": true,
-                                  "properties": {
-                                    "id": {
-                                      "type": "string"
-                                    },
-                                    "originId": {
-                                      "type": "string"
-                                    },
-                                    "type": {
-                                      "enum": [
-                                        "dashboard",
-                                        "lens",
-                                        "visualization",
-                                        "search",
-                                        "index-pattern",
-                                        "map",
-                                        "ml-module",
-                                        "security-rule",
-                                        "csp-rule-template",
-                                        "osquery-pack-asset",
-                                        "osquery-saved-query",
-                                        "tag"
-                                      ],
-                                      "type": "string"
-                                    }
-                                  },
-                                  "required": [
-                                    "id",
-                                    "type"
-                                  ],
-                                  "type": "object"
-                                },
-                                "type": "array"
-                              },
-                              "installed_kibana_space_id": {
-                                "type": "string"
-                              },
-                              "latest_executed_state": {
-                                "additionalProperties": true,
-                                "properties": {
-                                  "error": {
-                                    "type": "string"
-                                  },
-                                  "name": {
-                                    "type": "string"
-                                  },
-                                  "started_at": {
-                                    "type": "string"
-                                  }
-                                },
-                                "required": [
-                                  "name",
-                                  "started_at"
-                                ],
-                                "type": "object"
-                              },
-                              "latest_install_failed_attempts": {
-                                "items": {
-                                  "additionalProperties": true,
-                                  "properties": {
-                                    "created_at": {
-                                      "type": "string"
-                                    },
-                                    "error": {
-                                      "additionalProperties": true,
-                                      "properties": {
-                                        "message": {
-                                          "type": "string"
-                                        },
-                                        "name": {
-                                          "type": "string"
-                                        },
-                                        "stack": {
-                                          "type": "string"
-                                        }
-                                      },
-                                      "required": [
-                                        "name",
-                                        "message"
-                                      ],
-                                      "type": "object"
-                                    },
-                                    "target_version": {
-                                      "type": "string"
-                                    }
-                                  },
-                                  "required": [
-                                    "created_at",
-                                    "target_version",
-                                    "error"
-                                  ],
-                                  "type": "object"
-                                },
-                                "type": "array"
-                              },
-                              "name": {
-                                "type": "string"
-                              },
-                              "namespaces": {
-                                "items": {
-                                  "type": "string"
-                                },
-                                "type": "array"
-                              },
-                              "type": {
-                                "type": "string"
-                              },
-                              "updated_at": {
-                                "type": "string"
-                              },
-                              "verification_key_id": {
-                                "nullable": true,
-                                "type": "string"
-                              },
-                              "verification_status": {
-                                "enum": [
-                                  "unverified",
-                                  "verified",
-                                  "unknown"
-                                ],
-                                "type": "string"
-                              },
-                              "version": {
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "type",
-                              "installed_kibana",
-                              "installed_es",
-                              "name",
-                              "version",
-                              "install_status",
-                              "install_source",
-                              "verification_status"
-                            ],
-                            "type": "object"
-                          },
-                          "integration": {
-                            "type": "string"
-                          },
-                          "internal": {
-                            "type": "boolean"
-                          },
-                          "latestVersion": {
-                            "type": "string"
-                          },
-                          "name": {
-                            "type": "string"
-                          },
-                          "owner": {
-                            "additionalProperties": true,
-                            "properties": {
-                              "github": {
-                                "type": "string"
-                              },
-                              "type": {
-                                "enum": [
-                                  "elastic",
-                                  "partner",
-                                  "community"
-                                ],
-                                "type": "string"
-                              }
-                            },
-                            "type": "object"
-                          },
-                          "path": {
-                            "type": "string"
-                          },
-                          "policy_templates": {
-                            "items": {
-                              "additionalProperties": {},
-                              "type": "object"
-                            },
-                            "type": "array"
-                          },
-                          "readme": {
-                            "type": "string"
-                          },
-                          "release": {
-                            "enum": [
-                              "ga",
-                              "beta",
-                              "experimental"
-                            ],
-                            "type": "string"
-                          },
-                          "savedObject": {},
-                          "signature_path": {
-                            "type": "string"
-                          },
-                          "source": {
-                            "additionalProperties": true,
-                            "properties": {
-                              "license": {
+                              "version": {
                                 "type": "string"
                               }
                             },
                             "required": [
-                              "license"
+                              "id",
+                              "type"
                             ],
                             "type": "object"
-                          },
-                          "status": {
-                            "type": "string"
-                          },
-                          "title": {
-                            "type": "string"
-                          },
-                          "type": {
-                            "enum": [
-                              "integration",
-                              "input",
-                              "content"
-                            ],
-                            "type": "string"
-                          },
-                          "vars": {
-                            "items": {
-                              "additionalProperties": {},
-                              "type": "object"
-                            },
-                            "type": "array"
-                          },
-                          "version": {
-                            "type": "string"
                           }
-                        },
-                        "required": [
-                          "savedObject",
-                          "name",
-                          "version",
-                          "title",
-                          "id"
-                        ],
-                        "type": "object"
+                        ]
                       },
                       "type": "array"
                     }
                   },
                   "required": [
-                    "items"
+                    "items",
+                    "_meta"
                   ],
                   "type": "object"
                 }
@@ -19341,7 +18706,7 @@
           },
           "400": {
             "content": {
-              "application/json; Elastic-Api-Version=2023-10-31": {
+              "application/gzip; application/zip; Elastic-Api-Version=2023-10-31": {
                 "schema": {
                   "additionalProperties": false,
                   "description": "Generic Error",
@@ -19369,10 +18734,12 @@
         "tags": [
           "Elastic Package Manager (EPM)"
         ]
-      },
+      }
+    },
+    "/api/fleet/epm/packages/_bulk": {
       "post": {
-        "description": "Install package by upload",
-        "operationId": "post-fleet-epm-packages",
+        "description": "Bulk install packages",
+        "operationId": "post-fleet-epm-packages-bulk",
         "parameters": [
           {
             "description": "The version of the API to use",
@@ -19398,29 +18765,58 @@
           },
           {
             "in": "query",
-            "name": "ignoreMappingUpdateErrors",
-            "required": false,
-            "schema": {
-              "default": false,
-              "type": "boolean"
-            }
-          },
-          {
-            "in": "query",
-            "name": "skipDataStreamRollover",
+            "name": "prerelease",
             "required": false,
             "schema": {
-              "default": false,
               "type": "boolean"
             }
           }
         ],
         "requestBody": {
           "content": {
-            "application/gzip; application/zip; Elastic-Api-Version=2023-10-31": {
+            "application/json; Elastic-Api-Version=2023-10-31": {
               "schema": {
-                "format": "binary",
-                "type": "string"
+                "additionalProperties": false,
+                "properties": {
+                  "force": {
+                    "default": false,
+                    "type": "boolean"
+                  },
+                  "packages": {
+                    "items": {
+                      "anyOf": [
+                        {
+                          "type": "string"
+                        },
+                        {
+                          "additionalProperties": false,
+                          "properties": {
+                            "name": {
+                              "type": "string"
+                            },
+                            "prerelease": {
+                              "type": "boolean"
+                            },
+                            "version": {
+                              "type": "string"
+                            }
+                          },
+                          "required": [
+                            "name",
+                            "version"
+                          ],
+                          "type": "object"
+                        }
+                      ]
+                    },
+                    "minItems": 1,
+                    "type": "array"
+                  }
+                },
+                "required": [
+                  "packages"
+                ],
+                "type": "object"
               }
             }
           }
@@ -19428,160 +18824,148 @@
         "responses": {
           "200": {
             "content": {
-              "application/gzip; application/zip; Elastic-Api-Version=2023-10-31": {
+              "application/json; Elastic-Api-Version=2023-10-31": {
                 "schema": {
                   "additionalProperties": false,
                   "properties": {
-                    "_meta": {
-                      "additionalProperties": false,
-                      "properties": {
-                        "install_source": {
-                          "type": "string"
-                        }
-                      },
-                      "required": [
-                        "install_source"
-                      ],
-                      "type": "object"
-                    },
                     "items": {
                       "items": {
                         "anyOf": [
                           {
                             "additionalProperties": false,
                             "properties": {
-                              "id": {
-                                "type": "string"
-                              },
-                              "originId": {
-                                "type": "string"
-                              },
-                              "type": {
-                                "enum": [
-                                  "dashboard",
-                                  "lens",
-                                  "visualization",
-                                  "search",
-                                  "index-pattern",
-                                  "map",
-                                  "ml-module",
-                                  "security-rule",
-                                  "csp-rule-template",
-                                  "osquery-pack-asset",
-                                  "osquery-saved-query",
-                                  "tag"
-                                ],
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "id",
-                              "type"
-                            ],
-                            "type": "object"
-                          },
-                          {
-                            "additionalProperties": false,
-                            "properties": {
-                              "deferred": {
-                                "type": "boolean"
-                              },
-                              "id": {
+                              "name": {
                                 "type": "string"
                               },
-                              "type": {
-                                "enum": [
-                                  "index",
-                                  "index_template",
-                                  "component_template",
-                                  "ingest_pipeline",
-                                  "ilm_policy",
-                                  "data_stream_ilm_policy",
-                                  "transform",
-                                  "ml_model"
+                              "result": {
+                                "additionalProperties": false,
+                                "properties": {
+                                  "assets": {
+                                    "items": {
+                                      "anyOf": [
+                                        {
+                                          "additionalProperties": false,
+                                          "properties": {
+                                            "id": {
+                                              "type": "string"
+                                            },
+                                            "originId": {
+                                              "type": "string"
+                                            },
+                                            "type": {
+                                              "enum": [
+                                                "dashboard",
+                                                "lens",
+                                                "visualization",
+                                                "search",
+                                                "index-pattern",
+                                                "map",
+                                                "ml-module",
+                                                "security-rule",
+                                                "csp-rule-template",
+                                                "osquery-pack-asset",
+                                                "osquery-saved-query",
+                                                "tag"
+                                              ],
+                                              "type": "string"
+                                            }
+                                          },
+                                          "required": [
+                                            "id",
+                                            "type"
+                                          ],
+                                          "type": "object"
+                                        },
+                                        {
+                                          "additionalProperties": false,
+                                          "properties": {
+                                            "deferred": {
+                                              "type": "boolean"
+                                            },
+                                            "id": {
+                                              "type": "string"
+                                            },
+                                            "type": {
+                                              "enum": [
+                                                "index",
+                                                "index_template",
+                                                "component_template",
+                                                "ingest_pipeline",
+                                                "ilm_policy",
+                                                "data_stream_ilm_policy",
+                                                "transform",
+                                                "ml_model"
+                                              ],
+                                              "type": "string"
+                                            },
+                                            "version": {
+                                              "type": "string"
+                                            }
+                                          },
+                                          "required": [
+                                            "id",
+                                            "type"
+                                          ],
+                                          "type": "object"
+                                        }
+                                      ]
+                                    },
+                                    "type": "array"
+                                  },
+                                  "error": {},
+                                  "installSource": {
+                                    "type": "string"
+                                  },
+                                  "installType": {
+                                    "type": "string"
+                                  },
+                                  "status": {
+                                    "enum": [
+                                      "installed",
+                                      "already_installed"
+                                    ],
+                                    "type": "string"
+                                  }
+                                },
+                                "required": [
+                                  "error",
+                                  "installType"
                                 ],
-                                "type": "string"
+                                "type": "object"
                               },
                               "version": {
                                 "type": "string"
                               }
                             },
                             "required": [
-                              "id",
-                              "type"
-                            ],
-                            "type": "object"
-                          }
-                        ]
-                      },
-                      "type": "array"
-                    },
-                    "response": {
-                      "deprecated": true,
-                      "items": {
-                        "anyOf": [
-                          {
-                            "additionalProperties": false,
-                            "properties": {
-                              "id": {
-                                "type": "string"
-                              },
-                              "originId": {
-                                "type": "string"
-                              },
-                              "type": {
-                                "enum": [
-                                  "dashboard",
-                                  "lens",
-                                  "visualization",
-                                  "search",
-                                  "index-pattern",
-                                  "map",
-                                  "ml-module",
-                                  "security-rule",
-                                  "csp-rule-template",
-                                  "osquery-pack-asset",
-                                  "osquery-saved-query",
-                                  "tag"
-                                ],
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "id",
-                              "type"
+                              "name",
+                              "version",
+                              "result"
                             ],
                             "type": "object"
                           },
                           {
                             "additionalProperties": false,
                             "properties": {
-                              "deferred": {
-                                "type": "boolean"
-                              },
-                              "id": {
-                                "type": "string"
+                              "error": {
+                                "anyOf": [
+                                  {
+                                    "type": "string"
+                                  },
+                                  {}
+                                ]
                               },
-                              "type": {
-                                "enum": [
-                                  "index",
-                                  "index_template",
-                                  "component_template",
-                                  "ingest_pipeline",
-                                  "ilm_policy",
-                                  "data_stream_ilm_policy",
-                                  "transform",
-                                  "ml_model"
-                                ],
+                              "name": {
                                 "type": "string"
                               },
-                              "version": {
-                                "type": "string"
+                              "statusCode": {
+                                "type": "number"
                               }
                             },
                             "required": [
-                              "id",
-                              "type"
+                              "name",
+                              "statusCode",
+                              "error"
                             ],
                             "type": "object"
                           }
@@ -19591,8 +18975,7 @@
                     }
                   },
                   "required": [
-                    "items",
-                    "_meta"
+                    "items"
                   ],
                   "type": "object"
                 }
@@ -19601,7 +18984,7 @@
           },
           "400": {
             "content": {
-              "application/gzip; application/zip; Elastic-Api-Version=2023-10-31": {
+              "application/json; Elastic-Api-Version=2023-10-31": {
                 "schema": {
                   "additionalProperties": false,
                   "description": "Generic Error",
@@ -19631,10 +19014,10 @@
         ]
       }
     },
-    "/api/fleet/epm/packages/_bulk": {
-      "post": {
-        "description": "Bulk install packages",
-        "operationId": "post-fleet-epm-packages-bulk",
+    "/api/fleet/epm/packages/installed": {
+      "get": {
+        "description": "Get installed packages",
+        "operationId": "get-fleet-epm-packages-installed",
         "parameters": [
           {
             "description": "The version of the API to use",
@@ -19649,73 +19032,247 @@
             }
           },
           {
-            "description": "A required header to protect against CSRF attacks",
-            "in": "header",
-            "name": "kbn-xsrf",
-            "required": true,
+            "in": "query",
+            "name": "dataStreamType",
+            "required": false,
             "schema": {
-              "example": "true",
+              "enum": [
+                "logs",
+                "metrics",
+                "traces",
+                "synthetics",
+                "profiling"
+              ],
               "type": "string"
             }
           },
           {
             "in": "query",
-            "name": "prerelease",
+            "name": "showOnlyActiveDataStreams",
             "required": false,
             "schema": {
               "type": "boolean"
             }
-          }
-        ],
-        "requestBody": {
-          "content": {
-            "application/json; Elastic-Api-Version=2023-10-31": {
-              "schema": {
-                "additionalProperties": false,
-                "properties": {
-                  "force": {
-                    "default": false,
-                    "type": "boolean"
+          },
+          {
+            "in": "query",
+            "name": "nameQuery",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "query",
+            "name": "searchAfter",
+            "required": false,
+            "schema": {
+              "items": {
+                "anyOf": [
+                  {
+                    "type": "string"
                   },
-                  "packages": {
+                  {
+                    "type": "number"
+                  }
+                ]
+              },
+              "type": "array"
+            }
+          },
+          {
+            "in": "query",
+            "name": "perPage",
+            "required": false,
+            "schema": {
+              "default": 15,
+              "type": "number"
+            }
+          },
+          {
+            "in": "query",
+            "name": "sortOrder",
+            "required": false,
+            "schema": {
+              "default": "asc",
+              "enum": [
+                "asc",
+                "desc"
+              ],
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "content": {
+              "application/json; Elastic-Api-Version=2023-10-31": {
+                "schema": {
+                  "additionalProperties": false,
+                  "properties": {
                     "items": {
-                      "anyOf": [
-                        {
-                          "type": "string"
-                        },
-                        {
-                          "additionalProperties": false,
-                          "properties": {
-                            "name": {
-                              "type": "string"
+                      "items": {
+                        "additionalProperties": false,
+                        "properties": {
+                          "dataStreams": {
+                            "items": {
+                              "additionalProperties": false,
+                              "properties": {
+                                "name": {
+                                  "type": "string"
+                                },
+                                "title": {
+                                  "type": "string"
+                                }
+                              },
+                              "required": [
+                                "name",
+                                "title"
+                              ],
+                              "type": "object"
                             },
-                            "prerelease": {
-                              "type": "boolean"
+                            "type": "array"
+                          },
+                          "description": {
+                            "type": "string"
+                          },
+                          "icons": {
+                            "items": {
+                              "additionalProperties": false,
+                              "properties": {
+                                "dark_mode": {
+                                  "type": "boolean"
+                                },
+                                "path": {
+                                  "type": "string"
+                                },
+                                "size": {
+                                  "type": "string"
+                                },
+                                "src": {
+                                  "type": "string"
+                                },
+                                "title": {
+                                  "type": "string"
+                                },
+                                "type": {
+                                  "type": "string"
+                                }
+                              },
+                              "required": [
+                                "src"
+                              ],
+                              "type": "object"
                             },
-                            "version": {
-                              "type": "string"
-                            }
+                            "type": "array"
                           },
-                          "required": [
-                            "name",
-                            "version"
-                          ],
-                          "type": "object"
-                        }
-                      ]
+                          "name": {
+                            "type": "string"
+                          },
+                          "status": {
+                            "type": "string"
+                          },
+                          "title": {
+                            "type": "string"
+                          },
+                          "version": {
+                            "type": "string"
+                          }
+                        },
+                        "required": [
+                          "name",
+                          "version",
+                          "status",
+                          "dataStreams"
+                        ],
+                        "type": "object"
+                      },
+                      "type": "array"
                     },
-                    "minItems": 1,
-                    "type": "array"
-                  }
-                },
-                "required": [
-                  "packages"
-                ],
-                "type": "object"
+                    "searchAfter": {
+                      "items": {
+                        "anyOf": [
+                          {
+                            "type": "string"
+                          },
+                          {
+                            "type": "number"
+                          },
+                          {
+                            "type": "boolean"
+                          },
+                          {
+                            "enum": [],
+                            "nullable": true
+                          },
+                          {}
+                        ]
+                      },
+                      "type": "array"
+                    },
+                    "total": {
+                      "type": "number"
+                    }
+                  },
+                  "required": [
+                    "items",
+                    "total"
+                  ],
+                  "type": "object"
+                }
+              }
+            }
+          },
+          "400": {
+            "content": {
+              "application/json; Elastic-Api-Version=2023-10-31": {
+                "schema": {
+                  "additionalProperties": false,
+                  "description": "Generic Error",
+                  "properties": {
+                    "error": {
+                      "type": "string"
+                    },
+                    "message": {
+                      "type": "string"
+                    },
+                    "statusCode": {
+                      "type": "number"
+                    }
+                  },
+                  "required": [
+                    "message"
+                  ],
+                  "type": "object"
+                }
               }
             }
           }
         },
+        "summary": "",
+        "tags": [
+          "Elastic Package Manager (EPM)"
+        ]
+      }
+    },
+    "/api/fleet/epm/packages/limited": {
+      "get": {
+        "description": "Get limited package list",
+        "operationId": "get-fleet-epm-packages-limited",
+        "parameters": [
+          {
+            "description": "The version of the API to use",
+            "in": "header",
+            "name": "elastic-api-version",
+            "schema": {
+              "default": "2023-10-31",
+              "enum": [
+                "2023-10-31"
+              ],
+              "type": "string"
+            }
+          }
+        ],
         "responses": {
           "200": {
             "content": {
@@ -19725,298 +19282,99 @@
                   "properties": {
                     "items": {
                       "items": {
-                        "anyOf": [
-                          {
-                            "additionalProperties": false,
-                            "properties": {
-                              "name": {
-                                "type": "string"
-                              },
-                              "result": {
-                                "additionalProperties": false,
-                                "properties": {
-                                  "assets": {
-                                    "items": {
-                                      "anyOf": [
-                                        {
-                                          "additionalProperties": false,
-                                          "properties": {
-                                            "id": {
-                                              "type": "string"
-                                            },
-                                            "originId": {
-                                              "type": "string"
-                                            },
-                                            "type": {
-                                              "enum": [
-                                                "dashboard",
-                                                "lens",
-                                                "visualization",
-                                                "search",
-                                                "index-pattern",
-                                                "map",
-                                                "ml-module",
-                                                "security-rule",
-                                                "csp-rule-template",
-                                                "osquery-pack-asset",
-                                                "osquery-saved-query",
-                                                "tag"
-                                              ],
-                                              "type": "string"
-                                            }
-                                          },
-                                          "required": [
-                                            "id",
-                                            "type"
-                                          ],
-                                          "type": "object"
-                                        },
-                                        {
-                                          "additionalProperties": false,
-                                          "properties": {
-                                            "deferred": {
-                                              "type": "boolean"
-                                            },
-                                            "id": {
-                                              "type": "string"
-                                            },
-                                            "type": {
-                                              "enum": [
-                                                "index",
-                                                "index_template",
-                                                "component_template",
-                                                "ingest_pipeline",
-                                                "ilm_policy",
-                                                "data_stream_ilm_policy",
-                                                "transform",
-                                                "ml_model"
-                                              ],
-                                              "type": "string"
-                                            },
-                                            "version": {
-                                              "type": "string"
-                                            }
-                                          },
-                                          "required": [
-                                            "id",
-                                            "type"
-                                          ],
-                                          "type": "object"
-                                        }
-                                      ]
-                                    },
-                                    "type": "array"
-                                  },
-                                  "error": {},
-                                  "installSource": {
-                                    "type": "string"
-                                  },
-                                  "installType": {
-                                    "type": "string"
-                                  },
-                                  "status": {
-                                    "enum": [
-                                      "installed",
-                                      "already_installed"
-                                    ],
-                                    "type": "string"
-                                  }
-                                },
-                                "required": [
-                                  "error",
-                                  "installType"
-                                ],
-                                "type": "object"
-                              },
-                              "version": {
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "name",
-                              "version",
-                              "result"
-                            ],
-                            "type": "object"
-                          },
-                          {
-                            "additionalProperties": false,
-                            "properties": {
-                              "error": {
-                                "anyOf": [
-                                  {
-                                    "type": "string"
-                                  },
-                                  {}
-                                ]
-                              },
-                              "name": {
-                                "type": "string"
-                              },
-                              "statusCode": {
-                                "type": "number"
-                              }
-                            },
-                            "required": [
-                              "name",
-                              "statusCode",
-                              "error"
-                            ],
-                            "type": "object"
-                          }
-                        ]
+                        "type": "string"
                       },
                       "type": "array"
+                    }
+                  },
+                  "required": [
+                    "items"
+                  ],
+                  "type": "object"
+                }
+              }
+            }
+          },
+          "400": {
+            "content": {
+              "application/json; Elastic-Api-Version=2023-10-31": {
+                "schema": {
+                  "additionalProperties": false,
+                  "description": "Generic Error",
+                  "properties": {
+                    "error": {
+                      "type": "string"
                     },
+                    "message": {
+                      "type": "string"
+                    },
+                    "statusCode": {
+                      "type": "number"
+                    }
+                  },
+                  "required": [
+                    "message"
+                  ],
+                  "type": "object"
+                }
+              }
+            }
+          }
+        },
+        "summary": "",
+        "tags": [
+          "Elastic Package Manager (EPM)"
+        ]
+      }
+    },
+    "/api/fleet/epm/packages/{pkgName}/stats": {
+      "get": {
+        "description": "Get package stats",
+        "operationId": "get-fleet-epm-packages-pkgname-stats",
+        "parameters": [
+          {
+            "description": "The version of the API to use",
+            "in": "header",
+            "name": "elastic-api-version",
+            "schema": {
+              "default": "2023-10-31",
+              "enum": [
+                "2023-10-31"
+              ],
+              "type": "string"
+            }
+          },
+          {
+            "in": "path",
+            "name": "pkgName",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "content": {
+              "application/json; Elastic-Api-Version=2023-10-31": {
+                "schema": {
+                  "additionalProperties": false,
+                  "properties": {
                     "response": {
-                      "deprecated": true,
-                      "items": {
-                        "anyOf": [
-                          {
-                            "additionalProperties": false,
-                            "properties": {
-                              "name": {
-                                "type": "string"
-                              },
-                              "result": {
-                                "additionalProperties": false,
-                                "properties": {
-                                  "assets": {
-                                    "items": {
-                                      "anyOf": [
-                                        {
-                                          "additionalProperties": false,
-                                          "properties": {
-                                            "id": {
-                                              "type": "string"
-                                            },
-                                            "originId": {
-                                              "type": "string"
-                                            },
-                                            "type": {
-                                              "enum": [
-                                                "dashboard",
-                                                "lens",
-                                                "visualization",
-                                                "search",
-                                                "index-pattern",
-                                                "map",
-                                                "ml-module",
-                                                "security-rule",
-                                                "csp-rule-template",
-                                                "osquery-pack-asset",
-                                                "osquery-saved-query",
-                                                "tag"
-                                              ],
-                                              "type": "string"
-                                            }
-                                          },
-                                          "required": [
-                                            "id",
-                                            "type"
-                                          ],
-                                          "type": "object"
-                                        },
-                                        {
-                                          "additionalProperties": false,
-                                          "properties": {
-                                            "deferred": {
-                                              "type": "boolean"
-                                            },
-                                            "id": {
-                                              "type": "string"
-                                            },
-                                            "type": {
-                                              "enum": [
-                                                "index",
-                                                "index_template",
-                                                "component_template",
-                                                "ingest_pipeline",
-                                                "ilm_policy",
-                                                "data_stream_ilm_policy",
-                                                "transform",
-                                                "ml_model"
-                                              ],
-                                              "type": "string"
-                                            },
-                                            "version": {
-                                              "type": "string"
-                                            }
-                                          },
-                                          "required": [
-                                            "id",
-                                            "type"
-                                          ],
-                                          "type": "object"
-                                        }
-                                      ]
-                                    },
-                                    "type": "array"
-                                  },
-                                  "error": {},
-                                  "installSource": {
-                                    "type": "string"
-                                  },
-                                  "installType": {
-                                    "type": "string"
-                                  },
-                                  "status": {
-                                    "enum": [
-                                      "installed",
-                                      "already_installed"
-                                    ],
-                                    "type": "string"
-                                  }
-                                },
-                                "required": [
-                                  "error",
-                                  "installType"
-                                ],
-                                "type": "object"
-                              },
-                              "version": {
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "name",
-                              "version",
-                              "result"
-                            ],
-                            "type": "object"
-                          },
-                          {
-                            "additionalProperties": false,
-                            "properties": {
-                              "error": {
-                                "anyOf": [
-                                  {
-                                    "type": "string"
-                                  },
-                                  {}
-                                ]
-                              },
-                              "name": {
-                                "type": "string"
-                              },
-                              "statusCode": {
-                                "type": "number"
-                              }
-                            },
-                            "required": [
-                              "name",
-                              "statusCode",
-                              "error"
-                            ],
-                            "type": "object"
-                          }
-                        ]
+                      "additionalProperties": false,
+                      "properties": {
+                        "agent_policy_count": {
+                          "type": "number"
+                        }
                       },
-                      "type": "array"
+                      "required": [
+                        "agent_policy_count"
+                      ],
+                      "type": "object"
                     }
                   },
                   "required": [
-                    "items"
+                    "response"
                   ],
                   "type": "object"
                 }
@@ -20055,10 +19413,10 @@
         ]
       }
     },
-    "/api/fleet/epm/packages/installed": {
-      "get": {
-        "description": "Get installed packages",
-        "operationId": "get-fleet-epm-packages-installed",
+    "/api/fleet/epm/packages/{pkgName}/{pkgVersion}": {
+      "delete": {
+        "description": "Delete package",
+        "operationId": "delete-fleet-epm-packages-pkgname-pkgversion",
         "parameters": [
           {
             "description": "The version of the API to use",
@@ -20073,74 +19431,37 @@
             }
           },
           {
-            "in": "query",
-            "name": "dataStreamType",
-            "required": false,
+            "description": "A required header to protect against CSRF attacks",
+            "in": "header",
+            "name": "kbn-xsrf",
+            "required": true,
             "schema": {
-              "enum": [
-                "logs",
-                "metrics",
-                "traces",
-                "synthetics",
-                "profiling"
-              ],
+              "example": "true",
               "type": "string"
             }
           },
           {
-            "in": "query",
-            "name": "showOnlyActiveDataStreams",
-            "required": false,
-            "schema": {
-              "type": "boolean"
-            }
-          },
-          {
-            "in": "query",
-            "name": "nameQuery",
-            "required": false,
+            "in": "path",
+            "name": "pkgName",
+            "required": true,
             "schema": {
               "type": "string"
             }
           },
           {
-            "in": "query",
-            "name": "searchAfter",
-            "required": false,
-            "schema": {
-              "items": {
-                "anyOf": [
-                  {
-                    "type": "string"
-                  },
-                  {
-                    "type": "number"
-                  }
-                ]
-              },
-              "type": "array"
-            }
-          },
-          {
-            "in": "query",
-            "name": "perPage",
+            "in": "path",
+            "name": "pkgVersion",
             "required": false,
             "schema": {
-              "default": 15,
-              "type": "number"
+              "type": "string"
             }
           },
           {
             "in": "query",
-            "name": "sortOrder",
+            "name": "force",
             "required": false,
             "schema": {
-              "default": "asc",
-              "enum": [
-                "asc",
-                "desc"
-              ],
-              "type": "string"
+              "type": "boolean"
             }
           }
         ],
@@ -20153,186 +19474,75 @@
                   "properties": {
                     "items": {
                       "items": {
-                        "additionalProperties": false,
-                        "properties": {
-                          "dataStreams": {
-                            "items": {
-                              "additionalProperties": false,
-                              "properties": {
-                                "name": {
-                                  "type": "string"
-                                },
-                                "title": {
-                                  "type": "string"
-                                }
+                        "anyOf": [
+                          {
+                            "additionalProperties": false,
+                            "properties": {
+                              "id": {
+                                "type": "string"
                               },
-                              "required": [
-                                "name",
-                                "title"
-                              ],
-                              "type": "object"
-                            },
-                            "type": "array"
-                          },
-                          "description": {
-                            "type": "string"
-                          },
-                          "icons": {
-                            "items": {
-                              "additionalProperties": false,
-                              "properties": {
-                                "dark_mode": {
-                                  "type": "boolean"
-                                },
-                                "path": {
-                                  "type": "string"
-                                },
-                                "size": {
-                                  "type": "string"
-                                },
-                                "src": {
-                                  "type": "string"
-                                },
-                                "title": {
-                                  "type": "string"
-                                },
-                                "type": {
-                                  "type": "string"
-                                }
+                              "originId": {
+                                "type": "string"
                               },
-                              "required": [
-                                "src"
-                              ],
-                              "type": "object"
+                              "type": {
+                                "enum": [
+                                  "dashboard",
+                                  "lens",
+                                  "visualization",
+                                  "search",
+                                  "index-pattern",
+                                  "map",
+                                  "ml-module",
+                                  "security-rule",
+                                  "csp-rule-template",
+                                  "osquery-pack-asset",
+                                  "osquery-saved-query",
+                                  "tag"
+                                ],
+                                "type": "string"
+                              }
                             },
-                            "type": "array"
-                          },
-                          "name": {
-                            "type": "string"
-                          },
-                          "status": {
-                            "type": "string"
-                          },
-                          "title": {
-                            "type": "string"
-                          },
-                          "version": {
-                            "type": "string"
-                          }
-                        },
-                        "required": [
-                          "name",
-                          "version",
-                          "status",
-                          "dataStreams"
-                        ],
-                        "type": "object"
-                      },
-                      "type": "array"
-                    },
-                    "searchAfter": {
-                      "items": {
-                        "anyOf": [
-                          {
-                            "type": "string"
-                          },
-                          {
-                            "type": "number"
+                            "required": [
+                              "id",
+                              "type"
+                            ],
+                            "type": "object"
                           },
                           {
-                            "type": "boolean"
-                          },
-                          {
-                            "enum": [],
-                            "nullable": true
-                          },
-                          {}
+                            "additionalProperties": false,
+                            "properties": {
+                              "deferred": {
+                                "type": "boolean"
+                              },
+                              "id": {
+                                "type": "string"
+                              },
+                              "type": {
+                                "enum": [
+                                  "index",
+                                  "index_template",
+                                  "component_template",
+                                  "ingest_pipeline",
+                                  "ilm_policy",
+                                  "data_stream_ilm_policy",
+                                  "transform",
+                                  "ml_model"
+                                ],
+                                "type": "string"
+                              },
+                              "version": {
+                                "type": "string"
+                              }
+                            },
+                            "required": [
+                              "id",
+                              "type"
+                            ],
+                            "type": "object"
+                          }
                         ]
                       },
                       "type": "array"
-                    },
-                    "total": {
-                      "type": "number"
-                    }
-                  },
-                  "required": [
-                    "items",
-                    "total"
-                  ],
-                  "type": "object"
-                }
-              }
-            }
-          },
-          "400": {
-            "content": {
-              "application/json; Elastic-Api-Version=2023-10-31": {
-                "schema": {
-                  "additionalProperties": false,
-                  "description": "Generic Error",
-                  "properties": {
-                    "error": {
-                      "type": "string"
-                    },
-                    "message": {
-                      "type": "string"
-                    },
-                    "statusCode": {
-                      "type": "number"
-                    }
-                  },
-                  "required": [
-                    "message"
-                  ],
-                  "type": "object"
-                }
-              }
-            }
-          }
-        },
-        "summary": "",
-        "tags": [
-          "Elastic Package Manager (EPM)"
-        ]
-      }
-    },
-    "/api/fleet/epm/packages/limited": {
-      "get": {
-        "description": "Get limited package list",
-        "operationId": "get-fleet-epm-packages-limited",
-        "parameters": [
-          {
-            "description": "The version of the API to use",
-            "in": "header",
-            "name": "elastic-api-version",
-            "schema": {
-              "default": "2023-10-31",
-              "enum": [
-                "2023-10-31"
-              ],
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "content": {
-              "application/json; Elastic-Api-Version=2023-10-31": {
-                "schema": {
-                  "additionalProperties": false,
-                  "properties": {
-                    "items": {
-                      "items": {
-                        "type": "string"
-                      },
-                      "type": "array"
-                    },
-                    "response": {
-                      "deprecated": true,
-                      "items": {
-                        "type": "string"
-                      },
-                      "type": "array"
                     }
                   },
                   "required": [
@@ -20373,12 +19583,10 @@
         "tags": [
           "Elastic Package Manager (EPM)"
         ]
-      }
-    },
-    "/api/fleet/epm/packages/{pkgName}/stats": {
+      },
       "get": {
-        "description": "Get package stats",
-        "operationId": "get-fleet-epm-packages-pkgname-stats",
+        "description": "Get package",
+        "operationId": "get-fleet-epm-packages-pkgname-pkgversion",
         "parameters": [
           {
             "description": "The version of the API to use",
@@ -20399,139 +19607,49 @@
             "schema": {
               "type": "string"
             }
-          }
-        ],
-        "responses": {
-          "200": {
-            "content": {
-              "application/json; Elastic-Api-Version=2023-10-31": {
-                "schema": {
-                  "additionalProperties": false,
-                  "properties": {
-                    "response": {
-                      "additionalProperties": false,
-                      "properties": {
-                        "agent_policy_count": {
-                          "type": "number"
-                        }
-                      },
-                      "required": [
-                        "agent_policy_count"
-                      ],
-                      "type": "object"
-                    }
-                  },
-                  "required": [
-                    "response"
-                  ],
-                  "type": "object"
-                }
-              }
-            }
           },
-          "400": {
-            "content": {
-              "application/json; Elastic-Api-Version=2023-10-31": {
-                "schema": {
-                  "additionalProperties": false,
-                  "description": "Generic Error",
-                  "properties": {
-                    "error": {
-                      "type": "string"
-                    },
-                    "message": {
-                      "type": "string"
-                    },
-                    "statusCode": {
-                      "type": "number"
-                    }
-                  },
-                  "required": [
-                    "message"
-                  ],
-                  "type": "object"
-                }
-              }
-            }
-          }
-        },
-        "summary": "",
-        "tags": [
-          "Elastic Package Manager (EPM)"
-        ]
-      }
-    },
-    "/api/fleet/epm/packages/{pkgName}/{pkgVersion}": {
-      "delete": {
-        "description": "Delete package",
-        "operationId": "delete-fleet-epm-packages-pkgname-pkgversion",
-        "parameters": [
           {
-            "description": "The version of the API to use",
-            "in": "header",
-            "name": "elastic-api-version",
+            "in": "path",
+            "name": "pkgVersion",
+            "required": false,
             "schema": {
-              "default": "2023-10-31",
-              "enum": [
-                "2023-10-31"
-              ],
               "type": "string"
             }
           },
           {
-            "description": "A required header to protect against CSRF attacks",
-            "in": "header",
-            "name": "kbn-xsrf",
-            "required": true,
+            "in": "query",
+            "name": "ignoreUnverified",
+            "required": false,
             "schema": {
-              "example": "true",
-              "type": "string"
+              "type": "boolean"
             }
           },
           {
-            "in": "path",
-            "name": "pkgName",
-            "required": true,
+            "in": "query",
+            "name": "prerelease",
+            "required": false,
             "schema": {
-              "type": "string"
+              "type": "boolean"
             }
           },
           {
-            "in": "path",
-            "name": "pkgVersion",
-            "required": true,
+            "in": "query",
+            "name": "full",
+            "required": false,
             "schema": {
-              "type": "string"
+              "type": "boolean"
             }
           },
           {
             "in": "query",
-            "name": "force",
+            "name": "withMetadata",
             "required": false,
             "schema": {
+              "default": false,
               "type": "boolean"
             }
           }
         ],
-        "requestBody": {
-          "content": {
-            "application/json; Elastic-Api-Version=2023-10-31": {
-              "schema": {
-                "additionalProperties": false,
-                "nullable": true,
-                "properties": {
-                  "force": {
-                    "type": "boolean"
-                  }
-                },
-                "required": [
-                  "force"
-                ],
-                "type": "object"
-              }
-            }
-          }
-        },
         "responses": {
           "200": {
             "content": {
@@ -20539,470 +19657,212 @@
                 "schema": {
                   "additionalProperties": false,
                   "properties": {
-                    "items": {
-                      "items": {
-                        "anyOf": [
-                          {
+                    "item": {
+                      "additionalProperties": true,
+                      "properties": {
+                        "agent": {
+                          "additionalProperties": false,
+                          "properties": {
+                            "privileges": {
+                              "additionalProperties": false,
+                              "properties": {
+                                "root": {
+                                  "type": "boolean"
+                                }
+                              },
+                              "type": "object"
+                            }
+                          },
+                          "type": "object"
+                        },
+                        "asset_tags": {
+                          "items": {
                             "additionalProperties": false,
                             "properties": {
-                              "id": {
-                                "type": "string"
+                              "asset_ids": {
+                                "items": {
+                                  "type": "string"
+                                },
+                                "type": "array"
                               },
-                              "originId": {
-                                "type": "string"
+                              "asset_types": {
+                                "items": {
+                                  "type": "string"
+                                },
+                                "type": "array"
                               },
-                              "type": {
-                                "enum": [
-                                  "dashboard",
-                                  "lens",
-                                  "visualization",
-                                  "search",
-                                  "index-pattern",
-                                  "map",
-                                  "ml-module",
-                                  "security-rule",
-                                  "csp-rule-template",
-                                  "osquery-pack-asset",
-                                  "osquery-saved-query",
-                                  "tag"
-                                ],
+                              "text": {
                                 "type": "string"
                               }
                             },
                             "required": [
-                              "id",
-                              "type"
+                              "text"
                             ],
                             "type": "object"
                           },
-                          {
-                            "additionalProperties": false,
+                          "type": "array"
+                        },
+                        "assets": {
+                          "additionalProperties": {},
+                          "type": "object"
+                        },
+                        "categories": {
+                          "items": {
+                            "type": "string"
+                          },
+                          "type": "array"
+                        },
+                        "conditions": {
+                          "additionalProperties": true,
+                          "properties": {
+                            "elastic": {
+                              "additionalProperties": true,
+                              "properties": {
+                                "capabilities": {
+                                  "items": {
+                                    "type": "string"
+                                  },
+                                  "type": "array"
+                                },
+                                "subscription": {
+                                  "type": "string"
+                                }
+                              },
+                              "type": "object"
+                            },
+                            "kibana": {
+                              "additionalProperties": true,
+                              "properties": {
+                                "version": {
+                                  "type": "string"
+                                }
+                              },
+                              "type": "object"
+                            }
+                          },
+                          "type": "object"
+                        },
+                        "data_streams": {
+                          "items": {
+                            "additionalProperties": {},
+                            "type": "object"
+                          },
+                          "type": "array"
+                        },
+                        "description": {
+                          "type": "string"
+                        },
+                        "discovery": {
+                          "additionalProperties": true,
+                          "properties": {
+                            "fields": {
+                              "items": {
+                                "additionalProperties": true,
+                                "properties": {
+                                  "name": {
+                                    "type": "string"
+                                  }
+                                },
+                                "required": [
+                                  "name"
+                                ],
+                                "type": "object"
+                              },
+                              "type": "array"
+                            }
+                          },
+                          "type": "object"
+                        },
+                        "download": {
+                          "type": "string"
+                        },
+                        "elasticsearch": {
+                          "additionalProperties": {},
+                          "type": "object"
+                        },
+                        "format_version": {
+                          "type": "string"
+                        },
+                        "icons": {
+                          "items": {
+                            "additionalProperties": true,
                             "properties": {
-                              "deferred": {
+                              "dark_mode": {
                                 "type": "boolean"
                               },
-                              "id": {
+                              "path": {
                                 "type": "string"
                               },
-                              "type": {
-                                "enum": [
-                                  "index",
-                                  "index_template",
-                                  "component_template",
-                                  "ingest_pipeline",
-                                  "ilm_policy",
-                                  "data_stream_ilm_policy",
-                                  "transform",
-                                  "ml_model"
-                                ],
+                              "size": {
                                 "type": "string"
                               },
-                              "version": {
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "id",
-                              "type"
-                            ],
-                            "type": "object"
-                          }
-                        ]
-                      },
-                      "type": "array"
-                    },
-                    "response": {
-                      "deprecated": true,
-                      "items": {
-                        "anyOf": [
-                          {
-                            "additionalProperties": false,
-                            "properties": {
-                              "id": {
+                              "src": {
                                 "type": "string"
                               },
-                              "originId": {
+                              "title": {
                                 "type": "string"
                               },
                               "type": {
-                                "enum": [
-                                  "dashboard",
-                                  "lens",
-                                  "visualization",
-                                  "search",
-                                  "index-pattern",
-                                  "map",
-                                  "ml-module",
-                                  "security-rule",
-                                  "csp-rule-template",
-                                  "osquery-pack-asset",
-                                  "osquery-saved-query",
-                                  "tag"
-                                ],
                                 "type": "string"
                               }
                             },
                             "required": [
-                              "id",
-                              "type"
+                              "src"
                             ],
                             "type": "object"
                           },
-                          {
-                            "additionalProperties": false,
-                            "properties": {
-                              "deferred": {
-                                "type": "boolean"
-                              },
-                              "id": {
-                                "type": "string"
-                              },
-                              "type": {
-                                "enum": [
-                                  "index",
-                                  "index_template",
-                                  "component_template",
-                                  "ingest_pipeline",
-                                  "ilm_policy",
-                                  "data_stream_ilm_policy",
-                                  "transform",
-                                  "ml_model"
-                                ],
-                                "type": "string"
-                              },
-                              "version": {
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "id",
-                              "type"
-                            ],
-                            "type": "object"
-                          }
-                        ]
-                      },
-                      "type": "array"
-                    }
-                  },
-                  "required": [
-                    "items"
-                  ],
-                  "type": "object"
-                }
-              }
-            }
-          },
-          "400": {
-            "content": {
-              "application/json; Elastic-Api-Version=2023-10-31": {
-                "schema": {
-                  "additionalProperties": false,
-                  "description": "Generic Error",
-                  "properties": {
-                    "error": {
-                      "type": "string"
-                    },
-                    "message": {
-                      "type": "string"
-                    },
-                    "statusCode": {
-                      "type": "number"
-                    }
-                  },
-                  "required": [
-                    "message"
-                  ],
-                  "type": "object"
-                }
-              }
-            }
-          }
-        },
-        "summary": "",
-        "tags": [
-          "Elastic Package Manager (EPM)"
-        ]
-      },
-      "get": {
-        "description": "Get package",
-        "operationId": "get-fleet-epm-packages-pkgname-pkgversion",
-        "parameters": [
-          {
-            "description": "The version of the API to use",
-            "in": "header",
-            "name": "elastic-api-version",
-            "schema": {
-              "default": "2023-10-31",
-              "enum": [
-                "2023-10-31"
-              ],
-              "type": "string"
-            }
-          },
-          {
-            "in": "path",
-            "name": "pkgName",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "in": "path",
-            "name": "pkgVersion",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "in": "query",
-            "name": "ignoreUnverified",
-            "required": false,
-            "schema": {
-              "type": "boolean"
-            }
-          },
-          {
-            "in": "query",
-            "name": "prerelease",
-            "required": false,
-            "schema": {
-              "type": "boolean"
-            }
-          },
-          {
-            "in": "query",
-            "name": "full",
-            "required": false,
-            "schema": {
-              "type": "boolean"
-            }
-          },
-          {
-            "in": "query",
-            "name": "withMetadata",
-            "required": false,
-            "schema": {
-              "default": false,
-              "type": "boolean"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "content": {
-              "application/json; Elastic-Api-Version=2023-10-31": {
-                "schema": {
-                  "additionalProperties": false,
-                  "properties": {
-                    "item": {
-                      "additionalProperties": true,
-                      "properties": {
-                        "agent": {
-                          "additionalProperties": false,
-                          "properties": {
-                            "privileges": {
-                              "additionalProperties": false,
-                              "properties": {
-                                "root": {
-                                  "type": "boolean"
-                                }
-                              },
-                              "type": "object"
-                            }
-                          },
-                          "type": "object"
-                        },
-                        "asset_tags": {
-                          "items": {
-                            "additionalProperties": false,
-                            "properties": {
-                              "asset_ids": {
-                                "items": {
-                                  "type": "string"
-                                },
-                                "type": "array"
-                              },
-                              "asset_types": {
-                                "items": {
-                                  "type": "string"
-                                },
-                                "type": "array"
-                              },
-                              "text": {
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "text"
-                            ],
-                            "type": "object"
-                          },
-                          "type": "array"
-                        },
-                        "assets": {
-                          "additionalProperties": {},
-                          "type": "object"
-                        },
-                        "categories": {
-                          "items": {
-                            "type": "string"
-                          },
                           "type": "array"
                         },
-                        "conditions": {
+                        "installationInfo": {
                           "additionalProperties": true,
                           "properties": {
-                            "elastic": {
-                              "additionalProperties": true,
-                              "properties": {
-                                "capabilities": {
-                                  "items": {
-                                    "type": "string"
+                            "additional_spaces_installed_kibana": {
+                              "additionalProperties": {
+                                "items": {
+                                  "additionalProperties": true,
+                                  "properties": {
+                                    "id": {
+                                      "type": "string"
+                                    },
+                                    "originId": {
+                                      "type": "string"
+                                    },
+                                    "type": {
+                                      "enum": [
+                                        "dashboard",
+                                        "lens",
+                                        "visualization",
+                                        "search",
+                                        "index-pattern",
+                                        "map",
+                                        "ml-module",
+                                        "security-rule",
+                                        "csp-rule-template",
+                                        "osquery-pack-asset",
+                                        "osquery-saved-query",
+                                        "tag"
+                                      ],
+                                      "type": "string"
+                                    }
                                   },
-                                  "type": "array"
+                                  "required": [
+                                    "id",
+                                    "type"
+                                  ],
+                                  "type": "object"
                                 },
-                                "subscription": {
-                                  "type": "string"
-                                }
+                                "type": "array"
                               },
                               "type": "object"
                             },
-                            "kibana": {
-                              "additionalProperties": true,
-                              "properties": {
-                                "version": {
-                                  "type": "string"
-                                }
-                              },
-                              "type": "object"
-                            }
-                          },
-                          "type": "object"
-                        },
-                        "data_streams": {
-                          "items": {
-                            "additionalProperties": {},
-                            "type": "object"
-                          },
-                          "type": "array"
-                        },
-                        "description": {
-                          "type": "string"
-                        },
-                        "discovery": {
-                          "additionalProperties": true,
-                          "properties": {
-                            "fields": {
+                            "created_at": {
+                              "type": "string"
+                            },
+                            "experimental_data_stream_features": {
                               "items": {
                                 "additionalProperties": true,
                                 "properties": {
-                                  "name": {
-                                    "type": "string"
-                                  }
-                                },
-                                "required": [
-                                  "name"
-                                ],
-                                "type": "object"
-                              },
-                              "type": "array"
-                            }
-                          },
-                          "type": "object"
-                        },
-                        "download": {
-                          "type": "string"
-                        },
-                        "elasticsearch": {
-                          "additionalProperties": {},
-                          "type": "object"
-                        },
-                        "format_version": {
-                          "type": "string"
-                        },
-                        "icons": {
-                          "items": {
-                            "additionalProperties": true,
-                            "properties": {
-                              "dark_mode": {
-                                "type": "boolean"
-                              },
-                              "path": {
-                                "type": "string"
-                              },
-                              "size": {
-                                "type": "string"
-                              },
-                              "src": {
-                                "type": "string"
-                              },
-                              "title": {
-                                "type": "string"
-                              },
-                              "type": {
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "src"
-                            ],
-                            "type": "object"
-                          },
-                          "type": "array"
-                        },
-                        "installationInfo": {
-                          "additionalProperties": true,
-                          "properties": {
-                            "additional_spaces_installed_kibana": {
-                              "additionalProperties": {
-                                "items": {
-                                  "additionalProperties": true,
-                                  "properties": {
-                                    "id": {
-                                      "type": "string"
-                                    },
-                                    "originId": {
-                                      "type": "string"
-                                    },
-                                    "type": {
-                                      "enum": [
-                                        "dashboard",
-                                        "lens",
-                                        "visualization",
-                                        "search",
-                                        "index-pattern",
-                                        "map",
-                                        "ml-module",
-                                        "security-rule",
-                                        "csp-rule-template",
-                                        "osquery-pack-asset",
-                                        "osquery-saved-query",
-                                        "tag"
-                                      ],
-                                      "type": "string"
-                                    }
-                                  },
-                                  "required": [
-                                    "id",
-                                    "type"
-                                  ],
-                                  "type": "object"
-                                },
-                                "type": "array"
-                              },
-                              "type": "object"
-                            },
-                            "created_at": {
-                              "type": "string"
-                            },
-                            "experimental_data_stream_features": {
-                              "items": {
-                                "additionalProperties": true,
-                                "properties": {
-                                  "data_stream": {
+                                  "data_stream": {
                                     "type": "string"
                                   },
                                   "features": {
@@ -21286,7 +20146,6 @@
                           ],
                           "type": "string"
                         },
-                        "savedObject": {},
                         "screenshots": {
                           "items": {
                             "additionalProperties": false,
@@ -21358,7 +20217,6 @@
                         }
                       },
                       "required": [
-                        "savedObject",
                         "name",
                         "version",
                         "title",
@@ -21377,23 +20235,352 @@
                         "has_policies"
                       ],
                       "type": "object"
+                    }
+                  },
+                  "required": [
+                    "item"
+                  ],
+                  "type": "object"
+                }
+              }
+            }
+          },
+          "400": {
+            "content": {
+              "application/json; Elastic-Api-Version=2023-10-31": {
+                "schema": {
+                  "additionalProperties": false,
+                  "description": "Generic Error",
+                  "properties": {
+                    "error": {
+                      "type": "string"
                     },
-                    "response": {
-                      "additionalProperties": true,
-                      "deprecated": true,
+                    "message": {
+                      "type": "string"
+                    },
+                    "statusCode": {
+                      "type": "number"
+                    }
+                  },
+                  "required": [
+                    "message"
+                  ],
+                  "type": "object"
+                }
+              }
+            }
+          }
+        },
+        "summary": "",
+        "tags": [
+          "Elastic Package Manager (EPM)"
+        ]
+      },
+      "post": {
+        "description": "Install package from registry",
+        "operationId": "post-fleet-epm-packages-pkgname-pkgversion",
+        "parameters": [
+          {
+            "description": "The version of the API to use",
+            "in": "header",
+            "name": "elastic-api-version",
+            "schema": {
+              "default": "2023-10-31",
+              "enum": [
+                "2023-10-31"
+              ],
+              "type": "string"
+            }
+          },
+          {
+            "description": "A required header to protect against CSRF attacks",
+            "in": "header",
+            "name": "kbn-xsrf",
+            "required": true,
+            "schema": {
+              "example": "true",
+              "type": "string"
+            }
+          },
+          {
+            "in": "path",
+            "name": "pkgName",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "path",
+            "name": "pkgVersion",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "query",
+            "name": "prerelease",
+            "required": false,
+            "schema": {
+              "type": "boolean"
+            }
+          },
+          {
+            "in": "query",
+            "name": "ignoreMappingUpdateErrors",
+            "required": false,
+            "schema": {
+              "default": false,
+              "type": "boolean"
+            }
+          },
+          {
+            "in": "query",
+            "name": "skipDataStreamRollover",
+            "required": false,
+            "schema": {
+              "default": false,
+              "type": "boolean"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json; Elastic-Api-Version=2023-10-31": {
+              "schema": {
+                "additionalProperties": false,
+                "nullable": true,
+                "properties": {
+                  "force": {
+                    "default": false,
+                    "type": "boolean"
+                  },
+                  "ignore_constraints": {
+                    "default": false,
+                    "type": "boolean"
+                  }
+                },
+                "type": "object"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "content": {
+              "application/json; Elastic-Api-Version=2023-10-31": {
+                "schema": {
+                  "additionalProperties": false,
+                  "properties": {
+                    "_meta": {
+                      "additionalProperties": false,
                       "properties": {
-                        "agent": {
-                          "additionalProperties": false,
-                          "properties": {
-                            "privileges": {
-                              "additionalProperties": false,
-                              "properties": {
-                                "root": {
-                                  "type": "boolean"
-                                }
-                              },
-                              "type": "object"
-                            }
+                        "install_source": {
+                          "type": "string"
+                        }
+                      },
+                      "required": [
+                        "install_source"
+                      ],
+                      "type": "object"
+                    },
+                    "items": {
+                      "items": {
+                        "anyOf": [
+                          {
+                            "additionalProperties": false,
+                            "properties": {
+                              "id": {
+                                "type": "string"
+                              },
+                              "originId": {
+                                "type": "string"
+                              },
+                              "type": {
+                                "enum": [
+                                  "dashboard",
+                                  "lens",
+                                  "visualization",
+                                  "search",
+                                  "index-pattern",
+                                  "map",
+                                  "ml-module",
+                                  "security-rule",
+                                  "csp-rule-template",
+                                  "osquery-pack-asset",
+                                  "osquery-saved-query",
+                                  "tag"
+                                ],
+                                "type": "string"
+                              }
+                            },
+                            "required": [
+                              "id",
+                              "type"
+                            ],
+                            "type": "object"
+                          },
+                          {
+                            "additionalProperties": false,
+                            "properties": {
+                              "deferred": {
+                                "type": "boolean"
+                              },
+                              "id": {
+                                "type": "string"
+                              },
+                              "type": {
+                                "enum": [
+                                  "index",
+                                  "index_template",
+                                  "component_template",
+                                  "ingest_pipeline",
+                                  "ilm_policy",
+                                  "data_stream_ilm_policy",
+                                  "transform",
+                                  "ml_model"
+                                ],
+                                "type": "string"
+                              },
+                              "version": {
+                                "type": "string"
+                              }
+                            },
+                            "required": [
+                              "id",
+                              "type"
+                            ],
+                            "type": "object"
+                          }
+                        ]
+                      },
+                      "type": "array"
+                    }
+                  },
+                  "required": [
+                    "items",
+                    "_meta"
+                  ],
+                  "type": "object"
+                }
+              }
+            }
+          },
+          "400": {
+            "content": {
+              "application/json; Elastic-Api-Version=2023-10-31": {
+                "schema": {
+                  "additionalProperties": false,
+                  "description": "Generic Error",
+                  "properties": {
+                    "error": {
+                      "type": "string"
+                    },
+                    "message": {
+                      "type": "string"
+                    },
+                    "statusCode": {
+                      "type": "number"
+                    }
+                  },
+                  "required": [
+                    "message"
+                  ],
+                  "type": "object"
+                }
+              }
+            }
+          }
+        },
+        "summary": "",
+        "tags": [
+          "Elastic Package Manager (EPM)"
+        ]
+      },
+      "put": {
+        "description": "Update package settings",
+        "operationId": "put-fleet-epm-packages-pkgname-pkgversion",
+        "parameters": [
+          {
+            "description": "The version of the API to use",
+            "in": "header",
+            "name": "elastic-api-version",
+            "schema": {
+              "default": "2023-10-31",
+              "enum": [
+                "2023-10-31"
+              ],
+              "type": "string"
+            }
+          },
+          {
+            "description": "A required header to protect against CSRF attacks",
+            "in": "header",
+            "name": "kbn-xsrf",
+            "required": true,
+            "schema": {
+              "example": "true",
+              "type": "string"
+            }
+          },
+          {
+            "in": "path",
+            "name": "pkgName",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "path",
+            "name": "pkgVersion",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json; Elastic-Api-Version=2023-10-31": {
+              "schema": {
+                "additionalProperties": false,
+                "properties": {
+                  "keepPoliciesUpToDate": {
+                    "type": "boolean"
+                  }
+                },
+                "required": [
+                  "keepPoliciesUpToDate"
+                ],
+                "type": "object"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "content": {
+              "application/json; Elastic-Api-Version=2023-10-31": {
+                "schema": {
+                  "additionalProperties": false,
+                  "properties": {
+                    "item": {
+                      "additionalProperties": true,
+                      "properties": {
+                        "agent": {
+                          "additionalProperties": false,
+                          "properties": {
+                            "privileges": {
+                              "additionalProperties": false,
+                              "properties": {
+                                "root": {
+                                  "type": "boolean"
+                                }
+                              },
+                              "type": "object"
+                            }
                           },
                           "type": "object"
                         },
@@ -21868,7 +21055,6 @@
                           ],
                           "type": "string"
                         },
-                        "savedObject": {},
                         "screenshots": {
                           "items": {
                             "additionalProperties": false,
@@ -21933,1951 +21119,65 @@
                             "additionalProperties": {},
                             "type": "object"
                           },
-                          "type": "array"
-                        },
-                        "version": {
-                          "type": "string"
-                        }
-                      },
-                      "required": [
-                        "savedObject",
-                        "name",
-                        "version",
-                        "title",
-                        "assets"
-                      ],
-                      "type": "object"
-                    }
-                  },
-                  "required": [
-                    "item"
-                  ],
-                  "type": "object"
-                }
-              }
-            }
-          },
-          "400": {
-            "content": {
-              "application/json; Elastic-Api-Version=2023-10-31": {
-                "schema": {
-                  "additionalProperties": false,
-                  "description": "Generic Error",
-                  "properties": {
-                    "error": {
-                      "type": "string"
-                    },
-                    "message": {
-                      "type": "string"
-                    },
-                    "statusCode": {
-                      "type": "number"
-                    }
-                  },
-                  "required": [
-                    "message"
-                  ],
-                  "type": "object"
-                }
-              }
-            }
-          }
-        },
-        "summary": "",
-        "tags": [
-          "Elastic Package Manager (EPM)"
-        ]
-      },
-      "post": {
-        "description": "Install package from registry",
-        "operationId": "post-fleet-epm-packages-pkgname-pkgversion",
-        "parameters": [
-          {
-            "description": "The version of the API to use",
-            "in": "header",
-            "name": "elastic-api-version",
-            "schema": {
-              "default": "2023-10-31",
-              "enum": [
-                "2023-10-31"
-              ],
-              "type": "string"
-            }
-          },
-          {
-            "description": "A required header to protect against CSRF attacks",
-            "in": "header",
-            "name": "kbn-xsrf",
-            "required": true,
-            "schema": {
-              "example": "true",
-              "type": "string"
-            }
-          },
-          {
-            "in": "path",
-            "name": "pkgName",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "in": "path",
-            "name": "pkgVersion",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "in": "query",
-            "name": "prerelease",
-            "required": false,
-            "schema": {
-              "type": "boolean"
-            }
-          },
-          {
-            "in": "query",
-            "name": "ignoreMappingUpdateErrors",
-            "required": false,
-            "schema": {
-              "default": false,
-              "type": "boolean"
-            }
-          },
-          {
-            "in": "query",
-            "name": "skipDataStreamRollover",
-            "required": false,
-            "schema": {
-              "default": false,
-              "type": "boolean"
-            }
-          }
-        ],
-        "requestBody": {
-          "content": {
-            "application/json; Elastic-Api-Version=2023-10-31": {
-              "schema": {
-                "additionalProperties": false,
-                "nullable": true,
-                "properties": {
-                  "force": {
-                    "default": false,
-                    "type": "boolean"
-                  },
-                  "ignore_constraints": {
-                    "default": false,
-                    "type": "boolean"
-                  }
-                },
-                "type": "object"
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "content": {
-              "application/json; Elastic-Api-Version=2023-10-31": {
-                "schema": {
-                  "additionalProperties": false,
-                  "properties": {
-                    "_meta": {
-                      "additionalProperties": false,
-                      "properties": {
-                        "install_source": {
-                          "type": "string"
-                        }
-                      },
-                      "required": [
-                        "install_source"
-                      ],
-                      "type": "object"
-                    },
-                    "items": {
-                      "items": {
-                        "anyOf": [
-                          {
-                            "additionalProperties": false,
-                            "properties": {
-                              "id": {
-                                "type": "string"
-                              },
-                              "originId": {
-                                "type": "string"
-                              },
-                              "type": {
-                                "enum": [
-                                  "dashboard",
-                                  "lens",
-                                  "visualization",
-                                  "search",
-                                  "index-pattern",
-                                  "map",
-                                  "ml-module",
-                                  "security-rule",
-                                  "csp-rule-template",
-                                  "osquery-pack-asset",
-                                  "osquery-saved-query",
-                                  "tag"
-                                ],
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "id",
-                              "type"
-                            ],
-                            "type": "object"
-                          },
-                          {
-                            "additionalProperties": false,
-                            "properties": {
-                              "deferred": {
-                                "type": "boolean"
-                              },
-                              "id": {
-                                "type": "string"
-                              },
-                              "type": {
-                                "enum": [
-                                  "index",
-                                  "index_template",
-                                  "component_template",
-                                  "ingest_pipeline",
-                                  "ilm_policy",
-                                  "data_stream_ilm_policy",
-                                  "transform",
-                                  "ml_model"
-                                ],
-                                "type": "string"
-                              },
-                              "version": {
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "id",
-                              "type"
-                            ],
-                            "type": "object"
-                          }
-                        ]
-                      },
-                      "type": "array"
-                    },
-                    "response": {
-                      "deprecated": true,
-                      "items": {
-                        "anyOf": [
-                          {
-                            "additionalProperties": false,
-                            "properties": {
-                              "id": {
-                                "type": "string"
-                              },
-                              "originId": {
-                                "type": "string"
-                              },
-                              "type": {
-                                "enum": [
-                                  "dashboard",
-                                  "lens",
-                                  "visualization",
-                                  "search",
-                                  "index-pattern",
-                                  "map",
-                                  "ml-module",
-                                  "security-rule",
-                                  "csp-rule-template",
-                                  "osquery-pack-asset",
-                                  "osquery-saved-query",
-                                  "tag"
-                                ],
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "id",
-                              "type"
-                            ],
-                            "type": "object"
-                          },
-                          {
-                            "additionalProperties": false,
-                            "properties": {
-                              "deferred": {
-                                "type": "boolean"
-                              },
-                              "id": {
-                                "type": "string"
-                              },
-                              "type": {
-                                "enum": [
-                                  "index",
-                                  "index_template",
-                                  "component_template",
-                                  "ingest_pipeline",
-                                  "ilm_policy",
-                                  "data_stream_ilm_policy",
-                                  "transform",
-                                  "ml_model"
-                                ],
-                                "type": "string"
-                              },
-                              "version": {
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "id",
-                              "type"
-                            ],
-                            "type": "object"
-                          }
-                        ]
-                      },
-                      "type": "array"
-                    }
-                  },
-                  "required": [
-                    "items",
-                    "_meta"
-                  ],
-                  "type": "object"
-                }
-              }
-            }
-          },
-          "400": {
-            "content": {
-              "application/json; Elastic-Api-Version=2023-10-31": {
-                "schema": {
-                  "additionalProperties": false,
-                  "description": "Generic Error",
-                  "properties": {
-                    "error": {
-                      "type": "string"
-                    },
-                    "message": {
-                      "type": "string"
-                    },
-                    "statusCode": {
-                      "type": "number"
-                    }
-                  },
-                  "required": [
-                    "message"
-                  ],
-                  "type": "object"
-                }
-              }
-            }
-          }
-        },
-        "summary": "",
-        "tags": [
-          "Elastic Package Manager (EPM)"
-        ]
-      },
-      "put": {
-        "description": "Update package settings",
-        "operationId": "put-fleet-epm-packages-pkgname-pkgversion",
-        "parameters": [
-          {
-            "description": "The version of the API to use",
-            "in": "header",
-            "name": "elastic-api-version",
-            "schema": {
-              "default": "2023-10-31",
-              "enum": [
-                "2023-10-31"
-              ],
-              "type": "string"
-            }
-          },
-          {
-            "description": "A required header to protect against CSRF attacks",
-            "in": "header",
-            "name": "kbn-xsrf",
-            "required": true,
-            "schema": {
-              "example": "true",
-              "type": "string"
-            }
-          },
-          {
-            "in": "path",
-            "name": "pkgName",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "in": "path",
-            "name": "pkgVersion",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "requestBody": {
-          "content": {
-            "application/json; Elastic-Api-Version=2023-10-31": {
-              "schema": {
-                "additionalProperties": false,
-                "properties": {
-                  "keepPoliciesUpToDate": {
-                    "type": "boolean"
-                  }
-                },
-                "required": [
-                  "keepPoliciesUpToDate"
-                ],
-                "type": "object"
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "content": {
-              "application/json; Elastic-Api-Version=2023-10-31": {
-                "schema": {
-                  "additionalProperties": false,
-                  "properties": {
-                    "item": {
-                      "additionalProperties": true,
-                      "properties": {
-                        "agent": {
-                          "additionalProperties": false,
-                          "properties": {
-                            "privileges": {
-                              "additionalProperties": false,
-                              "properties": {
-                                "root": {
-                                  "type": "boolean"
-                                }
-                              },
-                              "type": "object"
-                            }
-                          },
-                          "type": "object"
-                        },
-                        "asset_tags": {
-                          "items": {
-                            "additionalProperties": false,
-                            "properties": {
-                              "asset_ids": {
-                                "items": {
-                                  "type": "string"
-                                },
-                                "type": "array"
-                              },
-                              "asset_types": {
-                                "items": {
-                                  "type": "string"
-                                },
-                                "type": "array"
-                              },
-                              "text": {
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "text"
-                            ],
-                            "type": "object"
-                          },
-                          "type": "array"
-                        },
-                        "assets": {
-                          "additionalProperties": {},
-                          "type": "object"
-                        },
-                        "categories": {
-                          "items": {
-                            "type": "string"
-                          },
-                          "type": "array"
-                        },
-                        "conditions": {
-                          "additionalProperties": true,
-                          "properties": {
-                            "elastic": {
-                              "additionalProperties": true,
-                              "properties": {
-                                "capabilities": {
-                                  "items": {
-                                    "type": "string"
-                                  },
-                                  "type": "array"
-                                },
-                                "subscription": {
-                                  "type": "string"
-                                }
-                              },
-                              "type": "object"
-                            },
-                            "kibana": {
-                              "additionalProperties": true,
-                              "properties": {
-                                "version": {
-                                  "type": "string"
-                                }
-                              },
-                              "type": "object"
-                            }
-                          },
-                          "type": "object"
-                        },
-                        "data_streams": {
-                          "items": {
-                            "additionalProperties": {},
-                            "type": "object"
-                          },
-                          "type": "array"
-                        },
-                        "description": {
-                          "type": "string"
-                        },
-                        "discovery": {
-                          "additionalProperties": true,
-                          "properties": {
-                            "fields": {
-                              "items": {
-                                "additionalProperties": true,
-                                "properties": {
-                                  "name": {
-                                    "type": "string"
-                                  }
-                                },
-                                "required": [
-                                  "name"
-                                ],
-                                "type": "object"
-                              },
-                              "type": "array"
-                            }
-                          },
-                          "type": "object"
-                        },
-                        "download": {
-                          "type": "string"
-                        },
-                        "elasticsearch": {
-                          "additionalProperties": {},
-                          "type": "object"
-                        },
-                        "format_version": {
-                          "type": "string"
-                        },
-                        "icons": {
-                          "items": {
-                            "additionalProperties": true,
-                            "properties": {
-                              "dark_mode": {
-                                "type": "boolean"
-                              },
-                              "path": {
-                                "type": "string"
-                              },
-                              "size": {
-                                "type": "string"
-                              },
-                              "src": {
-                                "type": "string"
-                              },
-                              "title": {
-                                "type": "string"
-                              },
-                              "type": {
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "src"
-                            ],
-                            "type": "object"
-                          },
-                          "type": "array"
-                        },
-                        "installationInfo": {
-                          "additionalProperties": true,
-                          "properties": {
-                            "additional_spaces_installed_kibana": {
-                              "additionalProperties": {
-                                "items": {
-                                  "additionalProperties": true,
-                                  "properties": {
-                                    "id": {
-                                      "type": "string"
-                                    },
-                                    "originId": {
-                                      "type": "string"
-                                    },
-                                    "type": {
-                                      "enum": [
-                                        "dashboard",
-                                        "lens",
-                                        "visualization",
-                                        "search",
-                                        "index-pattern",
-                                        "map",
-                                        "ml-module",
-                                        "security-rule",
-                                        "csp-rule-template",
-                                        "osquery-pack-asset",
-                                        "osquery-saved-query",
-                                        "tag"
-                                      ],
-                                      "type": "string"
-                                    }
-                                  },
-                                  "required": [
-                                    "id",
-                                    "type"
-                                  ],
-                                  "type": "object"
-                                },
-                                "type": "array"
-                              },
-                              "type": "object"
-                            },
-                            "created_at": {
-                              "type": "string"
-                            },
-                            "experimental_data_stream_features": {
-                              "items": {
-                                "additionalProperties": true,
-                                "properties": {
-                                  "data_stream": {
-                                    "type": "string"
-                                  },
-                                  "features": {
-                                    "additionalProperties": true,
-                                    "properties": {
-                                      "doc_value_only_numeric": {
-                                        "type": "boolean"
-                                      },
-                                      "doc_value_only_other": {
-                                        "type": "boolean"
-                                      },
-                                      "synthetic_source": {
-                                        "type": "boolean"
-                                      },
-                                      "tsdb": {
-                                        "type": "boolean"
-                                      }
-                                    },
-                                    "type": "object"
-                                  }
-                                },
-                                "required": [
-                                  "data_stream",
-                                  "features"
-                                ],
-                                "type": "object"
-                              },
-                              "type": "array"
-                            },
-                            "install_format_schema_version": {
-                              "type": "string"
-                            },
-                            "install_source": {
-                              "enum": [
-                                "registry",
-                                "upload",
-                                "bundled",
-                                "custom"
-                              ],
-                              "type": "string"
-                            },
-                            "install_status": {
-                              "enum": [
-                                "installed",
-                                "installing",
-                                "install_failed"
-                              ],
-                              "type": "string"
-                            },
-                            "installed_es": {
-                              "items": {
-                                "additionalProperties": true,
-                                "properties": {
-                                  "deferred": {
-                                    "type": "boolean"
-                                  },
-                                  "id": {
-                                    "type": "string"
-                                  },
-                                  "type": {
-                                    "enum": [
-                                      "index",
-                                      "index_template",
-                                      "component_template",
-                                      "ingest_pipeline",
-                                      "ilm_policy",
-                                      "data_stream_ilm_policy",
-                                      "transform",
-                                      "ml_model"
-                                    ],
-                                    "type": "string"
-                                  },
-                                  "version": {
-                                    "type": "string"
-                                  }
-                                },
-                                "required": [
-                                  "id",
-                                  "type"
-                                ],
-                                "type": "object"
-                              },
-                              "type": "array"
-                            },
-                            "installed_kibana": {
-                              "items": {
-                                "additionalProperties": true,
-                                "properties": {
-                                  "id": {
-                                    "type": "string"
-                                  },
-                                  "originId": {
-                                    "type": "string"
-                                  },
-                                  "type": {
-                                    "enum": [
-                                      "dashboard",
-                                      "lens",
-                                      "visualization",
-                                      "search",
-                                      "index-pattern",
-                                      "map",
-                                      "ml-module",
-                                      "security-rule",
-                                      "csp-rule-template",
-                                      "osquery-pack-asset",
-                                      "osquery-saved-query",
-                                      "tag"
-                                    ],
-                                    "type": "string"
-                                  }
-                                },
-                                "required": [
-                                  "id",
-                                  "type"
-                                ],
-                                "type": "object"
-                              },
-                              "type": "array"
-                            },
-                            "installed_kibana_space_id": {
-                              "type": "string"
-                            },
-                            "latest_executed_state": {
-                              "additionalProperties": true,
-                              "properties": {
-                                "error": {
-                                  "type": "string"
-                                },
-                                "name": {
-                                  "type": "string"
-                                },
-                                "started_at": {
-                                  "type": "string"
-                                }
-                              },
-                              "required": [
-                                "name",
-                                "started_at"
-                              ],
-                              "type": "object"
-                            },
-                            "latest_install_failed_attempts": {
-                              "items": {
-                                "additionalProperties": true,
-                                "properties": {
-                                  "created_at": {
-                                    "type": "string"
-                                  },
-                                  "error": {
-                                    "additionalProperties": true,
-                                    "properties": {
-                                      "message": {
-                                        "type": "string"
-                                      },
-                                      "name": {
-                                        "type": "string"
-                                      },
-                                      "stack": {
-                                        "type": "string"
-                                      }
-                                    },
-                                    "required": [
-                                      "name",
-                                      "message"
-                                    ],
-                                    "type": "object"
-                                  },
-                                  "target_version": {
-                                    "type": "string"
-                                  }
-                                },
-                                "required": [
-                                  "created_at",
-                                  "target_version",
-                                  "error"
-                                ],
-                                "type": "object"
-                              },
-                              "type": "array"
-                            },
-                            "name": {
-                              "type": "string"
-                            },
-                            "namespaces": {
-                              "items": {
-                                "type": "string"
-                              },
-                              "type": "array"
-                            },
-                            "type": {
-                              "type": "string"
-                            },
-                            "updated_at": {
-                              "type": "string"
-                            },
-                            "verification_key_id": {
-                              "nullable": true,
-                              "type": "string"
-                            },
-                            "verification_status": {
-                              "enum": [
-                                "unverified",
-                                "verified",
-                                "unknown"
-                              ],
-                              "type": "string"
-                            },
-                            "version": {
-                              "type": "string"
-                            }
-                          },
-                          "required": [
-                            "type",
-                            "installed_kibana",
-                            "installed_es",
-                            "name",
-                            "version",
-                            "install_status",
-                            "install_source",
-                            "verification_status"
-                          ],
-                          "type": "object"
-                        },
-                        "internal": {
-                          "type": "boolean"
-                        },
-                        "keepPoliciesUpToDate": {
-                          "type": "boolean"
-                        },
-                        "latestVersion": {
-                          "type": "string"
-                        },
-                        "license": {
-                          "type": "string"
-                        },
-                        "licensePath": {
-                          "type": "string"
-                        },
-                        "name": {
-                          "type": "string"
-                        },
-                        "notice": {
-                          "type": "string"
-                        },
-                        "owner": {
-                          "additionalProperties": true,
-                          "properties": {
-                            "github": {
-                              "type": "string"
-                            },
-                            "type": {
-                              "enum": [
-                                "elastic",
-                                "partner",
-                                "community"
-                              ],
-                              "type": "string"
-                            }
-                          },
-                          "type": "object"
-                        },
-                        "path": {
-                          "type": "string"
-                        },
-                        "policy_templates": {
-                          "items": {
-                            "additionalProperties": {},
-                            "type": "object"
-                          },
-                          "type": "array"
-                        },
-                        "readme": {
-                          "type": "string"
-                        },
-                        "release": {
-                          "enum": [
-                            "ga",
-                            "beta",
-                            "experimental"
-                          ],
-                          "type": "string"
-                        },
-                        "savedObject": {},
-                        "screenshots": {
-                          "items": {
-                            "additionalProperties": false,
-                            "properties": {
-                              "dark_mode": {
-                                "type": "boolean"
-                              },
-                              "path": {
-                                "type": "string"
-                              },
-                              "size": {
-                                "type": "string"
-                              },
-                              "src": {
-                                "type": "string"
-                              },
-                              "title": {
-                                "type": "string"
-                              },
-                              "type": {
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "src"
-                            ],
-                            "type": "object"
-                          },
-                          "type": "array"
-                        },
-                        "signature_path": {
-                          "type": "string"
-                        },
-                        "source": {
-                          "additionalProperties": true,
-                          "properties": {
-                            "license": {
-                              "type": "string"
-                            }
-                          },
-                          "required": [
-                            "license"
-                          ],
-                          "type": "object"
-                        },
-                        "status": {
-                          "type": "string"
-                        },
-                        "title": {
-                          "type": "string"
-                        },
-                        "type": {
-                          "enum": [
-                            "integration",
-                            "input",
-                            "content"
-                          ],
-                          "type": "string"
-                        },
-                        "vars": {
-                          "items": {
-                            "additionalProperties": {},
-                            "type": "object"
-                          },
-                          "type": "array"
-                        },
-                        "version": {
-                          "type": "string"
-                        }
-                      },
-                      "required": [
-                        "savedObject",
-                        "name",
-                        "version",
-                        "title",
-                        "assets"
-                      ],
-                      "type": "object"
-                    },
-                    "response": {
-                      "additionalProperties": true,
-                      "deprecated": true,
-                      "properties": {
-                        "agent": {
-                          "additionalProperties": false,
-                          "properties": {
-                            "privileges": {
-                              "additionalProperties": false,
-                              "properties": {
-                                "root": {
-                                  "type": "boolean"
-                                }
-                              },
-                              "type": "object"
-                            }
-                          },
-                          "type": "object"
-                        },
-                        "asset_tags": {
-                          "items": {
-                            "additionalProperties": false,
-                            "properties": {
-                              "asset_ids": {
-                                "items": {
-                                  "type": "string"
-                                },
-                                "type": "array"
-                              },
-                              "asset_types": {
-                                "items": {
-                                  "type": "string"
-                                },
-                                "type": "array"
-                              },
-                              "text": {
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "text"
-                            ],
-                            "type": "object"
-                          },
-                          "type": "array"
-                        },
-                        "assets": {
-                          "additionalProperties": {},
-                          "type": "object"
-                        },
-                        "categories": {
-                          "items": {
-                            "type": "string"
-                          },
-                          "type": "array"
-                        },
-                        "conditions": {
-                          "additionalProperties": true,
-                          "properties": {
-                            "elastic": {
-                              "additionalProperties": true,
-                              "properties": {
-                                "capabilities": {
-                                  "items": {
-                                    "type": "string"
-                                  },
-                                  "type": "array"
-                                },
-                                "subscription": {
-                                  "type": "string"
-                                }
-                              },
-                              "type": "object"
-                            },
-                            "kibana": {
-                              "additionalProperties": true,
-                              "properties": {
-                                "version": {
-                                  "type": "string"
-                                }
-                              },
-                              "type": "object"
-                            }
-                          },
-                          "type": "object"
-                        },
-                        "data_streams": {
-                          "items": {
-                            "additionalProperties": {},
-                            "type": "object"
-                          },
-                          "type": "array"
-                        },
-                        "description": {
-                          "type": "string"
-                        },
-                        "discovery": {
-                          "additionalProperties": true,
-                          "properties": {
-                            "fields": {
-                              "items": {
-                                "additionalProperties": true,
-                                "properties": {
-                                  "name": {
-                                    "type": "string"
-                                  }
-                                },
-                                "required": [
-                                  "name"
-                                ],
-                                "type": "object"
-                              },
-                              "type": "array"
-                            }
-                          },
-                          "type": "object"
-                        },
-                        "download": {
-                          "type": "string"
-                        },
-                        "elasticsearch": {
-                          "additionalProperties": {},
-                          "type": "object"
-                        },
-                        "format_version": {
-                          "type": "string"
-                        },
-                        "icons": {
-                          "items": {
-                            "additionalProperties": true,
-                            "properties": {
-                              "dark_mode": {
-                                "type": "boolean"
-                              },
-                              "path": {
-                                "type": "string"
-                              },
-                              "size": {
-                                "type": "string"
-                              },
-                              "src": {
-                                "type": "string"
-                              },
-                              "title": {
-                                "type": "string"
-                              },
-                              "type": {
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "src"
-                            ],
-                            "type": "object"
-                          },
-                          "type": "array"
-                        },
-                        "installationInfo": {
-                          "additionalProperties": true,
-                          "properties": {
-                            "additional_spaces_installed_kibana": {
-                              "additionalProperties": {
-                                "items": {
-                                  "additionalProperties": true,
-                                  "properties": {
-                                    "id": {
-                                      "type": "string"
-                                    },
-                                    "originId": {
-                                      "type": "string"
-                                    },
-                                    "type": {
-                                      "enum": [
-                                        "dashboard",
-                                        "lens",
-                                        "visualization",
-                                        "search",
-                                        "index-pattern",
-                                        "map",
-                                        "ml-module",
-                                        "security-rule",
-                                        "csp-rule-template",
-                                        "osquery-pack-asset",
-                                        "osquery-saved-query",
-                                        "tag"
-                                      ],
-                                      "type": "string"
-                                    }
-                                  },
-                                  "required": [
-                                    "id",
-                                    "type"
-                                  ],
-                                  "type": "object"
-                                },
-                                "type": "array"
-                              },
-                              "type": "object"
-                            },
-                            "created_at": {
-                              "type": "string"
-                            },
-                            "experimental_data_stream_features": {
-                              "items": {
-                                "additionalProperties": true,
-                                "properties": {
-                                  "data_stream": {
-                                    "type": "string"
-                                  },
-                                  "features": {
-                                    "additionalProperties": true,
-                                    "properties": {
-                                      "doc_value_only_numeric": {
-                                        "type": "boolean"
-                                      },
-                                      "doc_value_only_other": {
-                                        "type": "boolean"
-                                      },
-                                      "synthetic_source": {
-                                        "type": "boolean"
-                                      },
-                                      "tsdb": {
-                                        "type": "boolean"
-                                      }
-                                    },
-                                    "type": "object"
-                                  }
-                                },
-                                "required": [
-                                  "data_stream",
-                                  "features"
-                                ],
-                                "type": "object"
-                              },
-                              "type": "array"
-                            },
-                            "install_format_schema_version": {
-                              "type": "string"
-                            },
-                            "install_source": {
-                              "enum": [
-                                "registry",
-                                "upload",
-                                "bundled",
-                                "custom"
-                              ],
-                              "type": "string"
-                            },
-                            "install_status": {
-                              "enum": [
-                                "installed",
-                                "installing",
-                                "install_failed"
-                              ],
-                              "type": "string"
-                            },
-                            "installed_es": {
-                              "items": {
-                                "additionalProperties": true,
-                                "properties": {
-                                  "deferred": {
-                                    "type": "boolean"
-                                  },
-                                  "id": {
-                                    "type": "string"
-                                  },
-                                  "type": {
-                                    "enum": [
-                                      "index",
-                                      "index_template",
-                                      "component_template",
-                                      "ingest_pipeline",
-                                      "ilm_policy",
-                                      "data_stream_ilm_policy",
-                                      "transform",
-                                      "ml_model"
-                                    ],
-                                    "type": "string"
-                                  },
-                                  "version": {
-                                    "type": "string"
-                                  }
-                                },
-                                "required": [
-                                  "id",
-                                  "type"
-                                ],
-                                "type": "object"
-                              },
-                              "type": "array"
-                            },
-                            "installed_kibana": {
-                              "items": {
-                                "additionalProperties": true,
-                                "properties": {
-                                  "id": {
-                                    "type": "string"
-                                  },
-                                  "originId": {
-                                    "type": "string"
-                                  },
-                                  "type": {
-                                    "enum": [
-                                      "dashboard",
-                                      "lens",
-                                      "visualization",
-                                      "search",
-                                      "index-pattern",
-                                      "map",
-                                      "ml-module",
-                                      "security-rule",
-                                      "csp-rule-template",
-                                      "osquery-pack-asset",
-                                      "osquery-saved-query",
-                                      "tag"
-                                    ],
-                                    "type": "string"
-                                  }
-                                },
-                                "required": [
-                                  "id",
-                                  "type"
-                                ],
-                                "type": "object"
-                              },
-                              "type": "array"
-                            },
-                            "installed_kibana_space_id": {
-                              "type": "string"
-                            },
-                            "latest_executed_state": {
-                              "additionalProperties": true,
-                              "properties": {
-                                "error": {
-                                  "type": "string"
-                                },
-                                "name": {
-                                  "type": "string"
-                                },
-                                "started_at": {
-                                  "type": "string"
-                                }
-                              },
-                              "required": [
-                                "name",
-                                "started_at"
-                              ],
-                              "type": "object"
-                            },
-                            "latest_install_failed_attempts": {
-                              "items": {
-                                "additionalProperties": true,
-                                "properties": {
-                                  "created_at": {
-                                    "type": "string"
-                                  },
-                                  "error": {
-                                    "additionalProperties": true,
-                                    "properties": {
-                                      "message": {
-                                        "type": "string"
-                                      },
-                                      "name": {
-                                        "type": "string"
-                                      },
-                                      "stack": {
-                                        "type": "string"
-                                      }
-                                    },
-                                    "required": [
-                                      "name",
-                                      "message"
-                                    ],
-                                    "type": "object"
-                                  },
-                                  "target_version": {
-                                    "type": "string"
-                                  }
-                                },
-                                "required": [
-                                  "created_at",
-                                  "target_version",
-                                  "error"
-                                ],
-                                "type": "object"
-                              },
-                              "type": "array"
-                            },
-                            "name": {
-                              "type": "string"
-                            },
-                            "namespaces": {
-                              "items": {
-                                "type": "string"
-                              },
-                              "type": "array"
-                            },
-                            "type": {
-                              "type": "string"
-                            },
-                            "updated_at": {
-                              "type": "string"
-                            },
-                            "verification_key_id": {
-                              "nullable": true,
-                              "type": "string"
-                            },
-                            "verification_status": {
-                              "enum": [
-                                "unverified",
-                                "verified",
-                                "unknown"
-                              ],
-                              "type": "string"
-                            },
-                            "version": {
-                              "type": "string"
-                            }
-                          },
-                          "required": [
-                            "type",
-                            "installed_kibana",
-                            "installed_es",
-                            "name",
-                            "version",
-                            "install_status",
-                            "install_source",
-                            "verification_status"
-                          ],
-                          "type": "object"
-                        },
-                        "internal": {
-                          "type": "boolean"
-                        },
-                        "keepPoliciesUpToDate": {
-                          "type": "boolean"
-                        },
-                        "latestVersion": {
-                          "type": "string"
-                        },
-                        "license": {
-                          "type": "string"
-                        },
-                        "licensePath": {
-                          "type": "string"
-                        },
-                        "name": {
-                          "type": "string"
-                        },
-                        "notice": {
-                          "type": "string"
-                        },
-                        "owner": {
-                          "additionalProperties": true,
-                          "properties": {
-                            "github": {
-                              "type": "string"
-                            },
-                            "type": {
-                              "enum": [
-                                "elastic",
-                                "partner",
-                                "community"
-                              ],
-                              "type": "string"
-                            }
-                          },
-                          "type": "object"
-                        },
-                        "path": {
-                          "type": "string"
-                        },
-                        "policy_templates": {
-                          "items": {
-                            "additionalProperties": {},
-                            "type": "object"
-                          },
-                          "type": "array"
-                        },
-                        "readme": {
-                          "type": "string"
-                        },
-                        "release": {
-                          "enum": [
-                            "ga",
-                            "beta",
-                            "experimental"
-                          ],
-                          "type": "string"
-                        },
-                        "savedObject": {},
-                        "screenshots": {
-                          "items": {
-                            "additionalProperties": false,
-                            "properties": {
-                              "dark_mode": {
-                                "type": "boolean"
-                              },
-                              "path": {
-                                "type": "string"
-                              },
-                              "size": {
-                                "type": "string"
-                              },
-                              "src": {
-                                "type": "string"
-                              },
-                              "title": {
-                                "type": "string"
-                              },
-                              "type": {
-                                "type": "string"
-                              }
-                            },
-                            "required": [
-                              "src"
-                            ],
-                            "type": "object"
-                          },
-                          "type": "array"
-                        },
-                        "signature_path": {
-                          "type": "string"
-                        },
-                        "source": {
-                          "additionalProperties": true,
-                          "properties": {
-                            "license": {
-                              "type": "string"
-                            }
-                          },
-                          "required": [
-                            "license"
-                          ],
-                          "type": "object"
-                        },
-                        "status": {
-                          "type": "string"
-                        },
-                        "title": {
-                          "type": "string"
-                        },
-                        "type": {
-                          "enum": [
-                            "integration",
-                            "input",
-                            "content"
-                          ],
-                          "type": "string"
-                        },
-                        "vars": {
-                          "items": {
-                            "additionalProperties": {},
-                            "type": "object"
-                          },
-                          "type": "array"
-                        },
-                        "version": {
-                          "type": "string"
-                        }
-                      },
-                      "required": [
-                        "savedObject",
-                        "name",
-                        "version",
-                        "title",
-                        "assets"
-                      ],
-                      "type": "object"
-                    }
-                  },
-                  "required": [
-                    "item"
-                  ],
-                  "type": "object"
-                }
-              }
-            }
-          },
-          "400": {
-            "content": {
-              "application/json; Elastic-Api-Version=2023-10-31": {
-                "schema": {
-                  "additionalProperties": false,
-                  "description": "Generic Error",
-                  "properties": {
-                    "error": {
-                      "type": "string"
-                    },
-                    "message": {
-                      "type": "string"
-                    },
-                    "statusCode": {
-                      "type": "number"
-                    }
-                  },
-                  "required": [
-                    "message"
-                  ],
-                  "type": "object"
-                }
-              }
-            }
-          }
-        },
-        "summary": "",
-        "tags": [
-          "Elastic Package Manager (EPM)"
-        ]
-      }
-    },
-    "/api/fleet/epm/packages/{pkgName}/{pkgVersion}/transforms/authorize": {
-      "post": {
-        "description": "Authorize transforms",
-        "operationId": "post-fleet-epm-packages-pkgname-pkgversion-transforms-authorize",
-        "parameters": [
-          {
-            "description": "The version of the API to use",
-            "in": "header",
-            "name": "elastic-api-version",
-            "schema": {
-              "default": "2023-10-31",
-              "enum": [
-                "2023-10-31"
-              ],
-              "type": "string"
-            }
-          },
-          {
-            "description": "A required header to protect against CSRF attacks",
-            "in": "header",
-            "name": "kbn-xsrf",
-            "required": true,
-            "schema": {
-              "example": "true",
-              "type": "string"
-            }
-          },
-          {
-            "in": "path",
-            "name": "pkgName",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "in": "path",
-            "name": "pkgVersion",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "in": "query",
-            "name": "prerelease",
-            "required": false,
-            "schema": {
-              "type": "boolean"
-            }
-          }
-        ],
-        "requestBody": {
-          "content": {
-            "application/json; Elastic-Api-Version=2023-10-31": {
-              "schema": {
-                "additionalProperties": false,
-                "properties": {
-                  "transforms": {
-                    "items": {
-                      "additionalProperties": false,
-                      "properties": {
-                        "transformId": {
-                          "type": "string"
-                        }
-                      },
-                      "required": [
-                        "transformId"
-                      ],
-                      "type": "object"
-                    },
-                    "type": "array"
-                  }
-                },
-                "required": [
-                  "transforms"
-                ],
-                "type": "object"
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "content": {
-              "application/json; Elastic-Api-Version=2023-10-31": {
-                "schema": {
-                  "items": {
-                    "additionalProperties": false,
-                    "properties": {
-                      "error": {
-                        "nullable": true
-                      },
-                      "success": {
-                        "type": "boolean"
-                      },
-                      "transformId": {
-                        "type": "string"
-                      }
-                    },
-                    "required": [
-                      "transformId",
-                      "success",
-                      "error"
-                    ],
-                    "type": "object"
-                  },
-                  "type": "array"
-                }
-              }
-            }
-          },
-          "400": {
-            "content": {
-              "application/json; Elastic-Api-Version=2023-10-31": {
-                "schema": {
-                  "additionalProperties": false,
-                  "description": "Generic Error",
-                  "properties": {
-                    "error": {
-                      "type": "string"
-                    },
-                    "message": {
-                      "type": "string"
-                    },
-                    "statusCode": {
-                      "type": "number"
-                    }
-                  },
-                  "required": [
-                    "message"
-                  ],
-                  "type": "object"
-                }
-              }
-            }
-          }
-        },
-        "summary": "",
-        "tags": [
-          "Elastic Package Manager (EPM)"
-        ]
-      }
-    },
-    "/api/fleet/epm/packages/{pkgName}/{pkgVersion}/{filePath*}": {
-      "get": {
-        "description": "Get package file",
-        "operationId": "get-fleet-epm-packages-pkgname-pkgversion-filepath",
-        "parameters": [
-          {
-            "description": "The version of the API to use",
-            "in": "header",
-            "name": "elastic-api-version",
-            "schema": {
-              "default": "2023-10-31",
-              "enum": [
-                "2023-10-31"
-              ],
-              "type": "string"
-            }
-          },
-          {
-            "in": "path",
-            "name": "pkgName",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "in": "path",
-            "name": "pkgVersion",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "in": "path",
-            "name": "filePath",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "content": {
-              "application/json; Elastic-Api-Version=2023-10-31": {
-                "schema": {}
-              }
-            }
-          },
-          "400": {
-            "content": {
-              "application/json; Elastic-Api-Version=2023-10-31": {
-                "schema": {
-                  "additionalProperties": false,
-                  "description": "Generic Error",
-                  "properties": {
-                    "error": {
-                      "type": "string"
-                    },
-                    "message": {
-                      "type": "string"
-                    },
-                    "statusCode": {
-                      "type": "number"
-                    }
-                  },
-                  "required": [
-                    "message"
-                  ],
-                  "type": "object"
-                }
-              }
-            }
-          }
-        },
-        "summary": "",
-        "tags": [
-          "Elastic Package Manager (EPM)"
-        ]
-      }
-    },
-    "/api/fleet/epm/packages/{pkgkey}": {
-      "delete": {
-        "operationId": "delete-fleet-epm-packages-pkgkey",
-        "parameters": [
-          {
-            "description": "The version of the API to use",
-            "in": "header",
-            "name": "elastic-api-version",
-            "schema": {
-              "default": "2023-10-31",
-              "enum": [
-                "2023-10-31"
-              ],
-              "type": "string"
-            }
-          },
-          {
-            "description": "A required header to protect against CSRF attacks",
-            "in": "header",
-            "name": "kbn-xsrf",
-            "required": true,
-            "schema": {
-              "example": "true",
-              "type": "string"
-            }
-          },
-          {
-            "in": "path",
-            "name": "pkgkey",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          }
-        ],
-        "requestBody": {
-          "content": {
-            "application/json; Elastic-Api-Version=2023-10-31": {
-              "schema": {
-                "additionalProperties": false,
-                "nullable": true,
-                "properties": {
-                  "force": {
-                    "type": "boolean"
-                  }
-                },
-                "required": [
-                  "force"
-                ],
-                "type": "object"
-              }
-            }
-          }
-        },
-        "responses": {},
-        "summary": "",
-        "tags": []
-      },
-      "get": {
-        "operationId": "get-fleet-epm-packages-pkgkey",
-        "parameters": [
-          {
-            "description": "The version of the API to use",
-            "in": "header",
-            "name": "elastic-api-version",
-            "schema": {
-              "default": "2023-10-31",
-              "enum": [
-                "2023-10-31"
-              ],
-              "type": "string"
-            }
-          },
-          {
-            "in": "path",
-            "name": "pkgkey",
-            "required": true,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "in": "query",
-            "name": "ignoreUnverified",
-            "required": false,
-            "schema": {
-              "type": "boolean"
-            }
-          },
-          {
-            "in": "query",
-            "name": "prerelease",
-            "required": false,
-            "schema": {
-              "type": "boolean"
-            }
-          },
-          {
-            "in": "query",
-            "name": "full",
-            "required": false,
-            "schema": {
-              "type": "boolean"
+                          "type": "array"
+                        },
+                        "version": {
+                          "type": "string"
+                        }
+                      },
+                      "required": [
+                        "name",
+                        "version",
+                        "title",
+                        "assets"
+                      ],
+                      "type": "object"
+                    }
+                  },
+                  "required": [
+                    "item"
+                  ],
+                  "type": "object"
+                }
+              }
             }
           },
-          {
-            "in": "query",
-            "name": "withMetadata",
-            "required": false,
-            "schema": {
-              "default": false,
-              "type": "boolean"
+          "400": {
+            "content": {
+              "application/json; Elastic-Api-Version=2023-10-31": {
+                "schema": {
+                  "additionalProperties": false,
+                  "description": "Generic Error",
+                  "properties": {
+                    "error": {
+                      "type": "string"
+                    },
+                    "message": {
+                      "type": "string"
+                    },
+                    "statusCode": {
+                      "type": "number"
+                    }
+                  },
+                  "required": [
+                    "message"
+                  ],
+                  "type": "object"
+                }
+              }
             }
           }
-        ],
-        "responses": {},
+        },
         "summary": "",
-        "tags": []
-      },
+        "tags": [
+          "Elastic Package Manager (EPM)"
+        ]
+      }
+    },
+    "/api/fleet/epm/packages/{pkgName}/{pkgVersion}/transforms/authorize": {
       "post": {
-        "operationId": "post-fleet-epm-packages-pkgkey",
+        "description": "Authorize transforms",
+        "operationId": "post-fleet-epm-packages-pkgname-pkgversion-transforms-authorize",
         "parameters": [
           {
             "description": "The version of the API to use",
@@ -23903,35 +21203,25 @@
           },
           {
             "in": "path",
-            "name": "pkgkey",
+            "name": "pkgName",
             "required": true,
             "schema": {
               "type": "string"
             }
           },
           {
-            "in": "query",
-            "name": "prerelease",
-            "required": false,
-            "schema": {
-              "type": "boolean"
-            }
-          },
-          {
-            "in": "query",
-            "name": "ignoreMappingUpdateErrors",
-            "required": false,
+            "in": "path",
+            "name": "pkgVersion",
+            "required": true,
             "schema": {
-              "default": false,
-              "type": "boolean"
+              "type": "string"
             }
           },
           {
             "in": "query",
-            "name": "skipDataStreamRollover",
+            "name": "prerelease",
             "required": false,
             "schema": {
-              "default": false,
               "type": "boolean"
             }
           }
@@ -23941,26 +21231,97 @@
             "application/json; Elastic-Api-Version=2023-10-31": {
               "schema": {
                 "additionalProperties": false,
-                "nullable": true,
                 "properties": {
-                  "force": {
-                    "type": "boolean"
+                  "transforms": {
+                    "items": {
+                      "additionalProperties": false,
+                      "properties": {
+                        "transformId": {
+                          "type": "string"
+                        }
+                      },
+                      "required": [
+                        "transformId"
+                      ],
+                      "type": "object"
+                    },
+                    "type": "array"
                   }
                 },
                 "required": [
-                  "force"
+                  "transforms"
                 ],
                 "type": "object"
               }
             }
           }
         },
-        "responses": {},
+        "responses": {
+          "200": {
+            "content": {
+              "application/json; Elastic-Api-Version=2023-10-31": {
+                "schema": {
+                  "items": {
+                    "additionalProperties": false,
+                    "properties": {
+                      "error": {
+                        "nullable": true
+                      },
+                      "success": {
+                        "type": "boolean"
+                      },
+                      "transformId": {
+                        "type": "string"
+                      }
+                    },
+                    "required": [
+                      "transformId",
+                      "success",
+                      "error"
+                    ],
+                    "type": "object"
+                  },
+                  "type": "array"
+                }
+              }
+            }
+          },
+          "400": {
+            "content": {
+              "application/json; Elastic-Api-Version=2023-10-31": {
+                "schema": {
+                  "additionalProperties": false,
+                  "description": "Generic Error",
+                  "properties": {
+                    "error": {
+                      "type": "string"
+                    },
+                    "message": {
+                      "type": "string"
+                    },
+                    "statusCode": {
+                      "type": "number"
+                    }
+                  },
+                  "required": [
+                    "message"
+                  ],
+                  "type": "object"
+                }
+              }
+            }
+          }
+        },
         "summary": "",
-        "tags": []
-      },
-      "put": {
-        "operationId": "put-fleet-epm-packages-pkgkey",
+        "tags": [
+          "Elastic Package Manager (EPM)"
+        ]
+      }
+    },
+    "/api/fleet/epm/packages/{pkgName}/{pkgVersion}/{filePath*}": {
+      "get": {
+        "description": "Get package file",
+        "operationId": "get-fleet-epm-packages-pkgname-pkgversion-filepath",
         "parameters": [
           {
             "description": "The version of the API to use",
@@ -23975,45 +21336,68 @@
             }
           },
           {
-            "description": "A required header to protect against CSRF attacks",
-            "in": "header",
-            "name": "kbn-xsrf",
+            "in": "path",
+            "name": "pkgName",
             "required": true,
             "schema": {
-              "example": "true",
               "type": "string"
             }
           },
           {
             "in": "path",
-            "name": "pkgkey",
+            "name": "pkgVersion",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "in": "path",
+            "name": "filePath",
             "required": true,
             "schema": {
               "type": "string"
             }
           }
         ],
-        "requestBody": {
-          "content": {
-            "application/json; Elastic-Api-Version=2023-10-31": {
-              "schema": {
-                "additionalProperties": false,
-                "properties": {
-                  "keepPoliciesUpToDate": {
-                    "type": "boolean"
-                  }
-                },
-                "required": [
-                  "keepPoliciesUpToDate"
-                ],
-                "type": "object"
+        "responses": {
+          "200": {
+            "content": {
+              "application/json; Elastic-Api-Version=2023-10-31": {
+                "schema": {}
+              }
+            }
+          },
+          "400": {
+            "content": {
+              "application/json; Elastic-Api-Version=2023-10-31": {
+                "schema": {
+                  "additionalProperties": false,
+                  "description": "Generic Error",
+                  "properties": {
+                    "error": {
+                      "type": "string"
+                    },
+                    "message": {
+                      "type": "string"
+                    },
+                    "statusCode": {
+                      "type": "number"
+                    }
+                  },
+                  "required": [
+                    "message"
+                  ],
+                  "type": "object"
+                }
               }
             }
           }
         },
-        "responses": {},
         "summary": "",
-        "tags": []
+        "tags": [
+          "Elastic Package Manager (EPM)"
+        ]
       }
     },
     "/api/fleet/epm/templates/{pkgName}/{pkgVersion}/inputs": {
@@ -24920,10 +22304,6 @@
               "schema": {
                 "additionalProperties": false,
                 "properties": {
-                  "host": {
-                    "format": "uri",
-                    "type": "string"
-                  },
                   "id": {
                     "type": "string"
                   }
@@ -24943,10 +22323,6 @@
                 "schema": {
                   "additionalProperties": false,
                   "properties": {
-                    "host": {
-                      "deprecated": true,
-                      "type": "string"
-                    },
                     "host_id": {
                       "type": "string"
                     },
@@ -39316,12 +36692,6 @@
                           ],
                           "type": "object"
                         },
-                        "fleet_server_hosts": {
-                          "items": {
-                            "type": "string"
-                          },
-                          "type": "array"
-                        },
                         "has_seen_add_data_notice": {
                           "type": "boolean"
                         },
@@ -39476,13 +36846,6 @@
                     ],
                     "type": "object"
                   },
-                  "fleet_server_hosts": {
-                    "items": {
-                      "format": "uri",
-                      "type": "string"
-                    },
-                    "type": "array"
-                  },
                   "has_seen_add_data_notice": {
                     "type": "boolean"
                   },
@@ -39531,12 +36894,6 @@
                           ],
                           "type": "object"
                         },
-                        "fleet_server_hosts": {
-                          "items": {
-                            "type": "string"
-                          },
-                          "type": "array"
-                        },
                         "has_seen_add_data_notice": {
                           "type": "boolean"
                         },
diff --git a/oas_docs/output/kibana.serverless.yaml b/oas_docs/output/kibana.serverless.yaml
index afb7d8bbd5f4d..78c8541059d26 100644
--- a/oas_docs/output/kibana.serverless.yaml
+++ b/oas_docs/output/kibana.serverless.yaml
@@ -17841,44 +17841,6 @@ paths:
                         - active
                         - created_at
                     type: array
-                  list:
-                    deprecated: true
-                    items:
-                      additionalProperties: false
-                      type: object
-                      properties:
-                        active:
-                          description: >-
-                            When false, the enrollment API key is revoked and
-                            cannot be used for enrolling Elastic Agents.
-                          type: boolean
-                        api_key:
-                          description: >-
-                            The enrollment API key (token) used for enrolling
-                            Elastic Agents.
-                          type: string
-                        api_key_id:
-                          description: The ID of the API key in the Security API.
-                          type: string
-                        created_at:
-                          type: string
-                        id:
-                          type: string
-                        name:
-                          description: The name of the enrollment API key.
-                          type: string
-                        policy_id:
-                          description: >-
-                            The ID of the agent policy the Elastic Agent will be
-                            enrolled in.
-                          type: string
-                      required:
-                        - id
-                        - api_key_id
-                        - api_key
-                        - active
-                        - created_at
-                    type: array
                   page:
                     type: number
                   perPage:
@@ -17890,7 +17852,6 @@ paths:
                   - total
                   - page
                   - perPage
-                  - list
         '400':
           content:
             application/json; Elastic-Api-Version=2023-10-31:
@@ -18152,120 +18113,6 @@ paths:
       summary: ''
       tags:
         - Fleet enrollment API keys
-  /api/fleet/enrollment-api-keys:
-    get:
-      operationId: get-fleet-enrollment-api-keys-2
-      parameters:
-        - description: The version of the API to use
-          in: header
-          name: elastic-api-version
-          schema:
-            default: '2023-10-31'
-            enum:
-              - '2023-10-31'
-            type: string
-        - in: query
-          name: page
-          required: false
-          schema:
-            default: 1
-            type: number
-        - in: query
-          name: perPage
-          required: false
-          schema:
-            default: 20
-            type: number
-        - in: query
-          name: kuery
-          required: false
-          schema:
-            type: string
-      responses: {}
-      summary: ''
-      tags: []
-    post:
-      operationId: post-fleet-enrollment-api-keys-2
-      parameters:
-        - description: The version of the API to use
-          in: header
-          name: elastic-api-version
-          schema:
-            default: '2023-10-31'
-            enum:
-              - '2023-10-31'
-            type: string
-        - description: A required header to protect against CSRF attacks
-          in: header
-          name: kbn-xsrf
-          required: true
-          schema:
-            example: 'true'
-            type: string
-      requestBody:
-        content:
-          application/json; Elastic-Api-Version=2023-10-31:
-            schema:
-              additionalProperties: false
-              type: object
-              properties:
-                expiration:
-                  type: string
-                name:
-                  type: string
-                policy_id:
-                  type: string
-              required:
-                - policy_id
-      responses: {}
-      summary: ''
-      tags: []
-  /api/fleet/enrollment-api-keys/{keyId}:
-    delete:
-      operationId: delete-fleet-enrollment-api-keys-keyid-2
-      parameters:
-        - description: The version of the API to use
-          in: header
-          name: elastic-api-version
-          schema:
-            default: '2023-10-31'
-            enum:
-              - '2023-10-31'
-            type: string
-        - description: A required header to protect against CSRF attacks
-          in: header
-          name: kbn-xsrf
-          required: true
-          schema:
-            example: 'true'
-            type: string
-        - in: path
-          name: keyId
-          required: true
-          schema:
-            type: string
-      responses: {}
-      summary: ''
-      tags: []
-    get:
-      operationId: get-fleet-enrollment-api-keys-keyid-2
-      parameters:
-        - description: The version of the API to use
-          in: header
-          name: elastic-api-version
-          schema:
-            default: '2023-10-31'
-            enum:
-              - '2023-10-31'
-            type: string
-        - in: path
-          name: keyId
-          required: true
-          schema:
-            type: string
-      responses: {}
-      summary: ''
-      tags: []
   /api/fleet/epm/bulk_assets:
     post:
       description: Bulk get assets
@@ -18383,11 +18230,6 @@ paths:
           required: false
           schema:
             type: boolean
-        - in: query
-          name: experimental
-          required: false
-          schema:
-            type: boolean
         - in: query
           name: include_policy_templates
           required: false
@@ -18421,27 +18263,6 @@ paths:
                         - title
                         - count
                     type: array
-                  response:
-                    items:
-                      additionalProperties: false
-                      deprecated: true
-                      type: object
-                      properties:
-                        count:
-                          type: number
-                        id:
-                          type: string
-                        parent_id:
-                          type: string
-                        parent_title:
-                          type: string
-                        title:
-                          type: string
-                      required:
-                        - id
-                        - title
-                        - count
-                    type: array
                 required:
                   - items
         '400':
@@ -18584,59 +18405,6 @@ paths:
                             - id
                             - type
                     type: array
-                  response:
-                    deprecated: true
-                    items:
-                      anyOf:
-                        - additionalProperties: false
-                          type: object
-                          properties:
-                            id:
-                              type: string
-                            originId:
-                              type: string
-                            type:
-                              enum:
-                                - dashboard
-                                - lens
-                                - visualization
-                                - search
-                                - index-pattern
-                                - map
-                                - ml-module
-                                - security-rule
-                                - csp-rule-template
-                                - osquery-pack-asset
-                                - osquery-saved-query
-                                - tag
-                              type: string
-                          required:
-                            - id
-                            - type
-                        - additionalProperties: false
-                          type: object
-                          properties:
-                            deferred:
-                              type: boolean
-                            id:
-                              type: string
-                            type:
-                              enum:
-                                - index
-                                - index_template
-                                - component_template
-                                - ingest_pipeline
-                                - ilm_policy
-                                - data_stream_ilm_policy
-                                - transform
-                                - ml_model
-                              type: string
-                            version:
-                              type: string
-                          required:
-                            - id
-                            - type
-                    type: array
                 required:
                   - items
                   - _meta
@@ -18765,11 +18533,6 @@ paths:
           required: false
           schema:
             type: boolean
-        - in: query
-          name: experimental
-          required: false
-          schema:
-            type: boolean
         - in: query
           name: excludeInstallStatus
           required: false
@@ -19094,7 +18857,6 @@ paths:
                             - beta
                             - experimental
                           type: string
-                        savedObject: {}
                         signature_path:
                           type: string
                         source:
@@ -19123,2061 +18885,323 @@ paths:
                         version:
                           type: string
                       required:
-                        - savedObject
                         - name
                         - version
                         - title
                         - id
                     type: array
-                  response:
-                    items:
-                      additionalProperties: true
-                      deprecated: true
-                      type: object
-                      properties:
-                        categories:
-                          items:
-                            type: string
-                          type: array
-                        conditions:
-                          additionalProperties: true
-                          type: object
-                          properties:
-                            elastic:
-                              additionalProperties: true
-                              type: object
-                              properties:
-                                capabilities:
-                                  items:
-                                    type: string
-                                  type: array
-                                subscription:
-                                  type: string
-                            kibana:
-                              additionalProperties: true
-                              type: object
-                              properties:
-                                version:
-                                  type: string
-                        data_streams:
-                          items:
-                            additionalProperties: {}
-                            type: object
-                          type: array
-                        description:
-                          type: string
-                        discovery:
-                          additionalProperties: true
-                          type: object
-                          properties:
-                            fields:
-                              items:
-                                additionalProperties: true
-                                type: object
-                                properties:
-                                  name:
-                                    type: string
-                                required:
-                                  - name
-                              type: array
-                        download:
-                          type: string
-                        format_version:
-                          type: string
-                        icons:
-                          items:
-                            additionalProperties: true
-                            type: object
-                            properties:
-                              dark_mode:
-                                type: boolean
-                              path:
-                                type: string
-                              size:
-                                type: string
-                              src:
-                                type: string
-                              title:
-                                type: string
-                              type:
-                                type: string
-                            required:
-                              - src
-                          type: array
-                        id:
-                          type: string
-                        installationInfo:
-                          additionalProperties: true
-                          type: object
-                          properties:
-                            additional_spaces_installed_kibana:
-                              additionalProperties:
-                                items:
-                                  additionalProperties: true
-                                  type: object
-                                  properties:
-                                    id:
-                                      type: string
-                                    originId:
-                                      type: string
-                                    type:
-                                      enum:
-                                        - dashboard
-                                        - lens
-                                        - visualization
-                                        - search
-                                        - index-pattern
-                                        - map
-                                        - ml-module
-                                        - security-rule
-                                        - csp-rule-template
-                                        - osquery-pack-asset
-                                        - osquery-saved-query
-                                        - tag
-                                      type: string
-                                  required:
-                                    - id
-                                    - type
-                                type: array
-                              type: object
-                            created_at:
-                              type: string
-                            experimental_data_stream_features:
-                              items:
-                                additionalProperties: true
-                                type: object
-                                properties:
-                                  data_stream:
-                                    type: string
-                                  features:
-                                    additionalProperties: true
-                                    type: object
-                                    properties:
-                                      doc_value_only_numeric:
-                                        type: boolean
-                                      doc_value_only_other:
-                                        type: boolean
-                                      synthetic_source:
-                                        type: boolean
-                                      tsdb:
-                                        type: boolean
-                                required:
-                                  - data_stream
-                                  - features
-                              type: array
-                            install_format_schema_version:
-                              type: string
-                            install_source:
-                              enum:
-                                - registry
-                                - upload
-                                - bundled
-                                - custom
-                              type: string
-                            install_status:
-                              enum:
-                                - installed
-                                - installing
-                                - install_failed
-                              type: string
-                            installed_es:
-                              items:
-                                additionalProperties: true
-                                type: object
-                                properties:
-                                  deferred:
-                                    type: boolean
-                                  id:
-                                    type: string
-                                  type:
-                                    enum:
-                                      - index
-                                      - index_template
-                                      - component_template
-                                      - ingest_pipeline
-                                      - ilm_policy
-                                      - data_stream_ilm_policy
-                                      - transform
-                                      - ml_model
-                                    type: string
-                                  version:
-                                    type: string
-                                required:
-                                  - id
-                                  - type
-                              type: array
-                            installed_kibana:
-                              items:
-                                additionalProperties: true
-                                type: object
-                                properties:
-                                  id:
-                                    type: string
-                                  originId:
-                                    type: string
-                                  type:
-                                    enum:
-                                      - dashboard
-                                      - lens
-                                      - visualization
-                                      - search
-                                      - index-pattern
-                                      - map
-                                      - ml-module
-                                      - security-rule
-                                      - csp-rule-template
-                                      - osquery-pack-asset
-                                      - osquery-saved-query
-                                      - tag
-                                    type: string
-                                required:
-                                  - id
-                                  - type
-                              type: array
-                            installed_kibana_space_id:
-                              type: string
-                            latest_executed_state:
-                              additionalProperties: true
-                              type: object
-                              properties:
-                                error:
-                                  type: string
-                                name:
-                                  type: string
-                                started_at:
-                                  type: string
-                              required:
-                                - name
-                                - started_at
-                            latest_install_failed_attempts:
-                              items:
-                                additionalProperties: true
-                                type: object
-                                properties:
-                                  created_at:
-                                    type: string
-                                  error:
-                                    additionalProperties: true
-                                    type: object
-                                    properties:
-                                      message:
-                                        type: string
-                                      name:
-                                        type: string
-                                      stack:
-                                        type: string
-                                    required:
-                                      - name
-                                      - message
-                                  target_version:
-                                    type: string
-                                required:
-                                  - created_at
-                                  - target_version
-                                  - error
-                              type: array
-                            name:
-                              type: string
-                            namespaces:
-                              items:
-                                type: string
-                              type: array
-                            type:
-                              type: string
-                            updated_at:
-                              type: string
-                            verification_key_id:
-                              nullable: true
-                              type: string
-                            verification_status:
-                              enum:
-                                - unverified
-                                - verified
-                                - unknown
-                              type: string
-                            version:
-                              type: string
-                          required:
-                            - type
-                            - installed_kibana
-                            - installed_es
-                            - name
-                            - version
-                            - install_status
-                            - install_source
-                            - verification_status
-                        integration:
-                          type: string
-                        internal:
-                          type: boolean
-                        latestVersion:
-                          type: string
-                        name:
-                          type: string
-                        owner:
-                          additionalProperties: true
-                          type: object
-                          properties:
-                            github:
-                              type: string
-                            type:
-                              enum:
-                                - elastic
-                                - partner
-                                - community
-                              type: string
-                        path:
-                          type: string
-                        policy_templates:
-                          items:
-                            additionalProperties: {}
-                            type: object
-                          type: array
-                        readme:
-                          type: string
-                        release:
-                          enum:
-                            - ga
-                            - beta
-                            - experimental
-                          type: string
-                        savedObject: {}
-                        signature_path:
-                          type: string
-                        source:
-                          additionalProperties: true
-                          type: object
-                          properties:
-                            license:
-                              type: string
-                          required:
-                            - license
-                        status:
-                          type: string
-                        title:
-                          type: string
-                        type:
-                          enum:
-                            - integration
-                            - input
-                            - content
-                          type: string
-                        vars:
-                          items:
-                            additionalProperties: {}
-                            type: object
-                          type: array
-                        version:
-                          type: string
-                      required:
-                        - savedObject
-                        - name
-                        - version
-                        - title
-                        - id
-                    type: array
-                required:
-                  - items
-        '400':
-          content:
-            application/json; Elastic-Api-Version=2023-10-31:
-              schema:
-                additionalProperties: false
-                description: Generic Error
-                type: object
-                properties:
-                  error:
-                    type: string
-                  message:
-                    type: string
-                  statusCode:
-                    type: number
-                required:
-                  - message
-      summary: ''
-      tags:
-        - Elastic Package Manager (EPM)
-    post:
-      description: Install package by upload
-      operationId: post-fleet-epm-packages
-      parameters:
-        - description: The version of the API to use
-          in: header
-          name: elastic-api-version
-          schema:
-            default: '2023-10-31'
-            enum:
-              - '2023-10-31'
-            type: string
-        - description: A required header to protect against CSRF attacks
-          in: header
-          name: kbn-xsrf
-          required: true
-          schema:
-            example: 'true'
-            type: string
-        - in: query
-          name: ignoreMappingUpdateErrors
-          required: false
-          schema:
-            default: false
-            type: boolean
-        - in: query
-          name: skipDataStreamRollover
-          required: false
-          schema:
-            default: false
-            type: boolean
-      requestBody:
-        content:
-          application/gzip; application/zip; Elastic-Api-Version=2023-10-31:
-            schema:
-              format: binary
-              type: string
-      responses:
-        '200':
-          content:
-            application/gzip; application/zip; Elastic-Api-Version=2023-10-31:
-              schema:
-                additionalProperties: false
-                type: object
-                properties:
-                  _meta:
-                    additionalProperties: false
-                    type: object
-                    properties:
-                      install_source:
-                        type: string
-                    required:
-                      - install_source
-                  items:
-                    items:
-                      anyOf:
-                        - additionalProperties: false
-                          type: object
-                          properties:
-                            id:
-                              type: string
-                            originId:
-                              type: string
-                            type:
-                              enum:
-                                - dashboard
-                                - lens
-                                - visualization
-                                - search
-                                - index-pattern
-                                - map
-                                - ml-module
-                                - security-rule
-                                - csp-rule-template
-                                - osquery-pack-asset
-                                - osquery-saved-query
-                                - tag
-                              type: string
-                          required:
-                            - id
-                            - type
-                        - additionalProperties: false
-                          type: object
-                          properties:
-                            deferred:
-                              type: boolean
-                            id:
-                              type: string
-                            type:
-                              enum:
-                                - index
-                                - index_template
-                                - component_template
-                                - ingest_pipeline
-                                - ilm_policy
-                                - data_stream_ilm_policy
-                                - transform
-                                - ml_model
-                              type: string
-                            version:
-                              type: string
-                          required:
-                            - id
-                            - type
-                    type: array
-                  response:
-                    deprecated: true
-                    items:
-                      anyOf:
-                        - additionalProperties: false
-                          type: object
-                          properties:
-                            id:
-                              type: string
-                            originId:
-                              type: string
-                            type:
-                              enum:
-                                - dashboard
-                                - lens
-                                - visualization
-                                - search
-                                - index-pattern
-                                - map
-                                - ml-module
-                                - security-rule
-                                - csp-rule-template
-                                - osquery-pack-asset
-                                - osquery-saved-query
-                                - tag
-                              type: string
-                          required:
-                            - id
-                            - type
-                        - additionalProperties: false
-                          type: object
-                          properties:
-                            deferred:
-                              type: boolean
-                            id:
-                              type: string
-                            type:
-                              enum:
-                                - index
-                                - index_template
-                                - component_template
-                                - ingest_pipeline
-                                - ilm_policy
-                                - data_stream_ilm_policy
-                                - transform
-                                - ml_model
-                              type: string
-                            version:
-                              type: string
-                          required:
-                            - id
-                            - type
-                    type: array
-                required:
-                  - items
-                  - _meta
-        '400':
-          content:
-            application/gzip; application/zip; Elastic-Api-Version=2023-10-31:
-              schema:
-                additionalProperties: false
-                description: Generic Error
-                type: object
-                properties:
-                  error:
-                    type: string
-                  message:
-                    type: string
-                  statusCode:
-                    type: number
-                required:
-                  - message
-      summary: ''
-      tags:
-        - Elastic Package Manager (EPM)
-  /api/fleet/epm/packages/_bulk:
-    post:
-      description: Bulk install packages
-      operationId: post-fleet-epm-packages-bulk
-      parameters:
-        - description: The version of the API to use
-          in: header
-          name: elastic-api-version
-          schema:
-            default: '2023-10-31'
-            enum:
-              - '2023-10-31'
-            type: string
-        - description: A required header to protect against CSRF attacks
-          in: header
-          name: kbn-xsrf
-          required: true
-          schema:
-            example: 'true'
-            type: string
-        - in: query
-          name: prerelease
-          required: false
-          schema:
-            type: boolean
-      requestBody:
-        content:
-          application/json; Elastic-Api-Version=2023-10-31:
-            schema:
-              additionalProperties: false
-              type: object
-              properties:
-                force:
-                  default: false
-                  type: boolean
-                packages:
-                  items:
-                    anyOf:
-                      - type: string
-                      - additionalProperties: false
-                        type: object
-                        properties:
-                          name:
-                            type: string
-                          prerelease:
-                            type: boolean
-                          version:
-                            type: string
-                        required:
-                          - name
-                          - version
-                  minItems: 1
-                  type: array
-              required:
-                - packages
-      responses:
-        '200':
-          content:
-            application/json; Elastic-Api-Version=2023-10-31:
-              schema:
-                additionalProperties: false
-                type: object
-                properties:
-                  items:
-                    items:
-                      anyOf:
-                        - additionalProperties: false
-                          type: object
-                          properties:
-                            name:
-                              type: string
-                            result:
-                              additionalProperties: false
-                              type: object
-                              properties:
-                                assets:
-                                  items:
-                                    anyOf:
-                                      - additionalProperties: false
-                                        type: object
-                                        properties:
-                                          id:
-                                            type: string
-                                          originId:
-                                            type: string
-                                          type:
-                                            enum:
-                                              - dashboard
-                                              - lens
-                                              - visualization
-                                              - search
-                                              - index-pattern
-                                              - map
-                                              - ml-module
-                                              - security-rule
-                                              - csp-rule-template
-                                              - osquery-pack-asset
-                                              - osquery-saved-query
-                                              - tag
-                                            type: string
-                                        required:
-                                          - id
-                                          - type
-                                      - additionalProperties: false
-                                        type: object
-                                        properties:
-                                          deferred:
-                                            type: boolean
-                                          id:
-                                            type: string
-                                          type:
-                                            enum:
-                                              - index
-                                              - index_template
-                                              - component_template
-                                              - ingest_pipeline
-                                              - ilm_policy
-                                              - data_stream_ilm_policy
-                                              - transform
-                                              - ml_model
-                                            type: string
-                                          version:
-                                            type: string
-                                        required:
-                                          - id
-                                          - type
-                                  type: array
-                                error: {}
-                                installSource:
-                                  type: string
-                                installType:
-                                  type: string
-                                status:
-                                  enum:
-                                    - installed
-                                    - already_installed
-                                  type: string
-                              required:
-                                - error
-                                - installType
-                            version:
-                              type: string
-                          required:
-                            - name
-                            - version
-                            - result
-                        - additionalProperties: false
-                          type: object
-                          properties:
-                            error:
-                              anyOf:
-                                - type: string
-                                - {}
-                            name:
-                              type: string
-                            statusCode:
-                              type: number
-                          required:
-                            - name
-                            - statusCode
-                            - error
-                    type: array
-                  response:
-                    deprecated: true
-                    items:
-                      anyOf:
-                        - additionalProperties: false
-                          type: object
-                          properties:
-                            name:
-                              type: string
-                            result:
-                              additionalProperties: false
-                              type: object
-                              properties:
-                                assets:
-                                  items:
-                                    anyOf:
-                                      - additionalProperties: false
-                                        type: object
-                                        properties:
-                                          id:
-                                            type: string
-                                          originId:
-                                            type: string
-                                          type:
-                                            enum:
-                                              - dashboard
-                                              - lens
-                                              - visualization
-                                              - search
-                                              - index-pattern
-                                              - map
-                                              - ml-module
-                                              - security-rule
-                                              - csp-rule-template
-                                              - osquery-pack-asset
-                                              - osquery-saved-query
-                                              - tag
-                                            type: string
-                                        required:
-                                          - id
-                                          - type
-                                      - additionalProperties: false
-                                        type: object
-                                        properties:
-                                          deferred:
-                                            type: boolean
-                                          id:
-                                            type: string
-                                          type:
-                                            enum:
-                                              - index
-                                              - index_template
-                                              - component_template
-                                              - ingest_pipeline
-                                              - ilm_policy
-                                              - data_stream_ilm_policy
-                                              - transform
-                                              - ml_model
-                                            type: string
-                                          version:
-                                            type: string
-                                        required:
-                                          - id
-                                          - type
-                                  type: array
-                                error: {}
-                                installSource:
-                                  type: string
-                                installType:
-                                  type: string
-                                status:
-                                  enum:
-                                    - installed
-                                    - already_installed
-                                  type: string
-                              required:
-                                - error
-                                - installType
-                            version:
-                              type: string
-                          required:
-                            - name
-                            - version
-                            - result
-                        - additionalProperties: false
-                          type: object
-                          properties:
-                            error:
-                              anyOf:
-                                - type: string
-                                - {}
-                            name:
-                              type: string
-                            statusCode:
-                              type: number
-                          required:
-                            - name
-                            - statusCode
-                            - error
-                    type: array
-                required:
-                  - items
-        '400':
-          content:
-            application/json; Elastic-Api-Version=2023-10-31:
-              schema:
-                additionalProperties: false
-                description: Generic Error
-                type: object
-                properties:
-                  error:
-                    type: string
-                  message:
-                    type: string
-                  statusCode:
-                    type: number
-                required:
-                  - message
-      summary: ''
-      tags:
-        - Elastic Package Manager (EPM)
-  /api/fleet/epm/packages/{pkgkey}:
-    delete:
-      operationId: delete-fleet-epm-packages-pkgkey
-      parameters:
-        - description: The version of the API to use
-          in: header
-          name: elastic-api-version
-          schema:
-            default: '2023-10-31'
-            enum:
-              - '2023-10-31'
-            type: string
-        - description: A required header to protect against CSRF attacks
-          in: header
-          name: kbn-xsrf
-          required: true
-          schema:
-            example: 'true'
-            type: string
-        - in: path
-          name: pkgkey
-          required: true
-          schema:
-            type: string
-      requestBody:
-        content:
-          application/json; Elastic-Api-Version=2023-10-31:
-            schema:
-              additionalProperties: false
-              nullable: true
-              type: object
-              properties:
-                force:
-                  type: boolean
-              required:
-                - force
-      responses: {}
-      summary: ''
-      tags: []
-    get:
-      operationId: get-fleet-epm-packages-pkgkey
-      parameters:
-        - description: The version of the API to use
-          in: header
-          name: elastic-api-version
-          schema:
-            default: '2023-10-31'
-            enum:
-              - '2023-10-31'
-            type: string
-        - in: path
-          name: pkgkey
-          required: true
-          schema:
-            type: string
-        - in: query
-          name: ignoreUnverified
-          required: false
-          schema:
-            type: boolean
-        - in: query
-          name: prerelease
-          required: false
-          schema:
-            type: boolean
-        - in: query
-          name: full
-          required: false
-          schema:
-            type: boolean
-        - in: query
-          name: withMetadata
-          required: false
-          schema:
-            default: false
-            type: boolean
-      responses: {}
-      summary: ''
-      tags: []
-    post:
-      operationId: post-fleet-epm-packages-pkgkey
-      parameters:
-        - description: The version of the API to use
-          in: header
-          name: elastic-api-version
-          schema:
-            default: '2023-10-31'
-            enum:
-              - '2023-10-31'
-            type: string
-        - description: A required header to protect against CSRF attacks
-          in: header
-          name: kbn-xsrf
-          required: true
-          schema:
-            example: 'true'
-            type: string
-        - in: path
-          name: pkgkey
-          required: true
-          schema:
-            type: string
-        - in: query
-          name: prerelease
-          required: false
-          schema:
-            type: boolean
-        - in: query
-          name: ignoreMappingUpdateErrors
-          required: false
-          schema:
-            default: false
-            type: boolean
-        - in: query
-          name: skipDataStreamRollover
-          required: false
-          schema:
-            default: false
-            type: boolean
-      requestBody:
-        content:
-          application/json; Elastic-Api-Version=2023-10-31:
-            schema:
-              additionalProperties: false
-              nullable: true
-              type: object
-              properties:
-                force:
-                  type: boolean
-              required:
-                - force
-      responses: {}
-      summary: ''
-      tags: []
-    put:
-      operationId: put-fleet-epm-packages-pkgkey
-      parameters:
-        - description: The version of the API to use
-          in: header
-          name: elastic-api-version
-          schema:
-            default: '2023-10-31'
-            enum:
-              - '2023-10-31'
-            type: string
-        - description: A required header to protect against CSRF attacks
-          in: header
-          name: kbn-xsrf
-          required: true
-          schema:
-            example: 'true'
-            type: string
-        - in: path
-          name: pkgkey
-          required: true
-          schema:
-            type: string
-      requestBody:
-        content:
-          application/json; Elastic-Api-Version=2023-10-31:
-            schema:
-              additionalProperties: false
-              type: object
-              properties:
-                keepPoliciesUpToDate:
-                  type: boolean
-              required:
-                - keepPoliciesUpToDate
-      responses: {}
-      summary: ''
-      tags: []
-  /api/fleet/epm/packages/{pkgName}/{pkgVersion}:
-    delete:
-      description: Delete package
-      operationId: delete-fleet-epm-packages-pkgname-pkgversion
-      parameters:
-        - description: The version of the API to use
-          in: header
-          name: elastic-api-version
-          schema:
-            default: '2023-10-31'
-            enum:
-              - '2023-10-31'
-            type: string
-        - description: A required header to protect against CSRF attacks
-          in: header
-          name: kbn-xsrf
-          required: true
-          schema:
-            example: 'true'
-            type: string
-        - in: path
-          name: pkgName
-          required: true
-          schema:
-            type: string
-        - in: path
-          name: pkgVersion
-          required: true
-          schema:
-            type: string
-        - in: query
-          name: force
-          required: false
-          schema:
-            type: boolean
-      requestBody:
-        content:
-          application/json; Elastic-Api-Version=2023-10-31:
-            schema:
-              additionalProperties: false
-              nullable: true
-              type: object
-              properties:
-                force:
-                  type: boolean
-              required:
-                - force
-      responses:
-        '200':
-          content:
-            application/json; Elastic-Api-Version=2023-10-31:
-              schema:
-                additionalProperties: false
-                type: object
-                properties:
-                  items:
-                    items:
-                      anyOf:
-                        - additionalProperties: false
-                          type: object
-                          properties:
-                            id:
-                              type: string
-                            originId:
-                              type: string
-                            type:
-                              enum:
-                                - dashboard
-                                - lens
-                                - visualization
-                                - search
-                                - index-pattern
-                                - map
-                                - ml-module
-                                - security-rule
-                                - csp-rule-template
-                                - osquery-pack-asset
-                                - osquery-saved-query
-                                - tag
-                              type: string
-                          required:
-                            - id
-                            - type
-                        - additionalProperties: false
-                          type: object
-                          properties:
-                            deferred:
-                              type: boolean
-                            id:
-                              type: string
-                            type:
-                              enum:
-                                - index
-                                - index_template
-                                - component_template
-                                - ingest_pipeline
-                                - ilm_policy
-                                - data_stream_ilm_policy
-                                - transform
-                                - ml_model
-                              type: string
-                            version:
-                              type: string
-                          required:
-                            - id
-                            - type
-                    type: array
-                  response:
-                    deprecated: true
-                    items:
-                      anyOf:
-                        - additionalProperties: false
-                          type: object
-                          properties:
-                            id:
-                              type: string
-                            originId:
-                              type: string
-                            type:
-                              enum:
-                                - dashboard
-                                - lens
-                                - visualization
-                                - search
-                                - index-pattern
-                                - map
-                                - ml-module
-                                - security-rule
-                                - csp-rule-template
-                                - osquery-pack-asset
-                                - osquery-saved-query
-                                - tag
-                              type: string
-                          required:
-                            - id
-                            - type
-                        - additionalProperties: false
-                          type: object
-                          properties:
-                            deferred:
-                              type: boolean
-                            id:
-                              type: string
-                            type:
-                              enum:
-                                - index
-                                - index_template
-                                - component_template
-                                - ingest_pipeline
-                                - ilm_policy
-                                - data_stream_ilm_policy
-                                - transform
-                                - ml_model
-                              type: string
-                            version:
-                              type: string
-                          required:
-                            - id
-                            - type
-                    type: array
-                required:
-                  - items
-        '400':
-          content:
-            application/json; Elastic-Api-Version=2023-10-31:
-              schema:
-                additionalProperties: false
-                description: Generic Error
-                type: object
-                properties:
-                  error:
-                    type: string
-                  message:
-                    type: string
-                  statusCode:
-                    type: number
-                required:
-                  - message
-      summary: ''
-      tags:
-        - Elastic Package Manager (EPM)
-    get:
-      description: Get package
-      operationId: get-fleet-epm-packages-pkgname-pkgversion
-      parameters:
-        - description: The version of the API to use
-          in: header
-          name: elastic-api-version
-          schema:
-            default: '2023-10-31'
-            enum:
-              - '2023-10-31'
-            type: string
-        - in: path
-          name: pkgName
-          required: true
-          schema:
-            type: string
-        - in: path
-          name: pkgVersion
-          required: true
-          schema:
-            type: string
-        - in: query
-          name: ignoreUnverified
-          required: false
-          schema:
-            type: boolean
-        - in: query
-          name: prerelease
-          required: false
-          schema:
-            type: boolean
-        - in: query
-          name: full
-          required: false
-          schema:
-            type: boolean
-        - in: query
-          name: withMetadata
-          required: false
-          schema:
-            default: false
-            type: boolean
-      responses:
-        '200':
-          content:
-            application/json; Elastic-Api-Version=2023-10-31:
-              schema:
-                additionalProperties: false
-                type: object
-                properties:
-                  item:
-                    additionalProperties: true
-                    type: object
-                    properties:
-                      agent:
-                        additionalProperties: false
-                        type: object
-                        properties:
-                          privileges:
-                            additionalProperties: false
-                            type: object
-                            properties:
-                              root:
-                                type: boolean
-                      asset_tags:
-                        items:
-                          additionalProperties: false
-                          type: object
-                          properties:
-                            asset_ids:
-                              items:
-                                type: string
-                              type: array
-                            asset_types:
-                              items:
-                                type: string
-                              type: array
-                            text:
-                              type: string
-                          required:
-                            - text
-                        type: array
-                      assets:
-                        additionalProperties: {}
-                        type: object
-                      categories:
-                        items:
-                          type: string
-                        type: array
-                      conditions:
-                        additionalProperties: true
-                        type: object
-                        properties:
-                          elastic:
-                            additionalProperties: true
-                            type: object
-                            properties:
-                              capabilities:
-                                items:
-                                  type: string
-                                type: array
-                              subscription:
-                                type: string
-                          kibana:
-                            additionalProperties: true
-                            type: object
-                            properties:
-                              version:
-                                type: string
-                      data_streams:
-                        items:
-                          additionalProperties: {}
-                          type: object
-                        type: array
-                      description:
-                        type: string
-                      discovery:
-                        additionalProperties: true
-                        type: object
-                        properties:
-                          fields:
-                            items:
-                              additionalProperties: true
-                              type: object
-                              properties:
-                                name:
-                                  type: string
-                              required:
-                                - name
-                            type: array
-                      download:
-                        type: string
-                      elasticsearch:
-                        additionalProperties: {}
-                        type: object
-                      format_version:
-                        type: string
-                      icons:
-                        items:
-                          additionalProperties: true
-                          type: object
-                          properties:
-                            dark_mode:
-                              type: boolean
-                            path:
-                              type: string
-                            size:
-                              type: string
-                            src:
-                              type: string
-                            title:
-                              type: string
-                            type:
-                              type: string
-                          required:
-                            - src
-                        type: array
-                      installationInfo:
-                        additionalProperties: true
-                        type: object
-                        properties:
-                          additional_spaces_installed_kibana:
-                            additionalProperties:
-                              items:
-                                additionalProperties: true
-                                type: object
-                                properties:
-                                  id:
-                                    type: string
-                                  originId:
-                                    type: string
-                                  type:
-                                    enum:
-                                      - dashboard
-                                      - lens
-                                      - visualization
-                                      - search
-                                      - index-pattern
-                                      - map
-                                      - ml-module
-                                      - security-rule
-                                      - csp-rule-template
-                                      - osquery-pack-asset
-                                      - osquery-saved-query
-                                      - tag
-                                    type: string
-                                required:
-                                  - id
-                                  - type
-                              type: array
-                            type: object
-                          created_at:
-                            type: string
-                          experimental_data_stream_features:
-                            items:
-                              additionalProperties: true
-                              type: object
-                              properties:
-                                data_stream:
-                                  type: string
-                                features:
-                                  additionalProperties: true
-                                  type: object
-                                  properties:
-                                    doc_value_only_numeric:
-                                      type: boolean
-                                    doc_value_only_other:
-                                      type: boolean
-                                    synthetic_source:
-                                      type: boolean
-                                    tsdb:
-                                      type: boolean
-                              required:
-                                - data_stream
-                                - features
-                            type: array
-                          install_format_schema_version:
-                            type: string
-                          install_source:
-                            enum:
-                              - registry
-                              - upload
-                              - bundled
-                              - custom
-                            type: string
-                          install_status:
-                            enum:
-                              - installed
-                              - installing
-                              - install_failed
-                            type: string
-                          installed_es:
-                            items:
-                              additionalProperties: true
-                              type: object
-                              properties:
-                                deferred:
-                                  type: boolean
-                                id:
-                                  type: string
-                                type:
-                                  enum:
-                                    - index
-                                    - index_template
-                                    - component_template
-                                    - ingest_pipeline
-                                    - ilm_policy
-                                    - data_stream_ilm_policy
-                                    - transform
-                                    - ml_model
-                                  type: string
-                                version:
-                                  type: string
-                              required:
-                                - id
-                                - type
-                            type: array
-                          installed_kibana:
-                            items:
-                              additionalProperties: true
-                              type: object
-                              properties:
-                                id:
-                                  type: string
-                                originId:
-                                  type: string
-                                type:
-                                  enum:
-                                    - dashboard
-                                    - lens
-                                    - visualization
-                                    - search
-                                    - index-pattern
-                                    - map
-                                    - ml-module
-                                    - security-rule
-                                    - csp-rule-template
-                                    - osquery-pack-asset
-                                    - osquery-saved-query
-                                    - tag
-                                  type: string
-                              required:
-                                - id
-                                - type
-                            type: array
-                          installed_kibana_space_id:
-                            type: string
-                          latest_executed_state:
-                            additionalProperties: true
-                            type: object
-                            properties:
-                              error:
-                                type: string
-                              name:
-                                type: string
-                              started_at:
-                                type: string
-                            required:
-                              - name
-                              - started_at
-                          latest_install_failed_attempts:
-                            items:
-                              additionalProperties: true
-                              type: object
-                              properties:
-                                created_at:
-                                  type: string
-                                error:
-                                  additionalProperties: true
-                                  type: object
-                                  properties:
-                                    message:
-                                      type: string
-                                    name:
-                                      type: string
-                                    stack:
-                                      type: string
-                                  required:
-                                    - name
-                                    - message
-                                target_version:
-                                  type: string
-                              required:
-                                - created_at
-                                - target_version
-                                - error
-                            type: array
-                          name:
-                            type: string
-                          namespaces:
-                            items:
-                              type: string
-                            type: array
-                          type:
-                            type: string
-                          updated_at:
-                            type: string
-                          verification_key_id:
-                            nullable: true
-                            type: string
-                          verification_status:
-                            enum:
-                              - unverified
-                              - verified
-                              - unknown
-                            type: string
-                          version:
-                            type: string
-                        required:
-                          - type
-                          - installed_kibana
-                          - installed_es
-                          - name
-                          - version
-                          - install_status
-                          - install_source
-                          - verification_status
-                      internal:
-                        type: boolean
-                      keepPoliciesUpToDate:
-                        type: boolean
-                      latestVersion:
-                        type: string
-                      license:
-                        type: string
-                      licensePath:
-                        type: string
-                      name:
-                        type: string
-                      notice:
-                        type: string
-                      owner:
-                        additionalProperties: true
-                        type: object
-                        properties:
-                          github:
-                            type: string
-                          type:
-                            enum:
-                              - elastic
-                              - partner
-                              - community
-                            type: string
-                      path:
-                        type: string
-                      policy_templates:
-                        items:
-                          additionalProperties: {}
-                          type: object
-                        type: array
-                      readme:
-                        type: string
-                      release:
-                        enum:
-                          - ga
-                          - beta
-                          - experimental
-                        type: string
-                      savedObject: {}
-                      screenshots:
-                        items:
-                          additionalProperties: false
-                          type: object
-                          properties:
-                            dark_mode:
-                              type: boolean
-                            path:
-                              type: string
-                            size:
-                              type: string
-                            src:
-                              type: string
-                            title:
-                              type: string
-                            type:
-                              type: string
-                          required:
-                            - src
-                        type: array
-                      signature_path:
-                        type: string
-                      source:
-                        additionalProperties: true
-                        type: object
-                        properties:
-                          license:
-                            type: string
-                        required:
-                          - license
-                      status:
-                        type: string
-                      title:
-                        type: string
-                      type:
-                        enum:
-                          - integration
-                          - input
-                          - content
-                        type: string
-                      vars:
-                        items:
-                          additionalProperties: {}
-                          type: object
-                        type: array
-                      version:
-                        type: string
-                    required:
-                      - savedObject
-                      - name
-                      - version
-                      - title
-                      - assets
-                  metadata:
-                    additionalProperties: false
-                    type: object
-                    properties:
-                      has_policies:
-                        type: boolean
-                    required:
-                      - has_policies
-                  response:
-                    additionalProperties: true
-                    deprecated: true
-                    type: object
-                    properties:
-                      agent:
-                        additionalProperties: false
-                        type: object
-                        properties:
-                          privileges:
-                            additionalProperties: false
-                            type: object
-                            properties:
-                              root:
-                                type: boolean
-                      asset_tags:
-                        items:
-                          additionalProperties: false
-                          type: object
-                          properties:
-                            asset_ids:
-                              items:
-                                type: string
-                              type: array
-                            asset_types:
-                              items:
-                                type: string
-                              type: array
-                            text:
-                              type: string
-                          required:
-                            - text
-                        type: array
-                      assets:
-                        additionalProperties: {}
-                        type: object
-                      categories:
-                        items:
-                          type: string
-                        type: array
-                      conditions:
-                        additionalProperties: true
-                        type: object
-                        properties:
-                          elastic:
-                            additionalProperties: true
-                            type: object
-                            properties:
-                              capabilities:
-                                items:
-                                  type: string
-                                type: array
-                              subscription:
-                                type: string
-                          kibana:
-                            additionalProperties: true
-                            type: object
-                            properties:
-                              version:
-                                type: string
-                      data_streams:
-                        items:
-                          additionalProperties: {}
-                          type: object
-                        type: array
-                      description:
-                        type: string
-                      discovery:
-                        additionalProperties: true
-                        type: object
-                        properties:
-                          fields:
-                            items:
-                              additionalProperties: true
-                              type: object
-                              properties:
-                                name:
-                                  type: string
-                              required:
-                                - name
-                            type: array
-                      download:
-                        type: string
-                      elasticsearch:
-                        additionalProperties: {}
-                        type: object
-                      format_version:
-                        type: string
-                      icons:
-                        items:
-                          additionalProperties: true
-                          type: object
-                          properties:
-                            dark_mode:
-                              type: boolean
-                            path:
-                              type: string
-                            size:
-                              type: string
-                            src:
-                              type: string
-                            title:
-                              type: string
-                            type:
-                              type: string
-                          required:
-                            - src
-                        type: array
-                      installationInfo:
-                        additionalProperties: true
-                        type: object
-                        properties:
-                          additional_spaces_installed_kibana:
-                            additionalProperties:
-                              items:
-                                additionalProperties: true
-                                type: object
-                                properties:
-                                  id:
-                                    type: string
-                                  originId:
-                                    type: string
-                                  type:
-                                    enum:
-                                      - dashboard
-                                      - lens
-                                      - visualization
-                                      - search
-                                      - index-pattern
-                                      - map
-                                      - ml-module
-                                      - security-rule
-                                      - csp-rule-template
-                                      - osquery-pack-asset
-                                      - osquery-saved-query
-                                      - tag
-                                    type: string
-                                required:
-                                  - id
-                                  - type
-                              type: array
-                            type: object
-                          created_at:
-                            type: string
-                          experimental_data_stream_features:
-                            items:
-                              additionalProperties: true
-                              type: object
-                              properties:
-                                data_stream:
-                                  type: string
-                                features:
-                                  additionalProperties: true
-                                  type: object
-                                  properties:
-                                    doc_value_only_numeric:
-                                      type: boolean
-                                    doc_value_only_other:
-                                      type: boolean
-                                    synthetic_source:
-                                      type: boolean
-                                    tsdb:
-                                      type: boolean
-                              required:
-                                - data_stream
-                                - features
-                            type: array
-                          install_format_schema_version:
-                            type: string
-                          install_source:
-                            enum:
-                              - registry
-                              - upload
-                              - bundled
-                              - custom
-                            type: string
-                          install_status:
-                            enum:
-                              - installed
-                              - installing
-                              - install_failed
-                            type: string
-                          installed_es:
-                            items:
-                              additionalProperties: true
-                              type: object
-                              properties:
-                                deferred:
-                                  type: boolean
-                                id:
-                                  type: string
-                                type:
-                                  enum:
-                                    - index
-                                    - index_template
-                                    - component_template
-                                    - ingest_pipeline
-                                    - ilm_policy
-                                    - data_stream_ilm_policy
-                                    - transform
-                                    - ml_model
-                                  type: string
-                                version:
-                                  type: string
-                              required:
-                                - id
-                                - type
-                            type: array
-                          installed_kibana:
-                            items:
-                              additionalProperties: true
-                              type: object
-                              properties:
-                                id:
-                                  type: string
-                                originId:
-                                  type: string
-                                type:
-                                  enum:
-                                    - dashboard
-                                    - lens
-                                    - visualization
-                                    - search
-                                    - index-pattern
-                                    - map
-                                    - ml-module
-                                    - security-rule
-                                    - csp-rule-template
-                                    - osquery-pack-asset
-                                    - osquery-saved-query
-                                    - tag
-                                  type: string
-                              required:
-                                - id
-                                - type
-                            type: array
-                          installed_kibana_space_id:
-                            type: string
-                          latest_executed_state:
-                            additionalProperties: true
-                            type: object
-                            properties:
-                              error:
-                                type: string
-                              name:
-                                type: string
-                              started_at:
-                                type: string
-                            required:
-                              - name
-                              - started_at
-                          latest_install_failed_attempts:
-                            items:
-                              additionalProperties: true
-                              type: object
-                              properties:
-                                created_at:
-                                  type: string
-                                error:
-                                  additionalProperties: true
-                                  type: object
-                                  properties:
-                                    message:
-                                      type: string
-                                    name:
-                                      type: string
-                                    stack:
-                                      type: string
-                                  required:
-                                    - name
-                                    - message
-                                target_version:
-                                  type: string
-                              required:
-                                - created_at
-                                - target_version
-                                - error
-                            type: array
-                          name:
-                            type: string
-                          namespaces:
-                            items:
+                required:
+                  - items
+        '400':
+          content:
+            application/json; Elastic-Api-Version=2023-10-31:
+              schema:
+                additionalProperties: false
+                description: Generic Error
+                type: object
+                properties:
+                  error:
+                    type: string
+                  message:
+                    type: string
+                  statusCode:
+                    type: number
+                required:
+                  - message
+      summary: ''
+      tags:
+        - Elastic Package Manager (EPM)
+    post:
+      description: Install package by upload
+      operationId: post-fleet-epm-packages
+      parameters:
+        - description: The version of the API to use
+          in: header
+          name: elastic-api-version
+          schema:
+            default: '2023-10-31'
+            enum:
+              - '2023-10-31'
+            type: string
+        - description: A required header to protect against CSRF attacks
+          in: header
+          name: kbn-xsrf
+          required: true
+          schema:
+            example: 'true'
+            type: string
+        - in: query
+          name: ignoreMappingUpdateErrors
+          required: false
+          schema:
+            default: false
+            type: boolean
+        - in: query
+          name: skipDataStreamRollover
+          required: false
+          schema:
+            default: false
+            type: boolean
+      requestBody:
+        content:
+          application/gzip; application/zip; Elastic-Api-Version=2023-10-31:
+            schema:
+              format: binary
+              type: string
+      responses:
+        '200':
+          content:
+            application/gzip; application/zip; Elastic-Api-Version=2023-10-31:
+              schema:
+                additionalProperties: false
+                type: object
+                properties:
+                  _meta:
+                    additionalProperties: false
+                    type: object
+                    properties:
+                      install_source:
+                        type: string
+                    required:
+                      - install_source
+                  items:
+                    items:
+                      anyOf:
+                        - additionalProperties: false
+                          type: object
+                          properties:
+                            id:
                               type: string
-                            type: array
-                          type:
-                            type: string
-                          updated_at:
-                            type: string
-                          verification_key_id:
-                            nullable: true
-                            type: string
-                          verification_status:
-                            enum:
-                              - unverified
-                              - verified
-                              - unknown
+                            originId:
+                              type: string
+                            type:
+                              enum:
+                                - dashboard
+                                - lens
+                                - visualization
+                                - search
+                                - index-pattern
+                                - map
+                                - ml-module
+                                - security-rule
+                                - csp-rule-template
+                                - osquery-pack-asset
+                                - osquery-saved-query
+                                - tag
+                              type: string
+                          required:
+                            - id
+                            - type
+                        - additionalProperties: false
+                          type: object
+                          properties:
+                            deferred:
+                              type: boolean
+                            id:
+                              type: string
+                            type:
+                              enum:
+                                - index
+                                - index_template
+                                - component_template
+                                - ingest_pipeline
+                                - ilm_policy
+                                - data_stream_ilm_policy
+                                - transform
+                                - ml_model
+                              type: string
+                            version:
+                              type: string
+                          required:
+                            - id
+                            - type
+                    type: array
+                required:
+                  - items
+                  - _meta
+        '400':
+          content:
+            application/gzip; application/zip; Elastic-Api-Version=2023-10-31:
+              schema:
+                additionalProperties: false
+                description: Generic Error
+                type: object
+                properties:
+                  error:
+                    type: string
+                  message:
+                    type: string
+                  statusCode:
+                    type: number
+                required:
+                  - message
+      summary: ''
+      tags:
+        - Elastic Package Manager (EPM)
+  /api/fleet/epm/packages/_bulk:
+    post:
+      description: Bulk install packages
+      operationId: post-fleet-epm-packages-bulk
+      parameters:
+        - description: The version of the API to use
+          in: header
+          name: elastic-api-version
+          schema:
+            default: '2023-10-31'
+            enum:
+              - '2023-10-31'
+            type: string
+        - description: A required header to protect against CSRF attacks
+          in: header
+          name: kbn-xsrf
+          required: true
+          schema:
+            example: 'true'
+            type: string
+        - in: query
+          name: prerelease
+          required: false
+          schema:
+            type: boolean
+      requestBody:
+        content:
+          application/json; Elastic-Api-Version=2023-10-31:
+            schema:
+              additionalProperties: false
+              type: object
+              properties:
+                force:
+                  default: false
+                  type: boolean
+                packages:
+                  items:
+                    anyOf:
+                      - type: string
+                      - additionalProperties: false
+                        type: object
+                        properties:
+                          name:
                             type: string
+                          prerelease:
+                            type: boolean
                           version:
                             type: string
                         required:
-                          - type
-                          - installed_kibana
-                          - installed_es
                           - name
                           - version
-                          - install_status
-                          - install_source
-                          - verification_status
-                      internal:
-                        type: boolean
-                      keepPoliciesUpToDate:
-                        type: boolean
-                      latestVersion:
-                        type: string
-                      license:
-                        type: string
-                      licensePath:
-                        type: string
-                      name:
-                        type: string
-                      notice:
-                        type: string
-                      owner:
-                        additionalProperties: true
-                        type: object
-                        properties:
-                          github:
-                            type: string
-                          type:
-                            enum:
-                              - elastic
-                              - partner
-                              - community
-                            type: string
-                      path:
-                        type: string
-                      policy_templates:
-                        items:
-                          additionalProperties: {}
+                  minItems: 1
+                  type: array
+              required:
+                - packages
+      responses:
+        '200':
+          content:
+            application/json; Elastic-Api-Version=2023-10-31:
+              schema:
+                additionalProperties: false
+                type: object
+                properties:
+                  items:
+                    items:
+                      anyOf:
+                        - additionalProperties: false
                           type: object
-                        type: array
-                      readme:
-                        type: string
-                      release:
-                        enum:
-                          - ga
-                          - beta
-                          - experimental
-                        type: string
-                      savedObject: {}
-                      screenshots:
-                        items:
-                          additionalProperties: false
+                          properties:
+                            name:
+                              type: string
+                            result:
+                              additionalProperties: false
+                              type: object
+                              properties:
+                                assets:
+                                  items:
+                                    anyOf:
+                                      - additionalProperties: false
+                                        type: object
+                                        properties:
+                                          id:
+                                            type: string
+                                          originId:
+                                            type: string
+                                          type:
+                                            enum:
+                                              - dashboard
+                                              - lens
+                                              - visualization
+                                              - search
+                                              - index-pattern
+                                              - map
+                                              - ml-module
+                                              - security-rule
+                                              - csp-rule-template
+                                              - osquery-pack-asset
+                                              - osquery-saved-query
+                                              - tag
+                                            type: string
+                                        required:
+                                          - id
+                                          - type
+                                      - additionalProperties: false
+                                        type: object
+                                        properties:
+                                          deferred:
+                                            type: boolean
+                                          id:
+                                            type: string
+                                          type:
+                                            enum:
+                                              - index
+                                              - index_template
+                                              - component_template
+                                              - ingest_pipeline
+                                              - ilm_policy
+                                              - data_stream_ilm_policy
+                                              - transform
+                                              - ml_model
+                                            type: string
+                                          version:
+                                            type: string
+                                        required:
+                                          - id
+                                          - type
+                                  type: array
+                                error: {}
+                                installSource:
+                                  type: string
+                                installType:
+                                  type: string
+                                status:
+                                  enum:
+                                    - installed
+                                    - already_installed
+                                  type: string
+                              required:
+                                - error
+                                - installType
+                            version:
+                              type: string
+                          required:
+                            - name
+                            - version
+                            - result
+                        - additionalProperties: false
                           type: object
                           properties:
-                            dark_mode:
-                              type: boolean
-                            path:
-                              type: string
-                            size:
-                              type: string
-                            src:
-                              type: string
-                            title:
-                              type: string
-                            type:
+                            error:
+                              anyOf:
+                                - type: string
+                                - {}
+                            name:
                               type: string
+                            statusCode:
+                              type: number
                           required:
-                            - src
-                        type: array
-                      signature_path:
-                        type: string
-                      source:
-                        additionalProperties: true
-                        type: object
-                        properties:
-                          license:
-                            type: string
-                        required:
-                          - license
-                      status:
-                        type: string
-                      title:
-                        type: string
-                      type:
-                        enum:
-                          - integration
-                          - input
-                          - content
-                        type: string
-                      vars:
-                        items:
-                          additionalProperties: {}
-                          type: object
-                        type: array
-                      version:
-                        type: string
-                    required:
-                      - savedObject
-                      - name
-                      - version
-                      - title
-                      - assets
+                            - name
+                            - statusCode
+                            - error
+                    type: array
                 required:
-                  - item
+                  - items
         '400':
           content:
             application/json; Elastic-Api-Version=2023-10-31:
@@ -21197,9 +19221,10 @@ paths:
       summary: ''
       tags:
         - Elastic Package Manager (EPM)
-    post:
-      description: Install package from registry
-      operationId: post-fleet-epm-packages-pkgname-pkgversion
+  /api/fleet/epm/packages/{pkgName}/{pkgVersion}:
+    delete:
+      description: Delete package
+      operationId: delete-fleet-epm-packages-pkgname-pkgversion
       parameters:
         - description: The version of the API to use
           in: header
@@ -21223,40 +19248,14 @@ paths:
             type: string
         - in: path
           name: pkgVersion
-          required: true
-          schema:
-            type: string
-        - in: query
-          name: prerelease
           required: false
           schema:
-            type: boolean
-        - in: query
-          name: ignoreMappingUpdateErrors
-          required: false
-          schema:
-            default: false
-            type: boolean
+            type: string
         - in: query
-          name: skipDataStreamRollover
+          name: force
           required: false
           schema:
-            default: false
             type: boolean
-      requestBody:
-        content:
-          application/json; Elastic-Api-Version=2023-10-31:
-            schema:
-              additionalProperties: false
-              nullable: true
-              type: object
-              properties:
-                force:
-                  default: false
-                  type: boolean
-                ignore_constraints:
-                  default: false
-                  type: boolean
       responses:
         '200':
           content:
@@ -21265,14 +19264,6 @@ paths:
                 additionalProperties: false
                 type: object
                 properties:
-                  _meta:
-                    additionalProperties: false
-                    type: object
-                    properties:
-                      install_source:
-                        type: string
-                    required:
-                      - install_source
                   items:
                     items:
                       anyOf:
@@ -21325,62 +19316,8 @@ paths:
                             - id
                             - type
                     type: array
-                  response:
-                    deprecated: true
-                    items:
-                      anyOf:
-                        - additionalProperties: false
-                          type: object
-                          properties:
-                            id:
-                              type: string
-                            originId:
-                              type: string
-                            type:
-                              enum:
-                                - dashboard
-                                - lens
-                                - visualization
-                                - search
-                                - index-pattern
-                                - map
-                                - ml-module
-                                - security-rule
-                                - csp-rule-template
-                                - osquery-pack-asset
-                                - osquery-saved-query
-                                - tag
-                              type: string
-                          required:
-                            - id
-                            - type
-                        - additionalProperties: false
-                          type: object
-                          properties:
-                            deferred:
-                              type: boolean
-                            id:
-                              type: string
-                            type:
-                              enum:
-                                - index
-                                - index_template
-                                - component_template
-                                - ingest_pipeline
-                                - ilm_policy
-                                - data_stream_ilm_policy
-                                - transform
-                                - ml_model
-                              type: string
-                            version:
-                              type: string
-                          required:
-                            - id
-                            - type
-                    type: array
                 required:
                   - items
-                  - _meta
         '400':
           content:
             application/json; Elastic-Api-Version=2023-10-31:
@@ -21400,9 +19337,9 @@ paths:
       summary: ''
       tags:
         - Elastic Package Manager (EPM)
-    put:
-      description: Update package settings
-      operationId: put-fleet-epm-packages-pkgname-pkgversion
+    get:
+      description: Get package
+      operationId: get-fleet-epm-packages-pkgname-pkgversion
       parameters:
         - description: The version of the API to use
           in: header
@@ -21412,13 +19349,6 @@ paths:
             enum:
               - '2023-10-31'
             type: string
-        - description: A required header to protect against CSRF attacks
-          in: header
-          name: kbn-xsrf
-          required: true
-          schema:
-            example: 'true'
-            type: string
         - in: path
           name: pkgName
           required: true
@@ -21426,20 +19356,30 @@ paths:
             type: string
         - in: path
           name: pkgVersion
-          required: true
+          required: false
           schema:
             type: string
-      requestBody:
-        content:
-          application/json; Elastic-Api-Version=2023-10-31:
-            schema:
-              additionalProperties: false
-              type: object
-              properties:
-                keepPoliciesUpToDate:
-                  type: boolean
-              required:
-                - keepPoliciesUpToDate
+        - in: query
+          name: ignoreUnverified
+          required: false
+          schema:
+            type: boolean
+        - in: query
+          name: prerelease
+          required: false
+          schema:
+            type: boolean
+        - in: query
+          name: full
+          required: false
+          schema:
+            type: boolean
+        - in: query
+          name: withMetadata
+          required: false
+          schema:
+            default: false
+            type: boolean
       responses:
         '200':
           content:
@@ -21796,7 +19736,6 @@ paths:
                           - beta
                           - experimental
                         type: string
-                      savedObject: {}
                       screenshots:
                         items:
                           additionalProperties: false
@@ -21845,14 +19784,239 @@ paths:
                       version:
                         type: string
                     required:
-                      - savedObject
                       - name
                       - version
                       - title
                       - assets
-                  response:
+                  metadata:
+                    additionalProperties: false
+                    type: object
+                    properties:
+                      has_policies:
+                        type: boolean
+                    required:
+                      - has_policies
+                required:
+                  - item
+        '400':
+          content:
+            application/json; Elastic-Api-Version=2023-10-31:
+              schema:
+                additionalProperties: false
+                description: Generic Error
+                type: object
+                properties:
+                  error:
+                    type: string
+                  message:
+                    type: string
+                  statusCode:
+                    type: number
+                required:
+                  - message
+      summary: ''
+      tags:
+        - Elastic Package Manager (EPM)
+    post:
+      description: Install package from registry
+      operationId: post-fleet-epm-packages-pkgname-pkgversion
+      parameters:
+        - description: The version of the API to use
+          in: header
+          name: elastic-api-version
+          schema:
+            default: '2023-10-31'
+            enum:
+              - '2023-10-31'
+            type: string
+        - description: A required header to protect against CSRF attacks
+          in: header
+          name: kbn-xsrf
+          required: true
+          schema:
+            example: 'true'
+            type: string
+        - in: path
+          name: pkgName
+          required: true
+          schema:
+            type: string
+        - in: path
+          name: pkgVersion
+          required: false
+          schema:
+            type: string
+        - in: query
+          name: prerelease
+          required: false
+          schema:
+            type: boolean
+        - in: query
+          name: ignoreMappingUpdateErrors
+          required: false
+          schema:
+            default: false
+            type: boolean
+        - in: query
+          name: skipDataStreamRollover
+          required: false
+          schema:
+            default: false
+            type: boolean
+      requestBody:
+        content:
+          application/json; Elastic-Api-Version=2023-10-31:
+            schema:
+              additionalProperties: false
+              nullable: true
+              type: object
+              properties:
+                force:
+                  default: false
+                  type: boolean
+                ignore_constraints:
+                  default: false
+                  type: boolean
+      responses:
+        '200':
+          content:
+            application/json; Elastic-Api-Version=2023-10-31:
+              schema:
+                additionalProperties: false
+                type: object
+                properties:
+                  _meta:
+                    additionalProperties: false
+                    type: object
+                    properties:
+                      install_source:
+                        type: string
+                    required:
+                      - install_source
+                  items:
+                    items:
+                      anyOf:
+                        - additionalProperties: false
+                          type: object
+                          properties:
+                            id:
+                              type: string
+                            originId:
+                              type: string
+                            type:
+                              enum:
+                                - dashboard
+                                - lens
+                                - visualization
+                                - search
+                                - index-pattern
+                                - map
+                                - ml-module
+                                - security-rule
+                                - csp-rule-template
+                                - osquery-pack-asset
+                                - osquery-saved-query
+                                - tag
+                              type: string
+                          required:
+                            - id
+                            - type
+                        - additionalProperties: false
+                          type: object
+                          properties:
+                            deferred:
+                              type: boolean
+                            id:
+                              type: string
+                            type:
+                              enum:
+                                - index
+                                - index_template
+                                - component_template
+                                - ingest_pipeline
+                                - ilm_policy
+                                - data_stream_ilm_policy
+                                - transform
+                                - ml_model
+                              type: string
+                            version:
+                              type: string
+                          required:
+                            - id
+                            - type
+                    type: array
+                required:
+                  - items
+                  - _meta
+        '400':
+          content:
+            application/json; Elastic-Api-Version=2023-10-31:
+              schema:
+                additionalProperties: false
+                description: Generic Error
+                type: object
+                properties:
+                  error:
+                    type: string
+                  message:
+                    type: string
+                  statusCode:
+                    type: number
+                required:
+                  - message
+      summary: ''
+      tags:
+        - Elastic Package Manager (EPM)
+    put:
+      description: Update package settings
+      operationId: put-fleet-epm-packages-pkgname-pkgversion
+      parameters:
+        - description: The version of the API to use
+          in: header
+          name: elastic-api-version
+          schema:
+            default: '2023-10-31'
+            enum:
+              - '2023-10-31'
+            type: string
+        - description: A required header to protect against CSRF attacks
+          in: header
+          name: kbn-xsrf
+          required: true
+          schema:
+            example: 'true'
+            type: string
+        - in: path
+          name: pkgName
+          required: true
+          schema:
+            type: string
+        - in: path
+          name: pkgVersion
+          required: false
+          schema:
+            type: string
+      requestBody:
+        content:
+          application/json; Elastic-Api-Version=2023-10-31:
+            schema:
+              additionalProperties: false
+              type: object
+              properties:
+                keepPoliciesUpToDate:
+                  type: boolean
+              required:
+                - keepPoliciesUpToDate
+      responses:
+        '200':
+          content:
+            application/json; Elastic-Api-Version=2023-10-31:
+              schema:
+                additionalProperties: false
+                type: object
+                properties:
+                  item:
                     additionalProperties: true
-                    deprecated: true
                     type: object
                     properties:
                       agent:
@@ -22199,7 +20363,6 @@ paths:
                           - beta
                           - experimental
                         type: string
-                      savedObject: {}
                       screenshots:
                         items:
                           additionalProperties: false
@@ -22248,7 +20411,6 @@ paths:
                       version:
                         type: string
                     required:
-                      - savedObject
                       - name
                       - version
                       - title
@@ -22653,11 +20815,6 @@ paths:
                     items:
                       type: string
                     type: array
-                  response:
-                    deprecated: true
-                    items:
-                      type: string
-                    type: array
                 required:
                   - items
         '400':
@@ -23280,9 +21437,6 @@ paths:
               additionalProperties: false
               type: object
               properties:
-                host:
-                  format: uri
-                  type: string
                 id:
                   type: string
               required:
@@ -23295,9 +21449,6 @@ paths:
                 additionalProperties: false
                 type: object
                 properties:
-                  host:
-                    deprecated: true
-                    type: string
                   host_id:
                     type: string
                   name:
@@ -33088,10 +31239,6 @@ paths:
                         required:
                           - enabled
                           - is_preconfigured
-                      fleet_server_hosts:
-                        items:
-                          type: string
-                        type: array
                       has_seen_add_data_notice:
                         type: boolean
                       id:
@@ -33191,11 +31338,6 @@ paths:
                   required:
                     - enabled
                     - is_preconfigured
-                fleet_server_hosts:
-                  items:
-                    format: uri
-                    type: string
-                  type: array
                 has_seen_add_data_notice:
                   type: boolean
                 kibana_ca_sha256:
@@ -33230,10 +31372,6 @@ paths:
                         required:
                           - enabled
                           - is_preconfigured
-                      fleet_server_hosts:
-                        items:
-                          type: string
-                        type: array
                       has_seen_add_data_notice:
                         type: boolean
                       id:
diff --git a/oas_docs/output/kibana.yaml b/oas_docs/output/kibana.yaml
index 6122607df925f..64d227b91979d 100644
--- a/oas_docs/output/kibana.yaml
+++ b/oas_docs/output/kibana.yaml
@@ -21274,44 +21274,6 @@ paths:
                         - active
                         - created_at
                     type: array
-                  list:
-                    deprecated: true
-                    items:
-                      additionalProperties: false
-                      type: object
-                      properties:
-                        active:
-                          description: >-
-                            When false, the enrollment API key is revoked and
-                            cannot be used for enrolling Elastic Agents.
-                          type: boolean
-                        api_key:
-                          description: >-
-                            The enrollment API key (token) used for enrolling
-                            Elastic Agents.
-                          type: string
-                        api_key_id:
-                          description: The ID of the API key in the Security API.
-                          type: string
-                        created_at:
-                          type: string
-                        id:
-                          type: string
-                        name:
-                          description: The name of the enrollment API key.
-                          type: string
-                        policy_id:
-                          description: >-
-                            The ID of the agent policy the Elastic Agent will be
-                            enrolled in.
-                          type: string
-                      required:
-                        - id
-                        - api_key_id
-                        - api_key
-                        - active
-                        - created_at
-                    type: array
                   page:
                     type: number
                   perPage:
@@ -21323,7 +21285,6 @@ paths:
                   - total
                   - page
                   - perPage
-                  - list
         '400':
           content:
             application/json; Elastic-Api-Version=2023-10-31:
@@ -21585,120 +21546,6 @@ paths:
       summary: ''
       tags:
         - Fleet enrollment API keys
-  /api/fleet/enrollment-api-keys:
-    get:
-      operationId: get-fleet-enrollment-api-keys-2
-      parameters:
-        - description: The version of the API to use
-          in: header
-          name: elastic-api-version
-          schema:
-            default: '2023-10-31'
-            enum:
-              - '2023-10-31'
-            type: string
-        - in: query
-          name: page
-          required: false
-          schema:
-            default: 1
-            type: number
-        - in: query
-          name: perPage
-          required: false
-          schema:
-            default: 20
-            type: number
-        - in: query
-          name: kuery
-          required: false
-          schema:
-            type: string
-      responses: {}
-      summary: ''
-      tags: []
-    post:
-      operationId: post-fleet-enrollment-api-keys-2
-      parameters:
-        - description: The version of the API to use
-          in: header
-          name: elastic-api-version
-          schema:
-            default: '2023-10-31'
-            enum:
-              - '2023-10-31'
-            type: string
-        - description: A required header to protect against CSRF attacks
-          in: header
-          name: kbn-xsrf
-          required: true
-          schema:
-            example: 'true'
-            type: string
-      requestBody:
-        content:
-          application/json; Elastic-Api-Version=2023-10-31:
-            schema:
-              additionalProperties: false
-              type: object
-              properties:
-                expiration:
-                  type: string
-                name:
-                  type: string
-                policy_id:
-                  type: string
-              required:
-                - policy_id
-      responses: {}
-      summary: ''
-      tags: []
-  /api/fleet/enrollment-api-keys/{keyId}:
-    delete:
-      operationId: delete-fleet-enrollment-api-keys-keyid-2
-      parameters:
-        - description: The version of the API to use
-          in: header
-          name: elastic-api-version
-          schema:
-            default: '2023-10-31'
-            enum:
-              - '2023-10-31'
-            type: string
-        - description: A required header to protect against CSRF attacks
-          in: header
-          name: kbn-xsrf
-          required: true
-          schema:
-            example: 'true'
-            type: string
-        - in: path
-          name: keyId
-          required: true
-          schema:
-            type: string
-      responses: {}
-      summary: ''
-      tags: []
-    get:
-      operationId: get-fleet-enrollment-api-keys-keyid-2
-      parameters:
-        - description: The version of the API to use
-          in: header
-          name: elastic-api-version
-          schema:
-            default: '2023-10-31'
-            enum:
-              - '2023-10-31'
-            type: string
-        - in: path
-          name: keyId
-          required: true
-          schema:
-            type: string
-      responses: {}
-      summary: ''
-      tags: []
   /api/fleet/epm/bulk_assets:
     post:
       description: Bulk get assets
@@ -21816,11 +21663,6 @@ paths:
           required: false
           schema:
             type: boolean
-        - in: query
-          name: experimental
-          required: false
-          schema:
-            type: boolean
         - in: query
           name: include_policy_templates
           required: false
@@ -21854,27 +21696,6 @@ paths:
                         - title
                         - count
                     type: array
-                  response:
-                    items:
-                      additionalProperties: false
-                      deprecated: true
-                      type: object
-                      properties:
-                        count:
-                          type: number
-                        id:
-                          type: string
-                        parent_id:
-                          type: string
-                        parent_title:
-                          type: string
-                        title:
-                          type: string
-                      required:
-                        - id
-                        - title
-                        - count
-                    type: array
                 required:
                   - items
         '400':
@@ -22017,59 +21838,6 @@ paths:
                             - id
                             - type
                     type: array
-                  response:
-                    deprecated: true
-                    items:
-                      anyOf:
-                        - additionalProperties: false
-                          type: object
-                          properties:
-                            id:
-                              type: string
-                            originId:
-                              type: string
-                            type:
-                              enum:
-                                - dashboard
-                                - lens
-                                - visualization
-                                - search
-                                - index-pattern
-                                - map
-                                - ml-module
-                                - security-rule
-                                - csp-rule-template
-                                - osquery-pack-asset
-                                - osquery-saved-query
-                                - tag
-                              type: string
-                          required:
-                            - id
-                            - type
-                        - additionalProperties: false
-                          type: object
-                          properties:
-                            deferred:
-                              type: boolean
-                            id:
-                              type: string
-                            type:
-                              enum:
-                                - index
-                                - index_template
-                                - component_template
-                                - ingest_pipeline
-                                - ilm_policy
-                                - data_stream_ilm_policy
-                                - transform
-                                - ml_model
-                              type: string
-                            version:
-                              type: string
-                          required:
-                            - id
-                            - type
-                    type: array
                 required:
                   - items
                   - _meta
@@ -22198,11 +21966,6 @@ paths:
           required: false
           schema:
             type: boolean
-        - in: query
-          name: experimental
-          required: false
-          schema:
-            type: boolean
         - in: query
           name: excludeInstallStatus
           required: false
@@ -22527,7 +22290,6 @@ paths:
                             - beta
                             - experimental
                           type: string
-                        savedObject: {}
                         signature_path:
                           type: string
                         source:
@@ -22556,2061 +22318,323 @@ paths:
                         version:
                           type: string
                       required:
-                        - savedObject
                         - name
                         - version
                         - title
                         - id
                     type: array
-                  response:
-                    items:
-                      additionalProperties: true
-                      deprecated: true
-                      type: object
-                      properties:
-                        categories:
-                          items:
-                            type: string
-                          type: array
-                        conditions:
-                          additionalProperties: true
-                          type: object
-                          properties:
-                            elastic:
-                              additionalProperties: true
-                              type: object
-                              properties:
-                                capabilities:
-                                  items:
-                                    type: string
-                                  type: array
-                                subscription:
-                                  type: string
-                            kibana:
-                              additionalProperties: true
-                              type: object
-                              properties:
-                                version:
-                                  type: string
-                        data_streams:
-                          items:
-                            additionalProperties: {}
-                            type: object
-                          type: array
-                        description:
-                          type: string
-                        discovery:
-                          additionalProperties: true
-                          type: object
-                          properties:
-                            fields:
-                              items:
-                                additionalProperties: true
-                                type: object
-                                properties:
-                                  name:
-                                    type: string
-                                required:
-                                  - name
-                              type: array
-                        download:
-                          type: string
-                        format_version:
-                          type: string
-                        icons:
-                          items:
-                            additionalProperties: true
-                            type: object
-                            properties:
-                              dark_mode:
-                                type: boolean
-                              path:
-                                type: string
-                              size:
-                                type: string
-                              src:
-                                type: string
-                              title:
-                                type: string
-                              type:
-                                type: string
-                            required:
-                              - src
-                          type: array
-                        id:
-                          type: string
-                        installationInfo:
-                          additionalProperties: true
-                          type: object
-                          properties:
-                            additional_spaces_installed_kibana:
-                              additionalProperties:
-                                items:
-                                  additionalProperties: true
-                                  type: object
-                                  properties:
-                                    id:
-                                      type: string
-                                    originId:
-                                      type: string
-                                    type:
-                                      enum:
-                                        - dashboard
-                                        - lens
-                                        - visualization
-                                        - search
-                                        - index-pattern
-                                        - map
-                                        - ml-module
-                                        - security-rule
-                                        - csp-rule-template
-                                        - osquery-pack-asset
-                                        - osquery-saved-query
-                                        - tag
-                                      type: string
-                                  required:
-                                    - id
-                                    - type
-                                type: array
-                              type: object
-                            created_at:
-                              type: string
-                            experimental_data_stream_features:
-                              items:
-                                additionalProperties: true
-                                type: object
-                                properties:
-                                  data_stream:
-                                    type: string
-                                  features:
-                                    additionalProperties: true
-                                    type: object
-                                    properties:
-                                      doc_value_only_numeric:
-                                        type: boolean
-                                      doc_value_only_other:
-                                        type: boolean
-                                      synthetic_source:
-                                        type: boolean
-                                      tsdb:
-                                        type: boolean
-                                required:
-                                  - data_stream
-                                  - features
-                              type: array
-                            install_format_schema_version:
-                              type: string
-                            install_source:
-                              enum:
-                                - registry
-                                - upload
-                                - bundled
-                                - custom
-                              type: string
-                            install_status:
-                              enum:
-                                - installed
-                                - installing
-                                - install_failed
-                              type: string
-                            installed_es:
-                              items:
-                                additionalProperties: true
-                                type: object
-                                properties:
-                                  deferred:
-                                    type: boolean
-                                  id:
-                                    type: string
-                                  type:
-                                    enum:
-                                      - index
-                                      - index_template
-                                      - component_template
-                                      - ingest_pipeline
-                                      - ilm_policy
-                                      - data_stream_ilm_policy
-                                      - transform
-                                      - ml_model
-                                    type: string
-                                  version:
-                                    type: string
-                                required:
-                                  - id
-                                  - type
-                              type: array
-                            installed_kibana:
-                              items:
-                                additionalProperties: true
-                                type: object
-                                properties:
-                                  id:
-                                    type: string
-                                  originId:
-                                    type: string
-                                  type:
-                                    enum:
-                                      - dashboard
-                                      - lens
-                                      - visualization
-                                      - search
-                                      - index-pattern
-                                      - map
-                                      - ml-module
-                                      - security-rule
-                                      - csp-rule-template
-                                      - osquery-pack-asset
-                                      - osquery-saved-query
-                                      - tag
-                                    type: string
-                                required:
-                                  - id
-                                  - type
-                              type: array
-                            installed_kibana_space_id:
-                              type: string
-                            latest_executed_state:
-                              additionalProperties: true
-                              type: object
-                              properties:
-                                error:
-                                  type: string
-                                name:
-                                  type: string
-                                started_at:
-                                  type: string
-                              required:
-                                - name
-                                - started_at
-                            latest_install_failed_attempts:
-                              items:
-                                additionalProperties: true
-                                type: object
-                                properties:
-                                  created_at:
-                                    type: string
-                                  error:
-                                    additionalProperties: true
-                                    type: object
-                                    properties:
-                                      message:
-                                        type: string
-                                      name:
-                                        type: string
-                                      stack:
-                                        type: string
-                                    required:
-                                      - name
-                                      - message
-                                  target_version:
-                                    type: string
-                                required:
-                                  - created_at
-                                  - target_version
-                                  - error
-                              type: array
-                            name:
-                              type: string
-                            namespaces:
-                              items:
-                                type: string
-                              type: array
-                            type:
-                              type: string
-                            updated_at:
-                              type: string
-                            verification_key_id:
-                              nullable: true
-                              type: string
-                            verification_status:
-                              enum:
-                                - unverified
-                                - verified
-                                - unknown
-                              type: string
-                            version:
-                              type: string
-                          required:
-                            - type
-                            - installed_kibana
-                            - installed_es
-                            - name
-                            - version
-                            - install_status
-                            - install_source
-                            - verification_status
-                        integration:
-                          type: string
-                        internal:
-                          type: boolean
-                        latestVersion:
-                          type: string
-                        name:
-                          type: string
-                        owner:
-                          additionalProperties: true
-                          type: object
-                          properties:
-                            github:
-                              type: string
-                            type:
-                              enum:
-                                - elastic
-                                - partner
-                                - community
-                              type: string
-                        path:
-                          type: string
-                        policy_templates:
-                          items:
-                            additionalProperties: {}
-                            type: object
-                          type: array
-                        readme:
-                          type: string
-                        release:
-                          enum:
-                            - ga
-                            - beta
-                            - experimental
-                          type: string
-                        savedObject: {}
-                        signature_path:
-                          type: string
-                        source:
-                          additionalProperties: true
-                          type: object
-                          properties:
-                            license:
-                              type: string
-                          required:
-                            - license
-                        status:
-                          type: string
-                        title:
-                          type: string
-                        type:
-                          enum:
-                            - integration
-                            - input
-                            - content
-                          type: string
-                        vars:
-                          items:
-                            additionalProperties: {}
-                            type: object
-                          type: array
-                        version:
-                          type: string
-                      required:
-                        - savedObject
-                        - name
-                        - version
-                        - title
-                        - id
-                    type: array
-                required:
-                  - items
-        '400':
-          content:
-            application/json; Elastic-Api-Version=2023-10-31:
-              schema:
-                additionalProperties: false
-                description: Generic Error
-                type: object
-                properties:
-                  error:
-                    type: string
-                  message:
-                    type: string
-                  statusCode:
-                    type: number
-                required:
-                  - message
-      summary: ''
-      tags:
-        - Elastic Package Manager (EPM)
-    post:
-      description: Install package by upload
-      operationId: post-fleet-epm-packages
-      parameters:
-        - description: The version of the API to use
-          in: header
-          name: elastic-api-version
-          schema:
-            default: '2023-10-31'
-            enum:
-              - '2023-10-31'
-            type: string
-        - description: A required header to protect against CSRF attacks
-          in: header
-          name: kbn-xsrf
-          required: true
-          schema:
-            example: 'true'
-            type: string
-        - in: query
-          name: ignoreMappingUpdateErrors
-          required: false
-          schema:
-            default: false
-            type: boolean
-        - in: query
-          name: skipDataStreamRollover
-          required: false
-          schema:
-            default: false
-            type: boolean
-      requestBody:
-        content:
-          application/gzip; application/zip; Elastic-Api-Version=2023-10-31:
-            schema:
-              format: binary
-              type: string
-      responses:
-        '200':
-          content:
-            application/gzip; application/zip; Elastic-Api-Version=2023-10-31:
-              schema:
-                additionalProperties: false
-                type: object
-                properties:
-                  _meta:
-                    additionalProperties: false
-                    type: object
-                    properties:
-                      install_source:
-                        type: string
-                    required:
-                      - install_source
-                  items:
-                    items:
-                      anyOf:
-                        - additionalProperties: false
-                          type: object
-                          properties:
-                            id:
-                              type: string
-                            originId:
-                              type: string
-                            type:
-                              enum:
-                                - dashboard
-                                - lens
-                                - visualization
-                                - search
-                                - index-pattern
-                                - map
-                                - ml-module
-                                - security-rule
-                                - csp-rule-template
-                                - osquery-pack-asset
-                                - osquery-saved-query
-                                - tag
-                              type: string
-                          required:
-                            - id
-                            - type
-                        - additionalProperties: false
-                          type: object
-                          properties:
-                            deferred:
-                              type: boolean
-                            id:
-                              type: string
-                            type:
-                              enum:
-                                - index
-                                - index_template
-                                - component_template
-                                - ingest_pipeline
-                                - ilm_policy
-                                - data_stream_ilm_policy
-                                - transform
-                                - ml_model
-                              type: string
-                            version:
-                              type: string
-                          required:
-                            - id
-                            - type
-                    type: array
-                  response:
-                    deprecated: true
-                    items:
-                      anyOf:
-                        - additionalProperties: false
-                          type: object
-                          properties:
-                            id:
-                              type: string
-                            originId:
-                              type: string
-                            type:
-                              enum:
-                                - dashboard
-                                - lens
-                                - visualization
-                                - search
-                                - index-pattern
-                                - map
-                                - ml-module
-                                - security-rule
-                                - csp-rule-template
-                                - osquery-pack-asset
-                                - osquery-saved-query
-                                - tag
-                              type: string
-                          required:
-                            - id
-                            - type
-                        - additionalProperties: false
-                          type: object
-                          properties:
-                            deferred:
-                              type: boolean
-                            id:
-                              type: string
-                            type:
-                              enum:
-                                - index
-                                - index_template
-                                - component_template
-                                - ingest_pipeline
-                                - ilm_policy
-                                - data_stream_ilm_policy
-                                - transform
-                                - ml_model
-                              type: string
-                            version:
-                              type: string
-                          required:
-                            - id
-                            - type
-                    type: array
-                required:
-                  - items
-                  - _meta
-        '400':
-          content:
-            application/gzip; application/zip; Elastic-Api-Version=2023-10-31:
-              schema:
-                additionalProperties: false
-                description: Generic Error
-                type: object
-                properties:
-                  error:
-                    type: string
-                  message:
-                    type: string
-                  statusCode:
-                    type: number
-                required:
-                  - message
-      summary: ''
-      tags:
-        - Elastic Package Manager (EPM)
-  /api/fleet/epm/packages/_bulk:
-    post:
-      description: Bulk install packages
-      operationId: post-fleet-epm-packages-bulk
-      parameters:
-        - description: The version of the API to use
-          in: header
-          name: elastic-api-version
-          schema:
-            default: '2023-10-31'
-            enum:
-              - '2023-10-31'
-            type: string
-        - description: A required header to protect against CSRF attacks
-          in: header
-          name: kbn-xsrf
-          required: true
-          schema:
-            example: 'true'
-            type: string
-        - in: query
-          name: prerelease
-          required: false
-          schema:
-            type: boolean
-      requestBody:
-        content:
-          application/json; Elastic-Api-Version=2023-10-31:
-            schema:
-              additionalProperties: false
-              type: object
-              properties:
-                force:
-                  default: false
-                  type: boolean
-                packages:
-                  items:
-                    anyOf:
-                      - type: string
-                      - additionalProperties: false
-                        type: object
-                        properties:
-                          name:
-                            type: string
-                          prerelease:
-                            type: boolean
-                          version:
-                            type: string
-                        required:
-                          - name
-                          - version
-                  minItems: 1
-                  type: array
-              required:
-                - packages
-      responses:
-        '200':
-          content:
-            application/json; Elastic-Api-Version=2023-10-31:
-              schema:
-                additionalProperties: false
-                type: object
-                properties:
-                  items:
-                    items:
-                      anyOf:
-                        - additionalProperties: false
-                          type: object
-                          properties:
-                            name:
-                              type: string
-                            result:
-                              additionalProperties: false
-                              type: object
-                              properties:
-                                assets:
-                                  items:
-                                    anyOf:
-                                      - additionalProperties: false
-                                        type: object
-                                        properties:
-                                          id:
-                                            type: string
-                                          originId:
-                                            type: string
-                                          type:
-                                            enum:
-                                              - dashboard
-                                              - lens
-                                              - visualization
-                                              - search
-                                              - index-pattern
-                                              - map
-                                              - ml-module
-                                              - security-rule
-                                              - csp-rule-template
-                                              - osquery-pack-asset
-                                              - osquery-saved-query
-                                              - tag
-                                            type: string
-                                        required:
-                                          - id
-                                          - type
-                                      - additionalProperties: false
-                                        type: object
-                                        properties:
-                                          deferred:
-                                            type: boolean
-                                          id:
-                                            type: string
-                                          type:
-                                            enum:
-                                              - index
-                                              - index_template
-                                              - component_template
-                                              - ingest_pipeline
-                                              - ilm_policy
-                                              - data_stream_ilm_policy
-                                              - transform
-                                              - ml_model
-                                            type: string
-                                          version:
-                                            type: string
-                                        required:
-                                          - id
-                                          - type
-                                  type: array
-                                error: {}
-                                installSource:
-                                  type: string
-                                installType:
-                                  type: string
-                                status:
-                                  enum:
-                                    - installed
-                                    - already_installed
-                                  type: string
-                              required:
-                                - error
-                                - installType
-                            version:
-                              type: string
-                          required:
-                            - name
-                            - version
-                            - result
-                        - additionalProperties: false
-                          type: object
-                          properties:
-                            error:
-                              anyOf:
-                                - type: string
-                                - {}
-                            name:
-                              type: string
-                            statusCode:
-                              type: number
-                          required:
-                            - name
-                            - statusCode
-                            - error
-                    type: array
-                  response:
-                    deprecated: true
-                    items:
-                      anyOf:
-                        - additionalProperties: false
-                          type: object
-                          properties:
-                            name:
-                              type: string
-                            result:
-                              additionalProperties: false
-                              type: object
-                              properties:
-                                assets:
-                                  items:
-                                    anyOf:
-                                      - additionalProperties: false
-                                        type: object
-                                        properties:
-                                          id:
-                                            type: string
-                                          originId:
-                                            type: string
-                                          type:
-                                            enum:
-                                              - dashboard
-                                              - lens
-                                              - visualization
-                                              - search
-                                              - index-pattern
-                                              - map
-                                              - ml-module
-                                              - security-rule
-                                              - csp-rule-template
-                                              - osquery-pack-asset
-                                              - osquery-saved-query
-                                              - tag
-                                            type: string
-                                        required:
-                                          - id
-                                          - type
-                                      - additionalProperties: false
-                                        type: object
-                                        properties:
-                                          deferred:
-                                            type: boolean
-                                          id:
-                                            type: string
-                                          type:
-                                            enum:
-                                              - index
-                                              - index_template
-                                              - component_template
-                                              - ingest_pipeline
-                                              - ilm_policy
-                                              - data_stream_ilm_policy
-                                              - transform
-                                              - ml_model
-                                            type: string
-                                          version:
-                                            type: string
-                                        required:
-                                          - id
-                                          - type
-                                  type: array
-                                error: {}
-                                installSource:
-                                  type: string
-                                installType:
-                                  type: string
-                                status:
-                                  enum:
-                                    - installed
-                                    - already_installed
-                                  type: string
-                              required:
-                                - error
-                                - installType
-                            version:
-                              type: string
-                          required:
-                            - name
-                            - version
-                            - result
-                        - additionalProperties: false
-                          type: object
-                          properties:
-                            error:
-                              anyOf:
-                                - type: string
-                                - {}
-                            name:
-                              type: string
-                            statusCode:
-                              type: number
-                          required:
-                            - name
-                            - statusCode
-                            - error
-                    type: array
-                required:
-                  - items
-        '400':
-          content:
-            application/json; Elastic-Api-Version=2023-10-31:
-              schema:
-                additionalProperties: false
-                description: Generic Error
-                type: object
-                properties:
-                  error:
-                    type: string
-                  message:
-                    type: string
-                  statusCode:
-                    type: number
-                required:
-                  - message
-      summary: ''
-      tags:
-        - Elastic Package Manager (EPM)
-  /api/fleet/epm/packages/{pkgkey}:
-    delete:
-      operationId: delete-fleet-epm-packages-pkgkey
-      parameters:
-        - description: The version of the API to use
-          in: header
-          name: elastic-api-version
-          schema:
-            default: '2023-10-31'
-            enum:
-              - '2023-10-31'
-            type: string
-        - description: A required header to protect against CSRF attacks
-          in: header
-          name: kbn-xsrf
-          required: true
-          schema:
-            example: 'true'
-            type: string
-        - in: path
-          name: pkgkey
-          required: true
-          schema:
-            type: string
-      requestBody:
-        content:
-          application/json; Elastic-Api-Version=2023-10-31:
-            schema:
-              additionalProperties: false
-              nullable: true
-              type: object
-              properties:
-                force:
-                  type: boolean
-              required:
-                - force
-      responses: {}
-      summary: ''
-      tags: []
-    get:
-      operationId: get-fleet-epm-packages-pkgkey
-      parameters:
-        - description: The version of the API to use
-          in: header
-          name: elastic-api-version
-          schema:
-            default: '2023-10-31'
-            enum:
-              - '2023-10-31'
-            type: string
-        - in: path
-          name: pkgkey
-          required: true
-          schema:
-            type: string
-        - in: query
-          name: ignoreUnverified
-          required: false
-          schema:
-            type: boolean
-        - in: query
-          name: prerelease
-          required: false
-          schema:
-            type: boolean
-        - in: query
-          name: full
-          required: false
-          schema:
-            type: boolean
-        - in: query
-          name: withMetadata
-          required: false
-          schema:
-            default: false
-            type: boolean
-      responses: {}
-      summary: ''
-      tags: []
-    post:
-      operationId: post-fleet-epm-packages-pkgkey
-      parameters:
-        - description: The version of the API to use
-          in: header
-          name: elastic-api-version
-          schema:
-            default: '2023-10-31'
-            enum:
-              - '2023-10-31'
-            type: string
-        - description: A required header to protect against CSRF attacks
-          in: header
-          name: kbn-xsrf
-          required: true
-          schema:
-            example: 'true'
-            type: string
-        - in: path
-          name: pkgkey
-          required: true
-          schema:
-            type: string
-        - in: query
-          name: prerelease
-          required: false
-          schema:
-            type: boolean
-        - in: query
-          name: ignoreMappingUpdateErrors
-          required: false
-          schema:
-            default: false
-            type: boolean
-        - in: query
-          name: skipDataStreamRollover
-          required: false
-          schema:
-            default: false
-            type: boolean
-      requestBody:
-        content:
-          application/json; Elastic-Api-Version=2023-10-31:
-            schema:
-              additionalProperties: false
-              nullable: true
-              type: object
-              properties:
-                force:
-                  type: boolean
-              required:
-                - force
-      responses: {}
-      summary: ''
-      tags: []
-    put:
-      operationId: put-fleet-epm-packages-pkgkey
-      parameters:
-        - description: The version of the API to use
-          in: header
-          name: elastic-api-version
-          schema:
-            default: '2023-10-31'
-            enum:
-              - '2023-10-31'
-            type: string
-        - description: A required header to protect against CSRF attacks
-          in: header
-          name: kbn-xsrf
-          required: true
-          schema:
-            example: 'true'
-            type: string
-        - in: path
-          name: pkgkey
-          required: true
-          schema:
-            type: string
-      requestBody:
-        content:
-          application/json; Elastic-Api-Version=2023-10-31:
-            schema:
-              additionalProperties: false
-              type: object
-              properties:
-                keepPoliciesUpToDate:
-                  type: boolean
-              required:
-                - keepPoliciesUpToDate
-      responses: {}
-      summary: ''
-      tags: []
-  /api/fleet/epm/packages/{pkgName}/{pkgVersion}:
-    delete:
-      description: Delete package
-      operationId: delete-fleet-epm-packages-pkgname-pkgversion
-      parameters:
-        - description: The version of the API to use
-          in: header
-          name: elastic-api-version
-          schema:
-            default: '2023-10-31'
-            enum:
-              - '2023-10-31'
-            type: string
-        - description: A required header to protect against CSRF attacks
-          in: header
-          name: kbn-xsrf
-          required: true
-          schema:
-            example: 'true'
-            type: string
-        - in: path
-          name: pkgName
-          required: true
-          schema:
-            type: string
-        - in: path
-          name: pkgVersion
-          required: true
-          schema:
-            type: string
-        - in: query
-          name: force
-          required: false
-          schema:
-            type: boolean
-      requestBody:
-        content:
-          application/json; Elastic-Api-Version=2023-10-31:
-            schema:
-              additionalProperties: false
-              nullable: true
-              type: object
-              properties:
-                force:
-                  type: boolean
-              required:
-                - force
-      responses:
-        '200':
-          content:
-            application/json; Elastic-Api-Version=2023-10-31:
-              schema:
-                additionalProperties: false
-                type: object
-                properties:
-                  items:
-                    items:
-                      anyOf:
-                        - additionalProperties: false
-                          type: object
-                          properties:
-                            id:
-                              type: string
-                            originId:
-                              type: string
-                            type:
-                              enum:
-                                - dashboard
-                                - lens
-                                - visualization
-                                - search
-                                - index-pattern
-                                - map
-                                - ml-module
-                                - security-rule
-                                - csp-rule-template
-                                - osquery-pack-asset
-                                - osquery-saved-query
-                                - tag
-                              type: string
-                          required:
-                            - id
-                            - type
-                        - additionalProperties: false
-                          type: object
-                          properties:
-                            deferred:
-                              type: boolean
-                            id:
-                              type: string
-                            type:
-                              enum:
-                                - index
-                                - index_template
-                                - component_template
-                                - ingest_pipeline
-                                - ilm_policy
-                                - data_stream_ilm_policy
-                                - transform
-                                - ml_model
-                              type: string
-                            version:
-                              type: string
-                          required:
-                            - id
-                            - type
-                    type: array
-                  response:
-                    deprecated: true
-                    items:
-                      anyOf:
-                        - additionalProperties: false
-                          type: object
-                          properties:
-                            id:
-                              type: string
-                            originId:
-                              type: string
-                            type:
-                              enum:
-                                - dashboard
-                                - lens
-                                - visualization
-                                - search
-                                - index-pattern
-                                - map
-                                - ml-module
-                                - security-rule
-                                - csp-rule-template
-                                - osquery-pack-asset
-                                - osquery-saved-query
-                                - tag
-                              type: string
-                          required:
-                            - id
-                            - type
-                        - additionalProperties: false
-                          type: object
-                          properties:
-                            deferred:
-                              type: boolean
-                            id:
-                              type: string
-                            type:
-                              enum:
-                                - index
-                                - index_template
-                                - component_template
-                                - ingest_pipeline
-                                - ilm_policy
-                                - data_stream_ilm_policy
-                                - transform
-                                - ml_model
-                              type: string
-                            version:
-                              type: string
-                          required:
-                            - id
-                            - type
-                    type: array
-                required:
-                  - items
-        '400':
-          content:
-            application/json; Elastic-Api-Version=2023-10-31:
-              schema:
-                additionalProperties: false
-                description: Generic Error
-                type: object
-                properties:
-                  error:
-                    type: string
-                  message:
-                    type: string
-                  statusCode:
-                    type: number
-                required:
-                  - message
-      summary: ''
-      tags:
-        - Elastic Package Manager (EPM)
-    get:
-      description: Get package
-      operationId: get-fleet-epm-packages-pkgname-pkgversion
-      parameters:
-        - description: The version of the API to use
-          in: header
-          name: elastic-api-version
-          schema:
-            default: '2023-10-31'
-            enum:
-              - '2023-10-31'
-            type: string
-        - in: path
-          name: pkgName
-          required: true
-          schema:
-            type: string
-        - in: path
-          name: pkgVersion
-          required: true
-          schema:
-            type: string
-        - in: query
-          name: ignoreUnverified
-          required: false
-          schema:
-            type: boolean
-        - in: query
-          name: prerelease
-          required: false
-          schema:
-            type: boolean
-        - in: query
-          name: full
-          required: false
-          schema:
-            type: boolean
-        - in: query
-          name: withMetadata
-          required: false
-          schema:
-            default: false
-            type: boolean
-      responses:
-        '200':
-          content:
-            application/json; Elastic-Api-Version=2023-10-31:
-              schema:
-                additionalProperties: false
-                type: object
-                properties:
-                  item:
-                    additionalProperties: true
-                    type: object
-                    properties:
-                      agent:
-                        additionalProperties: false
-                        type: object
-                        properties:
-                          privileges:
-                            additionalProperties: false
-                            type: object
-                            properties:
-                              root:
-                                type: boolean
-                      asset_tags:
-                        items:
-                          additionalProperties: false
-                          type: object
-                          properties:
-                            asset_ids:
-                              items:
-                                type: string
-                              type: array
-                            asset_types:
-                              items:
-                                type: string
-                              type: array
-                            text:
-                              type: string
-                          required:
-                            - text
-                        type: array
-                      assets:
-                        additionalProperties: {}
-                        type: object
-                      categories:
-                        items:
-                          type: string
-                        type: array
-                      conditions:
-                        additionalProperties: true
-                        type: object
-                        properties:
-                          elastic:
-                            additionalProperties: true
-                            type: object
-                            properties:
-                              capabilities:
-                                items:
-                                  type: string
-                                type: array
-                              subscription:
-                                type: string
-                          kibana:
-                            additionalProperties: true
-                            type: object
-                            properties:
-                              version:
-                                type: string
-                      data_streams:
-                        items:
-                          additionalProperties: {}
-                          type: object
-                        type: array
-                      description:
-                        type: string
-                      discovery:
-                        additionalProperties: true
-                        type: object
-                        properties:
-                          fields:
-                            items:
-                              additionalProperties: true
-                              type: object
-                              properties:
-                                name:
-                                  type: string
-                              required:
-                                - name
-                            type: array
-                      download:
-                        type: string
-                      elasticsearch:
-                        additionalProperties: {}
-                        type: object
-                      format_version:
-                        type: string
-                      icons:
-                        items:
-                          additionalProperties: true
-                          type: object
-                          properties:
-                            dark_mode:
-                              type: boolean
-                            path:
-                              type: string
-                            size:
-                              type: string
-                            src:
-                              type: string
-                            title:
-                              type: string
-                            type:
-                              type: string
-                          required:
-                            - src
-                        type: array
-                      installationInfo:
-                        additionalProperties: true
-                        type: object
-                        properties:
-                          additional_spaces_installed_kibana:
-                            additionalProperties:
-                              items:
-                                additionalProperties: true
-                                type: object
-                                properties:
-                                  id:
-                                    type: string
-                                  originId:
-                                    type: string
-                                  type:
-                                    enum:
-                                      - dashboard
-                                      - lens
-                                      - visualization
-                                      - search
-                                      - index-pattern
-                                      - map
-                                      - ml-module
-                                      - security-rule
-                                      - csp-rule-template
-                                      - osquery-pack-asset
-                                      - osquery-saved-query
-                                      - tag
-                                    type: string
-                                required:
-                                  - id
-                                  - type
-                              type: array
-                            type: object
-                          created_at:
-                            type: string
-                          experimental_data_stream_features:
-                            items:
-                              additionalProperties: true
-                              type: object
-                              properties:
-                                data_stream:
-                                  type: string
-                                features:
-                                  additionalProperties: true
-                                  type: object
-                                  properties:
-                                    doc_value_only_numeric:
-                                      type: boolean
-                                    doc_value_only_other:
-                                      type: boolean
-                                    synthetic_source:
-                                      type: boolean
-                                    tsdb:
-                                      type: boolean
-                              required:
-                                - data_stream
-                                - features
-                            type: array
-                          install_format_schema_version:
-                            type: string
-                          install_source:
-                            enum:
-                              - registry
-                              - upload
-                              - bundled
-                              - custom
-                            type: string
-                          install_status:
-                            enum:
-                              - installed
-                              - installing
-                              - install_failed
-                            type: string
-                          installed_es:
-                            items:
-                              additionalProperties: true
-                              type: object
-                              properties:
-                                deferred:
-                                  type: boolean
-                                id:
-                                  type: string
-                                type:
-                                  enum:
-                                    - index
-                                    - index_template
-                                    - component_template
-                                    - ingest_pipeline
-                                    - ilm_policy
-                                    - data_stream_ilm_policy
-                                    - transform
-                                    - ml_model
-                                  type: string
-                                version:
-                                  type: string
-                              required:
-                                - id
-                                - type
-                            type: array
-                          installed_kibana:
-                            items:
-                              additionalProperties: true
-                              type: object
-                              properties:
-                                id:
-                                  type: string
-                                originId:
-                                  type: string
-                                type:
-                                  enum:
-                                    - dashboard
-                                    - lens
-                                    - visualization
-                                    - search
-                                    - index-pattern
-                                    - map
-                                    - ml-module
-                                    - security-rule
-                                    - csp-rule-template
-                                    - osquery-pack-asset
-                                    - osquery-saved-query
-                                    - tag
-                                  type: string
-                              required:
-                                - id
-                                - type
-                            type: array
-                          installed_kibana_space_id:
-                            type: string
-                          latest_executed_state:
-                            additionalProperties: true
-                            type: object
-                            properties:
-                              error:
-                                type: string
-                              name:
-                                type: string
-                              started_at:
-                                type: string
-                            required:
-                              - name
-                              - started_at
-                          latest_install_failed_attempts:
-                            items:
-                              additionalProperties: true
-                              type: object
-                              properties:
-                                created_at:
-                                  type: string
-                                error:
-                                  additionalProperties: true
-                                  type: object
-                                  properties:
-                                    message:
-                                      type: string
-                                    name:
-                                      type: string
-                                    stack:
-                                      type: string
-                                  required:
-                                    - name
-                                    - message
-                                target_version:
-                                  type: string
-                              required:
-                                - created_at
-                                - target_version
-                                - error
-                            type: array
-                          name:
-                            type: string
-                          namespaces:
-                            items:
-                              type: string
-                            type: array
-                          type:
-                            type: string
-                          updated_at:
-                            type: string
-                          verification_key_id:
-                            nullable: true
-                            type: string
-                          verification_status:
-                            enum:
-                              - unverified
-                              - verified
-                              - unknown
-                            type: string
-                          version:
-                            type: string
-                        required:
-                          - type
-                          - installed_kibana
-                          - installed_es
-                          - name
-                          - version
-                          - install_status
-                          - install_source
-                          - verification_status
-                      internal:
-                        type: boolean
-                      keepPoliciesUpToDate:
-                        type: boolean
-                      latestVersion:
-                        type: string
-                      license:
-                        type: string
-                      licensePath:
-                        type: string
-                      name:
-                        type: string
-                      notice:
-                        type: string
-                      owner:
-                        additionalProperties: true
-                        type: object
-                        properties:
-                          github:
-                            type: string
-                          type:
-                            enum:
-                              - elastic
-                              - partner
-                              - community
-                            type: string
-                      path:
-                        type: string
-                      policy_templates:
-                        items:
-                          additionalProperties: {}
-                          type: object
-                        type: array
-                      readme:
-                        type: string
-                      release:
-                        enum:
-                          - ga
-                          - beta
-                          - experimental
-                        type: string
-                      savedObject: {}
-                      screenshots:
-                        items:
-                          additionalProperties: false
-                          type: object
-                          properties:
-                            dark_mode:
-                              type: boolean
-                            path:
-                              type: string
-                            size:
-                              type: string
-                            src:
-                              type: string
-                            title:
-                              type: string
-                            type:
-                              type: string
-                          required:
-                            - src
-                        type: array
-                      signature_path:
-                        type: string
-                      source:
-                        additionalProperties: true
-                        type: object
-                        properties:
-                          license:
-                            type: string
-                        required:
-                          - license
-                      status:
-                        type: string
-                      title:
-                        type: string
-                      type:
-                        enum:
-                          - integration
-                          - input
-                          - content
-                        type: string
-                      vars:
-                        items:
-                          additionalProperties: {}
-                          type: object
-                        type: array
-                      version:
-                        type: string
-                    required:
-                      - savedObject
-                      - name
-                      - version
-                      - title
-                      - assets
-                  metadata:
-                    additionalProperties: false
-                    type: object
-                    properties:
-                      has_policies:
-                        type: boolean
-                    required:
-                      - has_policies
-                  response:
-                    additionalProperties: true
-                    deprecated: true
-                    type: object
-                    properties:
-                      agent:
-                        additionalProperties: false
-                        type: object
-                        properties:
-                          privileges:
-                            additionalProperties: false
-                            type: object
-                            properties:
-                              root:
-                                type: boolean
-                      asset_tags:
-                        items:
-                          additionalProperties: false
-                          type: object
-                          properties:
-                            asset_ids:
-                              items:
-                                type: string
-                              type: array
-                            asset_types:
-                              items:
-                                type: string
-                              type: array
-                            text:
-                              type: string
-                          required:
-                            - text
-                        type: array
-                      assets:
-                        additionalProperties: {}
-                        type: object
-                      categories:
-                        items:
-                          type: string
-                        type: array
-                      conditions:
-                        additionalProperties: true
-                        type: object
-                        properties:
-                          elastic:
-                            additionalProperties: true
-                            type: object
-                            properties:
-                              capabilities:
-                                items:
-                                  type: string
-                                type: array
-                              subscription:
-                                type: string
-                          kibana:
-                            additionalProperties: true
-                            type: object
-                            properties:
-                              version:
-                                type: string
-                      data_streams:
-                        items:
-                          additionalProperties: {}
-                          type: object
-                        type: array
-                      description:
-                        type: string
-                      discovery:
-                        additionalProperties: true
-                        type: object
-                        properties:
-                          fields:
-                            items:
-                              additionalProperties: true
-                              type: object
-                              properties:
-                                name:
-                                  type: string
-                              required:
-                                - name
-                            type: array
-                      download:
-                        type: string
-                      elasticsearch:
-                        additionalProperties: {}
-                        type: object
-                      format_version:
-                        type: string
-                      icons:
-                        items:
-                          additionalProperties: true
-                          type: object
-                          properties:
-                            dark_mode:
-                              type: boolean
-                            path:
-                              type: string
-                            size:
-                              type: string
-                            src:
-                              type: string
-                            title:
-                              type: string
-                            type:
-                              type: string
-                          required:
-                            - src
-                        type: array
-                      installationInfo:
-                        additionalProperties: true
-                        type: object
-                        properties:
-                          additional_spaces_installed_kibana:
-                            additionalProperties:
-                              items:
-                                additionalProperties: true
-                                type: object
-                                properties:
-                                  id:
-                                    type: string
-                                  originId:
-                                    type: string
-                                  type:
-                                    enum:
-                                      - dashboard
-                                      - lens
-                                      - visualization
-                                      - search
-                                      - index-pattern
-                                      - map
-                                      - ml-module
-                                      - security-rule
-                                      - csp-rule-template
-                                      - osquery-pack-asset
-                                      - osquery-saved-query
-                                      - tag
-                                    type: string
-                                required:
-                                  - id
-                                  - type
-                              type: array
-                            type: object
-                          created_at:
-                            type: string
-                          experimental_data_stream_features:
-                            items:
-                              additionalProperties: true
-                              type: object
-                              properties:
-                                data_stream:
-                                  type: string
-                                features:
-                                  additionalProperties: true
-                                  type: object
-                                  properties:
-                                    doc_value_only_numeric:
-                                      type: boolean
-                                    doc_value_only_other:
-                                      type: boolean
-                                    synthetic_source:
-                                      type: boolean
-                                    tsdb:
-                                      type: boolean
-                              required:
-                                - data_stream
-                                - features
-                            type: array
-                          install_format_schema_version:
-                            type: string
-                          install_source:
-                            enum:
-                              - registry
-                              - upload
-                              - bundled
-                              - custom
-                            type: string
-                          install_status:
-                            enum:
-                              - installed
-                              - installing
-                              - install_failed
-                            type: string
-                          installed_es:
-                            items:
-                              additionalProperties: true
-                              type: object
-                              properties:
-                                deferred:
-                                  type: boolean
-                                id:
-                                  type: string
-                                type:
-                                  enum:
-                                    - index
-                                    - index_template
-                                    - component_template
-                                    - ingest_pipeline
-                                    - ilm_policy
-                                    - data_stream_ilm_policy
-                                    - transform
-                                    - ml_model
-                                  type: string
-                                version:
-                                  type: string
-                              required:
-                                - id
-                                - type
-                            type: array
-                          installed_kibana:
-                            items:
-                              additionalProperties: true
-                              type: object
-                              properties:
-                                id:
-                                  type: string
-                                originId:
-                                  type: string
-                                type:
-                                  enum:
-                                    - dashboard
-                                    - lens
-                                    - visualization
-                                    - search
-                                    - index-pattern
-                                    - map
-                                    - ml-module
-                                    - security-rule
-                                    - csp-rule-template
-                                    - osquery-pack-asset
-                                    - osquery-saved-query
-                                    - tag
-                                  type: string
-                              required:
-                                - id
-                                - type
-                            type: array
-                          installed_kibana_space_id:
-                            type: string
-                          latest_executed_state:
-                            additionalProperties: true
-                            type: object
-                            properties:
-                              error:
-                                type: string
-                              name:
-                                type: string
-                              started_at:
-                                type: string
-                            required:
-                              - name
-                              - started_at
-                          latest_install_failed_attempts:
-                            items:
-                              additionalProperties: true
-                              type: object
-                              properties:
-                                created_at:
-                                  type: string
-                                error:
-                                  additionalProperties: true
-                                  type: object
-                                  properties:
-                                    message:
-                                      type: string
-                                    name:
-                                      type: string
-                                    stack:
-                                      type: string
-                                  required:
-                                    - name
-                                    - message
-                                target_version:
-                                  type: string
-                              required:
-                                - created_at
-                                - target_version
-                                - error
-                            type: array
-                          name:
-                            type: string
-                          namespaces:
-                            items:
+                required:
+                  - items
+        '400':
+          content:
+            application/json; Elastic-Api-Version=2023-10-31:
+              schema:
+                additionalProperties: false
+                description: Generic Error
+                type: object
+                properties:
+                  error:
+                    type: string
+                  message:
+                    type: string
+                  statusCode:
+                    type: number
+                required:
+                  - message
+      summary: ''
+      tags:
+        - Elastic Package Manager (EPM)
+    post:
+      description: Install package by upload
+      operationId: post-fleet-epm-packages
+      parameters:
+        - description: The version of the API to use
+          in: header
+          name: elastic-api-version
+          schema:
+            default: '2023-10-31'
+            enum:
+              - '2023-10-31'
+            type: string
+        - description: A required header to protect against CSRF attacks
+          in: header
+          name: kbn-xsrf
+          required: true
+          schema:
+            example: 'true'
+            type: string
+        - in: query
+          name: ignoreMappingUpdateErrors
+          required: false
+          schema:
+            default: false
+            type: boolean
+        - in: query
+          name: skipDataStreamRollover
+          required: false
+          schema:
+            default: false
+            type: boolean
+      requestBody:
+        content:
+          application/gzip; application/zip; Elastic-Api-Version=2023-10-31:
+            schema:
+              format: binary
+              type: string
+      responses:
+        '200':
+          content:
+            application/gzip; application/zip; Elastic-Api-Version=2023-10-31:
+              schema:
+                additionalProperties: false
+                type: object
+                properties:
+                  _meta:
+                    additionalProperties: false
+                    type: object
+                    properties:
+                      install_source:
+                        type: string
+                    required:
+                      - install_source
+                  items:
+                    items:
+                      anyOf:
+                        - additionalProperties: false
+                          type: object
+                          properties:
+                            id:
                               type: string
-                            type: array
-                          type:
-                            type: string
-                          updated_at:
-                            type: string
-                          verification_key_id:
-                            nullable: true
-                            type: string
-                          verification_status:
-                            enum:
-                              - unverified
-                              - verified
-                              - unknown
+                            originId:
+                              type: string
+                            type:
+                              enum:
+                                - dashboard
+                                - lens
+                                - visualization
+                                - search
+                                - index-pattern
+                                - map
+                                - ml-module
+                                - security-rule
+                                - csp-rule-template
+                                - osquery-pack-asset
+                                - osquery-saved-query
+                                - tag
+                              type: string
+                          required:
+                            - id
+                            - type
+                        - additionalProperties: false
+                          type: object
+                          properties:
+                            deferred:
+                              type: boolean
+                            id:
+                              type: string
+                            type:
+                              enum:
+                                - index
+                                - index_template
+                                - component_template
+                                - ingest_pipeline
+                                - ilm_policy
+                                - data_stream_ilm_policy
+                                - transform
+                                - ml_model
+                              type: string
+                            version:
+                              type: string
+                          required:
+                            - id
+                            - type
+                    type: array
+                required:
+                  - items
+                  - _meta
+        '400':
+          content:
+            application/gzip; application/zip; Elastic-Api-Version=2023-10-31:
+              schema:
+                additionalProperties: false
+                description: Generic Error
+                type: object
+                properties:
+                  error:
+                    type: string
+                  message:
+                    type: string
+                  statusCode:
+                    type: number
+                required:
+                  - message
+      summary: ''
+      tags:
+        - Elastic Package Manager (EPM)
+  /api/fleet/epm/packages/_bulk:
+    post:
+      description: Bulk install packages
+      operationId: post-fleet-epm-packages-bulk
+      parameters:
+        - description: The version of the API to use
+          in: header
+          name: elastic-api-version
+          schema:
+            default: '2023-10-31'
+            enum:
+              - '2023-10-31'
+            type: string
+        - description: A required header to protect against CSRF attacks
+          in: header
+          name: kbn-xsrf
+          required: true
+          schema:
+            example: 'true'
+            type: string
+        - in: query
+          name: prerelease
+          required: false
+          schema:
+            type: boolean
+      requestBody:
+        content:
+          application/json; Elastic-Api-Version=2023-10-31:
+            schema:
+              additionalProperties: false
+              type: object
+              properties:
+                force:
+                  default: false
+                  type: boolean
+                packages:
+                  items:
+                    anyOf:
+                      - type: string
+                      - additionalProperties: false
+                        type: object
+                        properties:
+                          name:
                             type: string
+                          prerelease:
+                            type: boolean
                           version:
                             type: string
                         required:
-                          - type
-                          - installed_kibana
-                          - installed_es
                           - name
                           - version
-                          - install_status
-                          - install_source
-                          - verification_status
-                      internal:
-                        type: boolean
-                      keepPoliciesUpToDate:
-                        type: boolean
-                      latestVersion:
-                        type: string
-                      license:
-                        type: string
-                      licensePath:
-                        type: string
-                      name:
-                        type: string
-                      notice:
-                        type: string
-                      owner:
-                        additionalProperties: true
-                        type: object
-                        properties:
-                          github:
-                            type: string
-                          type:
-                            enum:
-                              - elastic
-                              - partner
-                              - community
-                            type: string
-                      path:
-                        type: string
-                      policy_templates:
-                        items:
-                          additionalProperties: {}
+                  minItems: 1
+                  type: array
+              required:
+                - packages
+      responses:
+        '200':
+          content:
+            application/json; Elastic-Api-Version=2023-10-31:
+              schema:
+                additionalProperties: false
+                type: object
+                properties:
+                  items:
+                    items:
+                      anyOf:
+                        - additionalProperties: false
                           type: object
-                        type: array
-                      readme:
-                        type: string
-                      release:
-                        enum:
-                          - ga
-                          - beta
-                          - experimental
-                        type: string
-                      savedObject: {}
-                      screenshots:
-                        items:
-                          additionalProperties: false
+                          properties:
+                            name:
+                              type: string
+                            result:
+                              additionalProperties: false
+                              type: object
+                              properties:
+                                assets:
+                                  items:
+                                    anyOf:
+                                      - additionalProperties: false
+                                        type: object
+                                        properties:
+                                          id:
+                                            type: string
+                                          originId:
+                                            type: string
+                                          type:
+                                            enum:
+                                              - dashboard
+                                              - lens
+                                              - visualization
+                                              - search
+                                              - index-pattern
+                                              - map
+                                              - ml-module
+                                              - security-rule
+                                              - csp-rule-template
+                                              - osquery-pack-asset
+                                              - osquery-saved-query
+                                              - tag
+                                            type: string
+                                        required:
+                                          - id
+                                          - type
+                                      - additionalProperties: false
+                                        type: object
+                                        properties:
+                                          deferred:
+                                            type: boolean
+                                          id:
+                                            type: string
+                                          type:
+                                            enum:
+                                              - index
+                                              - index_template
+                                              - component_template
+                                              - ingest_pipeline
+                                              - ilm_policy
+                                              - data_stream_ilm_policy
+                                              - transform
+                                              - ml_model
+                                            type: string
+                                          version:
+                                            type: string
+                                        required:
+                                          - id
+                                          - type
+                                  type: array
+                                error: {}
+                                installSource:
+                                  type: string
+                                installType:
+                                  type: string
+                                status:
+                                  enum:
+                                    - installed
+                                    - already_installed
+                                  type: string
+                              required:
+                                - error
+                                - installType
+                            version:
+                              type: string
+                          required:
+                            - name
+                            - version
+                            - result
+                        - additionalProperties: false
                           type: object
                           properties:
-                            dark_mode:
-                              type: boolean
-                            path:
-                              type: string
-                            size:
-                              type: string
-                            src:
-                              type: string
-                            title:
-                              type: string
-                            type:
+                            error:
+                              anyOf:
+                                - type: string
+                                - {}
+                            name:
                               type: string
+                            statusCode:
+                              type: number
                           required:
-                            - src
-                        type: array
-                      signature_path:
-                        type: string
-                      source:
-                        additionalProperties: true
-                        type: object
-                        properties:
-                          license:
-                            type: string
-                        required:
-                          - license
-                      status:
-                        type: string
-                      title:
-                        type: string
-                      type:
-                        enum:
-                          - integration
-                          - input
-                          - content
-                        type: string
-                      vars:
-                        items:
-                          additionalProperties: {}
-                          type: object
-                        type: array
-                      version:
-                        type: string
-                    required:
-                      - savedObject
-                      - name
-                      - version
-                      - title
-                      - assets
+                            - name
+                            - statusCode
+                            - error
+                    type: array
                 required:
-                  - item
+                  - items
         '400':
           content:
             application/json; Elastic-Api-Version=2023-10-31:
@@ -24630,9 +22654,10 @@ paths:
       summary: ''
       tags:
         - Elastic Package Manager (EPM)
-    post:
-      description: Install package from registry
-      operationId: post-fleet-epm-packages-pkgname-pkgversion
+  /api/fleet/epm/packages/{pkgName}/{pkgVersion}:
+    delete:
+      description: Delete package
+      operationId: delete-fleet-epm-packages-pkgname-pkgversion
       parameters:
         - description: The version of the API to use
           in: header
@@ -24656,40 +22681,14 @@ paths:
             type: string
         - in: path
           name: pkgVersion
-          required: true
-          schema:
-            type: string
-        - in: query
-          name: prerelease
           required: false
           schema:
-            type: boolean
-        - in: query
-          name: ignoreMappingUpdateErrors
-          required: false
-          schema:
-            default: false
-            type: boolean
+            type: string
         - in: query
-          name: skipDataStreamRollover
+          name: force
           required: false
           schema:
-            default: false
             type: boolean
-      requestBody:
-        content:
-          application/json; Elastic-Api-Version=2023-10-31:
-            schema:
-              additionalProperties: false
-              nullable: true
-              type: object
-              properties:
-                force:
-                  default: false
-                  type: boolean
-                ignore_constraints:
-                  default: false
-                  type: boolean
       responses:
         '200':
           content:
@@ -24698,14 +22697,6 @@ paths:
                 additionalProperties: false
                 type: object
                 properties:
-                  _meta:
-                    additionalProperties: false
-                    type: object
-                    properties:
-                      install_source:
-                        type: string
-                    required:
-                      - install_source
                   items:
                     items:
                       anyOf:
@@ -24758,62 +22749,8 @@ paths:
                             - id
                             - type
                     type: array
-                  response:
-                    deprecated: true
-                    items:
-                      anyOf:
-                        - additionalProperties: false
-                          type: object
-                          properties:
-                            id:
-                              type: string
-                            originId:
-                              type: string
-                            type:
-                              enum:
-                                - dashboard
-                                - lens
-                                - visualization
-                                - search
-                                - index-pattern
-                                - map
-                                - ml-module
-                                - security-rule
-                                - csp-rule-template
-                                - osquery-pack-asset
-                                - osquery-saved-query
-                                - tag
-                              type: string
-                          required:
-                            - id
-                            - type
-                        - additionalProperties: false
-                          type: object
-                          properties:
-                            deferred:
-                              type: boolean
-                            id:
-                              type: string
-                            type:
-                              enum:
-                                - index
-                                - index_template
-                                - component_template
-                                - ingest_pipeline
-                                - ilm_policy
-                                - data_stream_ilm_policy
-                                - transform
-                                - ml_model
-                              type: string
-                            version:
-                              type: string
-                          required:
-                            - id
-                            - type
-                    type: array
                 required:
                   - items
-                  - _meta
         '400':
           content:
             application/json; Elastic-Api-Version=2023-10-31:
@@ -24833,9 +22770,9 @@ paths:
       summary: ''
       tags:
         - Elastic Package Manager (EPM)
-    put:
-      description: Update package settings
-      operationId: put-fleet-epm-packages-pkgname-pkgversion
+    get:
+      description: Get package
+      operationId: get-fleet-epm-packages-pkgname-pkgversion
       parameters:
         - description: The version of the API to use
           in: header
@@ -24845,13 +22782,6 @@ paths:
             enum:
               - '2023-10-31'
             type: string
-        - description: A required header to protect against CSRF attacks
-          in: header
-          name: kbn-xsrf
-          required: true
-          schema:
-            example: 'true'
-            type: string
         - in: path
           name: pkgName
           required: true
@@ -24859,20 +22789,30 @@ paths:
             type: string
         - in: path
           name: pkgVersion
-          required: true
+          required: false
           schema:
             type: string
-      requestBody:
-        content:
-          application/json; Elastic-Api-Version=2023-10-31:
-            schema:
-              additionalProperties: false
-              type: object
-              properties:
-                keepPoliciesUpToDate:
-                  type: boolean
-              required:
-                - keepPoliciesUpToDate
+        - in: query
+          name: ignoreUnverified
+          required: false
+          schema:
+            type: boolean
+        - in: query
+          name: prerelease
+          required: false
+          schema:
+            type: boolean
+        - in: query
+          name: full
+          required: false
+          schema:
+            type: boolean
+        - in: query
+          name: withMetadata
+          required: false
+          schema:
+            default: false
+            type: boolean
       responses:
         '200':
           content:
@@ -25229,7 +23169,6 @@ paths:
                           - beta
                           - experimental
                         type: string
-                      savedObject: {}
                       screenshots:
                         items:
                           additionalProperties: false
@@ -25278,14 +23217,239 @@ paths:
                       version:
                         type: string
                     required:
-                      - savedObject
                       - name
                       - version
                       - title
                       - assets
-                  response:
+                  metadata:
+                    additionalProperties: false
+                    type: object
+                    properties:
+                      has_policies:
+                        type: boolean
+                    required:
+                      - has_policies
+                required:
+                  - item
+        '400':
+          content:
+            application/json; Elastic-Api-Version=2023-10-31:
+              schema:
+                additionalProperties: false
+                description: Generic Error
+                type: object
+                properties:
+                  error:
+                    type: string
+                  message:
+                    type: string
+                  statusCode:
+                    type: number
+                required:
+                  - message
+      summary: ''
+      tags:
+        - Elastic Package Manager (EPM)
+    post:
+      description: Install package from registry
+      operationId: post-fleet-epm-packages-pkgname-pkgversion
+      parameters:
+        - description: The version of the API to use
+          in: header
+          name: elastic-api-version
+          schema:
+            default: '2023-10-31'
+            enum:
+              - '2023-10-31'
+            type: string
+        - description: A required header to protect against CSRF attacks
+          in: header
+          name: kbn-xsrf
+          required: true
+          schema:
+            example: 'true'
+            type: string
+        - in: path
+          name: pkgName
+          required: true
+          schema:
+            type: string
+        - in: path
+          name: pkgVersion
+          required: false
+          schema:
+            type: string
+        - in: query
+          name: prerelease
+          required: false
+          schema:
+            type: boolean
+        - in: query
+          name: ignoreMappingUpdateErrors
+          required: false
+          schema:
+            default: false
+            type: boolean
+        - in: query
+          name: skipDataStreamRollover
+          required: false
+          schema:
+            default: false
+            type: boolean
+      requestBody:
+        content:
+          application/json; Elastic-Api-Version=2023-10-31:
+            schema:
+              additionalProperties: false
+              nullable: true
+              type: object
+              properties:
+                force:
+                  default: false
+                  type: boolean
+                ignore_constraints:
+                  default: false
+                  type: boolean
+      responses:
+        '200':
+          content:
+            application/json; Elastic-Api-Version=2023-10-31:
+              schema:
+                additionalProperties: false
+                type: object
+                properties:
+                  _meta:
+                    additionalProperties: false
+                    type: object
+                    properties:
+                      install_source:
+                        type: string
+                    required:
+                      - install_source
+                  items:
+                    items:
+                      anyOf:
+                        - additionalProperties: false
+                          type: object
+                          properties:
+                            id:
+                              type: string
+                            originId:
+                              type: string
+                            type:
+                              enum:
+                                - dashboard
+                                - lens
+                                - visualization
+                                - search
+                                - index-pattern
+                                - map
+                                - ml-module
+                                - security-rule
+                                - csp-rule-template
+                                - osquery-pack-asset
+                                - osquery-saved-query
+                                - tag
+                              type: string
+                          required:
+                            - id
+                            - type
+                        - additionalProperties: false
+                          type: object
+                          properties:
+                            deferred:
+                              type: boolean
+                            id:
+                              type: string
+                            type:
+                              enum:
+                                - index
+                                - index_template
+                                - component_template
+                                - ingest_pipeline
+                                - ilm_policy
+                                - data_stream_ilm_policy
+                                - transform
+                                - ml_model
+                              type: string
+                            version:
+                              type: string
+                          required:
+                            - id
+                            - type
+                    type: array
+                required:
+                  - items
+                  - _meta
+        '400':
+          content:
+            application/json; Elastic-Api-Version=2023-10-31:
+              schema:
+                additionalProperties: false
+                description: Generic Error
+                type: object
+                properties:
+                  error:
+                    type: string
+                  message:
+                    type: string
+                  statusCode:
+                    type: number
+                required:
+                  - message
+      summary: ''
+      tags:
+        - Elastic Package Manager (EPM)
+    put:
+      description: Update package settings
+      operationId: put-fleet-epm-packages-pkgname-pkgversion
+      parameters:
+        - description: The version of the API to use
+          in: header
+          name: elastic-api-version
+          schema:
+            default: '2023-10-31'
+            enum:
+              - '2023-10-31'
+            type: string
+        - description: A required header to protect against CSRF attacks
+          in: header
+          name: kbn-xsrf
+          required: true
+          schema:
+            example: 'true'
+            type: string
+        - in: path
+          name: pkgName
+          required: true
+          schema:
+            type: string
+        - in: path
+          name: pkgVersion
+          required: false
+          schema:
+            type: string
+      requestBody:
+        content:
+          application/json; Elastic-Api-Version=2023-10-31:
+            schema:
+              additionalProperties: false
+              type: object
+              properties:
+                keepPoliciesUpToDate:
+                  type: boolean
+              required:
+                - keepPoliciesUpToDate
+      responses:
+        '200':
+          content:
+            application/json; Elastic-Api-Version=2023-10-31:
+              schema:
+                additionalProperties: false
+                type: object
+                properties:
+                  item:
                     additionalProperties: true
-                    deprecated: true
                     type: object
                     properties:
                       agent:
@@ -25632,7 +23796,6 @@ paths:
                           - beta
                           - experimental
                         type: string
-                      savedObject: {}
                       screenshots:
                         items:
                           additionalProperties: false
@@ -25681,7 +23844,6 @@ paths:
                       version:
                         type: string
                     required:
-                      - savedObject
                       - name
                       - version
                       - title
@@ -26086,11 +24248,6 @@ paths:
                     items:
                       type: string
                     type: array
-                  response:
-                    deprecated: true
-                    items:
-                      type: string
-                    type: array
                 required:
                   - items
         '400':
@@ -26713,9 +24870,6 @@ paths:
               additionalProperties: false
               type: object
               properties:
-                host:
-                  format: uri
-                  type: string
                 id:
                   type: string
               required:
@@ -26728,9 +24882,6 @@ paths:
                 additionalProperties: false
                 type: object
                 properties:
-                  host:
-                    deprecated: true
-                    type: string
                   host_id:
                     type: string
                   name:
@@ -36521,10 +34672,6 @@ paths:
                         required:
                           - enabled
                           - is_preconfigured
-                      fleet_server_hosts:
-                        items:
-                          type: string
-                        type: array
                       has_seen_add_data_notice:
                         type: boolean
                       id:
@@ -36624,11 +34771,6 @@ paths:
                   required:
                     - enabled
                     - is_preconfigured
-                fleet_server_hosts:
-                  items:
-                    format: uri
-                    type: string
-                  type: array
                 has_seen_add_data_notice:
                   type: boolean
                 kibana_ca_sha256:
@@ -36663,10 +34805,6 @@ paths:
                         required:
                           - enabled
                           - is_preconfigured
-                      fleet_server_hosts:
-                        items:
-                          type: string
-                        type: array
                       has_seen_add_data_notice:
                         type: boolean
                       id:
diff --git a/packages/core/rendering/core-rendering-server-internal/src/rendering_service.tsx b/packages/core/rendering/core-rendering-server-internal/src/rendering_service.tsx
index 44841ec0fbe3f..ace0399f242af 100644
--- a/packages/core/rendering/core-rendering-server-internal/src/rendering_service.tsx
+++ b/packages/core/rendering/core-rendering-server-internal/src/rendering_service.tsx
@@ -20,10 +20,10 @@ import type { IUiSettingsClient } from '@kbn/core-ui-settings-server';
 import type { UiPlugins } from '@kbn/core-plugins-base-server-internal';
 import type { CustomBranding } from '@kbn/core-custom-branding-common';
 import {
-  type UserProvidedValues,
   type DarkModeValue,
   parseDarkModeValue,
   type UiSettingsParams,
+  type UserProvidedValues,
 } from '@kbn/core-ui-settings-common';
 import { Template } from './views';
 import {
@@ -148,23 +148,29 @@ export class RenderingService {
     const basePath = http.basePath.get(request);
     const { serverBasePath, publicBaseUrl } = http.basePath;
 
-    let settingsUserValues: Record<string, UserProvidedValues> = {};
-    let globalSettingsUserValues: Record<string, UserProvidedValues> = {};
-
-    if (!isAnonymousPage) {
-      const userValues = await Promise.all([
-        uiSettings.client?.getUserProvided(),
-        uiSettings.globalClient?.getUserProvided(),
-      ]);
-
-      settingsUserValues = userValues[0];
-      globalSettingsUserValues = userValues[1];
-    }
-
-    const defaultSettings = await withAsyncDefaultValues(
-      request,
-      uiSettings.client?.getRegistered()
-    );
+    // Grouping all async HTTP requests to run them concurrently for performance reasons.
+    const [
+      defaultSettings,
+      settingsUserValues = {},
+      globalSettingsUserValues = {},
+      userSettingDarkMode,
+    ] = await Promise.all([
+      // All sites
+      withAsyncDefaultValues(request, uiSettings.client?.getRegistered()),
+      // Only non-anonymous pages
+      ...(!isAnonymousPage
+        ? ([
+            uiSettings.client?.getUserProvided(),
+            uiSettings.globalClient?.getUserProvided(),
+            // dark mode
+            userSettings?.getUserSettingDarkMode(request),
+          ] as [
+            Promise<Record<string, UserProvidedValues>>,
+            Promise<Record<string, UserProvidedValues>>,
+            Promise<DarkModeValue> | undefined
+          ])
+        : []),
+    ]);
 
     const settings = {
       defaults: defaultSettings,
@@ -196,10 +202,6 @@ export class RenderingService {
     }
 
     // dark mode
-    const userSettingDarkMode = isAnonymousPage
-      ? undefined
-      : await userSettings?.getUserSettingDarkMode(request);
-
     const isThemeOverridden = settings.user['theme:darkMode']?.isOverridden ?? false;
 
     let darkMode: DarkModeValue;
diff --git a/packages/kbn-alerts-ui-shared/src/rule_form/utils/check_action_type_enabled.test.ts b/packages/kbn-alerts-ui-shared/src/rule_form/utils/check_action_type_enabled.test.ts
index 987d95ef3d070..7794f83825c76 100644
--- a/packages/kbn-alerts-ui-shared/src/rule_form/utils/check_action_type_enabled.test.ts
+++ b/packages/kbn-alerts-ui-shared/src/rule_form/utils/check_action_type_enabled.test.ts
@@ -99,6 +99,26 @@ describe('checkActionTypeEnabled', () => {
           }
       `);
   });
+  test('checkActionTypeEnabled returns true when actionType is disabled by config', async () => {
+    const actionType: ActionType = {
+      id: '1',
+      minimumLicenseRequired: 'basic',
+      supportedFeatureIds: ['alerting'],
+      name: 'my action',
+      enabled: false,
+      enabledInConfig: false,
+      enabledInLicense: true,
+      isSystemActionType: false,
+    };
+
+    const isPreconfiguredConnector = true;
+
+    expect(checkActionTypeEnabled(actionType, isPreconfiguredConnector)).toMatchInlineSnapshot(`
+      Object {
+        "isEnabled": true,
+      }
+  `);
+  });
 });
 
 describe('checkActionFormActionTypeEnabled', () => {
diff --git a/packages/kbn-alerts-ui-shared/src/rule_form/utils/check_action_type_enabled.ts b/packages/kbn-alerts-ui-shared/src/rule_form/utils/check_action_type_enabled.ts
index 891012f0eeb23..79c26b7052e86 100644
--- a/packages/kbn-alerts-ui-shared/src/rule_form/utils/check_action_type_enabled.ts
+++ b/packages/kbn-alerts-ui-shared/src/rule_form/utils/check_action_type_enabled.ts
@@ -22,13 +22,14 @@ export interface IsDisabledResult {
 }
 
 export const checkActionTypeEnabled = (
-  actionType?: ActionType
+  actionType?: ActionType,
+  isPreconfiguredConnector: boolean = false
 ): IsEnabledResult | IsDisabledResult => {
   if (actionType?.enabledInLicense === false) {
     return getLicenseCheckResult(actionType);
   }
 
-  if (actionType?.enabledInConfig === false) {
+  if (actionType?.enabledInConfig === false && isPreconfiguredConnector === false) {
     return configurationCheckResult;
   }
 
diff --git a/packages/kbn-event-annotation-components/components/annotation_editor_controls/annotation_editor_controls.tsx b/packages/kbn-event-annotation-components/components/annotation_editor_controls/annotation_editor_controls.tsx
index fbef21087cffd..de230ac617987 100644
--- a/packages/kbn-event-annotation-components/components/annotation_editor_controls/annotation_editor_controls.tsx
+++ b/packages/kbn-event-annotation-components/components/annotation_editor_controls/annotation_editor_controls.tsx
@@ -386,7 +386,7 @@ const ConfigPanelGenericSwitch = ({
   value: boolean;
   onChange: (event: EuiSwitchEvent) => void;
 }) => (
-  <EuiFormRow label={label} display="columnCompressedSwitch" fullWidth>
+  <EuiFormRow label={label} display="columnCompressed" fullWidth>
     <EuiSwitch
       compressed
       label={label}
diff --git a/packages/kbn-ftr-common-functional-services/services/saml_auth/saml_auth_provider.ts b/packages/kbn-ftr-common-functional-services/services/saml_auth/saml_auth_provider.ts
index efc86f85213c0..c317645cc921b 100644
--- a/packages/kbn-ftr-common-functional-services/services/saml_auth/saml_auth_provider.ts
+++ b/packages/kbn-ftr-common-functional-services/services/saml_auth/saml_auth_provider.ts
@@ -7,7 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import { SamlSessionManager } from '@kbn/test';
+import { GetCookieOptions, SamlSessionManager } from '@kbn/test';
 import expect from '@kbn/expect';
 import { REPO_ROOT } from '@kbn/repo-info';
 import { resolve } from 'path';
@@ -91,16 +91,39 @@ export function SamlAuthProvider({ getService }: FtrProviderContext) {
   };
 
   return {
-    async getInteractiveUserSessionCookieWithRoleScope(role: string) {
+    /**
+     * Returns a Cookie string containing the session token for the specified role.
+     * This string can be used to update browser cookies and login with the designated role.
+     *
+     * @param role - The SAML role for which the session token is required.
+     * @param options - Optional settings to control session behavior, such as forcing a new session.
+     * @returns A string with the Cookie token
+     *
+     * @throws If the specified role is a custom role without a predefined descriptor.
+     */
+    async getInteractiveUserSessionCookieWithRoleScope(role: string, options?: GetCookieOptions) {
       // Custom role has no descriptors by default, check if it was added before authentication
       throwIfRoleNotSet(role, CUSTOM_ROLE, supportedRoleDescriptors);
-      return sessionManager.getInteractiveUserSessionCookieWithRoleScope(role);
+      return sessionManager.getInteractiveUserSessionCookieWithRoleScope(role, options);
     },
 
-    async getM2MApiCookieCredentialsWithRoleScope(role: string): Promise<CookieCredentials> {
+    /**
+     * Returns an object containing a Cookie header with the session token for the specified role.
+     * This header can be used for authenticating API requests as the designated role.
+     *
+     * @param role - The SAML role for which the session token is required.
+     * @param options - Optional settings to control session behavior, such as forcing a new session.
+     * @returns An object with the Cookie header for API authentication.
+     *
+     * @throws If the specified role is a custom role without a predefined descriptor.
+     */
+    async getM2MApiCookieCredentialsWithRoleScope(
+      role: string,
+      options?: GetCookieOptions
+    ): Promise<CookieCredentials> {
       // Custom role has no descriptors by default, check if it was added before authentication
       throwIfRoleNotSet(role, CUSTOM_ROLE, supportedRoleDescriptors);
-      return sessionManager.getApiCredentialsForRole(role);
+      return sessionManager.getApiCredentialsForRole(role, options);
     },
 
     async getEmail(role: string) {
@@ -195,7 +218,7 @@ export function SamlAuthProvider({ getService }: FtrProviderContext) {
 
       expect(status).to.be(204);
 
-      // Update descriptors for custome role, it will be used to create API key
+      // Update descriptors for the custom role, it will be used to create API key
       supportedRoleDescriptors.set(CUSTOM_ROLE, customRoleDescriptors);
     },
 
diff --git a/packages/kbn-generate-csv/src/generate_csv.test.ts b/packages/kbn-generate-csv/src/generate_csv.test.ts
index faba0a8425e9e..f39cf51352a58 100644
--- a/packages/kbn-generate-csv/src/generate_csv.test.ts
+++ b/packages/kbn-generate-csv/src/generate_csv.test.ts
@@ -47,7 +47,7 @@ const getMockConfig = (opts: Partial<CsvConfigType> = {}): CsvConfigType => ({
   maxSizeBytes: 180000,
   useByteOrderMarkEncoding: false,
   scroll: { size: 500, duration: '30s', strategy: 'pit' },
-  enablePanelActionDownload: true,
+  enablePanelActionDownload: false,
   maxConcurrentShardRequests: 5,
   ...opts,
 });
diff --git a/packages/kbn-generate-csv/src/generate_csv_esql.test.ts b/packages/kbn-generate-csv/src/generate_csv_esql.test.ts
index 4e85431448e45..9ae0b2b711c19 100644
--- a/packages/kbn-generate-csv/src/generate_csv_esql.test.ts
+++ b/packages/kbn-generate-csv/src/generate_csv_esql.test.ts
@@ -98,7 +98,7 @@ describe('CsvESQLGenerator', () => {
       maxSizeBytes: 180000,
       useByteOrderMarkEncoding: false,
       scroll: { size: 500, duration: '30s', strategy: 'pit' },
-      enablePanelActionDownload: true,
+      enablePanelActionDownload: false,
       maxConcurrentShardRequests: 5,
     };
 
@@ -569,7 +569,7 @@ describe('CsvESQLGenerator', () => {
         maxSizeBytes: 180000,
         useByteOrderMarkEncoding: false,
         scroll: { size: 500, duration: '30s', strategy: 'pit' },
-        enablePanelActionDownload: true,
+        enablePanelActionDownload: false,
         maxConcurrentShardRequests: 5,
       };
       mockSearchResponse({
diff --git a/packages/kbn-generate-csv/src/lib/get_export_settings.test.ts b/packages/kbn-generate-csv/src/lib/get_export_settings.test.ts
index 9b14636081233..05a321aa1a255 100644
--- a/packages/kbn-generate-csv/src/lib/get_export_settings.test.ts
+++ b/packages/kbn-generate-csv/src/lib/get_export_settings.test.ts
@@ -39,7 +39,7 @@ describe('getExportSettings', () => {
       scroll: { size: 500, duration: '30s', strategy: 'pit' },
       useByteOrderMarkEncoding: false,
       maxConcurrentShardRequests: 5,
-      enablePanelActionDownload: true,
+      enablePanelActionDownload: false,
     };
 
     taskInstanceFields = { startedAt: null, retryAt: null };
diff --git a/packages/kbn-generate/src/commands/codeowners_command.ts b/packages/kbn-generate/src/commands/codeowners_command.ts
index a86b4250d6850..ea76bc3a659c3 100644
--- a/packages/kbn-generate/src/commands/codeowners_command.ts
+++ b/packages/kbn-generate/src/commands/codeowners_command.ts
@@ -62,6 +62,11 @@ export const CodeownersCommand: GenerateCommand = {
       content = content.slice(0, ultStart);
     }
 
+    // sort genarated entries by directory name
+    // this improves readability and makes sure that ownership for nested
+    // test plugins is not overriden by the parent package's entry
+    pkgs.sort((a, b) => a.directory.localeCompare(b.directory));
+
     const newCodeowners = `${GENERATED_START}${pkgs
       .map(
         (pkg) =>
diff --git a/packages/kbn-optimizer/limits.yml b/packages/kbn-optimizer/limits.yml
index 7936e52ccbf18..432211d395f61 100644
--- a/packages/kbn-optimizer/limits.yml
+++ b/packages/kbn-optimizer/limits.yml
@@ -138,7 +138,7 @@ pageLoadAssetSize:
   screenshotMode: 17856
   screenshotting: 22870
   searchAssistant: 19831
-  searchConnectors: 30000
+  searchConnectors: 65000
   searchHomepage: 19831
   searchIndices: 20519
   searchInferenceEndpoints: 20470
diff --git a/packages/kbn-repo-packages/modern/package.js b/packages/kbn-repo-packages/modern/package.js
index 3ec33a69e841a..08d16fcf468ec 100644
--- a/packages/kbn-repo-packages/modern/package.js
+++ b/packages/kbn-repo-packages/modern/package.js
@@ -44,7 +44,7 @@ class Package {
    * @param {Package} b
    */
   static sorter(a, b) {
-    return a.manifest.id.localeCompare(b.manifest.id);
+    return a.manifest.id.localeCompare(b.manifest.id, 'en');
   }
 
   /**
diff --git a/packages/kbn-reporting/common/routes.ts b/packages/kbn-reporting/common/routes.ts
index 77d126b94e08a..dc01746fcc8db 100644
--- a/packages/kbn-reporting/common/routes.ts
+++ b/packages/kbn-reporting/common/routes.ts
@@ -24,7 +24,6 @@ export const INTERNAL_ROUTES = {
     DELETE_PREFIX: prefixInternalPath + '/jobs/delete', // docId is added to the final path
     DOWNLOAD_PREFIX: prefixInternalPath + '/jobs/download', // docId is added to the final path
   },
-  DOWNLOAD_CSV: prefixInternalPath + '/generate/immediate/csv_searchsource', // DEPRECATED
   GENERATE_PREFIX: prefixInternalPath + '/generate', // exportTypeId is added to the final path
 };
 
diff --git a/packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.test.ts b/packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.test.ts
deleted file mode 100644
index 417cc782a54cb..0000000000000
--- a/packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.test.ts
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the "Elastic License
- * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
- * Public License v 1"; you may not use this file except in compliance with, at
- * your election, the "Elastic License 2.0", the "GNU Affero General Public
- * License v3.0 only", or the "Server Side Public License, v 1".
- */
-
-import { CsvGenerator } from '@kbn/generate-csv';
-
-jest.mock('@kbn/generate-csv', () => {
-  return {
-    CsvGenerator: jest.fn().mockImplementation(() => {
-      return { generateData: jest.fn() };
-    }),
-  };
-});
-
-import { httpServerMock } from '@kbn/core-http-server-mocks';
-import type { CoreStart, KibanaRequest } from '@kbn/core/server';
-import { coreMock, elasticsearchServiceMock, loggingSystemMock } from '@kbn/core/server/mocks';
-import { dataPluginMock } from '@kbn/data-plugin/server/mocks';
-import { discoverPluginMock } from '@kbn/discover-plugin/server/mocks';
-import { createFieldFormatsStartMock } from '@kbn/field-formats-plugin/server/mocks';
-import { createMockConfigSchema } from '@kbn/reporting-mocks-server';
-import { setFieldFormats } from '@kbn/reporting-server';
-import type { Writable } from 'stream';
-
-import { CsvSearchSourceImmediateExportType } from '.';
-import { ReportingRequestHandlerContext } from './types';
-
-const mockLogger = loggingSystemMock.createLogger();
-const encryptionKey = 'tetkey';
-let stream: jest.Mocked<Writable>;
-let mockCsvSearchSourceImmediateExportType: CsvSearchSourceImmediateExportType;
-let mockCoreStart: CoreStart;
-let mockRequest: KibanaRequest<any, any, any, any>;
-let mockRequestHandlerContext: ReportingRequestHandlerContext;
-
-beforeEach(async () => {
-  // use fieldFormats plugin for csv formats
-  // normally, this is done in the Reporting plugin
-  setFieldFormats(createFieldFormatsStartMock());
-  stream = {} as typeof stream;
-
-  const configType = createMockConfigSchema({
-    encryptionKey,
-    csv: {
-      checkForFormulas: true,
-      escapeFormulaValues: true,
-      maxSizeBytes: 180000,
-      scroll: { size: 500, duration: 'auto' },
-    },
-  });
-  const mockCoreSetup = coreMock.createSetup();
-  mockCoreStart = coreMock.createStart();
-  const context = coreMock.createPluginInitializerContext(configType);
-  mockRequest = httpServerMock.createKibanaRequest();
-
-  mockCsvSearchSourceImmediateExportType = new CsvSearchSourceImmediateExportType(
-    mockCoreSetup,
-    configType,
-    mockLogger,
-    context
-  );
-
-  mockRequestHandlerContext = {
-    core: Promise.resolve(mockCoreStart),
-  } as unknown as ReportingRequestHandlerContext;
-
-  mockCsvSearchSourceImmediateExportType.setup({
-    basePath: { set: jest.fn() },
-  });
-
-  mockCsvSearchSourceImmediateExportType.start({
-    esClient: elasticsearchServiceMock.createClusterClient(),
-    savedObjects: mockCoreStart.savedObjects,
-    uiSettings: mockCoreStart.uiSettings,
-    discover: discoverPluginMock.createStartContract(),
-    data: dataPluginMock.createStartContract(),
-  });
-
-  jest.useFakeTimers();
-  jest.setSystemTime(1630526670000);
-});
-
-afterEach(() => {
-  jest.useRealTimers();
-});
-
-test('allows csv.scroll.duration to be "auto"', async () => {
-  const mockGenerateData = jest.fn().mockResolvedValue(() => ({ csv_contains_formulas: false }));
-  (CsvGenerator as jest.Mock).mockImplementationOnce(() => {
-    return { generateData: mockGenerateData };
-  });
-
-  await mockCsvSearchSourceImmediateExportType.runTask(
-    'cool-job-id',
-    { browserTimezone: 'US/Alaska', searchSource: {}, title: 'Test Search' },
-    mockRequestHandlerContext,
-    stream,
-    mockRequest
-  );
-
-  expect(CsvGenerator).toBeCalledWith(
-    {
-      browserTimezone: 'US/Alaska',
-      objectType: 'immediate-search',
-      searchSource: {},
-      title: 'Test Search',
-    },
-    {
-      checkForFormulas: true,
-      escapeFormulaValues: true,
-      maxSizeBytes: 180000,
-      scroll: { duration: 'auto', size: 500 },
-    },
-    {
-      retryAt: new Date('2021-09-01T20:06:30.000Z'),
-      startedAt: new Date('2021-09-01T20:04:30.000Z'),
-    },
-    expect.anything(),
-    expect.anything(),
-    expect.anything(),
-    expect.anything(),
-    expect.anything()
-  );
-
-  expect(mockGenerateData).toBeCalled();
-});
diff --git a/packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.ts b/packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.ts
deleted file mode 100644
index 5ca85cb27e540..0000000000000
--- a/packages/kbn-reporting/export_types/csv/csv_searchsource_immediate.ts
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the "Elastic License
- * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
- * Public License v 1"; you may not use this file except in compliance with, at
- * your election, the "Elastic License 2.0", the "GNU Affero General Public
- * License v3.0 only", or the "Server Side Public License, v 1".
- */
-
-import { Writable } from 'stream';
-
-import { KibanaRequest } from '@kbn/core-http-server';
-import { DataPluginStart } from '@kbn/data-plugin/server/plugin';
-import { DiscoverServerPluginStart } from '@kbn/discover-plugin/server';
-import { CsvGenerator } from '@kbn/generate-csv';
-import {
-  CancellationToken,
-  LICENSE_TYPE_BASIC,
-  LICENSE_TYPE_CLOUD_STANDARD,
-  LICENSE_TYPE_ENTERPRISE,
-  LICENSE_TYPE_GOLD,
-  LICENSE_TYPE_PLATINUM,
-  LICENSE_TYPE_TRIAL,
-  durationToNumber,
-} from '@kbn/reporting-common';
-import type { TaskRunResult } from '@kbn/reporting-common/types';
-import {
-  CSV_SEARCHSOURCE_IMMEDIATE_TYPE,
-  JobParamsDownloadCSV,
-} from '@kbn/reporting-export-types-csv-common';
-import type { BaseExportTypeSetupDeps, BaseExportTypeStartDeps } from '@kbn/reporting-server';
-import { ExportType, getFieldFormats } from '@kbn/reporting-server';
-
-import { ReportingRequestHandlerContext } from './types';
-
-type CsvSearchSourceImmediateExportTypeSetupDeps = BaseExportTypeSetupDeps;
-interface CsvSearchSourceImmediateExportTypeStartDeps extends BaseExportTypeStartDeps {
-  discover: DiscoverServerPluginStart;
-  data: DataPluginStart;
-}
-
-/*
- * ImmediateExecuteFn receives the job doc payload because the payload was
- * generated in the ScheduleFn
- */
-export type ImmediateExecuteFn = (
-  jobId: null,
-  job: JobParamsDownloadCSV,
-  context: ReportingRequestHandlerContext,
-  stream: Writable,
-  req: KibanaRequest
-) => Promise<TaskRunResult>;
-
-/**
- * @deprecated
- * Requires `xpack.reporting.csv.enablePanelActionDownload` set to `true` (default is false)
- */
-export class CsvSearchSourceImmediateExportType extends ExportType<
-  JobParamsDownloadCSV,
-  ImmediateExecuteFn,
-  CsvSearchSourceImmediateExportTypeSetupDeps,
-  CsvSearchSourceImmediateExportTypeStartDeps
-> {
-  id = CSV_SEARCHSOURCE_IMMEDIATE_TYPE;
-  name = CSV_SEARCHSOURCE_IMMEDIATE_TYPE;
-  jobType = CSV_SEARCHSOURCE_IMMEDIATE_TYPE;
-  jobContentEncoding = 'base64' as const;
-  jobContentExtension = 'csv' as const;
-  validLicenses = [
-    LICENSE_TYPE_TRIAL,
-    LICENSE_TYPE_BASIC,
-    LICENSE_TYPE_CLOUD_STANDARD,
-    LICENSE_TYPE_GOLD,
-    LICENSE_TYPE_PLATINUM,
-    LICENSE_TYPE_ENTERPRISE,
-  ];
-
-  constructor(...args: ConstructorParameters<typeof ExportType>) {
-    super(...args);
-    this.logger = this.logger.get('csv-searchsource-export');
-  }
-
-  public createJob = async () => {
-    throw new Error(`immediate download has no create job handler!`);
-  };
-  // @ts-ignore expected type failure from deprecated export type
-  public runTask = async (
-    _jobId: string | null,
-    immediateJobParams: JobParamsDownloadCSV,
-    context: ReportingRequestHandlerContext,
-    stream: Writable,
-    req: KibanaRequest
-  ) => {
-    const job = {
-      objectType: 'immediate-search',
-      ...immediateJobParams,
-    };
-
-    const dataPluginStart = this.startDeps.data;
-    const savedObjectsClient = (await context.core).savedObjects.client;
-    const uiSettings = this.getUiSettingsServiceFactory(savedObjectsClient);
-    const fieldFormatsRegistry = await getFieldFormats().fieldFormatServiceFactory(uiSettings);
-
-    const es = this.startDeps.esClient.asScoped(req);
-    const searchSourceStart = await dataPluginStart.search.searchSource.asScoped(req);
-    const clients = {
-      uiSettings,
-      data: dataPluginStart.search.asScoped(req),
-      es,
-    };
-    const dependencies = {
-      fieldFormatsRegistry,
-      searchSourceStart,
-    };
-    const cancellationToken = new CancellationToken();
-    const csvConfig = this.config.csv;
-    const taskInstanceFields =
-      csvConfig.scroll.duration === 'auto'
-        ? {
-            startedAt: new Date(),
-            retryAt: new Date(Date.now() + durationToNumber(this.config.queue.timeout)),
-          }
-        : {
-            startedAt: null,
-            retryAt: null,
-          };
-
-    const csv = new CsvGenerator(
-      job,
-      csvConfig,
-      taskInstanceFields,
-      clients,
-      dependencies,
-      cancellationToken,
-      this.logger,
-      stream
-    );
-    const result = await csv.generateData();
-
-    if (result.csv_contains_formulas) {
-      this.logger.warn(`CSV may contain formulas whose values have been escaped`);
-    }
-
-    if (result.max_size_reached) {
-      this.logger.warn(`Max size reached: CSV output truncated`);
-    }
-
-    const { warnings } = result;
-    if (warnings) {
-      warnings.forEach((warning) => {
-        this.logger.warn(warning);
-      });
-    }
-
-    return result;
-  };
-}
diff --git a/packages/kbn-reporting/export_types/csv/index.ts b/packages/kbn-reporting/export_types/csv/index.ts
index 5910d17926c06..8ad8d200f6b77 100644
--- a/packages/kbn-reporting/export_types/csv/index.ts
+++ b/packages/kbn-reporting/export_types/csv/index.ts
@@ -9,4 +9,3 @@
 
 export { CsvSearchSourceExportType } from './csv_searchsource';
 export { CsvV2ExportType } from './csv_v2';
-export { CsvSearchSourceImmediateExportType } from './csv_searchsource_immediate';
diff --git a/packages/kbn-reporting/export_types/csv/tsconfig.json b/packages/kbn-reporting/export_types/csv/tsconfig.json
index 2fef9b63fda79..a5ee79e9b52c4 100644
--- a/packages/kbn-reporting/export_types/csv/tsconfig.json
+++ b/packages/kbn-reporting/export_types/csv/tsconfig.json
@@ -21,12 +21,10 @@
     "@kbn/discover-plugin",
     "@kbn/data-plugin",
     "@kbn/generate-csv",
-    "@kbn/core-http-server",
     "@kbn/reporting-server",
     "@kbn/reporting-export-types-csv-common",
     "@kbn/reporting-mocks-server",
     "@kbn/core-http-request-handler-context-server",
     "@kbn/field-formats-plugin",
-    "@kbn/core-http-server-mocks",
   ]
 }
diff --git a/packages/kbn-reporting/export_types/csv_common/index.ts b/packages/kbn-reporting/export_types/csv_common/index.ts
index 1a2b175347484..259f4a917783a 100644
--- a/packages/kbn-reporting/export_types/csv_common/index.ts
+++ b/packages/kbn-reporting/export_types/csv_common/index.ts
@@ -18,17 +18,6 @@ import type {
 
 export * from './constants';
 
-/**
- * @deprecated
- * Requires `xpack.reporting.csv.enablePanelActionDownload` set to `true` (default is false)
- */
-export interface JobParamsDownloadCSV {
-  browserTimezone: string;
-  title: string;
-  searchSource: SerializedSearchSourceFields;
-  columns?: string[];
-}
-
 interface BaseParamsCSV {
   searchSource: SerializedSearchSourceFields;
   columns?: string[];
@@ -62,12 +51,6 @@ export interface TaskPayloadCsvFromSavedObject extends CsvFromSavedObjectBase, B
 
 export const CSV_REPORTING_ACTION = 'generateCsvReport';
 
-/**
- * @deprecated
- * Requires `xpack.reporting.csv.enablePanelActionDownload` set to `true` (default is false)
- */
-export const CSV_SEARCHSOURCE_IMMEDIATE_TYPE = 'csv_searchsource_immediate';
-
 /**
  * @deprecated
  * Supported in case older reports exist in storage
diff --git a/packages/kbn-reporting/get_csv_panel_actions/panel_actions/get_csv_panel_action.test.ts b/packages/kbn-reporting/get_csv_panel_actions/panel_actions/get_csv_panel_action.test.ts
index 72da136ba9223..6eaa3e933980b 100644
--- a/packages/kbn-reporting/get_csv_panel_actions/panel_actions/get_csv_panel_action.test.ts
+++ b/packages/kbn-reporting/get_csv_panel_actions/panel_actions/get_csv_panel_action.test.ts
@@ -61,7 +61,6 @@ describe('GetCsvReportPanelAction', () => {
   beforeEach(() => {
     csvConfig = {
       scroll: {} as ClientConfigType['csv']['scroll'],
-      enablePanelActionDownload: false,
     };
 
     apiClient = new ReportingAPIClient(core.http, core.uiSettings, '7.15.0');
@@ -285,58 +284,4 @@ describe('GetCsvReportPanelAction', () => {
       expect(await plugin.isCompatible(context)).toEqual(true);
     });
   });
-
-  describe('download csv', () => {
-    beforeEach(() => {
-      csvConfig = {
-        scroll: {} as ClientConfigType['csv']['scroll'],
-        enablePanelActionDownload: true,
-      };
-
-      core.http.post.mockResolvedValue({});
-    });
-
-    it('shows a success toast when the download successfully starts', async () => {
-      const panel = new ReportingCsvPanelAction({
-        core,
-        apiClient,
-        startServices$: mockStartServices$,
-        usesUiCapabilities: true,
-        csvConfig,
-      });
-
-      await Rx.firstValueFrom(mockStartServices$);
-
-      await panel.execute(context);
-
-      expect(core.notifications.toasts.addSuccess).toHaveBeenCalledWith({
-        'data-test-subj': 'csvDownloadStarted',
-        text: expect.any(Function),
-        title: 'CSV download started',
-      });
-      expect(core.notifications.toasts.addDanger).not.toHaveBeenCalled();
-    });
-
-    it('shows a bad old toastie when it unsuccessfully fails', async () => {
-      apiClient.createImmediateReport = jest.fn().mockRejectedValue('No more ram!');
-      const panel = new ReportingCsvPanelAction({
-        core,
-        apiClient,
-        startServices$: mockStartServices$,
-        usesUiCapabilities: true,
-        csvConfig,
-      });
-
-      await Rx.firstValueFrom(mockStartServices$);
-
-      await panel.execute(context);
-
-      expect(core.notifications.toasts.addSuccess).toHaveBeenCalled();
-      expect(core.notifications.toasts.addDanger).toHaveBeenCalledWith({
-        'data-test-subj': 'downloadCsvFail',
-        text: "We couldn't download your CSV at this time.",
-        title: 'CSV download failed',
-      });
-    });
-  });
 });
diff --git a/packages/kbn-reporting/get_csv_panel_actions/panel_actions/get_csv_panel_action.tsx b/packages/kbn-reporting/get_csv_panel_actions/panel_actions/get_csv_panel_action.tsx
index 7be14579523bd..65712496519f7 100644
--- a/packages/kbn-reporting/get_csv_panel_actions/panel_actions/get_csv_panel_action.tsx
+++ b/packages/kbn-reporting/get_csv_panel_actions/panel_actions/get_csv_panel_action.tsx
@@ -102,7 +102,6 @@ export class ReportingCsvPanelAction implements ActionDefinition<EmbeddableApiCo
   private readonly i18nStrings: ReturnType<typeof getI18nStrings>;
   private readonly notifications: NotificationsSetup;
   private readonly apiClient: ReportingAPIClient;
-  private readonly enablePanelActionDownload: boolean;
   private readonly theme: ThemeServiceSetup;
   private readonly startServices$: Params['startServices$'];
   private readonly usesUiCapabilities: boolean;
@@ -110,7 +109,6 @@ export class ReportingCsvPanelAction implements ActionDefinition<EmbeddableApiCo
   constructor({ core, csvConfig, apiClient, startServices$, usesUiCapabilities }: Params) {
     this.isDownloading = false;
     this.apiClient = apiClient;
-    this.enablePanelActionDownload = csvConfig.enablePanelActionDownload === true;
     this.notifications = core.notifications;
     this.theme = core.theme;
     this.startServices$ = startServices$;
@@ -123,9 +121,7 @@ export class ReportingCsvPanelAction implements ActionDefinition<EmbeddableApiCo
   }
 
   public getDisplayName() {
-    return this.enablePanelActionDownload
-      ? this.i18nStrings.download.displayName
-      : this.i18nStrings.generate.displayName;
+    return this.i18nStrings.generate.displayName;
   }
 
   public async getSharingData(savedSearch: SavedSearch) {
@@ -157,70 +153,6 @@ export class ReportingCsvPanelAction implements ActionDefinition<EmbeddableApiCo
     return getInheritedViewMode(embeddable) !== ViewMode.EDIT;
   };
 
-  /**
-   * Requires `xpack.reporting.csv.enablePanelActionDownload: true` in kibana.yml
-   * @deprecated
-   */
-  private executeDownload = async (params: ExecutionParams) => {
-    const { searchSource, columns, title, analytics, i18nStart } = params;
-    const immediateJobParams = this.apiClient.getDecoratedJobParams({
-      searchSource,
-      columns,
-      title,
-      objectType: 'downloadCsv', // FIXME: added for typescript, but immediate download job does not need objectType
-    });
-
-    this.isDownloading = true;
-
-    this.notifications.toasts.addSuccess({
-      title: this.i18nStrings.download.toasts.success.title,
-      text: toMountPoint(this.i18nStrings.download.toasts.success.body, {
-        analytics,
-        i18n: i18nStart,
-        theme: this.theme,
-      }),
-      'data-test-subj': 'csvDownloadStarted',
-    });
-
-    await this.apiClient
-      .createImmediateReport(immediateJobParams)
-      .then(({ body, response }) => {
-        this.isDownloading = false;
-
-        const download = `${title}.csv`;
-        const blob = new Blob([body as BlobPart], {
-          type: response?.headers.get('content-type') || undefined,
-        });
-
-        // Hack for IE11 Support
-        // @ts-expect-error
-        if (window.navigator.msSaveOrOpenBlob) {
-          // @ts-expect-error
-          return window.navigator.msSaveOrOpenBlob(blob, download);
-        }
-
-        const a = window.document.createElement('a');
-        const downloadObject = window.URL.createObjectURL(blob);
-
-        a.href = downloadObject;
-        a.download = download;
-        document.body.appendChild(a);
-        a.click();
-        window.URL.revokeObjectURL(downloadObject);
-        document.body.removeChild(a);
-      })
-      .catch((error: unknown) => {
-        // eslint-disable-next-line no-console
-        console.error(error);
-        this.isDownloading = false;
-        this.notifications.toasts.addDanger({
-          title: this.i18nStrings.download.toasts.error.title,
-          text: this.i18nStrings.download.toasts.error.body,
-          'data-test-subj': 'downloadCsvFail',
-        });
-      });
-  };
-
   private executeGenerate = async (params: ExecutionParams) => {
     const { searchSource, columns, title, analytics, i18nStart } = params;
     const csvJobParams = this.apiClient.getDecoratedJobParams<JobAppParamsCSV>({
@@ -278,9 +210,6 @@ export class ReportingCsvPanelAction implements ActionDefinition<EmbeddableApiCo
     const title = savedSearch.title || '';
     const executionParams = { searchSource, columns, title, savedSearch, i18nStart, analytics };
 
-    if (this.enablePanelActionDownload) {
-      return this.executeDownload(executionParams);
-    }
     return this.executeGenerate(executionParams);
   };
 }
diff --git a/packages/kbn-reporting/get_csv_panel_actions/panel_actions/strings.tsx b/packages/kbn-reporting/get_csv_panel_actions/panel_actions/strings.tsx
index 0ad63122779d9..104a70c8e608e 100644
--- a/packages/kbn-reporting/get_csv_panel_actions/panel_actions/strings.tsx
+++ b/packages/kbn-reporting/get_csv_panel_actions/panel_actions/strings.tsx
@@ -26,35 +26,7 @@ interface I18nStrings {
   };
 }
 
-export const getI18nStrings = (
-  apiClient: ReportingAPIClient
-): Record<'download' | 'generate', I18nStrings> => ({
-  download: {
-    displayName: i18n.translate('reporting.share.panelAction.downloadCsvPanelTitle', {
-      defaultMessage: 'Download CSV',
-    }),
-    toasts: {
-      error: {
-        title: i18n.translate('reporting.share.panelAction.failedCsvReportTitle', {
-          defaultMessage: `CSV download failed`,
-        }),
-        body: i18n.translate('reporting.share.panelAction.failedCsvReportMessage', {
-          defaultMessage: `We couldn't download your CSV at this time.`,
-        }),
-      },
-      success: {
-        title: i18n.translate('reporting.share.panelAction.csvDownloadStartedTitle', {
-          defaultMessage: `CSV download started`,
-        }),
-        body: (
-          <FormattedMessage
-            id="reporting.share.panelAction.csvDownloadStartedMessage"
-            defaultMessage="Your CSV will download momentarily."
-          />
-        ),
-      },
-    },
-  },
+export const getI18nStrings = (apiClient: ReportingAPIClient): Record<'generate', I18nStrings> => ({
   generate: {
     displayName: i18n.translate('reporting.share.panelAction.generateCsvPanelTitle', {
       defaultMessage: 'Generate CSV report',
diff --git a/packages/kbn-reporting/public/reporting_api_client.test.ts b/packages/kbn-reporting/public/reporting_api_client.test.ts
index c1da4b46ae27a..3504ed87956d4 100644
--- a/packages/kbn-reporting/public/reporting_api_client.test.ts
+++ b/packages/kbn-reporting/public/reporting_api_client.test.ts
@@ -214,32 +214,6 @@ describe('ReportingAPIClient', () => {
     });
   });
 
-  describe('createImmediateReport', () => {
-    beforeEach(() => {
-      httpClient.post.mockResolvedValueOnce({ job: { payload: {} } });
-    });
-
-    it('should send a post request', async () => {
-      await apiClient.createImmediateReport({
-        browserTimezone: 'UTC',
-        objectType: 'something',
-        title: 'some title',
-        version: 'some version',
-      });
-
-      expect(httpClient.post).toHaveBeenCalledWith(
-        expect.any(String),
-        expect.objectContaining({
-          body: JSON.stringify({
-            browserTimezone: 'UTC',
-            title: 'some title',
-            version: 'some version',
-          }),
-        })
-      );
-    });
-  });
-
   describe('getDecoratedJobParams', () => {
     beforeEach(() => {
       jest.spyOn(tz, 'guess').mockReturnValue('UTC');
diff --git a/packages/kbn-reporting/public/reporting_api_client.ts b/packages/kbn-reporting/public/reporting_api_client.ts
index 48931fee1cf51..66f5daa0c520a 100644
--- a/packages/kbn-reporting/public/reporting_api_client.ts
+++ b/packages/kbn-reporting/public/reporting_api_client.ts
@@ -215,18 +215,6 @@ export class ReportingAPIClient implements IReportingAPI {
     }
   }
 
-  /**
-   * @deprecated
-   * Requires `xpack.reporting.csv.enablePanelActionDownload` set to `true` (default is false)
-   */
-  public async createImmediateReport(baseParams: BaseParams) {
-    const { objectType: _objectType, ...params } = baseParams; // objectType is not needed for immediate download api
-    return this.http.post(INTERNAL_ROUTES.DOWNLOAD_CSV, {
-      asResponse: true,
-      body: JSON.stringify(params),
-    });
-  }
-
   /**
    * Adds the browserTimezone and kibana version to report job params
    */
diff --git a/packages/kbn-reporting/public/types.ts b/packages/kbn-reporting/public/types.ts
index 2579ee42fe0dd..e01a1b55b0a1f 100644
--- a/packages/kbn-reporting/public/types.ts
+++ b/packages/kbn-reporting/public/types.ts
@@ -25,7 +25,6 @@ export interface ReportingPublicPluginStartDependencies {
 
 export interface ClientConfigType {
   csv: {
-    enablePanelActionDownload: boolean;
     scroll: {
       duration: string;
       size: number;
diff --git a/packages/kbn-reporting/server/config_schema.ts b/packages/kbn-reporting/server/config_schema.ts
index 7d831f95fc006..a4117341d27ca 100644
--- a/packages/kbn-reporting/server/config_schema.ts
+++ b/packages/kbn-reporting/server/config_schema.ts
@@ -60,7 +60,7 @@ const CaptureSchema = schema.object({
 const CsvSchema = schema.object({
   checkForFormulas: schema.boolean({ defaultValue: true }),
   escapeFormulaValues: schema.boolean({ defaultValue: false }),
-  enablePanelActionDownload: schema.boolean({ defaultValue: false }),
+  enablePanelActionDownload: schema.boolean({ defaultValue: false }), // unused as of 9.0
   maxSizeBytes: schema.oneOf([schema.number(), schema.byteSize()], {
     defaultValue: ByteSizeValue.parse('250mb'),
   }),
diff --git a/packages/kbn-reporting/server/export_type.ts b/packages/kbn-reporting/server/export_type.ts
index 8ccf69f5073da..2ddd69b826b60 100644
--- a/packages/kbn-reporting/server/export_type.ts
+++ b/packages/kbn-reporting/server/export_type.ts
@@ -100,7 +100,6 @@ export abstract class ExportType<
     }
   }
 
-  // needed to be protected vs private for the csv search source immediate export type
   protected getUiSettingsServiceFactory(savedObjectsClient: SavedObjectsClientContract) {
     const { uiSettings: uiSettingsService } = this.startDeps;
     const scopedUiSettingsService = uiSettingsService.asScopedToClient(savedObjectsClient);
diff --git a/x-pack/plugins/search_connectors/common/connectors.ts b/packages/kbn-search-connectors/constants/connectors.ts
similarity index 50%
rename from x-pack/plugins/search_connectors/common/connectors.ts
rename to packages/kbn-search-connectors/constants/connectors.ts
index b0bc5564e9750..ad5c716234133 100644
--- a/x-pack/plugins/search_connectors/common/connectors.ts
+++ b/packages/kbn-search-connectors/constants/connectors.ts
@@ -1,42 +1,207 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
 import { i18n } from '@kbn/i18n';
+import {
+  ConnectorClientSideDefinition,
+  ConnectorServerSideDefinition,
+} from '../types/connector_definition';
 
-export interface ConnectorServerSideDefinition {
-  categories?: string[];
-  description?: string;
-  iconPath: string;
-  isBeta: boolean;
-  isNative: boolean;
-  isTechPreview?: boolean;
-  keywords: string[];
-  name: string;
-  serviceType: string;
-}
+import { docLinks } from './doc_links';
+
+// needs to be a function because, docLinks are only populated with actual
+// documentation links in browser after SearchConnectorsPlugin starts
+export const getConnectorsDict = (): Record<string, ConnectorClientSideDefinition> => ({
+  azure_blob_storage: {
+    docsUrl: docLinks.connectorsAzureBlobStorage,
+    externalAuthDocsUrl: 'https://learn.microsoft.com/azure/storage/common/authorize-data-access',
+    externalDocsUrl: 'https://learn.microsoft.com/azure/storage/blobs/',
+    platinumOnly: true,
+  },
+  box: {
+    docsUrl: docLinks.connectorsBox,
+    externalAuthDocsUrl: '',
+    externalDocsUrl: '',
+    platinumOnly: true,
+  },
+  confluence: {
+    docsUrl: docLinks.connectorsConfluence,
+    externalAuthDocsUrl: '',
+    externalDocsUrl: '',
+    platinumOnly: true,
+  },
+  custom: {
+    docsUrl: docLinks.connectors,
+    externalAuthDocsUrl: '',
+    externalDocsUrl: '',
+  },
+  dropbox: {
+    docsUrl: docLinks.connectorsDropbox,
+    externalAuthDocsUrl: '',
+    externalDocsUrl: '',
+    platinumOnly: true,
+  },
+  github: {
+    docsUrl: docLinks.connectorsGithub,
+    externalAuthDocsUrl: '',
+    externalDocsUrl: '',
+    platinumOnly: true,
+  },
+  gmail: {
+    docsUrl: docLinks.connectorsGmail,
+    externalAuthDocsUrl: '',
+    externalDocsUrl: '',
+    platinumOnly: true,
+  },
+  google_cloud_storage: {
+    docsUrl: docLinks.connectorsGoogleCloudStorage,
+    externalAuthDocsUrl: 'https://cloud.google.com/storage/docs/authentication',
+    externalDocsUrl: 'https://cloud.google.com/storage/docs',
+    platinumOnly: true,
+  },
+  google_drive: {
+    docsUrl: docLinks.connectorsGoogleDrive,
+    externalAuthDocsUrl: 'https://cloud.google.com/iam/docs/service-account-overview',
+    externalDocsUrl: 'https://developers.google.com/drive',
+    platinumOnly: true,
+  },
+  jira: {
+    docsUrl: docLinks.connectorsJira,
+    externalAuthDocsUrl: '',
+    externalDocsUrl: '',
+    platinumOnly: true,
+  },
+  microsoft_teams: {
+    docsUrl: docLinks.connectorsTeams,
+    externalAuthDocsUrl: '',
+    externalDocsUrl: '',
+    platinumOnly: true,
+  },
+  mongodb: {
+    docsUrl: docLinks.connectorsMongoDB,
+    externalAuthDocsUrl: 'https://www.mongodb.com/docs/atlas/app-services/authentication/',
+    externalDocsUrl: 'https://www.mongodb.com/docs/',
+    platinumOnly: true,
+  },
+  mssql: {
+    docsUrl: docLinks.connectorsMicrosoftSQL,
+    externalAuthDocsUrl:
+      'https://learn.microsoft.com/sql/relational-databases/security/authentication-access/getting-started-with-database-engine-permissions',
+    externalDocsUrl: 'https://learn.microsoft.com/sql/',
+    platinumOnly: true,
+  },
+  mysql: {
+    docsUrl: docLinks.connectorsMySQL,
+    externalDocsUrl: 'https://dev.mysql.com/doc/',
+    platinumOnly: true,
+  },
+  network_drive: {
+    docsUrl: docLinks.connectorsNetworkDrive,
+    externalAuthDocsUrl: '',
+    externalDocsUrl: '',
+    platinumOnly: true,
+  },
+  notion: {
+    docsUrl: docLinks.connectorsNotion,
+    externalAuthDocsUrl: '',
+    externalDocsUrl: '',
+    platinumOnly: true,
+  },
+  onedrive: {
+    docsUrl: docLinks.connectorsOneDrive,
+    externalAuthDocsUrl: '',
+    externalDocsUrl: '',
+    platinumOnly: true,
+  },
+  oracle: {
+    docsUrl: docLinks.connectorsOracle,
+    externalAuthDocsUrl:
+      'https://docs.oracle.com/en/database/oracle/oracle-database/19/dbseg/index.html',
+    externalDocsUrl: 'https://docs.oracle.com/database/oracle/oracle-database/',
+    platinumOnly: true,
+  },
+  outlook: {
+    docsUrl: docLinks.connectorsOutlook,
+    externalAuthDocsUrl: '',
+    externalDocsUrl: '',
+    platinumOnly: true,
+  },
+  postgresql: {
+    docsUrl: docLinks.connectorsPostgreSQL,
+    externalAuthDocsUrl: 'https://www.postgresql.org/docs/15/auth-methods.html',
+    externalDocsUrl: 'https://www.postgresql.org/docs/',
+    platinumOnly: true,
+  },
+  redis: {
+    docsUrl: docLinks.connectorsRedis,
+    externalAuthDocsUrl: '',
+    externalDocsUrl: '',
+    platinumOnly: true,
+  },
+  s3: {
+    docsUrl: docLinks.connectorsS3,
+    externalAuthDocsUrl: 'https://docs.aws.amazon.com/s3/index.html',
+    externalDocsUrl: '',
+    platinumOnly: true,
+  },
+  salesforce: {
+    docsUrl: docLinks.connectorsSalesforce,
+    externalAuthDocsUrl: '',
+    externalDocsUrl: '',
+    platinumOnly: true,
+  },
+  servicenow: {
+    docsUrl: docLinks.connectorsServiceNow,
+    externalAuthDocsUrl: '',
+    externalDocsUrl: '',
+    platinumOnly: true,
+  },
+  sharepoint_online: {
+    docsUrl: docLinks.connectorsSharepointOnline,
+    externalAuthDocsUrl: '',
+    externalDocsUrl: '',
+    platinumOnly: true,
+  },
+  sharepoint_server: {
+    docsUrl: docLinks.connectorsSharepoint,
+    externalAuthDocsUrl: '',
+    externalDocsUrl: '',
+    platinumOnly: true,
+  },
+  slack: {
+    docsUrl: docLinks.connectorsSlack,
+    externalAuthDocsUrl: '',
+    externalDocsUrl: '',
+    platinumOnly: true,
+  },
+  zoom: {
+    docsUrl: docLinks.connectorsZoom,
+    externalAuthDocsUrl: '',
+    externalDocsUrl: '',
+    platinumOnly: true,
+  },
+});
 
 /* The consumer should host these icons and transform the iconPath into something usable
  * Enterprise Search and Serverless Search do this right now
  */
-
 export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
   {
     categories: ['search', 'elastic_stack', 'custom', 'connector', 'connector_client'],
-    description: i18n.translate(
-      'searchConnectorsPlugin.content.nativeConnectors.azureBlob.description',
-      {
-        defaultMessage: 'Search over your content on Azure Blob Storage.',
-      }
-    ),
+    description: i18n.translate('searchConnectors.content.nativeConnectors.azureBlob.description', {
+      defaultMessage: 'Search over your content on Azure Blob Storage.',
+    }),
     iconPath: 'azure_blob_storage.svg',
     isBeta: false,
     isNative: true,
     keywords: ['cloud', 'azure', 'blob', 's3', 'connector'],
-    name: i18n.translate('searchConnectorsPlugin.content.nativeConnectors.azureBlob.name', {
+    name: i18n.translate('searchConnectors.content.nativeConnectors.azureBlob.name', {
       defaultMessage: 'Azure Blob Storage',
     }),
     serviceType: 'azure_blob_storage',
@@ -44,7 +209,7 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
   {
     categories: ['search', 'elastic_stack', 'custom', 'connector', 'connector_client'],
     description: i18n.translate(
-      'searchConnectorsPlugin.content.nativeConnectors.confluence.description',
+      'searchConnectors.content.nativeConnectors.confluence.description',
       {
         defaultMessage: 'Search over your content on Confluence Cloud.',
       }
@@ -53,7 +218,7 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
     isBeta: false,
     isNative: true,
     keywords: ['confluence', 'cloud', 'connector'],
-    name: i18n.translate('searchConnectorsPlugin.content.nativeConnectors.confluence.name', {
+    name: i18n.translate('searchConnectors.content.nativeConnectors.confluence.name', {
       defaultMessage: 'Confluence Cloud & Server',
     }),
     serviceType: 'confluence',
@@ -61,7 +226,7 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
   {
     categories: ['search', 'elastic_stack', 'custom', 'connector', 'connector_client'],
     description: i18n.translate(
-      'searchConnectorsPlugin.content.nativeConnectors.confluenceDataCenter.description',
+      'searchConnectors.content.nativeConnectors.confluenceDataCenter.description',
       {
         defaultMessage: 'Search over your content on Confluence Data Center.',
       }
@@ -71,45 +236,36 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
     isNative: true,
     isTechPreview: true,
     keywords: ['confluence', 'data', 'center', 'connector'],
-    name: i18n.translate(
-      'searchConnectorsPlugin.content.nativeConnectors.confluence_data_center.name',
-      {
-        defaultMessage: 'Confluence Data Center',
-      }
-    ),
+    name: i18n.translate('searchConnectors.content.nativeConnectors.confluence_data_center.name', {
+      defaultMessage: 'Confluence Data Center',
+    }),
     serviceType: 'confluence',
   },
   {
     categories: ['search', 'elastic_stack', 'datastore', 'connector', 'connector_client'],
-    description: i18n.translate(
-      'searchConnectorsPlugin.content.nativeConnectors.dropbox.description',
-      {
-        defaultMessage: 'Search over your files and folders stored on Dropbox.',
-      }
-    ),
+    description: i18n.translate('searchConnectors.content.nativeConnectors.dropbox.description', {
+      defaultMessage: 'Search over your files and folders stored on Dropbox.',
+    }),
     iconPath: 'dropbox.svg',
     isBeta: false,
     isNative: true,
     isTechPreview: false,
     keywords: ['dropbox', 'connector'],
-    name: i18n.translate('searchConnectorsPlugin.content.nativeConnectors.dropbox.name', {
+    name: i18n.translate('searchConnectors.content.nativeConnectors.dropbox.name', {
       defaultMessage: 'Dropbox',
     }),
     serviceType: 'dropbox',
   },
   {
     categories: ['search', 'elastic_stack', 'custom', 'connector', 'connector_client', 'jira'],
-    description: i18n.translate(
-      'searchConnectorsPlugin.content.nativeConnectors.jira.description',
-      {
-        defaultMessage: 'Search over your content on Jira Cloud.',
-      }
-    ),
+    description: i18n.translate('searchConnectors.content.nativeConnectors.jira.description', {
+      defaultMessage: 'Search over your content on Jira Cloud.',
+    }),
     iconPath: 'jira_cloud.svg',
     isBeta: false,
     isNative: true,
     keywords: ['jira', 'cloud', 'connector'],
-    name: i18n.translate('searchConnectorsPlugin.content.nativeConnectors.jira.name', {
+    name: i18n.translate('searchConnectors.content.nativeConnectors.jira.name', {
       defaultMessage: 'Jira Cloud',
     }),
     serviceType: 'jira',
@@ -117,7 +273,7 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
   {
     categories: ['search', 'elastic_stack', 'custom', 'connector', 'connector_client', 'jira'],
     description: i18n.translate(
-      'searchConnectorsPlugin.content.nativeConnectors.jiraServer.description',
+      'searchConnectors.content.nativeConnectors.jiraServer.description',
       {
         defaultMessage: 'Search over your content on Jira Server.',
       }
@@ -126,7 +282,7 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
     isBeta: false,
     isNative: false,
     keywords: ['jira', 'server', 'connector'],
-    name: i18n.translate('searchConnectorsPlugin.content.nativeConnectors.jiraServer.name', {
+    name: i18n.translate('searchConnectors.content.nativeConnectors.jiraServer.name', {
       defaultMessage: 'Jira Server',
     }),
     serviceType: 'jira',
@@ -134,7 +290,7 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
   {
     categories: ['search', 'elastic_stack', 'custom', 'connector', 'connector_client'],
     description: i18n.translate(
-      'searchConnectorsPlugin.content.nativeConnectors.jiraDataCenter.description',
+      'searchConnectors.content.nativeConnectors.jiraDataCenter.description',
       {
         defaultMessage: 'Search over your content on Jira Data Center.',
       }
@@ -144,24 +300,21 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
     isTechPreview: true,
     isNative: true,
     keywords: ['jira', 'data', 'center', 'connector'],
-    name: i18n.translate('searchConnectorsPlugin.content.nativeConnectors.jira_data_center.name', {
+    name: i18n.translate('searchConnectors.content.nativeConnectors.jira_data_center.name', {
       defaultMessage: 'Jira Data Center',
     }),
     serviceType: 'jira',
   },
   {
     categories: ['search', 'elastic_stack', 'connector', 'connector_client'],
-    description: i18n.translate(
-      'searchConnectorsPlugin.content.nativeConnectors.github.description',
-      {
-        defaultMessage: 'Search over your projects and repos on GitHub.',
-      }
-    ),
+    description: i18n.translate('searchConnectors.content.nativeConnectors.github.description', {
+      defaultMessage: 'Search over your projects and repos on GitHub.',
+    }),
     iconPath: 'github.svg',
     isBeta: false,
     isNative: true,
     keywords: ['github', 'cloud', 'connector'],
-    name: i18n.translate('searchConnectorsPlugin.content.nativeConnectors.github.name', {
+    name: i18n.translate('searchConnectors.content.nativeConnectors.github.name', {
       defaultMessage: 'GitHub & GitHub Enterprise Server',
     }),
     serviceType: 'github',
@@ -169,7 +322,7 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
   {
     categories: ['search', 'elastic_stack', 'custom', 'connector', 'connector_client'],
     description: i18n.translate(
-      'searchConnectorsPlugin.content.nativeConnectors.googleCloud.description',
+      'searchConnectors.content.nativeConnectors.googleCloud.description',
       {
         defaultMessage: 'Search over your content on Google Cloud Storage.',
       }
@@ -178,7 +331,7 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
     isBeta: false,
     isNative: true,
     keywords: ['google', 'cloud', 'blob', 's3', 'connector'],
-    name: i18n.translate('searchConnectorsPlugin.content.nativeConnectors.googleCloud.name', {
+    name: i18n.translate('searchConnectors.content.nativeConnectors.googleCloud.name', {
       defaultMessage: 'Google Cloud Storage',
     }),
     serviceType: 'google_cloud_storage',
@@ -186,7 +339,7 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
   {
     categories: ['search', 'elastic_stack', 'custom', 'connector', 'connector_client'],
     description: i18n.translate(
-      'searchConnectorsPlugin.content.nativeConnectors.googleDrive.description',
+      'searchConnectors.content.nativeConnectors.googleDrive.description',
       {
         defaultMessage: 'Search over your content on Google Drive.',
       }
@@ -195,24 +348,21 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
     isBeta: false,
     isNative: true,
     keywords: ['google', 'drive', 'connector'],
-    name: i18n.translate('searchConnectorsPlugin.content.nativeConnectors.googleDrive.name', {
+    name: i18n.translate('searchConnectors.content.nativeConnectors.googleDrive.name', {
       defaultMessage: 'Google Drive',
     }),
     serviceType: 'google_drive',
   },
   {
     categories: ['search', 'elastic_stack', 'custom', 'connector', 'connector_client'],
-    description: i18n.translate(
-      'searchConnectorsPlugin.content.nativeConnectors.graphQL.description',
-      {
-        defaultMessage: 'Search over your content with GraphQL.',
-      }
-    ),
+    description: i18n.translate('searchConnectors.content.nativeConnectors.graphQL.description', {
+      defaultMessage: 'Search over your content with GraphQL.',
+    }),
     iconPath: 'graphql.svg',
     isBeta: false,
     isNative: false,
     keywords: ['graphql', 'connector'],
-    name: i18n.translate('searchConnectorsPlugin.content.nativeConnectors.graphQL.name', {
+    name: i18n.translate('searchConnectors.content.nativeConnectors.graphQL.name', {
       defaultMessage: 'GraphQL',
     }),
     serviceType: 'graphql',
@@ -220,58 +370,49 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
   },
   {
     categories: ['search', 'datastore', 'elastic_stack', 'connector', 'connector_client'],
-    description: i18n.translate(
-      'searchConnectorsPlugin.content.nativeConnectors.mongoDB.description',
-      {
-        defaultMessage: 'Search over your MongoDB content.',
-      }
-    ),
+    description: i18n.translate('searchConnectors.content.nativeConnectors.mongoDB.description', {
+      defaultMessage: 'Search over your MongoDB content.',
+    }),
     iconPath: 'mongodb.svg',
     isBeta: false,
     isNative: true,
     keywords: ['mongo', 'mongodb', 'database', 'nosql', 'connector'],
-    name: i18n.translate('searchConnectorsPlugin.content.nativeConnectors.mongodb.name', {
+    name: i18n.translate('searchConnectors.content.nativeConnectors.mongodb.name', {
       defaultMessage: 'MongoDB',
     }),
     serviceType: 'mongodb',
   },
   {
     categories: ['search', 'datastore', 'elastic_stack', 'connector', 'connector_client'],
-    description: i18n.translate(
-      'searchConnectorsPlugin.content.nativeConnectors.mysql.description',
-      {
-        defaultMessage: 'Search over your MySQL content.',
-      }
-    ),
+    description: i18n.translate('searchConnectors.content.nativeConnectors.mysql.description', {
+      defaultMessage: 'Search over your MySQL content.',
+    }),
     iconPath: 'mysql.svg',
     isBeta: false,
     isNative: true,
     keywords: ['mysql', 'sql', 'database', 'connector'],
-    name: i18n.translate('searchConnectorsPlugin.content.nativeConnectors.mysql.name', {
+    name: i18n.translate('searchConnectors.content.nativeConnectors.mysql.name', {
       defaultMessage: 'MySQL',
     }),
     serviceType: 'mysql',
   },
   {
     categories: ['search', 'custom', 'elastic_stack', 'datastore', 'connector', 'connector_client'],
-    description: i18n.translate(
-      'searchConnectorsPlugin.content.nativeConnectors.msSql.description',
-      {
-        defaultMessage: 'Search over your content on Microsoft SQL Server.',
-      }
-    ),
+    description: i18n.translate('searchConnectors.content.nativeConnectors.msSql.description', {
+      defaultMessage: 'Search over your content on Microsoft SQL Server.',
+    }),
     iconPath: 'mssql.svg',
     isBeta: false,
     isNative: true,
     keywords: ['mssql', 'microsoft', 'sql', 'database', 'connector'],
-    name: i18n.translate('searchConnectorsPlugin.content.nativeConnectors.microsoftSQL.name', {
+    name: i18n.translate('searchConnectors.content.nativeConnectors.microsoftSQL.name', {
       defaultMessage: 'Microsoft SQL',
     }),
     serviceType: 'mssql',
   },
   {
     description: i18n.translate(
-      'searchConnectorsPlugin.content.nativeConnectors.netowkrDrive.description',
+      'searchConnectors.content.nativeConnectors.netowkrDrive.description',
       {
         defaultMessage: 'Search over your Network Drive content.',
       }
@@ -281,31 +422,28 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
     isBeta: false,
     isNative: true,
     keywords: ['network', 'drive', 'file', 'directory', 'connector'],
-    name: i18n.translate('searchConnectorsPlugin.content.nativeConnectors.networkDrive.name', {
+    name: i18n.translate('searchConnectors.content.nativeConnectors.networkDrive.name', {
       defaultMessage: 'Network drive',
     }),
     serviceType: 'network_drive',
   },
   {
     categories: ['search', 'elastic_stack', 'custom', 'connector', 'connector_client'],
-    description: i18n.translate(
-      'searchConnectorsPlugin.content.nativeConnectors.notion.description',
-      {
-        defaultMessage: 'Search over your content on Notion.',
-      }
-    ),
+    description: i18n.translate('searchConnectors.content.nativeConnectors.notion.description', {
+      defaultMessage: 'Search over your content on Notion.',
+    }),
     iconPath: 'notion.svg',
     isBeta: false,
     isNative: true,
     keywords: ['notion', 'connector'],
-    name: i18n.translate('searchConnectorsPlugin.content.nativeConnectors.notion.name', {
+    name: i18n.translate('searchConnectors.content.nativeConnectors.notion.name', {
       defaultMessage: 'Notion',
     }),
     serviceType: 'notion',
   },
   {
     description: i18n.translate(
-      'searchConnectorsPlugin.content.nativeConnectors.postgreSQL.description',
+      'searchConnectors.content.nativeConnectors.postgreSQL.description',
       {
         defaultMessage: 'Search over your content on PostgreSQL.',
       }
@@ -315,25 +453,22 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
     isBeta: false,
     isNative: true,
     keywords: ['postgresql', 'sql', 'database', 'connector'],
-    name: i18n.translate('searchConnectorsPlugin.content.nativeConnectors.postgresql.name', {
+    name: i18n.translate('searchConnectors.content.nativeConnectors.postgresql.name', {
       defaultMessage: 'PostgreSQL',
     }),
     serviceType: 'postgresql',
   },
   {
     categories: ['search', 'elastic_stack', 'custom', 'connector', 'connector_client'],
-    description: i18n.translate(
-      'searchConnectorsPlugin.content.nativeConnectors.redis.description',
-      {
-        defaultMessage: 'Search over your content on Redis.',
-      }
-    ),
+    description: i18n.translate('searchConnectors.content.nativeConnectors.redis.description', {
+      defaultMessage: 'Search over your content on Redis.',
+    }),
     iconPath: 'redis.svg',
     isBeta: false,
     isNative: false,
     isTechPreview: true,
     keywords: ['redis', 'connector'],
-    name: i18n.translate('searchConnectorsPlugin.content.nativeConnectors.redis.name', {
+    name: i18n.translate('searchConnectors.content.nativeConnectors.redis.name', {
       defaultMessage: 'Redis',
     }),
     serviceType: 'redis',
@@ -341,7 +476,7 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
   {
     categories: ['search', 'elastic_stack', 'connector', 'connector_client'],
     description: i18n.translate(
-      'searchConnectorsPlugin.content.nativeConnectors.salesforce.description',
+      'searchConnectors.content.nativeConnectors.salesforce.description',
       {
         defaultMessage: 'Search over your content on Salesforce.',
       }
@@ -350,7 +485,7 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
     isBeta: false,
     isNative: true,
     keywords: ['salesforce', 'cloud', 'connector'],
-    name: i18n.translate('searchConnectorsPlugin.content.nativeConnectors.salesforce.name', {
+    name: i18n.translate('searchConnectors.content.nativeConnectors.salesforce.name', {
       defaultMessage: 'Salesforce',
     }),
     serviceType: 'salesforce',
@@ -358,7 +493,7 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
   {
     categories: ['search', 'elastic_stack', 'custom', 'datastore', 'connector', 'connector_client'],
     description: i18n.translate(
-      'searchConnectorsPlugin.content.nativeConnectors.salesforceSandbox.description',
+      'searchConnectors.content.nativeConnectors.salesforceSandbox.description',
       {
         defaultMessage: 'Search over your content on Salesforce Sandbox.',
       }
@@ -367,7 +502,7 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
     isBeta: false,
     isNative: true,
     keywords: ['salesforce', 'cloud', 'connector', 'sandbox'],
-    name: i18n.translate('searchConnectorsPlugin.content.nativeConnectors.salesforceBox.name', {
+    name: i18n.translate('searchConnectors.content.nativeConnectors.salesforceBox.name', {
       defaultMessage: 'Salesforce Sandbox',
     }),
     serviceType: 'salesforce',
@@ -375,7 +510,7 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
   {
     categories: ['search', 'elastic_stack', 'connector', 'connector_client'],
     description: i18n.translate(
-      'searchConnectorsPlugin.content.nativeConnectors.serviceNow.description',
+      'searchConnectors.content.nativeConnectors.serviceNow.description',
       {
         defaultMessage: 'Search over your content on ServiceNow.',
       }
@@ -385,7 +520,7 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
     isNative: true,
     isTechPreview: false,
     keywords: ['servicenow', 'cloud', 'connector'],
-    name: i18n.translate('searchConnectorsPlugin.content.nativeConnectors.serviceNow.name', {
+    name: i18n.translate('searchConnectors.content.nativeConnectors.serviceNow.name', {
       defaultMessage: 'ServiceNow',
     }),
     serviceType: 'servicenow',
@@ -393,7 +528,7 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
   {
     categories: ['search', 'elastic_stack', 'connector', 'connector_client'],
     description: i18n.translate(
-      'searchConnectorsPlugin.content.nativeConnectors.sharepointOnline.description',
+      'searchConnectors.content.nativeConnectors.sharepointOnline.description',
       {
         defaultMessage: 'Search over your content on SharePoint Online.',
       }
@@ -403,24 +538,21 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
     isNative: true,
     isTechPreview: false,
     keywords: ['sharepoint', 'office365', 'cloud', 'connector'],
-    name: i18n.translate('searchConnectorsPlugin.content.nativeConnectors.sharepointOnline.name', {
+    name: i18n.translate('searchConnectors.content.nativeConnectors.sharepointOnline.name', {
       defaultMessage: 'Sharepoint Online',
     }),
     serviceType: 'sharepoint_online',
   },
   {
     categories: ['search', 'elastic_stack', 'connector', 'connector_client'],
-    description: i18n.translate(
-      'searchConnectorsPlugin.content.nativeConnectors.gmail.description',
-      {
-        defaultMessage: 'Search over your content on Gmail.',
-      }
-    ),
+    description: i18n.translate('searchConnectors.content.nativeConnectors.gmail.description', {
+      defaultMessage: 'Search over your content on Gmail.',
+    }),
     iconPath: 'gmail.svg',
     isBeta: false,
     isNative: true,
     keywords: ['gmail', 'connector'],
-    name: i18n.translate('searchConnectorsPlugin.content.nativeConnectors.gmail.name', {
+    name: i18n.translate('searchConnectors.content.nativeConnectors.gmail.name', {
       defaultMessage: 'Gmail',
     }),
     serviceType: 'gmail',
@@ -428,7 +560,7 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
   {
     categories: ['search', 'elastic_stack', 'connector', 'connector_client'],
     description: i18n.translate(
-      'searchConnectorsPlugin.content.nativeConnectors.openTextDocumentum.description',
+      'searchConnectors.content.nativeConnectors.openTextDocumentum.description',
       {
         defaultMessage: 'Search over your content on OpenText Documentum.',
       }
@@ -438,50 +570,41 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
     isNative: false,
     isTechPreview: true,
     keywords: ['opentext', 'documentum', 'connector'],
-    name: i18n.translate(
-      'searchConnectorsPlugin.content.nativeConnectors.openTextDocumentum.name',
-      {
-        defaultMessage: 'OpenText Documentum',
-      }
-    ),
+    name: i18n.translate('searchConnectors.content.nativeConnectors.openTextDocumentum.name', {
+      defaultMessage: 'OpenText Documentum',
+    }),
     serviceType: 'opentext_documentum',
   },
   {
     categories: ['search', 'elastic_stack', 'custom', 'datastore', 'connector', 'connector_client'],
-    description: i18n.translate(
-      'searchConnectorsPlugin.content.nativeConnectors.oracle.description',
-      {
-        defaultMessage: 'Search over your content on Oracle.',
-      }
-    ),
+    description: i18n.translate('searchConnectors.content.nativeConnectors.oracle.description', {
+      defaultMessage: 'Search over your content on Oracle.',
+    }),
     iconPath: 'oracle.svg',
     isBeta: false,
     isNative: true,
     keywords: ['oracle', 'sql', 'database', 'connector'],
-    name: i18n.translate('searchConnectorsPlugin.content.nativeConnectors.oracle.name', {
+    name: i18n.translate('searchConnectors.content.nativeConnectors.oracle.name', {
       defaultMessage: 'Oracle',
     }),
     serviceType: 'oracle',
   },
   {
     categories: ['search', 'elastic_stack', 'custom', 'datastore', 'connector', 'connector_client'],
-    description: i18n.translate(
-      'searchConnectorsPlugin.content.nativeConnectors.oneDrive.description',
-      {
-        defaultMessage: 'Search over your content on OneDrive.',
-      }
-    ),
+    description: i18n.translate('searchConnectors.content.nativeConnectors.oneDrive.description', {
+      defaultMessage: 'Search over your content on OneDrive.',
+    }),
     iconPath: 'onedrive.svg',
     isBeta: false,
     isNative: true,
     keywords: ['network', 'drive', 'file', 'connector'],
-    name: i18n.translate('searchConnectorsPlugin.content.nativeConnectors.oneDrive.name', {
+    name: i18n.translate('searchConnectors.content.nativeConnectors.oneDrive.name', {
       defaultMessage: 'OneDrive',
     }),
     serviceType: 'onedrive',
   },
   {
-    description: i18n.translate('searchConnectorsPlugin.content.nativeConnectors.s3.description', {
+    description: i18n.translate('searchConnectors.content.nativeConnectors.s3.description', {
       defaultMessage: 'Search over your content on Amazon S3.',
     }),
     categories: ['search', 'datastore', 'elastic_stack', 'connector', 'connector_client'],
@@ -489,25 +612,22 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
     isBeta: false,
     isNative: true,
     keywords: ['s3', 'cloud', 'amazon', 'connector'],
-    name: i18n.translate('searchConnectorsPlugin.content.nativeConnectors.s3.name', {
+    name: i18n.translate('searchConnectors.content.nativeConnectors.s3.name', {
       defaultMessage: 'S3',
     }),
     serviceType: 's3',
   },
   {
-    description: i18n.translate(
-      'searchConnectorsPlugin.content.nativeConnectors.slack.description',
-      {
-        defaultMessage: 'Search over your content on Slack.',
-      }
-    ),
+    description: i18n.translate('searchConnectors.content.nativeConnectors.slack.description', {
+      defaultMessage: 'Search over your content on Slack.',
+    }),
     categories: ['search', 'elastic_stack', 'connector', 'connector_client'],
     iconPath: 'slack.svg',
     isBeta: false,
     isNative: true,
     isTechPreview: true,
     keywords: ['slack', 'connector'],
-    name: i18n.translate('searchConnectorsPlugin.content.nativeConnectors.slack.name', {
+    name: i18n.translate('searchConnectors.content.nativeConnectors.slack.name', {
       defaultMessage: 'Slack',
     }),
     serviceType: 'slack',
@@ -515,7 +635,7 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
   {
     categories: ['search', 'elastic_stack', 'custom', 'connector', 'connector_client'],
     description: i18n.translate(
-      'searchConnectorsPlugin.content.nativeConnectors.sharepointServer.description',
+      'searchConnectors.content.nativeConnectors.sharepointServer.description',
       {
         defaultMessage: 'Search over your content on SharePoint Server.',
       }
@@ -525,14 +645,14 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
     isNative: true,
     isTechPreview: false,
     keywords: ['sharepoint', 'cloud', 'connector'],
-    name: i18n.translate('searchConnectorsPlugin.content.nativeConnectors.sharepointServer.name', {
+    name: i18n.translate('searchConnectors.content.nativeConnectors.sharepointServer.name', {
       defaultMessage: 'Sharepoint Server',
     }),
     serviceType: 'sharepoint_server',
   },
   {
     categories: ['search', 'elastic_stack', 'custom', 'connector', 'connector_client', 'box'],
-    description: i18n.translate('searchConnectorsPlugin.content.nativeConnectors.box.description', {
+    description: i18n.translate('searchConnectors.content.nativeConnectors.box.description', {
       defaultMessage: 'Search over your content on Box.',
     }),
     iconPath: 'box.svg',
@@ -540,60 +660,51 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
     isNative: true,
     isTechPreview: true,
     keywords: ['cloud', 'box'],
-    name: i18n.translate('searchConnectorsPlugin.content.nativeConnectors.box.name', {
+    name: i18n.translate('searchConnectors.content.nativeConnectors.box.name', {
       defaultMessage: 'Box',
     }),
     serviceType: 'box',
   },
   {
-    description: i18n.translate(
-      'searchConnectorsPlugin.content.nativeConnectors.outlook.description',
-      {
-        defaultMessage: 'Search over your content on Outlook.',
-      }
-    ),
+    description: i18n.translate('searchConnectors.content.nativeConnectors.outlook.description', {
+      defaultMessage: 'Search over your content on Outlook.',
+    }),
     categories: ['search', 'elastic_stack', 'custom', 'connector', 'connector_client', 'outlook'],
     iconPath: 'outlook.svg',
     isBeta: false,
     isNative: true,
     keywords: ['outlook', 'connector'],
-    name: i18n.translate('searchConnectorsPlugin.content.nativeConnectors.outlook.name', {
+    name: i18n.translate('searchConnectors.content.nativeConnectors.outlook.name', {
       defaultMessage: 'Outlook',
     }),
     serviceType: 'outlook',
   },
   {
     categories: ['search', 'elastic_stack', 'custom', 'connector', 'connector_client', 'teams'],
-    description: i18n.translate(
-      'searchConnectorsPlugin.content.nativeConnectors.teams.description',
-      {
-        defaultMessage: 'Search over your content on Teams.',
-      }
-    ),
+    description: i18n.translate('searchConnectors.content.nativeConnectors.teams.description', {
+      defaultMessage: 'Search over your content on Teams.',
+    }),
     iconPath: 'teams.svg',
     isBeta: false,
     isNative: true,
     isTechPreview: true,
     keywords: ['teams', 'connector'],
-    name: i18n.translate('searchConnectorsPlugin.content.nativeConnectors.teams.name', {
+    name: i18n.translate('searchConnectors.content.nativeConnectors.teams.name', {
       defaultMessage: 'Teams',
     }),
     serviceType: 'microsoft_teams',
   },
   {
     categories: ['search', 'elastic_stack', 'custom', 'connector', 'connector_client', 'zoom'],
-    description: i18n.translate(
-      'searchConnectorsPlugin.content.nativeConnectors.zoom.description',
-      {
-        defaultMessage: 'Search over your content on Zoom.',
-      }
-    ),
+    description: i18n.translate('searchConnectors.content.nativeConnectors.zoom.description', {
+      defaultMessage: 'Search over your content on Zoom.',
+    }),
     iconPath: 'zoom.svg',
     isBeta: false,
     isNative: true,
     isTechPreview: true,
     keywords: ['zoom', 'connector'],
-    name: i18n.translate('searchConnectorsPlugin.content.nativeConnectors.zoom.name', {
+    name: i18n.translate('searchConnectors.content.nativeConnectors.zoom.name', {
       defaultMessage: 'Zoom',
     }),
     serviceType: 'zoom',
@@ -601,7 +712,7 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
   {
     categories: ['search', 'custom', 'elastic_stack', 'connector', 'connector_client'],
     description: i18n.translate(
-      'searchConnectorsPlugin.content.nativeConnectors.customConnector.description',
+      'searchConnectors.content.nativeConnectors.customConnector.description',
       {
         defaultMessage: 'Search over data stored on custom data sources.',
       }
@@ -610,7 +721,7 @@ export const CONNECTOR_DEFINITIONS: ConnectorServerSideDefinition[] = [
     isBeta: false,
     isNative: false,
     keywords: ['custom', 'connector', 'code'],
-    name: i18n.translate('searchConnectorsPlugin.content.nativeConnectors.customConnector.name', {
+    name: i18n.translate('searchConnectors.content.nativeConnectors.customConnector.name', {
       defaultMessage: 'Customized connector',
     }),
     serviceType: '',
diff --git a/x-pack/plugins/search_connectors/common/doc_links.ts b/packages/kbn-search-connectors/constants/doc_links.ts
similarity index 90%
rename from x-pack/plugins/search_connectors/common/doc_links.ts
rename to packages/kbn-search-connectors/constants/doc_links.ts
index 0c5edc1a07ca7..db4dc3870e5c4 100644
--- a/x-pack/plugins/search_connectors/common/doc_links.ts
+++ b/packages/kbn-search-connectors/constants/doc_links.ts
@@ -1,8 +1,10 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
 import { DocLinks } from '@kbn/doc-links';
diff --git a/packages/kbn-search-connectors/constants/index.ts b/packages/kbn-search-connectors/constants/index.ts
new file mode 100644
index 0000000000000..6019d3d61be2f
--- /dev/null
+++ b/packages/kbn-search-connectors/constants/index.ts
@@ -0,0 +1,11 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+export * from './connectors';
+export * from './doc_links';
diff --git a/packages/kbn-search-connectors/index.ts b/packages/kbn-search-connectors/index.ts
index 2418d0f4d557d..5f45a1bd8ffb6 100644
--- a/packages/kbn-search-connectors/index.ts
+++ b/packages/kbn-search-connectors/index.ts
@@ -16,6 +16,7 @@ export const CONNECTORS_ACCESS_CONTROL_INDEX_PREFIX = '.search-acl-filter-';
 export const CRAWLER_SERVICE_TYPE = 'elastic-crawler';
 
 export * from './components';
+export * from './constants';
 export * from './lib';
 export * from './types';
 export * from './utils';
diff --git a/packages/kbn-search-connectors/tsconfig.json b/packages/kbn-search-connectors/tsconfig.json
index cb54e57748e94..4aebaeb1fcb13 100644
--- a/packages/kbn-search-connectors/tsconfig.json
+++ b/packages/kbn-search-connectors/tsconfig.json
@@ -25,5 +25,6 @@
     "@kbn/i18n-react",
     "@kbn/test-jest-helpers",
     "@kbn/std",
+    "@kbn/doc-links",
   ]
 }
diff --git a/packages/kbn-search-connectors/types/connector_definition.ts b/packages/kbn-search-connectors/types/connector_definition.ts
new file mode 100644
index 0000000000000..a2dccf6554959
--- /dev/null
+++ b/packages/kbn-search-connectors/types/connector_definition.ts
@@ -0,0 +1,29 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the "Elastic License
+ * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side
+ * Public License v 1"; you may not use this file except in compliance with, at
+ * your election, the "Elastic License 2.0", the "GNU Affero General Public
+ * License v3.0 only", or the "Server Side Public License, v 1".
+ */
+
+export interface ConnectorClientSideDefinition {
+  docsUrl?: string;
+  externalAuthDocsUrl?: string;
+  externalDocsUrl: string;
+  platinumOnly?: boolean;
+}
+
+export interface ConnectorServerSideDefinition {
+  categories?: string[];
+  description?: string;
+  iconPath: string;
+  isBeta: boolean;
+  isNative: boolean;
+  isTechPreview?: boolean;
+  keywords: string[];
+  name: string;
+  serviceType: string;
+}
+
+export type ConnectorDefinition = ConnectorClientSideDefinition & ConnectorServerSideDefinition;
diff --git a/packages/kbn-search-connectors/types/index.ts b/packages/kbn-search-connectors/types/index.ts
index ca5c483ab51df..aaf98748cfcbd 100644
--- a/packages/kbn-search-connectors/types/index.ts
+++ b/packages/kbn-search-connectors/types/index.ts
@@ -7,6 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
+export * from './connector_definition';
 export * from './connectors';
 export * from './connectors_api';
 export * from './connector_stats';
diff --git a/packages/kbn-search-connectors/types/native_connectors.ts b/packages/kbn-search-connectors/types/native_connectors.ts
index f9719cb84b801..c5ef7beab0ba5 100644
--- a/packages/kbn-search-connectors/types/native_connectors.ts
+++ b/packages/kbn-search-connectors/types/native_connectors.ts
@@ -11,54 +11,64 @@ import { i18n } from '@kbn/i18n';
 
 import { DisplayType, FeatureName, FieldType, NativeConnector } from './connectors';
 
-const USERNAME_LABEL = i18n.translate('searchConnectors.nativeConnectors.usernameLabel', {
+// assigning these to a local var significantly improves bundle size
+// because it reduces references to the imported modules.
+const { translate } = i18n;
+const { TEXTBOX, TEXTAREA, NUMERIC, TOGGLE, DROPDOWN } = DisplayType;
+const {
+  SYNC_RULES,
+  INCREMENTAL_SYNC,
+  DOCUMENT_LEVEL_SECURITY,
+  FILTERING_ADVANCED_CONFIG,
+  FILTERING_RULES,
+} = FeatureName;
+const { STRING, LIST, INTEGER, BOOLEAN } = FieldType;
+
+const USERNAME_LABEL = translate('searchConnectors.nativeConnectors.usernameLabel', {
   defaultMessage: 'Username',
 });
 
-const PASSWORD_LABEL = i18n.translate('searchConnectors.nativeConnectors.passwordLabel', {
+const PASSWORD_LABEL = translate('searchConnectors.nativeConnectors.passwordLabel', {
   defaultMessage: 'Password',
 });
 
-const ENABLE_SSL_LABEL = i18n.translate('searchConnectors.nativeConnectors.enableSSL.label', {
+const ENABLE_SSL_LABEL = translate('searchConnectors.nativeConnectors.enableSSL.label', {
   defaultMessage: 'Enable SSL',
 });
 
-const SSL_CERTIFICATE_LABEL = i18n.translate(
-  'searchConnectors.nativeConnectors.sslCertificate.label',
-  {
-    defaultMessage: 'SSL certificate',
-  }
-);
+const SSL_CERTIFICATE_LABEL = translate('searchConnectors.nativeConnectors.sslCertificate.label', {
+  defaultMessage: 'SSL certificate',
+});
 
-const RETRIES_PER_REQUEST_LABEL = i18n.translate(
+const RETRIES_PER_REQUEST_LABEL = translate(
   'searchConnectors.nativeConnectors.retriesPerRequest.label',
   {
     defaultMessage: 'Retries per request',
   }
 );
 
-const ADVANCED_RULES_IGNORED_LABEL = i18n.translate(
+const ADVANCED_RULES_IGNORED_LABEL = translate(
   'searchConnectors.nativeConnectors.advancedRulesIgnored.label',
   {
     defaultMessage: 'This configurable field is ignored when Advanced Sync Rules are used.',
   }
 );
 
-const MAX_CONCURRENT_DOWNLOADS_LABEL = i18n.translate(
+const MAX_CONCURRENT_DOWNLOADS_LABEL = translate(
   'searchConnectors.nativeConnectors.nativeConnectors.maximumConcurrentLabel',
   {
     defaultMessage: 'Maximum concurrent downloads',
   }
 );
 
-const USE_TEXT_EXTRACTION_SERVICE_LABEL = i18n.translate(
+const USE_TEXT_EXTRACTION_SERVICE_LABEL = translate(
   'searchConnectors.nativeConnectors.textExtractionService.label',
   {
     defaultMessage: 'Use text extraction service',
   }
 );
 
-const USE_TEXT_EXTRACTION_SERVICE_TOOLTIP = i18n.translate(
+const USE_TEXT_EXTRACTION_SERVICE_TOOLTIP = translate(
   'searchConnectors.nativeConnectors.textExtractionService.tooltip',
   {
     defaultMessage:
@@ -67,7 +77,7 @@ const USE_TEXT_EXTRACTION_SERVICE_TOOLTIP = i18n.translate(
   }
 );
 
-const ENABLE_DOCUMENT_LEVEL_SECURITY_LABEL = i18n.translate(
+const ENABLE_DOCUMENT_LEVEL_SECURITY_LABEL = translate(
   'searchConnectors.nativeConnectors.enableDLS.label',
   {
     defaultMessage: 'Enable document level security',
@@ -75,21 +85,21 @@ const ENABLE_DOCUMENT_LEVEL_SECURITY_LABEL = i18n.translate(
 );
 
 const getEnableDocumentLevelSecurityTooltip = (serviceName: string) =>
-  i18n.translate('searchConnectors.nativeConnectors.enableDLS.tooltip', {
+  translate('searchConnectors.nativeConnectors.enableDLS.tooltip', {
     defaultMessage:
       'Document level security ensures identities and permissions set in {serviceName} are maintained in Elasticsearch. This enables you to restrict and personalize read-access users and groups have to documents in this index. Access control syncs ensure this metadata is kept up to date in your Elasticsearch documents.',
     values: { serviceName },
   });
 
-const DATABASE_LABEL = i18n.translate('searchConnectors.nativeConnectors.databaseLabel', {
+const DATABASE_LABEL = translate('searchConnectors.nativeConnectors.databaseLabel', {
   defaultMessage: 'Database',
 });
 
-const SCHEMA_LABEL = i18n.translate('searchConnectors.nativeConnectors.schemaLabel', {
+const SCHEMA_LABEL = translate('searchConnectors.nativeConnectors.schemaLabel', {
   defaultMessage: 'Schema',
 });
 
-const PORT_LABEL = i18n.translate('searchConnectors.nativeConnectors.portLabel', {
+const PORT_LABEL = translate('searchConnectors.nativeConnectors.portLabel', {
   defaultMessage: 'Port',
 });
 
@@ -103,19 +113,16 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       account_name: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate(
-          'searchConnectors.nativeConnectors.azureBlobStorage.accountNameLabel',
-          {
-            defaultMessage: 'Account name',
-          }
-        ),
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.azureBlobStorage.accountNameLabel', {
+          defaultMessage: 'Account name',
+        }),
         options: [],
         order: 1,
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -123,19 +130,16 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       account_key: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate(
-          'searchConnectors.nativeConnectors.azureBlobStorage.accountKeyLabel',
-          {
-            defaultMessage: 'Account key',
-          }
-        ),
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.azureBlobStorage.accountKeyLabel', {
+          defaultMessage: 'Account key',
+        }),
         options: [],
         order: 2,
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -143,20 +147,17 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       blob_endpoint: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate(
-          'searchConnectors.nativeConnectors.azureBlobStorage.blobEndpointLabel',
-          {
-            defaultMessage: 'Blob endpoint',
-          }
-        ),
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.azureBlobStorage.blobEndpointLabel', {
+          defaultMessage: 'Blob endpoint',
+        }),
         options: [],
         order: 3,
         placeholder: 'http://127.0.0.1:10000/devstoreaccount',
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -164,19 +165,16 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       containers: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTAREA,
-        label: i18n.translate(
-          'searchConnectors.nativeConnectors.azureBlobStorage.containerNameLabel',
-          {
-            defaultMessage: 'List of containers',
-          }
-        ),
+        display: TEXTAREA,
+        label: translate('searchConnectors.nativeConnectors.azureBlobStorage.containerNameLabel', {
+          defaultMessage: 'List of containers',
+        }),
         options: [],
         order: 4,
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.LIST,
+        type: LIST,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -184,14 +182,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       retry_count: {
         default_value: 3,
         depends_on: [],
-        display: DisplayType.NUMERIC,
+        display: NUMERIC,
         label: RETRIES_PER_REQUEST_LABEL,
         options: [],
         order: 5,
         required: false,
         sensitive: false,
         tooltip: null,
-        type: FieldType.INTEGER,
+        type: INTEGER,
         ui_restrictions: ['advanced'],
         validations: [],
         value: 3,
@@ -199,14 +197,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       concurrent_downloads: {
         default_value: 100,
         depends_on: [],
-        display: DisplayType.NUMERIC,
+        display: NUMERIC,
         label: MAX_CONCURRENT_DOWNLOADS_LABEL,
         options: [],
         order: 6,
         required: false,
         sensitive: false,
         tooltip: null,
-        type: FieldType.INTEGER,
+        type: INTEGER,
         ui_restrictions: ['advanced'],
         validations: [
           {
@@ -219,29 +217,29 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       use_text_extraction_service: {
         default_value: false,
         depends_on: [],
-        display: DisplayType.TOGGLE,
+        display: TOGGLE,
         label: USE_TEXT_EXTRACTION_SERVICE_LABEL,
         options: [],
         order: 7,
         required: true,
         sensitive: false,
         tooltip: USE_TEXT_EXTRACTION_SERVICE_TOOLTIP,
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: ['advanced'],
         validations: [],
         value: false,
       },
     },
     features: {
-      [FeatureName.SYNC_RULES]: {
+      [SYNC_RULES]: {
         advanced: { enabled: false },
         basic: { enabled: true },
       },
-      [FeatureName.INCREMENTAL_SYNC]: {
+      [INCREMENTAL_SYNC]: {
         enabled: true,
       },
     },
-    name: i18n.translate('searchConnectors.nativeConnectors.azureBlobStorage.name', {
+    name: translate('searchConnectors.nativeConnectors.azureBlobStorage.name', {
       defaultMessage: 'Azure Blob Storage',
     }),
     serviceType: 'azure_blob_storage',
@@ -251,18 +249,18 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       path: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.box.pathLabel', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.box.pathLabel', {
           defaultMessage: 'Path to fetch files/folders',
         }),
         options: [],
         order: 1,
         required: false,
         sensitive: false,
-        tooltip: i18n.translate('searchConnectors.nativeConnectors.box.pathTooltip', {
+        tooltip: translate('searchConnectors.nativeConnectors.box.pathTooltip', {
           defaultMessage: 'Path is ignored when Advanced Sync Rules are used. ',
         }),
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -270,8 +268,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       app_key: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.box.appKeyLabel', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.box.appKeyLabel', {
           defaultMessage: 'App Key',
         }),
         options: [],
@@ -279,7 +277,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: true,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -287,8 +285,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       app_secret: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.box.appSecretLabel', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.box.appSecretLabel', {
           defaultMessage: 'App secret',
         }),
         options: [],
@@ -296,7 +294,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: true,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -304,8 +302,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       refresh_token: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.box.refreshTokenLabel', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.box.refreshTokenLabel', {
           defaultMessage: 'Refresh token',
         }),
         options: [],
@@ -313,7 +311,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: true,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -321,14 +319,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       retry_count: {
         default_value: 3,
         depends_on: [],
-        display: DisplayType.NUMERIC,
+        display: NUMERIC,
         label: RETRIES_PER_REQUEST_LABEL,
         options: [],
         order: 5,
         required: false,
         sensitive: false,
         tooltip: null,
-        type: FieldType.INTEGER,
+        type: INTEGER,
         ui_restrictions: ['advanced'],
         validations: [],
         value: '',
@@ -336,14 +334,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       concurrent_downloads: {
         default_value: 100,
         depends_on: [],
-        display: DisplayType.NUMERIC,
+        display: NUMERIC,
         label: MAX_CONCURRENT_DOWNLOADS_LABEL,
         options: [],
         order: 6,
         required: false,
         sensitive: false,
         tooltip: null,
-        type: FieldType.INTEGER,
+        type: INTEGER,
         ui_restrictions: ['advanced'],
         validations: [],
         value: '',
@@ -351,14 +349,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       use_text_extraction_service: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TOGGLE,
+        display: TOGGLE,
         label: USE_TEXT_EXTRACTION_SERVICE_LABEL,
         options: [],
         order: 7,
         required: true,
         sensitive: false,
         tooltip: USE_TEXT_EXTRACTION_SERVICE_TOOLTIP,
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: ['advanced'],
         validations: [],
         value: false,
@@ -366,18 +364,18 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       use_document_level_security: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TOGGLE,
+        display: TOGGLE,
         label: ENABLE_DOCUMENT_LEVEL_SECURITY_LABEL,
         options: [],
         order: 8,
         required: true,
         sensitive: false,
         tooltip: getEnableDocumentLevelSecurityTooltip(
-          i18n.translate('searchConnectors.nativeConnectors.boxTooltip.name', {
+          translate('searchConnectors.nativeConnectors.boxTooltip.name', {
             defaultMessage: 'Box',
           })
         ),
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: false,
@@ -390,29 +388,26 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: true,
           },
         ],
-        display: DisplayType.TOGGLE,
-        label: i18n.translate('searchConnectors.nativeConnectors.box.includeInheritedUsersLabel', {
+        display: TOGGLE,
+        label: translate('searchConnectors.nativeConnectors.box.includeInheritedUsersLabel', {
           defaultMessage: 'Include groups and inherited users',
         }),
         options: [],
         order: 9,
         required: true,
         sensitive: false,
-        tooltip: i18n.translate(
-          'searchConnectors.nativeConnectors.box.includeInheritedUsersTooltip',
-          {
-            defaultMessage:
-              'Include groups and inherited users when indexing permissions. Enabling this configurable field will cause a significant performance degradation.',
-          }
-        ),
-        type: FieldType.BOOLEAN,
+        tooltip: translate('searchConnectors.nativeConnectors.box.includeInheritedUsersTooltip', {
+          defaultMessage:
+            'Include groups and inherited users when indexing permissions. Enabling this configurable field will cause a significant performance degradation.',
+        }),
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: false,
       },
     },
     features: {},
-    name: i18n.translate('searchConnectors.nativeConnectors.box.name', {
+    name: translate('searchConnectors.nativeConnectors.box.name', {
       defaultMessage: 'Box',
     }),
     serviceType: 'box',
@@ -422,25 +417,25 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       data_source: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.DROPDOWN,
-        label: i18n.translate('searchConnectors.nativeConnectors.confluenceSource.label', {
+        display: DROPDOWN,
+        label: translate('searchConnectors.nativeConnectors.confluenceSource.label', {
           defaultMessage: 'Confluence data source',
         }),
         options: [
           {
-            label: i18n.translate('searchConnectors.nativeConnectors.confluenceCloud.name', {
+            label: translate('searchConnectors.nativeConnectors.confluenceCloud.name', {
               defaultMessage: 'Confluence Cloud',
             }),
             value: 'confluence_cloud',
           },
           {
-            label: i18n.translate('searchConnectors.nativeConnectors.confluenceServer.name', {
+            label: translate('searchConnectors.nativeConnectors.confluenceServer.name', {
               defaultMessage: 'Confluence Server',
             }),
             value: 'confluence_server',
           },
           {
-            label: i18n.translate('searchConnectors.nativeConnectors.confluenceDataCenter.name', {
+            label: translate('searchConnectors.nativeConnectors.confluenceDataCenter.name', {
               defaultMessage: 'Confluence Data Center',
             }),
             value: 'confluence_data_center',
@@ -450,7 +445,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: 'confluence_server',
@@ -463,8 +458,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: 'confluence_server',
           },
         ],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.confluenceServer.usernameLabel', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.confluenceServer.usernameLabel', {
           defaultMessage: 'Confluence Server username',
         }),
         options: [],
@@ -472,7 +467,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: 'admin',
@@ -485,8 +480,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: 'confluence_server',
           },
         ],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.confluenceServer.passwordLabel', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.confluenceServer.passwordLabel', {
           defaultMessage: 'Confluence Server password',
         }),
         options: [],
@@ -494,7 +489,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: true,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -507,19 +502,16 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: 'confluence_data_center',
           },
         ],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate(
-          'searchConnectors.nativeConnectors.confluenceDataCenter.usernameLabel',
-          {
-            defaultMessage: 'Username',
-          }
-        ),
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.confluenceDataCenter.usernameLabel', {
+          defaultMessage: 'Username',
+        }),
         options: [],
         order: 4,
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: 'admin',
@@ -532,19 +524,16 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: 'confluence_data_center',
           },
         ],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate(
-          'searchConnectors.nativeConnectors.confluenceDataCenter.passwordLabel',
-          {
-            defaultMessage: 'Password',
-          }
-        ),
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.confluenceDataCenter.passwordLabel', {
+          defaultMessage: 'Password',
+        }),
         options: [],
         order: 5,
         required: true,
         sensitive: true,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -557,20 +546,17 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: 'confluence_cloud',
           },
         ],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate(
-          'searchConnectors.nativeConnectors.confluenceCloud.accountEmailLabel',
-          {
-            defaultMessage: 'Confluence Cloud account email',
-          }
-        ),
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.confluenceCloud.accountEmailLabel', {
+          defaultMessage: 'Confluence Cloud account email',
+        }),
         options: [],
         order: 6,
         placeholder: 'me@example.com',
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -583,8 +569,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: 'confluence_cloud',
           },
         ],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.confluenceServer.apiTokenLabel', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.confluenceServer.apiTokenLabel', {
           defaultMessage: 'Confluence Cloud API token',
         }),
         options: [],
@@ -592,7 +578,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: true,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -600,8 +586,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       confluence_url: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.confluence.urlLabel', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.confluence.urlLabel', {
           defaultMessage: 'Confluence URL label',
         }),
         options: [],
@@ -610,7 +596,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -618,8 +604,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       spaces: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTAREA,
-        label: i18n.translate('searchConnectors.nativeConnectors.confluence.spaceKeysLabel', {
+        display: TEXTAREA,
+        label: translate('searchConnectors.nativeConnectors.confluence.spaceKeysLabel', {
           defaultMessage: 'Confluence space keys',
         }),
         options: [],
@@ -627,7 +613,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: ADVANCED_RULES_IGNORED_LABEL,
-        type: FieldType.LIST,
+        type: LIST,
         ui_restrictions: [],
         validations: [],
         value: '*',
@@ -635,19 +621,19 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       index_labels: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TOGGLE,
-        label: i18n.translate('searchConnectors.nativeConnectors.confluence.indexLabelsLabel', {
+        display: TOGGLE,
+        label: translate('searchConnectors.nativeConnectors.confluence.indexLabelsLabel', {
           defaultMessage: 'Enable indexing labels',
         }),
         options: [],
         order: 10,
         required: true,
         sensitive: false,
-        tooltip: i18n.translate('searchConnectors.nativeConnectors.confluence.indexLabelsTooltip', {
+        tooltip: translate('searchConnectors.nativeConnectors.confluence.indexLabelsTooltip', {
           defaultMessage:
             'Enabling this will increase the amount of network calls to the source, and may decrease performance',
         }),
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: false,
@@ -655,14 +641,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       ssl_enabled: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TOGGLE,
+        display: TOGGLE,
         label: ENABLE_SSL_LABEL,
         options: [],
         order: 11,
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: false,
@@ -675,14 +661,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: true,
           },
         ],
-        display: DisplayType.TEXTBOX,
+        display: TEXTBOX,
         label: SSL_CERTIFICATE_LABEL,
         options: [],
         order: 12,
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -690,14 +676,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       retry_count: {
         default_value: 3,
         depends_on: [],
-        display: DisplayType.NUMERIC,
+        display: NUMERIC,
         label: RETRIES_PER_REQUEST_LABEL,
         options: [],
         order: 13,
         required: false,
         sensitive: false,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: ['advanced'],
         validations: [],
         value: 3,
@@ -705,14 +691,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       concurrent_downloads: {
         default_value: 50,
         depends_on: [],
-        display: DisplayType.NUMERIC,
+        display: NUMERIC,
         label: MAX_CONCURRENT_DOWNLOADS_LABEL,
         options: [],
         order: 14,
         required: false,
         sensitive: false,
         tooltip: null,
-        type: FieldType.INTEGER,
+        type: INTEGER,
         ui_restrictions: ['advanced'],
         validations: [
           {
@@ -730,18 +716,18 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: 'confluence_cloud',
           },
         ],
-        display: DisplayType.TOGGLE,
+        display: TOGGLE,
         label: ENABLE_DOCUMENT_LEVEL_SECURITY_LABEL,
         options: [],
         order: 15,
         required: true,
         sensitive: false,
         tooltip: getEnableDocumentLevelSecurityTooltip(
-          i18n.translate('searchConnectors.nativeConnectors.confluence.tooltipName', {
+          translate('searchConnectors.nativeConnectors.confluence.tooltipName', {
             defaultMessage: 'Confluence',
           })
         ),
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: false,
@@ -749,32 +735,32 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       use_text_extraction_service: {
         default_value: false,
         depends_on: [],
-        display: DisplayType.TOGGLE,
+        display: TOGGLE,
         label: USE_TEXT_EXTRACTION_SERVICE_LABEL,
         options: [],
         order: 16,
         required: true,
         sensitive: false,
         tooltip: USE_TEXT_EXTRACTION_SERVICE_TOOLTIP,
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: ['advanced'],
         validations: [],
         value: false,
       },
     },
     features: {
-      [FeatureName.SYNC_RULES]: {
+      [SYNC_RULES]: {
         advanced: { enabled: true },
         basic: { enabled: true },
       },
-      [FeatureName.DOCUMENT_LEVEL_SECURITY]: {
+      [DOCUMENT_LEVEL_SECURITY]: {
         enabled: true,
       },
-      [FeatureName.INCREMENTAL_SYNC]: {
+      [INCREMENTAL_SYNC]: {
         enabled: true,
       },
     },
-    name: i18n.translate('searchConnectors.nativeConnectors.confluence.name', {
+    name: translate('searchConnectors.nativeConnectors.confluence.name', {
       defaultMessage: 'Confluence',
     }),
     serviceType: 'confluence',
@@ -784,14 +770,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       path: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
+        display: TEXTBOX,
         label: 'Path to fetch files/folders',
         options: [],
         order: 1,
         required: false,
         sensitive: false,
         tooltip: 'This configurable field is ignored when Advanced Sync Rules are used.',
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '/',
@@ -799,7 +785,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       app_key: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
+        display: TEXTBOX,
         label: 'App key',
         options: [],
         order: 2,
@@ -807,7 +793,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: true,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -815,14 +801,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       app_secret: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
+        display: TEXTBOX,
         label: 'App secret',
         options: [],
         order: 3,
         required: true,
         sensitive: true,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -830,14 +816,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       refresh_token: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
+        display: TEXTBOX,
         label: 'Refresh token',
         options: [],
         order: 4,
         required: true,
         sensitive: true,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -845,14 +831,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       retry_count: {
         default_value: 3,
         depends_on: [],
-        display: DisplayType.NUMERIC,
+        display: NUMERIC,
         label: 'Retries per request',
         options: [],
         order: 5,
         required: false,
         sensitive: false,
         tooltip: null,
-        type: FieldType.INTEGER,
+        type: INTEGER,
         ui_restrictions: ['advanced'],
         validations: [],
         value: 3,
@@ -860,14 +846,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       concurrent_downloads: {
         default_value: 100,
         depends_on: [],
-        display: DisplayType.NUMERIC,
+        display: NUMERIC,
         label: 'Maximum concurrent downloads',
         options: [],
         order: 6,
         required: false,
         sensitive: false,
         tooltip: null,
-        type: FieldType.INTEGER,
+        type: INTEGER,
         ui_restrictions: ['advanced'],
         validations: [],
         value: 100,
@@ -875,14 +861,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       use_text_extraction_service: {
         default_value: false,
         depends_on: [],
-        display: DisplayType.TOGGLE,
+        display: TOGGLE,
         label: USE_TEXT_EXTRACTION_SERVICE_LABEL,
         options: [],
         order: 7,
         required: true,
         sensitive: false,
         tooltip: USE_TEXT_EXTRACTION_SERVICE_TOOLTIP,
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: ['advanced'],
         validations: [],
         value: false,
@@ -890,18 +876,18 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       use_document_level_security: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TOGGLE,
+        display: TOGGLE,
         label: ENABLE_DOCUMENT_LEVEL_SECURITY_LABEL,
         options: [],
         order: 8,
         required: true,
         sensitive: false,
         tooltip: getEnableDocumentLevelSecurityTooltip(
-          i18n.translate('searchConnectors.nativeConnectors.dropbox.tooltipName', {
+          translate('searchConnectors.nativeConnectors.dropbox.tooltipName', {
             defaultMessage: 'Dropbox',
           })
         ),
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: false,
@@ -909,8 +895,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       include_inherited_users_and_groups: {
         default_value: null,
         depends_on: [{ field: 'use_document_level_security', value: true }],
-        display: DisplayType.TOGGLE,
-        label: i18n.translate(
+        display: TOGGLE,
+        label: translate(
           'searchConnectors.nativeConnectors.dropbox.includeInheritedUsersAndGroups.label',
           {
             defaultMessage: 'Include groups and inherited users',
@@ -920,32 +906,32 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         order: 9,
         required: false,
         sensitive: false,
-        tooltip: i18n.translate(
+        tooltip: translate(
           'searchConnectors.nativeConnectors.dropbox.includeInheritedUsersAndGroups.tooltip',
           {
             defaultMessage:
               'Include groups and inherited users when indexing permissions. Enabling this configurable field will cause a significant performance degradation.',
           }
         ),
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: false,
       },
     },
     features: {
-      [FeatureName.DOCUMENT_LEVEL_SECURITY]: {
+      [DOCUMENT_LEVEL_SECURITY]: {
         enabled: true,
       },
-      [FeatureName.SYNC_RULES]: {
+      [SYNC_RULES]: {
         advanced: { enabled: true },
         basic: { enabled: true },
       },
-      [FeatureName.INCREMENTAL_SYNC]: {
+      [INCREMENTAL_SYNC]: {
         enabled: true,
       },
     },
-    name: i18n.translate('searchConnectors.nativeConnectors.dropbox.name', {
+    name: translate('searchConnectors.nativeConnectors.dropbox.name', {
       defaultMessage: 'Dropbox',
     }),
     serviceType: 'dropbox',
@@ -955,19 +941,19 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       data_source: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.DROPDOWN,
-        label: i18n.translate('searchConnectors.nativeConnectors.github.label', {
+        display: DROPDOWN,
+        label: translate('searchConnectors.nativeConnectors.github.label', {
           defaultMessage: 'Data source',
         }),
         options: [
           {
-            label: i18n.translate('searchConnectors.nativeConnectors.github.options.cloudLabel', {
+            label: translate('searchConnectors.nativeConnectors.github.options.cloudLabel', {
               defaultMessage: 'GitHub Cloud',
             }),
             value: 'github_cloud',
           },
           {
-            label: i18n.translate('searchConnectors.nativeConnectors.github.options.cloudServer', {
+            label: translate('searchConnectors.nativeConnectors.github.options.cloudServer', {
               defaultMessage: 'GitHub Server',
             }),
             value: 'github_server',
@@ -977,7 +963,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: 'github_server',
@@ -990,8 +976,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: 'github_server',
           },
         ],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.github.url.label', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.github.url.label', {
           defaultMessage: 'Server URL',
         }),
         options: [],
@@ -999,7 +985,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -1007,13 +993,13 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       auth_method: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.DROPDOWN,
-        label: i18n.translate('searchConnectors.nativeConnectors.github.authMethod.label', {
+        display: DROPDOWN,
+        label: translate('searchConnectors.nativeConnectors.github.authMethod.label', {
           defaultMessage: 'Authentication method',
         }),
         options: [
           {
-            label: i18n.translate(
+            label: translate(
               'searchConnectors.nativeConnectors.github.options.personalAccessToken',
               {
                 defaultMessage: 'Personal access token',
@@ -1022,7 +1008,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: PERSONAL_ACCESS_TOKEN,
           },
           {
-            label: i18n.translate('searchConnectors.nativeConnectors.github.options.githubApp', {
+            label: translate('searchConnectors.nativeConnectors.github.options.githubApp', {
               defaultMessage: 'GitHub App',
             }),
             value: GITHUB_APP,
@@ -1032,7 +1018,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: PERSONAL_ACCESS_TOKEN,
@@ -1045,8 +1031,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: PERSONAL_ACCESS_TOKEN,
           },
         ],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.github.token.label', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.github.token.label', {
           defaultMessage: 'Token',
         }),
         options: [],
@@ -1054,7 +1040,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: true,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -1062,19 +1048,19 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       repo_type: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.DROPDOWN,
-        label: i18n.translate('searchConnectors.nativeConnectors.github.repo_type.label', {
+        display: DROPDOWN,
+        label: translate('searchConnectors.nativeConnectors.github.repo_type.label', {
           defaultMessage: 'Repository Type',
         }),
         options: [
           {
-            label: i18n.translate('searchConnectors.nativeConnectors.github.options.organization', {
+            label: translate('searchConnectors.nativeConnectors.github.options.organization', {
               defaultMessage: 'Organization',
             }),
             value: 'organization',
           },
           {
-            label: i18n.translate('searchConnectors.nativeConnectors.github.options.other', {
+            label: translate('searchConnectors.nativeConnectors.github.options.other', {
               defaultMessage: 'Other',
             }),
             value: 'other',
@@ -1083,11 +1069,11 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         order: 5,
         required: true,
         sensitive: false,
-        tooltip: i18n.translate('searchConnectors.nativeConnectors.github.repo_type', {
+        tooltip: translate('searchConnectors.nativeConnectors.github.repo_type', {
           defaultMessage:
             'The Document Level Security feature is not available for the Other Repository Type',
         }),
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: 'other',
@@ -1104,8 +1090,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: 'organization',
           },
         ],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.github.org_name.label', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.github.org_name.label', {
           defaultMessage: 'Organization Name',
         }),
         options: [],
@@ -1113,7 +1099,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -1126,8 +1112,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: GITHUB_APP,
           },
         ],
-        display: DisplayType.NUMERIC,
-        label: i18n.translate('searchConnectors.nativeConnectors.github.appID.label', {
+        display: NUMERIC,
+        label: translate('searchConnectors.nativeConnectors.github.appID.label', {
           defaultMessage: 'App ID',
         }),
         options: [],
@@ -1135,7 +1121,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.INTEGER,
+        type: INTEGER,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -1148,8 +1134,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: GITHUB_APP,
           },
         ],
-        display: DisplayType.TEXTAREA,
-        label: i18n.translate('searchConnectors.nativeConnectors.github.privateKey.label', {
+        display: TEXTAREA,
+        label: translate('searchConnectors.nativeConnectors.github.privateKey.label', {
           defaultMessage: 'App private key',
         }),
         options: [],
@@ -1157,7 +1143,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: true,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -1165,18 +1151,18 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       repositories: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTAREA,
-        label: i18n.translate('searchConnectors.nativeConnectors.github.listOfRepos.label', {
+        display: TEXTAREA,
+        label: translate('searchConnectors.nativeConnectors.github.listOfRepos.label', {
           defaultMessage: 'List of repositories',
         }),
         options: [],
         order: 9,
         required: true,
         sensitive: false,
-        tooltip: i18n.translate('searchConnectors.nativeConnectors.github.listOfRepos.tooltip', {
+        tooltip: translate('searchConnectors.nativeConnectors.github.listOfRepos.tooltip', {
           defaultMessage: 'This configurable field is ignored when Advanced Sync Rules are used.',
         }),
-        type: FieldType.LIST,
+        type: LIST,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -1184,14 +1170,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       ssl_enabled: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TOGGLE,
+        display: TOGGLE,
         label: ENABLE_SSL_LABEL,
         options: [],
         order: 10,
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: false,
@@ -1204,14 +1190,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: true,
           },
         ],
-        display: DisplayType.TEXTBOX,
+        display: TEXTBOX,
         label: SSL_CERTIFICATE_LABEL,
         options: [],
         order: 11,
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -1219,14 +1205,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       retry_count: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.NUMERIC,
+        display: NUMERIC,
         label: RETRIES_PER_REQUEST_LABEL,
         options: [],
         order: 12,
         required: false,
         sensitive: false,
         tooltip: null,
-        type: FieldType.INTEGER,
+        type: INTEGER,
         ui_restrictions: ['advanced'],
         validations: [],
         value: 3,
@@ -1234,14 +1220,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       use_text_extraction_service: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TOGGLE,
+        display: TOGGLE,
         label: USE_TEXT_EXTRACTION_SERVICE_LABEL,
         options: [],
         order: 13,
         required: true,
         sensitive: false,
         tooltip: USE_TEXT_EXTRACTION_SERVICE_TOOLTIP,
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: ['advanced'],
         validations: [],
         value: false,
@@ -1254,34 +1240,34 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: 'organization',
           },
         ],
-        display: DisplayType.TOGGLE,
+        display: TOGGLE,
         label: ENABLE_DOCUMENT_LEVEL_SECURITY_LABEL,
         options: [],
         order: 14,
         required: true,
         sensitive: false,
-        tooltip: i18n.translate(
+        tooltip: translate(
           'searchConnectors.nativeConnectors.github.configuration.useDocumentLevelSecurityTooltip',
           {
             defaultMessage:
               'Document level security ensures identities and permissions set in GitHub are maintained in Elasticsearch. This enables you to restrict and personalize read-access users and groups have to documents in this index. Access control syncs ensure this metadata is kept up to date in your Elasticsearch documents.',
           }
         ),
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: false,
       },
     },
-    name: i18n.translate('searchConnectors.nativeConnectors.github.name', {
+    name: translate('searchConnectors.nativeConnectors.github.name', {
       defaultMessage: 'Github',
     }),
     features: {
-      [FeatureName.SYNC_RULES]: {
+      [SYNC_RULES]: {
         advanced: { enabled: true },
         basic: { enabled: true },
       },
-      [FeatureName.INCREMENTAL_SYNC]: {
+      [INCREMENTAL_SYNC]: {
         enabled: true,
       },
     },
@@ -1292,8 +1278,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       service_account_credentials: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTAREA,
-        label: i18n.translate(
+        display: TEXTAREA,
+        label: translate(
           'searchConnectors.nativeConnectors.gmail.service_account_credentials.label',
           {
             defaultMessage: 'GMail service account JSON',
@@ -1304,7 +1290,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: true,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -1312,18 +1298,18 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       subject: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.gmail.subject.label', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.gmail.subject.label', {
           defaultMessage: 'Google Workspace admin email',
         }),
         options: [],
         order: 2,
         required: true,
         sensitive: false,
-        tooltip: i18n.translate('searchConnectors.nativeConnectors.gmail.subject.tooltip', {
+        tooltip: translate('searchConnectors.nativeConnectors.gmail.subject.tooltip', {
           defaultMessage: 'Admin account email address',
         }),
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [
           {
@@ -1336,18 +1322,18 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       customer_id: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.gmail.customer_id.label', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.gmail.customer_id.label', {
           defaultMessage: 'Google customer id',
         }),
         options: [],
         order: 3,
         required: true,
         sensitive: false,
-        tooltip: i18n.translate('searchConnectors.nativeConnectors.gmail.customer_id.tooltip', {
+        tooltip: translate('searchConnectors.nativeConnectors.gmail.customer_id.tooltip', {
           defaultMessage: 'Google admin console -> Account -> Settings -> Customer Id',
         }),
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -1355,24 +1341,21 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       include_spam_and_trash: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TOGGLE,
-        label: i18n.translate(
-          'searchConnectors.nativeConnectors.gmail.include_spam_and_trash.label',
-          {
-            defaultMessage: 'Include spam and trash emails',
-          }
-        ),
+        display: TOGGLE,
+        label: translate('searchConnectors.nativeConnectors.gmail.include_spam_and_trash.label', {
+          defaultMessage: 'Include spam and trash emails',
+        }),
         options: [],
         order: 4,
         required: true,
         sensitive: false,
-        tooltip: i18n.translate(
+        tooltip: translate(
           'searchConnectors.nativeConnectors.gmail.include_spam_and_trash.tooltip',
           {
             defaultMessage: 'Will include spam and trash emails, when set to true.',
           }
         ),
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: false,
@@ -1380,8 +1363,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       use_document_level_security: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TOGGLE,
-        label: i18n.translate(
+        display: TOGGLE,
+        label: translate(
           'searchConnectors.nativeConnectors.gmail.use_document_level_security.label',
           {
             defaultMessage: 'Enable document level security',
@@ -1391,39 +1374,39 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         order: 5,
         required: true,
         sensitive: false,
-        tooltip: i18n.translate(
+        tooltip: translate(
           'searchConnectors.nativeConnectors.gmail.use_document_level_security.tooltip',
           {
             defaultMessage:
               'Document level security ensures identities and permissions set in GMail are maintained in Elasticsearch. This enables you to restrict and personalize read-access users have to documents in this index. Access control syncs ensure this metadata is kept up to date in your Elasticsearch documents.',
           }
         ),
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: true,
       },
     },
     features: {
-      [FeatureName.SYNC_RULES]: {
+      [SYNC_RULES]: {
         advanced: { enabled: true },
         basic: { enabled: true },
       },
-      [FeatureName.DOCUMENT_LEVEL_SECURITY]: {
+      [DOCUMENT_LEVEL_SECURITY]: {
         enabled: true,
       },
-      [FeatureName.INCREMENTAL_SYNC]: {
+      [INCREMENTAL_SYNC]: {
         enabled: true,
       },
     },
-    name: i18n.translate('searchConnectors.nativeConnectors.gmail.name', {
+    name: translate('searchConnectors.nativeConnectors.gmail.name', {
       defaultMessage: 'Gmail',
     }),
     serviceType: 'gmail',
   },
   google_cloud_storage: {
     features: {
-      [FeatureName.INCREMENTAL_SYNC]: {
+      [INCREMENTAL_SYNC]: {
         enabled: true,
       },
     },
@@ -1431,19 +1414,16 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       buckets: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTAREA,
-        label: i18n.translate(
-          'searchConnectors.nativeConnectors.googleCloudStorage.bucketNameLabel',
-          {
-            defaultMessage: 'List of buckets',
-          }
-        ),
+        display: TEXTAREA,
+        label: translate('searchConnectors.nativeConnectors.googleCloudStorage.bucketNameLabel', {
+          defaultMessage: 'List of buckets',
+        }),
         options: [],
         order: 1,
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.LIST,
+        type: LIST,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -1451,8 +1431,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       service_account_credentials: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTAREA,
-        label: i18n.translate('searchConnectors.nativeConnectors.googleCloudStorage.label', {
+        display: TEXTAREA,
+        label: translate('searchConnectors.nativeConnectors.googleCloudStorage.label', {
           defaultMessage: 'Google Cloud service account JSON',
         }),
         options: [],
@@ -1460,7 +1440,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: true,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -1468,8 +1448,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       retry_count: {
         default_value: 3,
         depends_on: [],
-        display: DisplayType.NUMERIC,
-        label: i18n.translate('searchConnectors.nativeConnectors.googleCloudStorage.retry.label', {
+        display: NUMERIC,
+        label: translate('searchConnectors.nativeConnectors.googleCloudStorage.retry.label', {
           defaultMessage: 'Maximum retries for failed requests',
         }),
         options: [],
@@ -1477,7 +1457,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: false,
         sensitive: false,
         tooltip: null,
-        type: FieldType.INTEGER,
+        type: INTEGER,
         ui_restrictions: ['advanced'],
         validations: [],
         value: '',
@@ -1485,20 +1465,20 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       use_text_extraction_service: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TOGGLE,
+        display: TOGGLE,
         label: USE_TEXT_EXTRACTION_SERVICE_LABEL,
         options: [],
         order: 4,
         required: true,
         sensitive: false,
         tooltip: USE_TEXT_EXTRACTION_SERVICE_TOOLTIP,
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: ['advanced'],
         validations: [],
         value: false,
       },
     },
-    name: i18n.translate('searchConnectors.content.nativeConnectors.googleCloud.name', {
+    name: translate('searchConnectors.content.nativeConnectors.googleCloud.name', {
       defaultMessage: 'Google Cloud Storage',
     }),
     serviceType: 'google_cloud_storage',
@@ -1508,19 +1488,19 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       service_account_credentials: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTAREA,
-        label: i18n.translate('searchConnectors.nativeConnectors.gdrive.label', {
+        display: TEXTAREA,
+        label: translate('searchConnectors.nativeConnectors.gdrive.label', {
           defaultMessage: 'Google Drive service account JSON',
         }),
         options: [],
         order: 1,
         required: true,
         sensitive: true,
-        tooltip: i18n.translate('searchConnectors.nativeConnectors.gdrive.tooltip', {
+        tooltip: translate('searchConnectors.nativeConnectors.gdrive.tooltip', {
           defaultMessage:
             'This connectors authenticates as a service account to synchronize content from Google Drive.',
         }),
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -1528,25 +1508,22 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       use_domain_wide_delegation_for_sync: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TOGGLE,
-        label: i18n.translate(
-          'searchConnectors.nativeConnectors.gdrive.useDomainWideDelegation.label',
-          {
-            defaultMessage: 'Use domain-wide delegation for data sync',
-          }
-        ),
+        display: TOGGLE,
+        label: translate('searchConnectors.nativeConnectors.gdrive.useDomainWideDelegation.label', {
+          defaultMessage: 'Use domain-wide delegation for data sync',
+        }),
         options: [],
         order: 2,
         required: true,
         sensitive: false,
-        tooltip: i18n.translate(
+        tooltip: translate(
           'searchConnectors.nativeConnectors.gdrive.useDomainWideDelegation.tooltip',
           {
             defaultMessage:
               'Enable domain-wide delegation to automatically sync content from all shared and personal drives in the Google workspace. This eliminates the need to manually share Google Drive data with your service account, though it may increase sync time. If disabled, only items and folders manually shared with the service account will be synced. Please refer to the connector documentation to ensure domain-wide delegation is correctly configured and has the appropriate scopes.',
           }
         ),
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: false,
@@ -1559,8 +1536,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: true,
           },
         ],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate(
+        display: TEXTBOX,
+        label: translate(
           'searchConnectors.nativeConnectors.gdrive.workspaceAdminEmailDataSync.label',
           {
             defaultMessage: 'Google Workspace admin email',
@@ -1570,14 +1547,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         order: 3,
         required: true,
         sensitive: false,
-        tooltip: i18n.translate(
+        tooltip: translate(
           'searchConnectors.nativeConnectors.gdrive.workspaceAdminEmailDataSync.tooltip',
           {
             defaultMessage:
               'Provide the admin email to be used with domain-wide delegation for data sync. This email enables the connector to utilize the Admin Directory API for listing organization users. Please refer to the connector documentation to ensure domain-wide delegation is correctly configured and has the appropriate scopes.',
           }
         ),
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [
           {
@@ -1595,8 +1572,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: true,
           },
         ],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate(
+        display: TEXTBOX,
+        label: translate(
           'searchConnectors.nativeConnectors.gdrive.workspaceEmailSharedDrivesSync.label',
           {
             defaultMessage: 'Google Workspace email for syncing shared drives',
@@ -1606,14 +1583,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         order: 4,
         required: true,
         sensitive: false,
-        tooltip: i18n.translate(
+        tooltip: translate(
           'searchConnectors.nativeConnectors.gdrive.workspaceEmailSharedDrivesSync.tooltip',
           {
             defaultMessage:
               'Provide the Google Workspace user email for discovery and syncing of shared drives. Only the shared drives this user has access to will be synced.',
           }
         ),
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [
           {
@@ -1626,18 +1603,18 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       use_document_level_security: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TOGGLE,
+        display: TOGGLE,
         label: ENABLE_DOCUMENT_LEVEL_SECURITY_LABEL,
         options: [],
         order: 5,
         required: true,
         sensitive: false,
         tooltip: getEnableDocumentLevelSecurityTooltip(
-          i18n.translate('searchConnectors.nativeConnectors.gdrive.tooltipName', {
+          translate('searchConnectors.nativeConnectors.gdrive.tooltipName', {
             defaultMessage: 'Google Drive',
           })
         ),
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: false,
@@ -1654,23 +1631,19 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: false,
           },
         ],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate(
-          'searchConnectors.nativeConnectors.gdrive.workspaceAdminEmail.label',
-          { defaultMessage: 'Google Workspace admin email' }
-        ),
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.gdrive.workspaceAdminEmail.label', {
+          defaultMessage: 'Google Workspace admin email',
+        }),
         options: [],
         order: 6,
         required: true,
         sensitive: false,
-        tooltip: i18n.translate(
-          'searchConnectors.nativeConnectors.gdrive.workspaceAdminEmail.tooltip',
-          {
-            defaultMessage:
-              'In order to use Document Level Security you need to enable Google Workspace domain-wide delegation of authority for your service account. A service account with delegated authority can impersonate admin user with sufficient permissions to fetch all users and their corresponding permissions.',
-          }
-        ),
-        type: FieldType.STRING,
+        tooltip: translate('searchConnectors.nativeConnectors.gdrive.workspaceAdminEmail.tooltip', {
+          defaultMessage:
+            'In order to use Document Level Security you need to enable Google Workspace domain-wide delegation of authority for your service account. A service account with delegated authority can impersonate admin user with sufficient permissions to fetch all users and their corresponding permissions.',
+        }),
+        type: STRING,
         ui_restrictions: [],
         validations: [
           {
@@ -1683,19 +1656,19 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       max_concurrency: {
         default_value: 25,
         depends_on: [],
-        display: DisplayType.NUMERIC,
-        label: i18n.translate('searchConnectors.nativeConnectors.gdrive.maxHTTPRequest.label', {
+        display: NUMERIC,
+        label: translate('searchConnectors.nativeConnectors.gdrive.maxHTTPRequest.label', {
           defaultMessage: 'Maximum concurrent HTTP requests',
         }),
         options: [],
         order: 7,
         required: false,
         sensitive: false,
-        tooltip: i18n.translate('searchConnectors.nativeConnectors.gdrive.maxHTTPRequest.tooltip', {
+        tooltip: translate('searchConnectors.nativeConnectors.gdrive.maxHTTPRequest.tooltip', {
           defaultMessage:
             'This setting determines the maximum number of concurrent HTTP requests sent to the Google API to fetch data. Increasing this value can improve data retrieval speed, but it may also place higher demands on system resources and network bandwidth.',
         }),
-        type: FieldType.INTEGER,
+        type: INTEGER,
         ui_restrictions: ['advanced'],
         validations: [
           {
@@ -1708,28 +1681,28 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       use_text_extraction_service: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TOGGLE,
+        display: TOGGLE,
         label: USE_TEXT_EXTRACTION_SERVICE_LABEL,
         options: [],
         order: 8,
         required: true,
         sensitive: false,
         tooltip: USE_TEXT_EXTRACTION_SERVICE_TOOLTIP,
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: ['advanced'],
         validations: [],
         value: false,
       },
     },
     features: {
-      [FeatureName.DOCUMENT_LEVEL_SECURITY]: {
+      [DOCUMENT_LEVEL_SECURITY]: {
         enabled: true,
       },
-      [FeatureName.INCREMENTAL_SYNC]: {
+      [INCREMENTAL_SYNC]: {
         enabled: true,
       },
     },
-    name: i18n.translate('searchConnectors.nativeConnectors.google_drive.name', {
+    name: translate('searchConnectors.nativeConnectors.google_drive.name', {
       defaultMessage: 'Google Drive',
     }),
     serviceType: 'google_drive',
@@ -1739,25 +1712,25 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       data_source: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.DROPDOWN,
-        label: i18n.translate('searchConnectors.nativeConnectors.jira.dataSourceLabel', {
+        display: DROPDOWN,
+        label: translate('searchConnectors.nativeConnectors.jira.dataSourceLabel', {
           defaultMessage: 'Jira data source',
         }),
         options: [
           {
-            label: i18n.translate('searchConnectors.nativeConnectors.jira.jiraCloudLabel', {
+            label: translate('searchConnectors.nativeConnectors.jira.jiraCloudLabel', {
               defaultMessage: 'Jira Cloud',
             }),
             value: 'jira_cloud',
           },
           {
-            label: i18n.translate('searchConnectors.nativeConnectors.jira.jiraServerLabel', {
+            label: translate('searchConnectors.nativeConnectors.jira.jiraServerLabel', {
               defaultMessage: 'Jira Server',
             }),
             value: 'jira_server',
           },
           {
-            label: i18n.translate('searchConnectors.nativeConnectors.jira.jiraDataCenterLabel', {
+            label: translate('searchConnectors.nativeConnectors.jira.jiraDataCenterLabel', {
               defaultMessage: 'Jira Data Center',
             }),
             value: 'jira_data_center',
@@ -1767,7 +1740,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: 'jira_cloud',
@@ -1780,8 +1753,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: 'jira_server',
           },
         ],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.jira.serverUsername', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.jira.serverUsername', {
           defaultMessage: 'Jira Server username',
         }),
         options: [],
@@ -1789,7 +1762,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: 'admin',
@@ -1802,8 +1775,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: 'jira_server',
           },
         ],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.jira.serverPasswordLabel', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.jira.serverPasswordLabel', {
           defaultMessage: 'Jira Server password',
         }),
         options: [],
@@ -1811,7 +1784,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: true,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: 'changeme',
@@ -1824,8 +1797,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: 'jira_data_center',
           },
         ],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.jira.dataCenterUsername', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.jira.dataCenterUsername', {
           defaultMessage: 'Username',
         }),
         options: [],
@@ -1833,7 +1806,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: 'admin',
@@ -1846,8 +1819,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: 'jira_data_center',
           },
         ],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.jira.dataCenterPasswordLabel', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.jira.dataCenterPasswordLabel', {
           defaultMessage: 'Password',
         }),
         options: [],
@@ -1855,7 +1828,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: true,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: 'changeme',
@@ -1868,8 +1841,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: 'jira_cloud',
           },
         ],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.jira.cloudServiceAccountLabel', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.jira.cloudServiceAccountLabel', {
           defaultMessage: 'Jira Cloud email address',
         }),
         options: [],
@@ -1877,14 +1850,11 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         placeholder: 'me@example.com',
         required: true,
         sensitive: false,
-        tooltip: i18n.translate(
-          'searchConnectors.nativeConnectors.jira.cloudServiceAccountTooltip',
-          {
-            defaultMessage:
-              'Email address associated with Jira Cloud account. E.g. jane.doe@gmail.com',
-          }
-        ),
-        type: FieldType.STRING,
+        tooltip: translate('searchConnectors.nativeConnectors.jira.cloudServiceAccountTooltip', {
+          defaultMessage:
+            'Email address associated with Jira Cloud account. E.g. jane.doe@gmail.com',
+        }),
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -1897,8 +1867,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: 'jira_cloud',
           },
         ],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.jira.cloudApiTokenLabel', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.jira.cloudApiTokenLabel', {
           defaultMessage: 'Jira Cloud API token',
         }),
         options: [],
@@ -1906,7 +1876,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: true,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: 'abc#123',
@@ -1914,8 +1884,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       jira_url: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.jira.hostUrlLabel', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.jira.hostUrlLabel', {
           defaultMessage: 'Jira host url',
         }),
         options: [],
@@ -1924,7 +1894,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -1932,8 +1902,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       projects: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTAREA,
-        label: i18n.translate('searchConnectors.nativeConnectors.jira.projectKeysLabel', {
+        display: TEXTAREA,
+        label: translate('searchConnectors.nativeConnectors.jira.projectKeysLabel', {
           defaultMessage: 'Jira project keys',
         }),
         options: [],
@@ -1941,7 +1911,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: ADVANCED_RULES_IGNORED_LABEL,
-        type: FieldType.LIST,
+        type: LIST,
         ui_restrictions: [],
         validations: [],
         value: '*',
@@ -1949,14 +1919,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       ssl_enabled: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TOGGLE,
+        display: TOGGLE,
         label: ENABLE_SSL_LABEL,
         options: [],
         order: 10,
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: false,
@@ -1969,14 +1939,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: true,
           },
         ],
-        display: DisplayType.TEXTBOX,
+        display: TEXTBOX,
         label: SSL_CERTIFICATE_LABEL,
         options: [],
         order: 11,
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -1984,14 +1954,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       retry_count: {
         default_value: 3,
         depends_on: [],
-        display: DisplayType.NUMERIC,
+        display: NUMERIC,
         label: RETRIES_PER_REQUEST_LABEL,
         options: [],
         order: 12,
         required: false,
         sensitive: false,
         tooltip: null,
-        type: FieldType.INTEGER,
+        type: INTEGER,
         ui_restrictions: ['advanced'],
         validations: [],
         value: 3,
@@ -1999,14 +1969,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       concurrent_downloads: {
         default_value: 100,
         depends_on: [],
-        display: DisplayType.NUMERIC,
+        display: NUMERIC,
         label: MAX_CONCURRENT_DOWNLOADS_LABEL,
         options: [],
         order: 13,
         required: false,
         sensitive: false,
         tooltip: null,
-        type: FieldType.INTEGER,
+        type: INTEGER,
         ui_restrictions: ['advanced'],
         validations: [
           {
@@ -2019,18 +1989,18 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       use_document_level_security: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TOGGLE,
+        display: TOGGLE,
         label: ENABLE_DOCUMENT_LEVEL_SECURITY_LABEL,
         options: [],
         order: 14,
         required: true,
         sensitive: false,
         tooltip: getEnableDocumentLevelSecurityTooltip(
-          i18n.translate('searchConnectors.nativeConnectors.jiraTooltip.name', {
+          translate('searchConnectors.nativeConnectors.jiraTooltip.name', {
             defaultMessage: 'Jira',
           })
         ),
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: false,
@@ -2038,32 +2008,32 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       use_text_extraction_service: {
         default_value: false,
         depends_on: [],
-        display: DisplayType.TOGGLE,
+        display: TOGGLE,
         label: USE_TEXT_EXTRACTION_SERVICE_LABEL,
         options: [],
         order: 15,
         required: true,
         sensitive: false,
         tooltip: USE_TEXT_EXTRACTION_SERVICE_TOOLTIP,
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: ['advanced'],
         validations: [],
         value: false,
       },
     },
     features: {
-      [FeatureName.SYNC_RULES]: {
+      [SYNC_RULES]: {
         advanced: { enabled: true },
         basic: { enabled: true },
       },
-      [FeatureName.DOCUMENT_LEVEL_SECURITY]: {
+      [DOCUMENT_LEVEL_SECURITY]: {
         enabled: true,
       },
-      [FeatureName.INCREMENTAL_SYNC]: {
+      [INCREMENTAL_SYNC]: {
         enabled: true,
       },
     },
-    name: i18n.translate('searchConnectors.nativeConnectors.jira.name', {
+    name: translate('searchConnectors.nativeConnectors.jira.name', {
       defaultMessage: 'Jira',
     }),
     serviceType: 'jira',
@@ -2073,8 +2043,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       tenant_id: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.microsoftTeams.tenantIdLabel', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.microsoftTeams.tenantIdLabel', {
           defaultMessage: 'Tenant ID',
         }),
         options: [],
@@ -2082,7 +2052,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -2090,8 +2060,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       client_id: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.microsoftTeams.clientIdLabel', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.microsoftTeams.clientIdLabel', {
           defaultMessage: 'Client ID',
         }),
         options: [],
@@ -2099,7 +2069,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -2107,8 +2077,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       secret_value: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.microsoftTeams.secretValueLabel', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.microsoftTeams.secretValueLabel', {
           defaultMessage: 'Secret value',
         }),
         options: [],
@@ -2116,7 +2086,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: true,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -2124,14 +2094,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       username: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
+        display: TEXTBOX,
         label: USERNAME_LABEL,
         options: [],
         order: 4,
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -2139,21 +2109,21 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       password: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
+        display: TEXTBOX,
         label: PASSWORD_LABEL,
         options: [],
         order: 5,
         required: true,
         sensitive: true,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
       },
     },
     features: {},
-    name: i18n.translate('searchConnectors.nativeConnectors.microsoftTeams.name', {
+    name: translate('searchConnectors.nativeConnectors.microsoftTeams.name', {
       defaultMessage: 'Microsoft Teams',
     }),
     serviceType: 'microsoft_teams',
@@ -2163,8 +2133,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       host: {
         default_value: '',
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.mongodb.configuration.hostLabel', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.mongodb.configuration.hostLabel', {
           defaultMessage: 'Server hostname',
         }),
         options: [],
@@ -2172,7 +2142,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -2180,14 +2150,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       user: {
         default_value: '',
         depends_on: [],
-        display: DisplayType.TEXTBOX,
+        display: TEXTBOX,
         label: USERNAME_LABEL,
         options: [],
         order: 2,
         required: false,
         sensitive: false,
         tooltip: '',
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -2195,14 +2165,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       password: {
         default_value: '',
         depends_on: [],
-        display: DisplayType.TEXTBOX,
+        display: TEXTBOX,
         label: PASSWORD_LABEL,
         options: [],
         order: 3,
         required: false,
         sensitive: true,
         tooltip: '',
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -2210,14 +2180,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       database: {
         default_value: '',
         depends_on: [],
-        display: DisplayType.TEXTBOX,
+        display: TEXTBOX,
         label: DATABASE_LABEL,
         options: [],
         order: 4,
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -2225,8 +2195,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       collection: {
         default_value: '',
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate(
+        display: TEXTBOX,
+        label: translate(
           'searchConnectors.nativeConnectors.mongodb.configuration.collectionLabel',
           {
             defaultMessage: 'Collection',
@@ -2237,7 +2207,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -2245,8 +2215,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       direct_connection: {
         default_value: false,
         depends_on: [],
-        display: DisplayType.TOGGLE,
-        label: i18n.translate(
+        display: TOGGLE,
+        label: translate(
           'searchConnectors.nativeConnectors.mongodb.configuration.directConnectionLabel',
           {
             defaultMessage: 'Direct connection',
@@ -2257,7 +2227,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: false,
@@ -2265,8 +2235,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       ssl_enabled: {
         default_value: false,
         depends_on: [],
-        display: DisplayType.TOGGLE,
-        label: i18n.translate(
+        display: TOGGLE,
+        label: translate(
           'searchConnectors.nativeConnectors.mongodb.configuration.sslEnabledLabel',
           {
             defaultMessage: 'SSL/TLS Connection',
@@ -2276,14 +2246,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         order: 7,
         required: true,
         sensitive: false,
-        tooltip: i18n.translate(
+        tooltip: translate(
           'searchConnectors.nativeConnectors.mongodb.configuration.sslEnabledTooltip',
           {
             defaultMessage:
               'This option establishes a secure connection to the MongoDB server using SSL/TLS encryption. Ensure that your MongoDB deployment supports SSL/TLS connections. Enable if MongoDB cluster uses DNS SRV records.',
           }
         ),
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: false,
@@ -2291,25 +2261,19 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       ssl_ca: {
         default_value: '',
         depends_on: [{ field: 'ssl_enabled', value: true }],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate(
-          'searchConnectors.nativeConnectors.mongodb.configuration.sslCaLabel',
-          {
-            defaultMessage: 'Certificate Authority (.pem)',
-          }
-        ),
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.mongodb.configuration.sslCaLabel', {
+          defaultMessage: 'Certificate Authority (.pem)',
+        }),
         options: [],
         order: 8,
         required: false,
         sensitive: false,
-        tooltip: i18n.translate(
-          'searchConnectors.nativeConnectors.mongodb.configuration.sslCaTooltip',
-          {
-            defaultMessage:
-              'Specifies the root certificate from the Certificate Authority. The value of the certificate is used to validate the certificate presented by the MongoDB instance.',
-          }
-        ),
-        type: FieldType.STRING,
+        tooltip: translate('searchConnectors.nativeConnectors.mongodb.configuration.sslCaTooltip', {
+          defaultMessage:
+            'Specifies the root certificate from the Certificate Authority. The value of the certificate is used to validate the certificate presented by the MongoDB instance.',
+        }),
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -2317,8 +2281,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       tls_insecure: {
         default_value: false,
         depends_on: [{ field: 'ssl_enabled', value: true }],
-        display: DisplayType.TOGGLE,
-        label: i18n.translate(
+        display: TOGGLE,
+        label: translate(
           'searchConnectors.nativeConnectors.mongodb.configuration.tlsInsecureLabel',
           {
             defaultMessage: 'Skip certificate verification',
@@ -2328,28 +2292,28 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         order: 9,
         required: true,
         sensitive: false,
-        tooltip: i18n.translate(
+        tooltip: translate(
           'searchConnectors.nativeConnectors.mongodb.configuration.tlsInsecureTooltip',
           {
             defaultMessage:
               "This option skips certificate validation for TLS/SSL connections to your MongoDB server. We strongly recommend setting this option to 'disable'.",
           }
         ),
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: ['advanced'],
         validations: [],
         value: false,
       },
     },
     features: {
-      [FeatureName.FILTERING_ADVANCED_CONFIG]: true,
-      [FeatureName.FILTERING_RULES]: true,
-      [FeatureName.SYNC_RULES]: {
+      [FILTERING_ADVANCED_CONFIG]: true,
+      [FILTERING_RULES]: true,
+      [SYNC_RULES]: {
         advanced: { enabled: true },
         basic: { enabled: true },
       },
     },
-    name: i18n.translate('searchConnectors.nativeConnectors.mongodb.name', {
+    name: translate('searchConnectors.nativeConnectors.mongodb.name', {
       defaultMessage: 'MongoDB',
     }),
     serviceType: 'mongodb',
@@ -2359,8 +2323,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       host: {
         default_value: '',
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.mssql.configuration.hostLabel', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.mssql.configuration.hostLabel', {
           defaultMessage: 'Host',
         }),
         options: [],
@@ -2368,7 +2332,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -2376,14 +2340,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       port: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.NUMERIC,
+        display: NUMERIC,
         label: PORT_LABEL,
         options: [],
         order: 2,
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.INTEGER,
+        type: INTEGER,
         ui_restrictions: [],
         validations: [],
         value: 1433,
@@ -2391,19 +2355,16 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       username: {
         default_value: '',
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate(
-          'searchConnectors.nativeConnectors.mssql.configuration.usernameLabel',
-          {
-            defaultMessage: 'Username',
-          }
-        ),
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.mssql.configuration.usernameLabel', {
+          defaultMessage: 'Username',
+        }),
         options: [],
         order: 3,
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -2411,19 +2372,16 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       password: {
         default_value: '',
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate(
-          'searchConnectors.nativeConnectors.mssql.configuration.passwordLabel',
-          {
-            defaultMessage: 'Password',
-          }
-        ),
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.mssql.configuration.passwordLabel', {
+          defaultMessage: 'Password',
+        }),
         options: [],
         order: 4,
         required: true,
         sensitive: true,
         tooltip: '',
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -2431,14 +2389,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       database: {
         default_value: '',
         depends_on: [],
-        display: DisplayType.TEXTBOX,
+        display: TEXTBOX,
         label: DATABASE_LABEL,
         options: [],
         order: 5,
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -2446,8 +2404,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       tables: {
         default_value: '',
         depends_on: [],
-        display: DisplayType.TEXTAREA,
-        label: i18n.translate('searchConnectors.nativeConnectors.mssql.configuration.tablesLabel', {
+        display: TEXTAREA,
+        label: translate('searchConnectors.nativeConnectors.mssql.configuration.tablesLabel', {
           defaultMessage: 'Comma-separated list of tables',
         }),
         options: [],
@@ -2455,7 +2413,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.LIST,
+        type: LIST,
         ui_restrictions: [],
         validations: [],
         value: '*',
@@ -2463,14 +2421,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       ssl_enabled: {
         default_value: false,
         depends_on: [],
-        display: DisplayType.TOGGLE,
+        display: TOGGLE,
         label: ENABLE_SSL_LABEL,
         options: [],
         order: 10,
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: false,
@@ -2478,14 +2436,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       ssl_ca: {
         default_value: '',
         depends_on: [{ field: 'ssl_enabled', value: true }],
-        display: DisplayType.TEXTBOX,
+        display: TEXTBOX,
         label: SSL_CERTIFICATE_LABEL,
         options: [],
         order: 11,
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -2493,8 +2451,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       schema: {
         default_value: '',
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.mssql.configuration.schemaLabel', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.mssql.configuration.schemaLabel', {
           defaultMessage: 'Schema',
         }),
         options: [],
@@ -2502,7 +2460,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: 'dbo',
@@ -2510,19 +2468,16 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       fetch_size: {
         default_value: 50,
         depends_on: [],
-        display: DisplayType.NUMERIC,
-        label: i18n.translate(
-          'searchConnectors.nativeConnectors.mssql.configuration.rowsFetchedLabel',
-          {
-            defaultMessage: 'Rows fetched per request',
-          }
-        ),
+        display: NUMERIC,
+        label: translate('searchConnectors.nativeConnectors.mssql.configuration.rowsFetchedLabel', {
+          defaultMessage: 'Rows fetched per request',
+        }),
         options: [],
         order: 7,
         required: false,
         sensitive: false,
         tooltip: '',
-        type: FieldType.INTEGER,
+        type: INTEGER,
         ui_restrictions: ['advanced'],
         validations: [],
         value: 50,
@@ -2530,19 +2485,16 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       retry_count: {
         default_value: 3,
         depends_on: [],
-        display: DisplayType.NUMERIC,
-        label: i18n.translate(
-          'searchConnectors.nativeConnectors.mssql.configuration.retriesLabel',
-          {
-            defaultMessage: 'Retries per request',
-          }
-        ),
+        display: NUMERIC,
+        label: translate('searchConnectors.nativeConnectors.mssql.configuration.retriesLabel', {
+          defaultMessage: 'Retries per request',
+        }),
         options: [],
         order: 8,
         required: false,
         sensitive: false,
         tooltip: '',
-        type: FieldType.INTEGER,
+        type: INTEGER,
         ui_restrictions: ['advanced'],
         validations: [],
         value: 3,
@@ -2550,8 +2502,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       validate_host: {
         default_value: false,
         depends_on: [],
-        display: DisplayType.TOGGLE,
-        label: i18n.translate(
+        display: TOGGLE,
+        label: translate(
           'searchConnectors.nativeConnectors.mssql.configuration.validateHostLabel',
           {
             defaultMessage: 'Validate host',
@@ -2562,19 +2514,19 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: false,
       },
     },
     features: {
-      [FeatureName.SYNC_RULES]: {
+      [SYNC_RULES]: {
         advanced: { enabled: true },
         basic: { enabled: true },
       },
     },
-    name: i18n.translate('searchConnectors.nativeConnectors.mssql.name', {
+    name: translate('searchConnectors.nativeConnectors.mssql.name', {
       defaultMessage: 'Microsoft SQL',
     }),
     serviceType: 'mssql',
@@ -2584,8 +2536,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       host: {
         default_value: '',
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.mysql.configuration.hostLabel', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.mysql.configuration.hostLabel', {
           defaultMessage: 'Host',
         }),
         options: [],
@@ -2593,7 +2545,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -2601,14 +2553,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       port: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.NUMERIC,
+        display: NUMERIC,
         label: PORT_LABEL,
         options: [],
         order: 2,
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.INTEGER,
+        type: INTEGER,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -2616,19 +2568,16 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       user: {
         default_value: '',
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate(
-          'searchConnectors.nativeConnectors.mysql.configuration.usernameLabel',
-          {
-            defaultMessage: 'Username',
-          }
-        ),
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.mysql.configuration.usernameLabel', {
+          defaultMessage: 'Username',
+        }),
         options: [],
         order: 3,
         required: false,
         sensitive: false,
         tooltip: '',
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -2636,19 +2585,16 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       password: {
         default_value: '',
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate(
-          'searchConnectors.nativeConnectors.mysql.configuration.passwordLabel',
-          {
-            defaultMessage: 'Password',
-          }
-        ),
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.mysql.configuration.passwordLabel', {
+          defaultMessage: 'Password',
+        }),
         options: [],
         order: 4,
         required: false,
         sensitive: true,
         tooltip: '',
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -2656,14 +2602,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       database: {
         default_value: '',
         depends_on: [],
-        display: DisplayType.TEXTBOX,
+        display: TEXTBOX,
         label: DATABASE_LABEL,
         options: [],
         order: 5,
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -2671,8 +2617,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       tables: {
         default_value: '',
         depends_on: [],
-        display: DisplayType.TEXTAREA,
-        label: i18n.translate('searchConnectors.nativeConnectors.mysql.configuration.tablesLabel', {
+        display: TEXTAREA,
+        label: translate('searchConnectors.nativeConnectors.mysql.configuration.tablesLabel', {
           defaultMessage: 'Comma-separated list of tables',
         }),
         options: [],
@@ -2680,7 +2626,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.LIST,
+        type: LIST,
         ui_restrictions: [],
         validations: [],
         value: '*',
@@ -2688,14 +2634,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       ssl_enabled: {
         default_value: false,
         depends_on: [],
-        display: DisplayType.TOGGLE,
+        display: TOGGLE,
         label: ENABLE_SSL_LABEL,
         options: [],
         order: 7,
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: false,
@@ -2703,14 +2649,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       ssl_ca: {
         default_value: '',
         depends_on: [{ field: 'ssl_enabled', value: true }],
-        display: DisplayType.TEXTBOX,
+        display: TEXTBOX,
         label: SSL_CERTIFICATE_LABEL,
         options: [],
         order: 8,
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -2718,19 +2664,16 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       fetch_size: {
         default_value: 50,
         depends_on: [],
-        display: DisplayType.NUMERIC,
-        label: i18n.translate(
-          'searchConnectors.nativeConnectors.mysql.configuration.rowsFetchedLabel',
-          {
-            defaultMessage: 'Rows fetched per request',
-          }
-        ),
+        display: NUMERIC,
+        label: translate('searchConnectors.nativeConnectors.mysql.configuration.rowsFetchedLabel', {
+          defaultMessage: 'Rows fetched per request',
+        }),
         options: [],
         order: 9,
         required: false,
         sensitive: false,
         tooltip: '',
-        type: FieldType.INTEGER,
+        type: INTEGER,
         ui_restrictions: ['advanced'],
         validations: [],
         value: 50,
@@ -2738,31 +2681,28 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       retry_count: {
         default_value: 3,
         depends_on: [],
-        display: DisplayType.NUMERIC,
-        label: i18n.translate(
-          'searchConnectors.nativeConnectors.mysql.configuration.retriesLabel',
-          {
-            defaultMessage: 'Retries per request',
-          }
-        ),
+        display: NUMERIC,
+        label: translate('searchConnectors.nativeConnectors.mysql.configuration.retriesLabel', {
+          defaultMessage: 'Retries per request',
+        }),
         options: [],
         order: 10,
         required: false,
         sensitive: false,
         tooltip: '',
-        type: FieldType.INTEGER,
+        type: INTEGER,
         ui_restrictions: ['advanced'],
         validations: [],
         value: 3,
       },
     },
     features: {
-      [FeatureName.SYNC_RULES]: {
+      [SYNC_RULES]: {
         advanced: { enabled: true },
         basic: { enabled: true },
       },
     },
-    name: i18n.translate('searchConnectors.nativeConnectors.mysql.name', {
+    name: translate('searchConnectors.nativeConnectors.mysql.name', {
       defaultMessage: 'MySQL',
     }),
     serviceType: 'mysql',
@@ -2772,14 +2712,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       username: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
+        display: TEXTBOX,
         label: USERNAME_LABEL,
         options: [],
         order: 1,
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -2787,14 +2727,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       password: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
+        display: TEXTBOX,
         label: PASSWORD_LABEL,
         options: [],
         order: 2,
         required: true,
         sensitive: true,
         tooltip: '',
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -2802,8 +2742,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       server_ip: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.networkDrive.ipAddressLabel', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.networkDrive.ipAddressLabel', {
           defaultMessage: 'IP address',
         }),
         options: [],
@@ -2812,7 +2752,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -2820,14 +2760,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       server_port: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.NUMERIC,
+        display: NUMERIC,
         label: PORT_LABEL,
         options: [],
         order: 4,
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.INTEGER,
+        type: INTEGER,
         ui_restrictions: [],
         validations: [],
         value: 445,
@@ -2835,8 +2775,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       drive_path: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.networkDrive.pathLabel', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.networkDrive.pathLabel', {
           defaultMessage: 'Path',
         }),
         options: [],
@@ -2845,7 +2785,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -2853,33 +2793,33 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       use_document_level_security: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TOGGLE,
+        display: TOGGLE,
         label: ENABLE_DOCUMENT_LEVEL_SECURITY_LABEL,
         options: [],
         order: 6,
         required: true,
         sensitive: false,
         tooltip: getEnableDocumentLevelSecurityTooltip(
-          i18n.translate('searchConnectors.nativeConnectors.networkDriveTooltip.name', {
+          translate('searchConnectors.nativeConnectors.networkDriveTooltip.name', {
             defaultMessage: 'Network drive',
           })
         ),
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: false,
       },
     },
     features: {
-      [FeatureName.SYNC_RULES]: {
+      [SYNC_RULES]: {
         advanced: { enabled: true },
         basic: { enabled: true },
       },
-      [FeatureName.INCREMENTAL_SYNC]: {
+      [INCREMENTAL_SYNC]: {
         enabled: true,
       },
     },
-    name: i18n.translate('searchConnectors.nativeConnectors.networkDrive.name', {
+    name: translate('searchConnectors.nativeConnectors.networkDrive.name', {
       defaultMessage: 'Network drive',
     }),
     serviceType: 'network_drive',
@@ -2889,8 +2829,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       notion_secret_key: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.notion.notionSecretKeyLabel', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.notion.notionSecretKeyLabel', {
           defaultMessage: 'Notion Secret Key',
         }),
         options: [],
@@ -2898,7 +2838,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: true,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -2906,8 +2846,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       databases: {
         default_value: '',
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.notion.databasesLabel', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.notion.databasesLabel', {
           defaultMessage: 'List of Databases',
         }),
         options: [],
@@ -2915,7 +2855,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.LIST,
+        type: LIST,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -2923,8 +2863,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       pages: {
         default_value: '',
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.notion.pagesLabel', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.notion.pagesLabel', {
           defaultMessage: 'List of Pages',
         }),
         options: [],
@@ -2932,7 +2872,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.LIST,
+        type: LIST,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -2940,19 +2880,19 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       index_comments: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TOGGLE,
-        label: i18n.translate('searchConnectors.nativeConnectors.notion.indexCommentsLabel', {
+        display: TOGGLE,
+        label: translate('searchConnectors.nativeConnectors.notion.indexCommentsLabel', {
           defaultMessage: 'Enable indexing comments',
         }),
         options: [],
         order: 4,
         required: true,
         sensitive: false,
-        tooltip: i18n.translate('searchConnectors.nativeConnectors.notion.indexCommentsTooltip', {
+        tooltip: translate('searchConnectors.nativeConnectors.notion.indexCommentsTooltip', {
           defaultMessage:
             'Enabling this will increase the amount of network calls to the source, and may decrease performance',
         }),
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: false,
@@ -2960,26 +2900,26 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       concurrent_downloads: {
         default_value: 30,
         depends_on: [],
-        display: DisplayType.NUMERIC,
+        display: NUMERIC,
         label: MAX_CONCURRENT_DOWNLOADS_LABEL,
         options: [],
         order: 5,
         required: false,
         sensitive: false,
         tooltip: null,
-        type: FieldType.INTEGER,
+        type: INTEGER,
         ui_restrictions: ['advanced'],
         validations: [],
         value: '',
       },
     },
     features: {
-      [FeatureName.SYNC_RULES]: {
+      [SYNC_RULES]: {
         advanced: { enabled: true },
         basic: { enabled: true },
       },
     },
-    name: i18n.translate('searchConnectors.nativeConnectors.notion.name', {
+    name: translate('searchConnectors.nativeConnectors.notion.name', {
       defaultMessage: 'Notion',
     }),
     serviceType: 'notion',
@@ -2989,8 +2929,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       client_id: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.oneDrive.azureClientId.label', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.oneDrive.azureClientId.label', {
           defaultMessage: 'Azure application Client ID',
         }),
         options: [],
@@ -2998,7 +2938,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -3006,17 +2946,16 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       client_secret: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate(
-          'searchConnectors.nativeConnectors.oneDrive.azureClientSecret.label',
-          { defaultMessage: 'Azure application Client Secret' }
-        ),
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.oneDrive.azureClientSecret.label', {
+          defaultMessage: 'Azure application Client Secret',
+        }),
         options: [],
         order: 2,
         required: true,
         sensitive: true,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -3024,8 +2963,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       tenant_id: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.oneDrive.tenantId.label', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.oneDrive.tenantId.label', {
           defaultMessage: 'Azure application Tenant ID',
         }),
         options: [],
@@ -3033,7 +2972,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -3041,14 +2980,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       retry_count: {
         default_value: 3,
         depends_on: [],
-        display: DisplayType.NUMERIC,
+        display: NUMERIC,
         label: RETRIES_PER_REQUEST_LABEL,
         options: [],
         order: 4,
         required: false,
         sensitive: false,
         tooltip: null,
-        type: FieldType.INTEGER,
+        type: INTEGER,
         ui_restrictions: ['advanced'],
         validations: [],
         value: '',
@@ -3056,14 +2995,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       concurrent_downloads: {
         default_value: 15,
         depends_on: [],
-        display: DisplayType.NUMERIC,
+        display: NUMERIC,
         label: MAX_CONCURRENT_DOWNLOADS_LABEL,
         options: [],
         order: 5,
         required: false,
         sensitive: false,
         tooltip: null,
-        type: FieldType.INTEGER,
+        type: INTEGER,
         ui_restrictions: ['advanced'],
         validations: [],
         value: '',
@@ -3071,18 +3010,18 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       use_document_level_security: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TOGGLE,
+        display: TOGGLE,
         label: ENABLE_DOCUMENT_LEVEL_SECURITY_LABEL,
         options: [],
         order: 6,
         required: true,
         sensitive: false,
         tooltip: getEnableDocumentLevelSecurityTooltip(
-          i18n.translate('searchConnectors.nativeConnectors.oneDriveTooltip.name', {
+          translate('searchConnectors.nativeConnectors.oneDriveTooltip.name', {
             defaultMessage: 'OneDrive',
           })
         ),
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: false,
@@ -3090,31 +3029,31 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       use_text_extraction_service: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TOGGLE,
+        display: TOGGLE,
         label: USE_TEXT_EXTRACTION_SERVICE_LABEL,
         options: [],
         order: 7,
         required: true,
         sensitive: false,
         tooltip: USE_TEXT_EXTRACTION_SERVICE_TOOLTIP,
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: ['advanced'],
         validations: [],
         value: false,
       },
     },
-    name: i18n.translate('searchConnectors.nativeConnectors.onedrive.name', {
+    name: translate('searchConnectors.nativeConnectors.onedrive.name', {
       defaultMessage: 'OneDrive',
     }),
     features: {
-      [FeatureName.SYNC_RULES]: {
+      [SYNC_RULES]: {
         advanced: { enabled: true },
         basic: { enabled: true },
       },
-      [FeatureName.DOCUMENT_LEVEL_SECURITY]: {
+      [DOCUMENT_LEVEL_SECURITY]: {
         enabled: true,
       },
-      [FeatureName.INCREMENTAL_SYNC]: {
+      [INCREMENTAL_SYNC]: {
         enabled: true,
       },
     },
@@ -3125,8 +3064,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       host: {
         default_value: '',
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.oracle.configuration.hostLabel', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.oracle.configuration.hostLabel', {
           defaultMessage: 'Host',
         }),
         options: [],
@@ -3134,7 +3073,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -3142,8 +3081,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       port: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.NUMERIC,
-        label: i18n.translate('searchConnectors.nativeConnectors.oracle.configuration.portLabel', {
+        display: NUMERIC,
+        label: translate('searchConnectors.nativeConnectors.oracle.configuration.portLabel', {
           defaultMessage: 'Port',
         }),
         options: [],
@@ -3151,7 +3090,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.INTEGER,
+        type: INTEGER,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -3159,19 +3098,16 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       username: {
         default_value: '',
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate(
-          'searchConnectors.nativeConnectors.oracle.configuration.usernameLabel',
-          {
-            defaultMessage: 'Username',
-          }
-        ),
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.oracle.configuration.usernameLabel', {
+          defaultMessage: 'Username',
+        }),
         options: [],
         order: 3,
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -3179,19 +3115,16 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       password: {
         default_value: '',
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate(
-          'searchConnectors.nativeConnectors.oracle.configuration.passwordLabel',
-          {
-            defaultMessage: 'Password',
-          }
-        ),
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.oracle.configuration.passwordLabel', {
+          defaultMessage: 'Password',
+        }),
         options: [],
         order: 4,
         required: true,
         sensitive: true,
         tooltip: '',
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -3199,19 +3132,16 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       database: {
         default_value: '',
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate(
-          'searchConnectors.nativeConnectors.oracle.configuration.databaseLabel',
-          {
-            defaultMessage: 'Database',
-          }
-        ),
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.oracle.configuration.databaseLabel', {
+          defaultMessage: 'Database',
+        }),
         options: [],
         order: 5,
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -3219,19 +3149,16 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       tables: {
         default_value: '',
         depends_on: [],
-        display: DisplayType.TEXTAREA,
-        label: i18n.translate(
-          'searchConnectors.nativeConnectors.oracle.configuration.tablesLabel',
-          {
-            defaultMessage: 'Comma-separated list of tables',
-          }
-        ),
+        display: TEXTAREA,
+        label: translate('searchConnectors.nativeConnectors.oracle.configuration.tablesLabel', {
+          defaultMessage: 'Comma-separated list of tables',
+        }),
         options: [],
         order: 6,
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.LIST,
+        type: LIST,
         ui_restrictions: [],
         validations: [],
         value: '*',
@@ -3239,19 +3166,16 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       fetch_size: {
         default_value: 50,
         depends_on: [],
-        display: DisplayType.NUMERIC,
-        label: i18n.translate(
-          'searchConnectors.nativeConnectors.oracle.configuration.fetch_sizeLabel',
-          {
-            defaultMessage: 'Rows fetched per request',
-          }
-        ),
+        display: NUMERIC,
+        label: translate('searchConnectors.nativeConnectors.oracle.configuration.fetch_sizeLabel', {
+          defaultMessage: 'Rows fetched per request',
+        }),
         options: [],
         order: 7,
         required: false,
         sensitive: false,
         tooltip: '',
-        type: FieldType.INTEGER,
+        type: INTEGER,
         ui_restrictions: ['advanced'],
         validations: [],
         value: 50,
@@ -3259,8 +3183,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       retry_count: {
         default_value: 3,
         depends_on: [],
-        display: DisplayType.NUMERIC,
-        label: i18n.translate(
+        display: NUMERIC,
+        label: translate(
           'searchConnectors.nativeConnectors.oracle.configuration.retry_countLabel',
           {
             defaultMessage: 'Retries per request',
@@ -3271,7 +3195,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: false,
         sensitive: false,
         tooltip: '',
-        type: FieldType.INTEGER,
+        type: INTEGER,
         ui_restrictions: ['advanced'],
         validations: [],
         value: 3,
@@ -3279,8 +3203,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       oracle_protocol: {
         default_value: 'TCP',
         depends_on: [],
-        display: DisplayType.DROPDOWN,
-        label: i18n.translate(
+        display: DROPDOWN,
+        label: translate(
           'searchConnectors.nativeConnectors.oracle.configuration.oracle_protocolLabel',
           {
             defaultMessage: 'Oracle connection protocol',
@@ -3300,7 +3224,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: ['advanced'],
         validations: [],
         value: 'TCP',
@@ -3308,8 +3232,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       oracle_home: {
         default_value: '',
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate(
+        display: TEXTBOX,
+        label: translate(
           'searchConnectors.nativeConnectors.oracle.configuration.oracle_homeLabel',
           {
             defaultMessage: 'Path to Oracle Home',
@@ -3320,7 +3244,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: false,
         sensitive: false,
         tooltip: '',
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: ['advanced'],
         validations: [],
         value: '',
@@ -3328,8 +3252,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       wallet_configuration_path: {
         default_value: '',
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate(
+        display: TEXTBOX,
+        label: translate(
           'searchConnectors.nativeConnectors.oracle.configuration.wallet_configuration_pathLabel',
           {
             defaultMessage: 'Path to SSL Wallet configuration files',
@@ -3340,19 +3264,19 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: false,
         sensitive: false,
         tooltip: '',
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: ['advanced'],
         validations: [],
         value: '',
       },
     },
     features: {
-      [FeatureName.SYNC_RULES]: {
+      [SYNC_RULES]: {
         advanced: { enabled: false },
         basic: { enabled: true },
       },
     },
-    name: i18n.translate('searchConnectors.nativeConnectors.oracle.name', {
+    name: translate('searchConnectors.nativeConnectors.oracle.name', {
       defaultMessage: 'Oracle',
     }),
     serviceType: 'oracle',
@@ -3362,8 +3286,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       data_source: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.DROPDOWN,
-        label: i18n.translate('searchConnectors.nativeConnectors.outlook.data_source.label', {
+        display: DROPDOWN,
+        label: translate('searchConnectors.nativeConnectors.outlook.data_source.label', {
           defaultMessage: 'Outlook data source',
         }),
         options: [
@@ -3380,7 +3304,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: 'outlook_cloud',
@@ -3393,8 +3317,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: 'outlook_cloud',
           },
         ],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.outlook.tenant_id.label', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.outlook.tenant_id.label', {
           defaultMessage: 'Tenant ID',
         }),
         options: [],
@@ -3402,7 +3326,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -3415,8 +3339,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: 'outlook_cloud',
           },
         ],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.outlook.client_id.label', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.outlook.client_id.label', {
           defaultMessage: 'Client ID',
         }),
         options: [],
@@ -3424,7 +3348,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -3437,8 +3361,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: 'outlook_cloud',
           },
         ],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.outlook.client_secret.label', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.outlook.client_secret.label', {
           defaultMessage: 'Client Secret Value',
         }),
         options: [],
@@ -3446,7 +3370,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: true,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -3459,21 +3383,18 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: 'outlook_server',
           },
         ],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.outlook.exchange_server.label', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.outlook.exchange_server.label', {
           defaultMessage: 'Exchange Server',
         }),
         options: [],
         order: 5,
         required: true,
         sensitive: false,
-        tooltip: i18n.translate(
-          'searchConnectors.nativeConnectors.outlook.exchange_server.tooltip',
-          {
-            defaultMessage: "Exchange server's IP address. E.g. 127.0.0.1",
-          }
-        ),
-        type: FieldType.STRING,
+        tooltip: translate('searchConnectors.nativeConnectors.outlook.exchange_server.tooltip', {
+          defaultMessage: "Exchange server's IP address. E.g. 127.0.0.1",
+        }),
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -3486,8 +3407,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: 'outlook_server',
           },
         ],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate(
+        display: TEXTBOX,
+        label: translate(
           'searchConnectors.nativeConnectors.outlook.active_directory_server.label',
           {
             defaultMessage: 'Active Directory Server',
@@ -3497,13 +3418,13 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         order: 6,
         required: true,
         sensitive: false,
-        tooltip: i18n.translate(
+        tooltip: translate(
           'searchConnectors.nativeConnectors.outlook.active_directory_server.tooltip',
           {
             defaultMessage: "Active Directory server's IP address. E.g. 127.0.0.1",
           }
         ),
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -3516,8 +3437,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: 'outlook_server',
           },
         ],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.outlook.username.label', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.outlook.username.label', {
           defaultMessage: 'Exchange server username',
         }),
         options: [],
@@ -3525,7 +3446,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -3538,8 +3459,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: 'outlook_server',
           },
         ],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.outlook.password.label', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.outlook.password.label', {
           defaultMessage: 'Exchange server password',
         }),
         options: [],
@@ -3547,7 +3468,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: true,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -3560,18 +3481,18 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: 'outlook_server',
           },
         ],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.outlook.domain.label', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.outlook.domain.label', {
           defaultMessage: 'Exchange server domain name',
         }),
         options: [],
         order: 9,
         required: true,
         sensitive: false,
-        tooltip: i18n.translate('searchConnectors.nativeConnectors.outlook.domain.tooltip', {
+        tooltip: translate('searchConnectors.nativeConnectors.outlook.domain.tooltip', {
           defaultMessage: 'Domain name such as gmail.com, outlook.com',
         }),
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -3584,8 +3505,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: 'outlook_server',
           },
         ],
-        display: DisplayType.TOGGLE,
-        label: i18n.translate('searchConnectors.nativeConnectors.outlook.ssl_enabled.label', {
+        display: TOGGLE,
+        label: translate('searchConnectors.nativeConnectors.outlook.ssl_enabled.label', {
           defaultMessage: 'Enable SSL',
         }),
         options: [],
@@ -3593,7 +3514,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: false,
@@ -3610,8 +3531,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: true,
           },
         ],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.outlook.ssl_ca.label', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.outlook.ssl_ca.label', {
           defaultMessage: 'SSL certificate',
         }),
         options: [],
@@ -3619,7 +3540,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -3627,8 +3548,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       use_text_extraction_service: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TOGGLE,
-        label: i18n.translate(
+        display: TOGGLE,
+        label: translate(
           'searchConnectors.nativeConnectors.outlook.use_text_extraction_service.label',
           {
             defaultMessage: 'Use text extraction service',
@@ -3638,14 +3559,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         order: 12,
         required: true,
         sensitive: false,
-        tooltip: i18n.translate(
+        tooltip: translate(
           'searchConnectors.nativeConnectors.outlook.use_text_extraction_service.toolip',
           {
             defaultMessage:
               'Requires a separate deployment of the Elastic Text Extraction Service. Requires that pipeline settings disable text extraction.',
           }
         ),
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: ['advanced'],
         validations: [],
         value: false,
@@ -3653,36 +3574,36 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       use_document_level_security: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TOGGLE,
+        display: TOGGLE,
         label: ENABLE_DOCUMENT_LEVEL_SECURITY_LABEL,
         options: [],
         order: 13,
         required: true,
         sensitive: false,
         tooltip: getEnableDocumentLevelSecurityTooltip(
-          i18n.translate('searchConnectors.nativeConnectors.outlookTooltip.name', {
+          translate('searchConnectors.nativeConnectors.outlookTooltip.name', {
             defaultMessage: 'Outlook',
           })
         ),
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: false,
       },
     },
     features: {
-      [FeatureName.SYNC_RULES]: {
+      [SYNC_RULES]: {
         advanced: { enabled: false },
         basic: { enabled: true },
       },
-      [FeatureName.DOCUMENT_LEVEL_SECURITY]: {
+      [DOCUMENT_LEVEL_SECURITY]: {
         enabled: true,
       },
-      [FeatureName.INCREMENTAL_SYNC]: {
+      [INCREMENTAL_SYNC]: {
         enabled: true,
       },
     },
-    name: i18n.translate('searchConnectors.nativeConnectors.outlook.name', {
+    name: translate('searchConnectors.nativeConnectors.outlook.name', {
       defaultMessage: 'Outlook',
     }),
     serviceType: 'outlook',
@@ -3692,19 +3613,16 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       host: {
         default_value: '',
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate(
-          'searchConnectors.nativeConnectors.postgresql.configuration.hostLabel',
-          {
-            defaultMessage: 'Host',
-          }
-        ),
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.postgresql.configuration.hostLabel', {
+          defaultMessage: 'Host',
+        }),
         options: [],
         order: 1,
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -3712,14 +3630,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       port: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.NUMERIC,
+        display: NUMERIC,
         label: PORT_LABEL,
         options: [],
         order: 2,
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.INTEGER,
+        type: INTEGER,
         ui_restrictions: [],
         validations: [],
         value: 5432,
@@ -3727,14 +3645,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       username: {
         default_value: '',
         depends_on: [],
-        display: DisplayType.TEXTBOX,
+        display: TEXTBOX,
         label: USERNAME_LABEL,
         options: [],
         order: 3,
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -3742,14 +3660,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       password: {
         default_value: '',
         depends_on: [],
-        display: DisplayType.TEXTBOX,
+        display: TEXTBOX,
         label: PASSWORD_LABEL,
         options: [],
         order: 4,
         required: true,
         sensitive: true,
         tooltip: '',
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -3757,14 +3675,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       database: {
         default_value: '',
         depends_on: [],
-        display: DisplayType.TEXTBOX,
+        display: TEXTBOX,
         label: DATABASE_LABEL,
         options: [],
         order: 5,
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -3772,14 +3690,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       schema: {
         default_value: '',
         depends_on: [],
-        display: DisplayType.TEXTBOX,
+        display: TEXTBOX,
         label: SCHEMA_LABEL,
         options: [],
         order: 6,
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -3787,19 +3705,16 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       tables: {
         default_value: '',
         depends_on: [],
-        display: DisplayType.TEXTAREA,
-        label: i18n.translate(
-          'searchConnectors.nativeConnectors.postgresql.configuration.tablesLabel',
-          {
-            defaultMessage: 'Comma-separated list of tables',
-          }
-        ),
+        display: TEXTAREA,
+        label: translate('searchConnectors.nativeConnectors.postgresql.configuration.tablesLabel', {
+          defaultMessage: 'Comma-separated list of tables',
+        }),
         options: [],
         order: 7,
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.LIST,
+        type: LIST,
         ui_restrictions: [],
         validations: [],
         value: '*',
@@ -3807,14 +3722,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       ssl_enabled: {
         default_value: false,
         depends_on: [],
-        display: DisplayType.TOGGLE,
+        display: TOGGLE,
         label: ENABLE_SSL_LABEL,
         options: [],
         order: 10,
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: false,
@@ -3822,14 +3737,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       ssl_ca: {
         default_value: '',
         depends_on: [{ field: 'ssl_enabled', value: true }],
-        display: DisplayType.TEXTBOX,
+        display: TEXTBOX,
         label: SSL_CERTIFICATE_LABEL,
         options: [],
         order: 11,
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -3837,8 +3752,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       fetch_size: {
         default_value: 50,
         depends_on: [],
-        display: DisplayType.NUMERIC,
-        label: i18n.translate(
+        display: NUMERIC,
+        label: translate(
           'searchConnectors.nativeConnectors.postgresql.configuration.rowsFetchedLabel',
           {
             defaultMessage: 'Rows fetched per request',
@@ -3849,7 +3764,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: false,
         sensitive: false,
         tooltip: '',
-        type: FieldType.INTEGER,
+        type: INTEGER,
         ui_restrictions: ['advanced'],
         validations: [],
         value: 50,
@@ -3857,8 +3772,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       retry_count: {
         default_value: 3,
         depends_on: [],
-        display: DisplayType.NUMERIC,
-        label: i18n.translate(
+        display: NUMERIC,
+        label: translate(
           'searchConnectors.nativeConnectors.postgresql.configuration.retriesLabel',
           {
             defaultMessage: 'Retries per request',
@@ -3869,19 +3784,19 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: false,
         sensitive: false,
         tooltip: '',
-        type: FieldType.INTEGER,
+        type: INTEGER,
         ui_restrictions: ['advanced'],
         validations: [],
         value: 3,
       },
     },
     features: {
-      [FeatureName.SYNC_RULES]: {
+      [SYNC_RULES]: {
         advanced: { enabled: true },
         basic: { enabled: true },
       },
     },
-    name: i18n.translate('searchConnectors.nativeConnectors.postgresql.name', {
+    name: translate('searchConnectors.nativeConnectors.postgresql.name', {
       defaultMessage: 'PostgreSQL',
     }),
     serviceType: 'postgresql',
@@ -3891,18 +3806,18 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       buckets: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTAREA,
-        label: i18n.translate('searchConnectors.content.nativeConnectors.s3.buckets.label', {
+        display: TEXTAREA,
+        label: translate('searchConnectors.content.nativeConnectors.s3.buckets.label', {
           defaultMessage: 'AWS Buckets',
         }),
         options: [],
         order: 1,
         required: true,
         sensitive: false,
-        tooltip: i18n.translate('searchConnectors.content.nativeConnectors.s3.buckets.tooltip', {
+        tooltip: translate('searchConnectors.content.nativeConnectors.s3.buckets.tooltip', {
           defaultMessage: 'AWS Buckets are ignored when Advanced Sync Rules are used.',
         }),
-        type: FieldType.LIST,
+        type: LIST,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -3910,8 +3825,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       aws_access_key_id: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.content.nativeConnectors.s3.accessKey.label', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.content.nativeConnectors.s3.accessKey.label', {
           defaultMessage: 'AWS Access Key Id',
         }),
         options: [],
@@ -3919,7 +3834,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -3927,8 +3842,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       aws_secret_access_key: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.content.nativeConnectors.s3.secretKey.label', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.content.nativeConnectors.s3.secretKey.label', {
           defaultMessage: 'AWS Secret Key',
         }),
         options: [],
@@ -3936,7 +3851,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: true,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -3944,9 +3859,9 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       read_timeout: {
         default_value: 90,
         depends_on: [],
-        display: DisplayType.NUMERIC,
+        display: NUMERIC,
 
-        label: i18n.translate('searchConnectors.content.nativeConnectors.s3.readTimeout.label', {
+        label: translate('searchConnectors.content.nativeConnectors.s3.readTimeout.label', {
           defaultMessage: 'Read timeout',
         }),
         options: [],
@@ -3954,7 +3869,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: false,
         sensitive: false,
         tooltip: null,
-        type: FieldType.INTEGER,
+        type: INTEGER,
         ui_restrictions: ['advanced'],
         validations: [],
         value: '',
@@ -3962,8 +3877,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       connect_timeout: {
         default_value: 90,
         depends_on: [],
-        display: DisplayType.NUMERIC,
-        label: i18n.translate('searchConnectors.content.nativeConnectors.s3.connectTimeout.label', {
+        display: NUMERIC,
+        label: translate('searchConnectors.content.nativeConnectors.s3.connectTimeout.label', {
           defaultMessage: 'Connection timeout',
         }),
         options: [],
@@ -3971,7 +3886,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: false,
         sensitive: false,
         tooltip: null,
-        type: FieldType.INTEGER,
+        type: INTEGER,
         ui_restrictions: ['advanced'],
         validations: [],
         value: '',
@@ -3979,8 +3894,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       max_attempts: {
         default_value: 5,
         depends_on: [],
-        display: DisplayType.NUMERIC,
-        label: i18n.translate('searchConnectors.content.nativeConnectors.s3.maxAttempts.label', {
+        display: NUMERIC,
+        label: translate('searchConnectors.content.nativeConnectors.s3.maxAttempts.label', {
           defaultMessage: 'Maximum retry attempts',
         }),
         options: [],
@@ -3988,7 +3903,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: false,
         sensitive: false,
         tooltip: null,
-        type: FieldType.INTEGER,
+        type: INTEGER,
         ui_restrictions: ['advanced'],
         validations: [],
         value: '',
@@ -3996,8 +3911,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       page_size: {
         default_value: 100,
         depends_on: [],
-        display: DisplayType.NUMERIC,
-        label: i18n.translate('searchConnectors.content.nativeConnectors.s3.maxPageSize.label', {
+        display: NUMERIC,
+        label: translate('searchConnectors.content.nativeConnectors.s3.maxPageSize.label', {
           defaultMessage: 'Maximum size of page',
         }),
         options: [],
@@ -4005,7 +3920,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: false,
         sensitive: false,
         tooltip: null,
-        type: FieldType.INTEGER,
+        type: INTEGER,
         ui_restrictions: ['advanced'],
         validations: [],
         value: '',
@@ -4013,37 +3928,37 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       use_text_extraction_service: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TOGGLE,
+        display: TOGGLE,
         label: USE_TEXT_EXTRACTION_SERVICE_LABEL,
         options: [],
         order: 8,
         required: true,
         sensitive: false,
         tooltip: USE_TEXT_EXTRACTION_SERVICE_TOOLTIP,
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: ['advanced'],
         validations: [],
         value: false,
       },
     },
     features: {
-      [FeatureName.SYNC_RULES]: {
+      [SYNC_RULES]: {
         advanced: { enabled: true },
         basic: { enabled: true },
       },
     },
-    name: i18n.translate('searchConnectors.content.nativeConnectors.s3.name', {
+    name: translate('searchConnectors.content.nativeConnectors.s3.name', {
       defaultMessage: 'S3',
     }),
     serviceType: 's3',
   },
   salesforce: {
     features: {
-      [FeatureName.SYNC_RULES]: {
+      [SYNC_RULES]: {
         advanced: { enabled: true },
         basic: { enabled: true },
       },
-      [FeatureName.INCREMENTAL_SYNC]: {
+      [INCREMENTAL_SYNC]: {
         enabled: true,
       },
     },
@@ -4051,22 +3966,19 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       domain: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.content.nativeConnectors.salesforce.domain.label', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.content.nativeConnectors.salesforce.domain.label', {
           defaultMessage: 'Domain',
         }),
         options: [],
         order: 1,
         required: true,
         sensitive: false,
-        tooltip: i18n.translate(
-          'searchConnectors.content.nativeConnectors.salesforce.domain.tooltip',
-          {
-            defaultMessage:
-              "The domain for your Salesforce instance. If your Salesforce URL is 'https://foo.salesforce.com', the domain would be 'foo'.",
-          }
-        ),
-        type: FieldType.STRING,
+        tooltip: translate('searchConnectors.content.nativeConnectors.salesforce.domain.tooltip', {
+          defaultMessage:
+            "The domain for your Salesforce instance. If your Salesforce URL is 'https://foo.salesforce.com', the domain would be 'foo'.",
+        }),
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -4074,25 +3986,22 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       client_id: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate(
-          'searchConnectors.content.nativeConnectors.salesforce.clientId.label',
-          {
-            defaultMessage: 'Client ID',
-          }
-        ),
+        display: TEXTBOX,
+        label: translate('searchConnectors.content.nativeConnectors.salesforce.clientId.label', {
+          defaultMessage: 'Client ID',
+        }),
         options: [],
         order: 2,
         required: true,
         sensitive: true,
-        tooltip: i18n.translate(
+        tooltip: translate(
           'searchConnectors.content.nativeConnectors.salesforce.clientId.tooltip',
           {
             defaultMessage:
               "The client id for your OAuth2-enabled connected app. Also called 'consumer key'",
           }
         ),
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -4100,8 +4009,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       client_secret: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate(
+        display: TEXTBOX,
+        label: translate(
           'searchConnectors.content.nativeConnectors.salesforce.clientSecret.label',
           { defaultMessage: 'Client Secret' }
         ),
@@ -4109,14 +4018,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         order: 3,
         required: true,
         sensitive: true,
-        tooltip: i18n.translate(
+        tooltip: translate(
           'searchConnectors.content.nativeConnectors.salesforce.clientSecret.tooltip',
           {
             defaultMessage:
               "The client secret for your OAuth2-enabled connected app. Also called 'consumer secret'",
           }
         ),
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -4124,18 +4033,18 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       use_document_level_security: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TOGGLE,
+        display: TOGGLE,
         label: ENABLE_DOCUMENT_LEVEL_SECURITY_LABEL,
         options: [],
         order: 4,
         required: true,
         sensitive: false,
         tooltip: getEnableDocumentLevelSecurityTooltip(
-          i18n.translate('searchConnectors.nativeConnectors.salesforce.name', {
+          translate('searchConnectors.nativeConnectors.salesforce.name', {
             defaultMessage: 'Salesforce',
           })
         ),
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: false,
@@ -4143,20 +4052,20 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       use_text_extraction_service: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TOGGLE,
+        display: TOGGLE,
         label: USE_TEXT_EXTRACTION_SERVICE_LABEL,
         options: [],
         order: 5,
         required: true,
         sensitive: false,
         tooltip: USE_TEXT_EXTRACTION_SERVICE_TOOLTIP,
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: ['advanced'],
         validations: [],
         value: false,
       },
     },
-    name: i18n.translate('searchConnectors.content.nativeConnectors.salesforce.name', {
+    name: translate('searchConnectors.content.nativeConnectors.salesforce.name', {
       defaultMessage: 'Salesforce',
     }),
     serviceType: 'salesforce',
@@ -4166,8 +4075,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       url: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.servicenow.url.label', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.servicenow.url.label', {
           defaultMessage: 'Service URL',
         }),
         options: [],
@@ -4175,7 +4084,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: 'http://127.0.0.1:9318',
@@ -4183,8 +4092,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       username: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.servicenow.username.label', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.servicenow.username.label', {
           defaultMessage: 'Username',
         }),
         options: [],
@@ -4192,7 +4101,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -4200,8 +4109,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       password: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.servicenow.password.label', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.servicenow.password.label', {
           defaultMessage: 'Password',
         }),
         options: [],
@@ -4209,7 +4118,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: true,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -4217,18 +4126,18 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       services: {
         default_value: null,
         depends_on: [],
-        label: i18n.translate('searchConnectors.nativeConnectors.servicenow.services.label', {
+        label: translate('searchConnectors.nativeConnectors.servicenow.services.label', {
           defaultMessage: 'Comma-separated list of services',
         }),
-        display: DisplayType.TEXTAREA,
+        display: TEXTAREA,
         options: [],
         order: 4,
         required: true,
         sensitive: false,
-        tooltip: i18n.translate('searchConnectors.nativeConnectors.servicenow.services.tooltip', {
+        tooltip: translate('searchConnectors.nativeConnectors.servicenow.services.tooltip', {
           defaultMessage: 'List of services is ignored when Advanced Sync Rules are used.',
         }),
-        type: FieldType.LIST,
+        type: LIST,
         ui_restrictions: [],
         validations: [],
         value: '*',
@@ -4236,14 +4145,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       retry_count: {
         default_value: 3,
         depends_on: [],
-        display: DisplayType.NUMERIC,
+        display: NUMERIC,
         label: RETRIES_PER_REQUEST_LABEL,
         options: [],
         order: 5,
         required: false,
         sensitive: false,
         tooltip: null,
-        type: FieldType.INTEGER,
+        type: INTEGER,
         ui_restrictions: ['advanced'],
         validations: [],
         value: 3,
@@ -4251,14 +4160,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       concurrent_downloads: {
         default_value: 10,
         depends_on: [],
-        display: DisplayType.NUMERIC,
+        display: NUMERIC,
         label: MAX_CONCURRENT_DOWNLOADS_LABEL,
         options: [],
         order: 6,
         required: false,
         sensitive: false,
         tooltip: null,
-        type: FieldType.INTEGER,
+        type: INTEGER,
         ui_restrictions: ['advanced'],
         validations: [],
         value: 10,
@@ -4266,14 +4175,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       use_text_extraction_service: {
         default_value: false,
         depends_on: [],
-        display: DisplayType.TOGGLE,
+        display: TOGGLE,
         label: USE_TEXT_EXTRACTION_SERVICE_LABEL,
         options: [],
         order: 7,
         required: true,
         sensitive: false,
         tooltip: USE_TEXT_EXTRACTION_SERVICE_TOOLTIP,
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: ['advanced'],
         validations: [],
         value: false,
@@ -4281,35 +4190,35 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       use_document_level_security: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TOGGLE,
+        display: TOGGLE,
         label: ENABLE_DOCUMENT_LEVEL_SECURITY_LABEL,
         options: [],
         order: 8,
         required: true,
         sensitive: false,
-        tooltip: i18n.translate(
+        tooltip: translate(
           'searchConnectors.nativeConnectors.servicenow.configuration.useDocumentLevelSecurityTooltip',
           {
             defaultMessage:
               'Document level security ensures identities and permissions set in ServiceNow are maintained in Elasticsearch. This enables you to restrict and personalize read-access users and groups have to documents in this index. Access control syncs ensure this metadata is kept up to date in your Elasticsearch documents.',
           }
         ),
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: false,
       },
     },
     features: {
-      [FeatureName.SYNC_RULES]: {
+      [SYNC_RULES]: {
         advanced: { enabled: true },
         basic: { enabled: true },
       },
-      [FeatureName.INCREMENTAL_SYNC]: {
+      [INCREMENTAL_SYNC]: {
         enabled: true,
       },
     },
-    name: i18n.translate('searchConnectors.nativeConnectors.servicenow.name', {
+    name: translate('searchConnectors.nativeConnectors.servicenow.name', {
       defaultMessage: 'ServiceNow',
     }),
     serviceType: 'servicenow',
@@ -4319,8 +4228,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       tenant_id: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate(
+        display: TEXTBOX,
+        label: translate(
           'searchConnectors.nativeConnectors.sharepoint_online.configuration.tenantIdLabel',
           {
             defaultMessage: 'Tenant ID',
@@ -4331,7 +4240,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -4339,8 +4248,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       tenant_name: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate(
+        display: TEXTBOX,
+        label: translate(
           'searchConnectors.nativeConnectors.sharepoint_online.configuration.tenantNameLabel',
           {
             defaultMessage: 'Tenant name',
@@ -4351,7 +4260,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -4359,8 +4268,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       client_id: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate(
+        display: TEXTBOX,
+        label: translate(
           'searchConnectors.nativeConnectors.sharepoint_online.configuration.clientIdLabel',
           {
             defaultMessage: 'Client ID',
@@ -4371,7 +4280,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -4379,8 +4288,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       secret_value: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate(
+        display: TEXTBOX,
+        label: translate(
           'searchConnectors.nativeConnectors.sharepoint_online.configuration.secretValueLabel',
           {
             defaultMessage: 'Secret value',
@@ -4391,7 +4300,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: true,
         tooltip: '',
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -4399,8 +4308,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       site_collections: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTAREA,
-        label: i18n.translate(
+        display: TEXTAREA,
+        label: translate(
           'searchConnectors.nativeConnectors.sharepoint_online.configuration.siteCollectionsLabel',
           {
             defaultMessage: 'Comma-separated list of sites',
@@ -4410,7 +4319,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         order: 5,
         required: true,
         sensitive: false,
-        tooltip: i18n.translate(
+        tooltip: translate(
           'searchConnectors.nativeConnectors.sharepoint_online.configuration.siteCollectionsTooltip',
           {
             defaultMessage:
@@ -4418,7 +4327,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
               'Use * to include all available sites.',
           }
         ),
-        type: FieldType.LIST,
+        type: LIST,
         ui_restrictions: [],
         validations: [],
         value: '*',
@@ -4426,14 +4335,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       use_text_extraction_service: {
         default_value: false,
         depends_on: [],
-        display: DisplayType.TOGGLE,
+        display: TOGGLE,
         label: USE_TEXT_EXTRACTION_SERVICE_LABEL,
         options: [],
         order: 6,
         required: true,
         sensitive: false,
         tooltip: USE_TEXT_EXTRACTION_SERVICE_TOOLTIP,
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: ['advanced'],
         validations: [],
         value: false,
@@ -4441,8 +4350,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       use_document_level_security: {
         default_value: false,
         depends_on: [],
-        display: DisplayType.TOGGLE,
-        label: i18n.translate(
+        display: TOGGLE,
+        label: translate(
           'searchConnectors.nativeConnectors.sharepoint_online.configuration.useDocumentLevelSecurityLabel',
           {
             defaultMessage: 'Enable document level security',
@@ -4452,14 +4361,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         order: 7,
         required: true,
         sensitive: false,
-        tooltip: i18n.translate(
+        tooltip: translate(
           'searchConnectors.nativeConnectors.sharepoint_online.configuration.useDocumentLevelSecurityTooltip',
           {
             defaultMessage:
               'Document level security ensures identities and permissions set in Sharepoint Online are maintained in Elasticsearch. This metadata is added to your Elasticsearch documents, so you can control user and group read-access. Access control syncs ensure this metadata is kept up to date.',
           }
         ),
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: false,
@@ -4472,8 +4381,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: true,
           },
         ],
-        display: DisplayType.TOGGLE,
-        label: i18n.translate(
+        display: TOGGLE,
+        label: translate(
           'searchConnectors.nativeConnectors.sharepoint_online.configuration.fetchDriveItemPermissionsLabel',
           {
             defaultMessage: 'Fetch drive item permissions',
@@ -4483,14 +4392,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         order: 8,
         required: true,
         sensitive: false,
-        tooltip: i18n.translate(
+        tooltip: translate(
           'searchConnectors.nativeConnectors.sharepoint_online.configuration.fetchDriveItemPermissionsTooltip',
           {
             defaultMessage:
               'Enable this option to fetch drive item specific permissions. This setting can increase sync time.',
           }
         ),
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: true,
@@ -4503,8 +4412,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: true,
           },
         ],
-        display: DisplayType.TOGGLE,
-        label: i18n.translate(
+        display: TOGGLE,
+        label: translate(
           'searchConnectors.nativeConnectors.sharepoint_online.configuration.fetchUniquePagePermissionsLabel',
           {
             defaultMessage: 'Fetch unique page permissions',
@@ -4514,14 +4423,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         order: 9,
         required: true,
         sensitive: false,
-        tooltip: i18n.translate(
+        tooltip: translate(
           'searchConnectors.nativeConnectors.sharepoint_online.configuration.fetchUniquePagePermissionsTooltip',
           {
             defaultMessage:
               'Enable this option to fetch unique page permissions. This setting can increase sync time. If this setting is disabled a page will inherit permissions from its parent site.',
           }
         ),
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: true,
@@ -4534,8 +4443,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: true,
           },
         ],
-        display: DisplayType.TOGGLE,
-        label: i18n.translate(
+        display: TOGGLE,
+        label: translate(
           'searchConnectors.nativeConnectors.sharepoint_online.configuration.fetchUniqueListPermissionsLabel',
           {
             defaultMessage: 'Fetch unique list permissions',
@@ -4545,14 +4454,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         order: 10,
         required: true,
         sensitive: false,
-        tooltip: i18n.translate(
+        tooltip: translate(
           'searchConnectors.nativeConnectors.sharepoint_online.configuration.fetchUniqueListPermissionsTooltip',
           {
             defaultMessage:
               'Enable this option to fetch unique list permissions. This setting can increase sync time. If this setting is disabled a list will inherit permissions from its parent site.',
           }
         ),
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: true,
@@ -4565,8 +4474,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: true,
           },
         ],
-        display: DisplayType.TOGGLE,
-        label: i18n.translate(
+        display: TOGGLE,
+        label: translate(
           'searchConnectors.nativeConnectors.sharepoint_online.configuration.fetchUniqueListItemPermissionsLabel',
           {
             defaultMessage: 'Fetch unique list item permissions',
@@ -4576,14 +4485,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         order: 11,
         required: true,
         sensitive: false,
-        tooltip: i18n.translate(
+        tooltip: translate(
           'searchConnectors.nativeConnectors.sharepoint_online.configuration.fetchUniqueListItemPermissionsTooltip',
           {
             defaultMessage:
               'Enable this option to fetch unique list item permissions. This setting can increase sync time. If this setting is disabled a list item will inherit permissions from its parent site.',
           }
         ),
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: true,
@@ -4591,8 +4500,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       enumerate_all_sites: {
         default_value: true,
         depends_on: [],
-        display: DisplayType.TOGGLE,
-        label: i18n.translate(
+        display: TOGGLE,
+        label: translate(
           'searchConnectors.nativeConnectors.sharepoint_online.configuration.enumerateAllSitesLabel',
           { defaultMessage: 'Enumerate all sites?' }
         ),
@@ -4600,14 +4509,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         order: 6,
         required: false,
         sensitive: false,
-        tooltip: i18n.translate(
+        tooltip: translate(
           'searchConnectors.nativeConnectors.sharepoint_online.configuration.enumerateAllSitesTooltip',
           {
             defaultMessage:
               'If enabled, sites will be fetched in bulk, then filtered down to the configured list of sites. This is efficient when syncing many sites. If disabled, each configured site will be fetched with an individual request. This is efficient when syncing fewer sites.',
           }
         ),
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: true,
@@ -4615,8 +4524,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       fetch_subsites: {
         default_value: false,
         depends_on: [{ field: 'enumerate_all_sites', value: false }],
-        display: DisplayType.TOGGLE,
-        label: i18n.translate(
+        display: TOGGLE,
+        label: translate(
           'searchConnectors.nativeConnectors.sharepoint_online.configuration.fetchSubsitesLabel',
           {
             defaultMessage: 'Fetch sub-sites of configured sites?',
@@ -4626,32 +4535,32 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         order: 7,
         required: false,
         sensitive: false,
-        tooltip: i18n.translate(
+        tooltip: translate(
           'searchConnectors.nativeConnectors.sharepoint_online.configuration.fetchSubsitesTooltip',
           {
             defaultMessage:
               'Whether subsites of the configured site(s) should be automatically fetched.',
           }
         ),
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: true,
       },
     },
     features: {
-      [FeatureName.SYNC_RULES]: {
+      [SYNC_RULES]: {
         advanced: { enabled: true },
         basic: { enabled: true },
       },
-      [FeatureName.DOCUMENT_LEVEL_SECURITY]: {
+      [DOCUMENT_LEVEL_SECURITY]: {
         enabled: true,
       },
-      [FeatureName.INCREMENTAL_SYNC]: {
+      [INCREMENTAL_SYNC]: {
         enabled: true,
       },
     },
-    name: i18n.translate('searchConnectors.nativeConnectors.sharepoint_online.name', {
+    name: translate('searchConnectors.nativeConnectors.sharepoint_online.name', {
       defaultMessage: 'Sharepoint Online',
     }),
     serviceType: 'sharepoint_online',
@@ -4661,8 +4570,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       authentication: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.DROPDOWN,
-        label: i18n.translate(
+        display: DROPDOWN,
+        label: translate(
           'searchConnectors.nativeConnectors.sharepoint_server.configuration.authentication',
           {
             defaultMessage: 'Authentication',
@@ -4670,7 +4579,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         ),
         options: [
           {
-            label: i18n.translate(
+            label: translate(
               'searchConnectors.nativeConnectors.sharepoint_server.options.basicLabel',
               {
                 defaultMessage: 'Basic',
@@ -4679,7 +4588,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: 'basic_auth',
           },
           {
-            label: i18n.translate(
+            label: translate(
               'searchConnectors.nativeConnectors.sharepoint_server.options.ntlmLabel',
               {
                 defaultMessage: 'NTLM',
@@ -4692,7 +4601,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: 'basic_auth',
@@ -4700,8 +4609,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       username: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate(
+        display: TEXTBOX,
+        label: translate(
           'searchConnectors.nativeConnectors.sharepoint_server.configuration.username',
           {
             defaultMessage: 'SharePoint Server username',
@@ -4712,7 +4621,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -4720,8 +4629,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       password: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate(
+        display: TEXTBOX,
+        label: translate(
           'searchConnectors.nativeConnectors.sharepoint_server.configuration.password',
           {
             defaultMessage: 'SharePoint Server password',
@@ -4732,7 +4641,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: true,
         tooltip: '',
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -4740,19 +4649,16 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       host_url: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate(
-          'searchConnectors.nativeConnectors.sharepoint_server.configuration.host',
-          {
-            defaultMessage: 'SharePoint host',
-          }
-        ),
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.sharepoint_server.configuration.host', {
+          defaultMessage: 'SharePoint host',
+        }),
         options: [],
         order: 4,
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -4760,8 +4666,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       site_collections: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTAREA,
-        label: i18n.translate(
+        display: TEXTAREA,
+        label: translate(
           'searchConnectors.nativeConnectors.sharepoint_server.configuration.site_collections',
           {
             defaultMessage: 'Comma-separated list of SharePoint site collections to index',
@@ -4772,7 +4678,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: '',
-        type: FieldType.LIST,
+        type: LIST,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -4780,14 +4686,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       ssl_enabled: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TOGGLE,
+        display: TOGGLE,
         label: ENABLE_SSL_LABEL,
         options: [],
         order: 6,
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: false,
@@ -4800,14 +4706,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: true,
           },
         ],
-        display: DisplayType.TEXTBOX,
+        display: TEXTBOX,
         label: SSL_CERTIFICATE_LABEL,
         options: [],
         order: 7,
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -4815,14 +4721,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       retry_count: {
         default_value: 3,
         depends_on: [],
-        display: DisplayType.NUMERIC,
+        display: NUMERIC,
         label: RETRIES_PER_REQUEST_LABEL,
         options: [],
         order: 8,
         required: false,
         sensitive: false,
         tooltip: null,
-        type: FieldType.INTEGER,
+        type: INTEGER,
         ui_restrictions: ['advanced'],
         validations: [],
         value: 3,
@@ -4830,14 +4736,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       use_text_extraction_service: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TOGGLE,
+        display: TOGGLE,
         label: USE_TEXT_EXTRACTION_SERVICE_LABEL,
         options: [],
         order: 9,
         required: true,
         sensitive: false,
         tooltip: USE_TEXT_EXTRACTION_SERVICE_TOOLTIP,
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: ['advanced'],
         validations: [],
         value: false,
@@ -4845,18 +4751,18 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       use_document_level_security: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TOGGLE,
+        display: TOGGLE,
         label: ENABLE_DOCUMENT_LEVEL_SECURITY_LABEL,
         options: [],
         order: 10,
         required: true,
         sensitive: false,
         tooltip: getEnableDocumentLevelSecurityTooltip(
-          i18n.translate('searchConnectors.nativeConnectors.sharepoint_server.name', {
+          translate('searchConnectors.nativeConnectors.sharepoint_server.name', {
             defaultMessage: 'Sharepoint Server',
           })
         ),
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: false,
@@ -4869,8 +4775,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: true,
           },
         ],
-        display: DisplayType.TOGGLE,
-        label: i18n.translate(
+        display: TOGGLE,
+        label: translate(
           'searchConnectors.nativeConnectors.sharepoint_server.configuration.fetchUniqueListPermissionsLabel',
           {
             defaultMessage: 'Fetch unique list permissions',
@@ -4880,14 +4786,14 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         order: 11,
         required: true,
         sensitive: false,
-        tooltip: i18n.translate(
+        tooltip: translate(
           'searchConnectors.nativeConnectors.sharepoint_server.configuration.fetchUniqueListPermissionsTooltip',
           {
             defaultMessage:
               'Enable this option to fetch unique list permissions. This setting can increase sync time. If this setting is disabled a list will inherit permissions from its parent site.',
           }
         ),
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: true,
@@ -4900,8 +4806,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
             value: true,
           },
         ],
-        display: DisplayType.TOGGLE,
-        label: i18n.translate(
+        display: TOGGLE,
+        label: translate(
           'searchConnectors.nativeConnectors.sharepoint_server.configuration.fetchUniqueListItemPermissionsLabel',
           {
             defaultMessage: 'Fetch unique list item permissions',
@@ -4911,32 +4817,32 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         order: 12,
         required: true,
         sensitive: false,
-        tooltip: i18n.translate(
+        tooltip: translate(
           'searchConnectors.nativeConnectors.sharepoint_server.configuration.fetchUniqueListItemPermissionsTooltip',
           {
             defaultMessage:
               'Enable this option to fetch unique list item permissions. This setting can increase sync time. If this setting is disabled a list item will inherit permissions from its parent site.',
           }
         ),
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: true,
       },
     },
     features: {
-      [FeatureName.SYNC_RULES]: {
+      [SYNC_RULES]: {
         advanced: { enabled: false },
         basic: { enabled: true },
       },
-      [FeatureName.DOCUMENT_LEVEL_SECURITY]: {
+      [DOCUMENT_LEVEL_SECURITY]: {
         enabled: true,
       },
-      [FeatureName.INCREMENTAL_SYNC]: {
+      [INCREMENTAL_SYNC]: {
         enabled: true,
       },
     },
-    name: i18n.translate('searchConnectors.nativeConnectors.sharepoint_server.name', {
+    name: translate('searchConnectors.nativeConnectors.sharepoint_server.name', {
       defaultMessage: 'Sharepoint Server',
     }),
     serviceType: 'sharepoint_server',
@@ -4946,19 +4852,19 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       token: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.slack.token.label', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.slack.token.label', {
           defaultMessage: 'Authentication Token',
         }),
         options: [],
         order: 1,
         required: true,
         sensitive: true,
-        tooltip: i18n.translate('searchConnectors.nativeConnectors.slack.token.tooltip', {
+        tooltip: translate('searchConnectors.nativeConnectors.slack.token.tooltip', {
           defaultMessage:
             'The Slack Authentication Token for the slack application you created. See the docs for details.',
         }),
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -4966,19 +4872,19 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       fetch_last_n_days: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.NUMERIC,
-        label: i18n.translate('searchConnectors.nativeConnectors.slack.fetchLastNDays.label', {
+        display: NUMERIC,
+        label: translate('searchConnectors.nativeConnectors.slack.fetchLastNDays.label', {
           defaultMessage: 'Days of message history to fetch',
         }),
         options: [],
         order: 2,
         required: true,
         sensitive: false,
-        tooltip: i18n.translate('searchConnectors.nativeConnectors.slack.fetchLastNDays.tooltip', {
+        tooltip: translate('searchConnectors.nativeConnectors.slack.fetchLastNDays.tooltip', {
           defaultMessage:
             'How far back in time to request message history from slack. Messages older than this will not be indexed.',
         }),
-        type: FieldType.INTEGER,
+        type: INTEGER,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -4986,22 +4892,19 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       auto_join_channels: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TOGGLE,
-        label: i18n.translate('searchConnectors.nativeConnectors.slack.autoJoinChannels.label', {
+        display: TOGGLE,
+        label: translate('searchConnectors.nativeConnectors.slack.autoJoinChannels.label', {
           defaultMessage: 'Automatically join channels',
         }),
         options: [],
         order: 3,
         required: true,
         sensitive: false,
-        tooltip: i18n.translate(
-          'searchConnectors.nativeConnectors.slack.autoJoinChannels.tooltip',
-          {
-            defaultMessage:
-              'The Slack application bot will only be able to read conversation history from channels it has joined. The default requires it to be manually invited to channels. Enabling this allows it to automatically invite itself into all public channels.',
-          }
-        ),
-        type: FieldType.BOOLEAN,
+        tooltip: translate('searchConnectors.nativeConnectors.slack.autoJoinChannels.tooltip', {
+          defaultMessage:
+            'The Slack application bot will only be able to read conversation history from channels it has joined. The default requires it to be manually invited to channels. Enabling this allows it to automatically invite itself into all public channels.',
+        }),
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: false,
@@ -5009,26 +4912,26 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       sync_users: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TOGGLE,
-        label: i18n.translate('searchConnectors.nativeConnectors.slack.syncUsers.label', {
+        display: TOGGLE,
+        label: translate('searchConnectors.nativeConnectors.slack.syncUsers.label', {
           defaultMessage: 'Sync users',
         }),
         options: [],
         order: 4,
         required: true,
         sensitive: false,
-        tooltip: i18n.translate('searchConnectors.nativeConnectors.slack.syncUsers.tooltip', {
+        tooltip: translate('searchConnectors.nativeConnectors.slack.syncUsers.tooltip', {
           defaultMessage:
             'Whether or not Slack Users should be indexed as documents in Elasticsearch.',
         }),
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: true,
       },
     },
     features: {},
-    name: i18n.translate('searchConnectors.nativeConnectors.slack.name', {
+    name: translate('searchConnectors.nativeConnectors.slack.name', {
       defaultMessage: 'Slack',
     }),
     serviceType: 'slack',
@@ -5038,8 +4941,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       account_id: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.zoom.accountId.label', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.zoom.accountId.label', {
           defaultMessage: 'Account ID',
         }),
         options: [],
@@ -5047,7 +4950,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -5055,8 +4958,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       client_id: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.zoom.clientId.label', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.zoom.clientId.label', {
           defaultMessage: 'Client ID',
         }),
         options: [],
@@ -5064,7 +4967,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: false,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -5072,8 +4975,8 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       client_secret: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TEXTBOX,
-        label: i18n.translate('searchConnectors.nativeConnectors.zoom.clientSecret.label', {
+        display: TEXTBOX,
+        label: translate('searchConnectors.nativeConnectors.zoom.clientSecret.label', {
           defaultMessage: 'Client secret',
         }),
         options: [],
@@ -5081,7 +4984,7 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
         required: true,
         sensitive: true,
         tooltip: null,
-        type: FieldType.STRING,
+        type: STRING,
         ui_restrictions: [],
         validations: [],
         value: '',
@@ -5089,25 +4992,22 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       fetch_past_meeting_details: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TOGGLE,
-        label: i18n.translate(
-          'searchConnectors.nativeConnectors.zoom.fetchPastMeetingDetails.label',
-          {
-            defaultMessage: 'Fetch past meeting details',
-          }
-        ),
+        display: TOGGLE,
+        label: translate('searchConnectors.nativeConnectors.zoom.fetchPastMeetingDetails.label', {
+          defaultMessage: 'Fetch past meeting details',
+        }),
         options: [],
         order: 4,
         required: true,
         sensitive: false,
-        tooltip: i18n.translate(
+        tooltip: translate(
           'searchConnectors.nativeConnectors.zoom.fetchPastMeetingDetails.tooltip',
           {
             defaultMessage:
               'Enable this option to fetch past past meeting details. This setting can increase sync time.',
           }
         ),
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: [],
         validations: [],
         value: false,
@@ -5115,19 +5015,19 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       recording_age: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.NUMERIC,
-        label: i18n.translate('searchConnectors.nativeConnectors.zoom.recordingAge.label', {
+        display: NUMERIC,
+        label: translate('searchConnectors.nativeConnectors.zoom.recordingAge.label', {
           defaultMessage: 'Recording Age Limit (Months)',
         }),
         options: [],
         order: 5,
         required: true,
         sensitive: false,
-        tooltip: i18n.translate('searchConnectors.nativeConnectors.zoom.recordingAge.tooltip', {
+        tooltip: translate('searchConnectors.nativeConnectors.zoom.recordingAge.tooltip', {
           defaultMessage:
             'How far back in time to request recordings from zoom. Recordings older than this will not be indexed.',
         }),
-        type: FieldType.INTEGER,
+        type: INTEGER,
         ui_restrictions: [],
         validations: [
           {
@@ -5140,21 +5040,21 @@ export const NATIVE_CONNECTOR_DEFINITIONS: Record<string, NativeConnector | unde
       use_text_extraction_service: {
         default_value: null,
         depends_on: [],
-        display: DisplayType.TOGGLE,
+        display: TOGGLE,
         label: USE_TEXT_EXTRACTION_SERVICE_LABEL,
         options: [],
         order: 6,
         required: true,
         sensitive: false,
         tooltip: USE_TEXT_EXTRACTION_SERVICE_TOOLTIP,
-        type: FieldType.BOOLEAN,
+        type: BOOLEAN,
         ui_restrictions: ['advanced'],
         validations: [],
         value: false,
       },
     },
     features: {},
-    name: i18n.translate('searchConnectors.nativeConnectors.zoom.name', {
+    name: translate('searchConnectors.nativeConnectors.zoom.name', {
       defaultMessage: 'Zoom',
     }),
     serviceType: 'zoom',
diff --git a/packages/kbn-test/index.ts b/packages/kbn-test/index.ts
index 3c03a32efa9ea..57d9c767827df 100644
--- a/packages/kbn-test/index.ts
+++ b/packages/kbn-test/index.ts
@@ -14,7 +14,12 @@ export { startServersCli, startServers } from './src/functional_tests/start_serv
 
 // @internal
 export { runTestsCli, runTests } from './src/functional_tests/run_tests';
-export { SamlSessionManager, type SamlSessionManagerOptions, type HostOptions } from './src/auth';
+export {
+  SamlSessionManager,
+  type SamlSessionManagerOptions,
+  type HostOptions,
+  type GetCookieOptions,
+} from './src/auth';
 export { runElasticsearch, runKibanaServer } from './src/functional_tests/lib';
 export { getKibanaCliArg, getKibanaCliLoggers } from './src/functional_tests/lib/kibana_cli_args';
 
diff --git a/packages/kbn-test/src/auth/index.ts b/packages/kbn-test/src/auth/index.ts
index 61dd5853873b3..b16ddc6951944 100644
--- a/packages/kbn-test/src/auth/index.ts
+++ b/packages/kbn-test/src/auth/index.ts
@@ -9,6 +9,7 @@
 
 export {
   SamlSessionManager,
-  type SamlSessionManagerOptions,
+  type GetCookieOptions,
   type HostOptions,
+  type SamlSessionManagerOptions,
 } from './session_manager';
diff --git a/packages/kbn-test/src/auth/session_manager.test.ts b/packages/kbn-test/src/auth/session_manager.test.ts
index 4b20581eced4c..284432574833f 100644
--- a/packages/kbn-test/src/auth/session_manager.test.ts
+++ b/packages/kbn-test/src/auth/session_manager.test.ts
@@ -8,6 +8,7 @@
  */
 
 import { ToolingLog } from '@kbn/tooling-log';
+import crypto from 'crypto';
 import { Cookie } from 'tough-cookie';
 import { Session } from './saml_auth';
 import { SamlSessionManager, SupportedRoles } from './session_manager';
@@ -33,6 +34,8 @@ const getSecurityProfileMock = jest.spyOn(samlAuth, 'getSecurityProfile');
 const readCloudUsersFromFileMock = jest.spyOn(helper, 'readCloudUsersFromFile');
 const isValidHostnameMock = jest.spyOn(helper, 'isValidHostname');
 
+const getTestToken = () => 'kbn_cookie_' + crypto.randomBytes(16).toString('hex');
+
 jest.mock('../kbn_client/kbn_client', () => {
   return {
     KbnClient: jest.fn(),
@@ -105,6 +108,34 @@ describe('SamlSessionManager', () => {
       expect(createCloudSAMLSessionMock.mock.calls).toHaveLength(0);
     });
 
+    test(`'getSessionCookieForRole' should call 'createLocalSAMLSession' again if 'forceNewSession = true'`, async () => {
+      const samlSessionManager = new SamlSessionManager(samlSessionManagerOptions);
+      createLocalSAMLSessionMock.mockResolvedValueOnce(
+        new Session(
+          Cookie.parse(`sid=${getTestToken()}; Path=/; Expires=Wed, 01 Oct 2023 07:00:00 GMT`)!,
+          testEmail
+        )
+      );
+      const cookieStr1 = await samlSessionManager.getInteractiveUserSessionCookieWithRoleScope(
+        roleViewer
+      );
+      createLocalSAMLSessionMock.mockResolvedValueOnce(
+        new Session(
+          Cookie.parse(`sid=${getTestToken()}; Path=/; Expires=Wed, 01 Oct 2023 08:00:00 GMT`)!,
+          testEmail
+        )
+      );
+      const cookieStr2 = await samlSessionManager.getInteractiveUserSessionCookieWithRoleScope(
+        roleViewer,
+        {
+          forceNewSession: true,
+        }
+      );
+      expect(createLocalSAMLSessionMock.mock.calls).toHaveLength(2);
+      expect(createCloudSAMLSessionMock.mock.calls).toHaveLength(0);
+      expect(cookieStr1).not.toEqual(cookieStr2);
+    });
+
     test(`'getEmail' return the correct email`, async () => {
       const samlSessionManager = new SamlSessionManager(samlSessionManagerOptions);
       const email = await samlSessionManager.getEmail(roleEditor);
@@ -255,6 +286,34 @@ describe('SamlSessionManager', () => {
       expect(createCloudSAMLSessionMock.mock.calls).toHaveLength(2);
     });
 
+    test(`'getSessionCookieForRole' should call 'createCloudSAMLSession' again if 'forceNewSession = true'`, async () => {
+      const samlSessionManager = new SamlSessionManager(samlSessionManagerOptions);
+      createCloudSAMLSessionMock.mockResolvedValueOnce(
+        new Session(
+          Cookie.parse(`sid=${getTestToken()}; Path=/; Expires=Wed, 01 Oct 2023 07:00:00 GMT`)!,
+          cloudEmail
+        )
+      );
+      const cookieStr1 = await samlSessionManager.getInteractiveUserSessionCookieWithRoleScope(
+        roleViewer
+      );
+      createCloudSAMLSessionMock.mockResolvedValueOnce(
+        new Session(
+          Cookie.parse(`sid=${getTestToken()}; Path=/; Expires=Wed, 01 Oct 2023 08:00:00 GMT`)!,
+          cloudEmail
+        )
+      );
+      const cookieStr2 = await samlSessionManager.getInteractiveUserSessionCookieWithRoleScope(
+        roleViewer,
+        {
+          forceNewSession: true,
+        }
+      );
+      expect(createLocalSAMLSessionMock.mock.calls).toHaveLength(0);
+      expect(createCloudSAMLSessionMock.mock.calls).toHaveLength(2);
+      expect(cookieStr1).not.toEqual(cookieStr2);
+    });
+
     test(`'getEmail' return the correct email`, async () => {
       const samlSessionManager = new SamlSessionManager(samlSessionManagerOptions);
       const email = await samlSessionManager.getEmail(roleViewer);
diff --git a/packages/kbn-test/src/auth/session_manager.ts b/packages/kbn-test/src/auth/session_manager.ts
index ba411aaa21891..4efd55a71aad5 100644
--- a/packages/kbn-test/src/auth/session_manager.ts
+++ b/packages/kbn-test/src/auth/session_manager.ts
@@ -17,7 +17,7 @@ import {
   getSecurityProfile,
   Session,
 } from './saml_auth';
-import { Role, User } from './types';
+import { GetSessionByRole, Role, User } from './types';
 
 export interface HostOptions {
   protocol: 'http' | 'https';
@@ -40,6 +40,10 @@ export interface SupportedRoles {
   roles: string[];
 }
 
+export interface GetCookieOptions {
+  forceNewSession: boolean;
+}
+
 /**
  * Manages cookies associated with user roles
  */
@@ -115,24 +119,32 @@ Set env variable 'TEST_CLOUD=1' to run FTR against your Cloud deployment`
     }
   };
 
-  private getSessionByRole = async (role: string) => {
-    if (this.sessionCache.has(role)) {
+  private getSessionByRole = async (options: GetSessionByRole): Promise<Session> => {
+    const { role, forceNewSession } = options;
+
+    // Validate role before creating SAML session
+    this.validateRole(role);
+
+    // Check if session is cached and not forced to create the new one
+    if (!forceNewSession && this.sessionCache.has(role)) {
       return this.sessionCache.get(role)!;
     }
 
-    // Validate role before creating SAML session
-    if (this.supportedRoles && !this.supportedRoles.roles.includes(role)) {
-      throw new Error(
-        `Role '${role}' is not in the supported list: ${this.supportedRoles.roles.join(
-          ', '
-        )}. Add role descriptor in ${this.supportedRoles.sourcePath} to enable it for testing`
-      );
+    const session = await this.createSessionForRole(role);
+    this.sessionCache.set(role, session);
+
+    if (forceNewSession) {
+      this.log.debug(`Session for role '${role}' was force updated.`);
     }
 
+    return session;
+  };
+
+  private createSessionForRole = async (role: string): Promise<Session> => {
     let session: Session;
 
     if (this.isCloud) {
-      this.log.debug(`new cloud SAML authentication with '${role}' role`);
+      this.log.debug(`Creating new cloud SAML session for role '${role}'`);
       const kbnVersion = await this.kbnClient.version.get();
       const { email, password } = this.getCloudUserByRole(role);
       session = await createCloudSAMLSession({
@@ -143,7 +155,7 @@ Set env variable 'TEST_CLOUD=1' to run FTR against your Cloud deployment`
         log: this.log,
       });
     } else {
-      this.log.debug(`new fake SAML authentication with '${role}' role`);
+      this.log.debug(`Creating new local SAML session for role '${role}'`);
       session = await createLocalSAMLSession({
         username: `elastic_${role}`,
         email: `elastic_${role}@elastic.co`,
@@ -154,27 +166,38 @@ Set env variable 'TEST_CLOUD=1' to run FTR against your Cloud deployment`
       });
     }
 
-    this.sessionCache.set(role, session);
     return session;
   };
 
-  async getApiCredentialsForRole(role: string) {
-    const session = await this.getSessionByRole(role);
+  private validateRole = (role: string): void => {
+    if (this.supportedRoles && !this.supportedRoles.roles.includes(role)) {
+      throw new Error(
+        `Role '${role}' is not in the supported list: ${this.supportedRoles.roles.join(
+          ', '
+        )}. Add role descriptor in ${this.supportedRoles.sourcePath} to enable it for testing`
+      );
+    }
+  };
+
+  async getApiCredentialsForRole(role: string, options?: GetCookieOptions) {
+    const { forceNewSession } = options || { forceNewSession: false };
+    const session = await this.getSessionByRole({ role, forceNewSession });
     return { Cookie: `sid=${session.getCookieValue()}` };
   }
 
-  async getInteractiveUserSessionCookieWithRoleScope(role: string) {
-    const session = await this.getSessionByRole(role);
+  async getInteractiveUserSessionCookieWithRoleScope(role: string, options?: GetCookieOptions) {
+    const { forceNewSession } = options || { forceNewSession: false };
+    const session = await this.getSessionByRole({ role, forceNewSession });
     return session.getCookieValue();
   }
 
   async getEmail(role: string) {
-    const session = await this.getSessionByRole(role);
+    const session = await this.getSessionByRole({ role, forceNewSession: false });
     return session.email;
   }
 
   async getUserData(role: string) {
-    const { cookie } = await this.getSessionByRole(role);
+    const { cookie } = await this.getSessionByRole({ role, forceNewSession: false });
     const profileData = await getSecurityProfile({ kbnHost: this.kbnHost, cookie, log: this.log });
     return profileData;
   }
diff --git a/packages/kbn-test/src/auth/types.ts b/packages/kbn-test/src/auth/types.ts
index 170793b8950a1..4a61f71d5d572 100644
--- a/packages/kbn-test/src/auth/types.ts
+++ b/packages/kbn-test/src/auth/types.ts
@@ -61,3 +61,8 @@ export interface RetryParams {
   attemptsCount: number;
   attemptDelay: number;
 }
+
+export interface GetSessionByRole {
+  role: string;
+  forceNewSession: boolean;
+}
diff --git a/packages/kbn-unified-data-table/src/components/__snapshots__/data_table_columns.test.tsx.snap b/packages/kbn-unified-data-table/src/components/__snapshots__/data_table_columns.test.tsx.snap
index bd28bfc354f9f..fd1ad71558aa5 100644
--- a/packages/kbn-unified-data-table/src/components/__snapshots__/data_table_columns.test.tsx.snap
+++ b/packages/kbn-unified-data-table/src/components/__snapshots__/data_table_columns.test.tsx.snap
@@ -48,6 +48,9 @@ Array [
       test
     </span>,
     "displayAsText": "extension",
+    "displayHeaderCellProps": Object {
+      "className": "unifiedDataTable__headerCell",
+    },
     "id": "extension",
     "isSortable": true,
     "schema": "string",
@@ -332,6 +335,9 @@ Array [
       headerRowHeight={5}
     />,
     "displayAsText": "message",
+    "displayHeaderCellProps": Object {
+      "className": "unifiedDataTable__headerCell",
+    },
     "id": "message",
     "isSortable": true,
     "schema": "string",
@@ -589,6 +595,9 @@ Array [
       headerRowHeight={5}
     />,
     "displayAsText": "timestamp",
+    "displayHeaderCellProps": Object {
+      "className": "unifiedDataTable__headerCell",
+    },
     "id": "timestamp",
     "initialWidth": 212,
     "isSortable": true,
@@ -837,6 +846,9 @@ Array [
       showColumnTokens={true}
     />,
     "displayAsText": "extension",
+    "displayHeaderCellProps": Object {
+      "className": "unifiedDataTable__headerCell",
+    },
     "id": "extension",
     "isSortable": false,
     "schema": "string",
@@ -1082,6 +1094,9 @@ Array [
       showColumnTokens={true}
     />,
     "displayAsText": "message",
+    "displayHeaderCellProps": Object {
+      "className": "unifiedDataTable__headerCell",
+    },
     "id": "message",
     "isSortable": false,
     "schema": "string",
@@ -1372,6 +1387,9 @@ Array [
       showColumnTokens={true}
     />,
     "displayAsText": "extension",
+    "displayHeaderCellProps": Object {
+      "className": "unifiedDataTable__headerCell",
+    },
     "id": "extension",
     "isSortable": false,
     "schema": "string",
@@ -1655,6 +1673,9 @@ Array [
       showColumnTokens={true}
     />,
     "displayAsText": "message",
+    "displayHeaderCellProps": Object {
+      "className": "unifiedDataTable__headerCell",
+    },
     "id": "message",
     "isSortable": false,
     "schema": "string",
@@ -1819,6 +1840,9 @@ Array [
       headerRowHeight={5}
     />,
     "displayAsText": "extension",
+    "displayHeaderCellProps": Object {
+      "className": "unifiedDataTable__headerCell",
+    },
     "id": "extension",
     "isSortable": false,
     "schema": "string",
@@ -1976,6 +2000,9 @@ Array [
       headerRowHeight={5}
     />,
     "displayAsText": "message",
+    "displayHeaderCellProps": Object {
+      "className": "unifiedDataTable__headerCell",
+    },
     "id": "message",
     "isSortable": false,
     "schema": "string",
@@ -2191,6 +2218,9 @@ Array [
       headerRowHeight={5}
     />,
     "displayAsText": "timestamp",
+    "displayHeaderCellProps": Object {
+      "className": "unifiedDataTable__headerCell",
+    },
     "id": "timestamp",
     "initialWidth": 212,
     "isSortable": true,
@@ -2396,6 +2426,9 @@ Array [
       headerRowHeight={5}
     />,
     "displayAsText": "extension",
+    "displayHeaderCellProps": Object {
+      "className": "unifiedDataTable__headerCell",
+    },
     "id": "extension",
     "isSortable": false,
     "schema": "string",
@@ -2598,6 +2631,9 @@ Array [
       headerRowHeight={5}
     />,
     "displayAsText": "message",
+    "displayHeaderCellProps": Object {
+      "className": "unifiedDataTable__headerCell",
+    },
     "id": "message",
     "isSortable": false,
     "schema": "string",
@@ -2823,6 +2859,9 @@ Array [
       headerRowHeight={5}
     />,
     "displayAsText": "timestamp",
+    "displayHeaderCellProps": Object {
+      "className": "unifiedDataTable__headerCell",
+    },
     "id": "timestamp",
     "initialWidth": 212,
     "isSortable": true,
@@ -3043,6 +3082,9 @@ Array [
       headerRowHeight={5}
     />,
     "displayAsText": "extension",
+    "displayHeaderCellProps": Object {
+      "className": "unifiedDataTable__headerCell",
+    },
     "id": "extension",
     "isSortable": true,
     "schema": "string",
@@ -3262,6 +3304,9 @@ Array [
       headerRowHeight={5}
     />,
     "displayAsText": "message",
+    "displayHeaderCellProps": Object {
+      "className": "unifiedDataTable__headerCell",
+    },
     "id": "message",
     "isSortable": true,
     "schema": "string",
diff --git a/packages/kbn-unified-data-table/src/components/data_table.scss b/packages/kbn-unified-data-table/src/components/data_table.scss
index 6093659d487d6..a9d8f26a3c68a 100644
--- a/packages/kbn-unified-data-table/src/components/data_table.scss
+++ b/packages/kbn-unified-data-table/src/components/data_table.scss
@@ -40,14 +40,6 @@
     background: transparent;
   }
 
-  .euiDataGridHeaderCell {
-    align-items: start;
-
-    .euiPopover[class*='euiDataGridHeaderCell__popover'] {
-      align-self: center;
-    }
-  }
-
   .euiDataGrid--bordersHorizontal .euiDataGridHeader {
     border-top: none;
   }
@@ -101,6 +93,20 @@
   }
 }
 
+// Custom styles for data grid header cell.
+// It can also be inside a portal (outside of `unifiedDataTable__inner`) when dragged.
+.unifiedDataTable__headerCell {
+  align-items: start;
+
+  .euiDataGridHeaderCell__draggableIcon {
+    padding-block: calc($euiSizeXS / 2); // to align with a token height
+  }
+
+  .euiDataGridHeaderCell__button {
+    margin-block: -$euiSizeXS; // to override Eui value for Density "Expanded"
+  }
+}
+
 .unifiedDataTable__table {
   flex-grow: 1;
   flex-shrink: 1;
diff --git a/packages/kbn-unified-data-table/src/components/data_table.test.tsx b/packages/kbn-unified-data-table/src/components/data_table.test.tsx
index 13304d4661cc0..f440c2845adaa 100644
--- a/packages/kbn-unified-data-table/src/components/data_table.test.tsx
+++ b/packages/kbn-unified-data-table/src/components/data_table.test.tsx
@@ -1354,5 +1354,49 @@ describe('UnifiedDataTable', () => {
       },
       EXTENDED_JEST_TIMEOUT
     );
+
+    it(
+      'should have columnVisibility configuration',
+      async () => {
+        const component = await getComponent({
+          ...getProps(),
+          columns: ['message'],
+          canDragAndDropColumns: true,
+        });
+        expect(component.find(EuiDataGrid).last().prop('columnVisibility')).toMatchInlineSnapshot(`
+          Object {
+            "canDragAndDropColumns": true,
+            "setVisibleColumns": [Function],
+            "visibleColumns": Array [
+              "@timestamp",
+              "message",
+            ],
+          }
+        `);
+      },
+      EXTENDED_JEST_TIMEOUT
+    );
+
+    it(
+      'should disable drag&drop if Summary is present',
+      async () => {
+        const component = await getComponent({
+          ...getProps(),
+          columns: [],
+          canDragAndDropColumns: true,
+        });
+        expect(component.find(EuiDataGrid).last().prop('columnVisibility')).toMatchInlineSnapshot(`
+          Object {
+            "canDragAndDropColumns": false,
+            "setVisibleColumns": [Function],
+            "visibleColumns": Array [
+              "@timestamp",
+              "_source",
+            ],
+          }
+        `);
+      },
+      EXTENDED_JEST_TIMEOUT
+    );
   });
 });
diff --git a/packages/kbn-unified-data-table/src/components/data_table.tsx b/packages/kbn-unified-data-table/src/components/data_table.tsx
index 662c8526dd567..a22ee8317be2f 100644
--- a/packages/kbn-unified-data-table/src/components/data_table.tsx
+++ b/packages/kbn-unified-data-table/src/components/data_table.tsx
@@ -137,6 +137,10 @@ export interface UnifiedDataTableProps {
    * Field tokens could be rendered in column header next to the field name.
    */
   showColumnTokens?: boolean;
+  /**
+   * Set to true to allow users to drag and drop columns for reordering
+   */
+  canDragAndDropColumns?: boolean;
   /**
    * Optional value for providing configuration setting for UnifiedDataTable header row height
    */
@@ -425,6 +429,7 @@ export const UnifiedDataTable = ({
   columns,
   columnsMeta,
   showColumnTokens,
+  canDragAndDropColumns,
   configHeaderRowHeight,
   headerRowHeightState,
   onUpdateHeaderRowHeight,
@@ -870,13 +875,20 @@ export const UnifiedDataTable = ({
   const schemaDetectors = useMemo(() => getSchemaDetectors(), []);
   const columnsVisibility = useMemo(
     () => ({
+      canDragAndDropColumns: defaultColumns ? false : canDragAndDropColumns,
       visibleColumns,
       setVisibleColumns: (newColumns: string[]) => {
         const dontModifyColumns = !shouldPrependTimeFieldColumn(newColumns);
         onSetColumns(newColumns, dontModifyColumns);
       },
     }),
-    [visibleColumns, onSetColumns, shouldPrependTimeFieldColumn]
+    [
+      visibleColumns,
+      onSetColumns,
+      shouldPrependTimeFieldColumn,
+      canDragAndDropColumns,
+      defaultColumns,
+    ]
   );
 
   const canSetExpandedDoc = Boolean(setExpandedDoc && !!renderDocumentView);
diff --git a/packages/kbn-unified-data-table/src/components/data_table_columns.tsx b/packages/kbn-unified-data-table/src/components/data_table_columns.tsx
index 985a5db9f2178..8f1503ade8a7c 100644
--- a/packages/kbn-unified-data-table/src/components/data_table_columns.tsx
+++ b/packages/kbn-unified-data-table/src/components/data_table_columns.tsx
@@ -258,6 +258,7 @@ function buildEuiGridColumn({
     },
     cellActions,
     visibleCellActions,
+    displayHeaderCellProps: { className: 'unifiedDataTable__headerCell' },
   };
 
   if (column.id === dataView.timeFieldName) {
diff --git a/packages/shared-ux/page/analytics_no_data/impl/kibana.jsonc b/packages/shared-ux/page/analytics_no_data/impl/kibana.jsonc
index b8690de58bdb9..45c7a028be286 100644
--- a/packages/shared-ux/page/analytics_no_data/impl/kibana.jsonc
+++ b/packages/shared-ux/page/analytics_no_data/impl/kibana.jsonc
@@ -1,5 +1,7 @@
 {
   "type": "shared-browser",
   "id": "@kbn/shared-ux-page-analytics-no-data",
-  "owner": "@elastic/appex-sharedux"
+  "owner": "@elastic/appex-sharedux",
+  "group": "platform",
+  "visibility": "private"
 }
diff --git a/packages/shared-ux/page/analytics_no_data/mocks/kibana.jsonc b/packages/shared-ux/page/analytics_no_data/mocks/kibana.jsonc
index cde1666e15f14..e7d570e4239e6 100644
--- a/packages/shared-ux/page/analytics_no_data/mocks/kibana.jsonc
+++ b/packages/shared-ux/page/analytics_no_data/mocks/kibana.jsonc
@@ -1,5 +1,7 @@
 {
   "type": "shared-common",
   "id": "@kbn/shared-ux-page-analytics-no-data-mocks",
-  "owner": "@elastic/appex-sharedux"
+  "owner": "@elastic/appex-sharedux",
+  "group": "platform",
+  "visibility": "private"
 }
diff --git a/packages/shared-ux/page/analytics_no_data/types/kibana.jsonc b/packages/shared-ux/page/analytics_no_data/types/kibana.jsonc
index df5498181fe69..fd1740c0d757e 100644
--- a/packages/shared-ux/page/analytics_no_data/types/kibana.jsonc
+++ b/packages/shared-ux/page/analytics_no_data/types/kibana.jsonc
@@ -1,5 +1,7 @@
 {
   "type": "shared-browser",
   "id": "@kbn/shared-ux-page-analytics-no-data-types",
-  "owner": "@elastic/appex-sharedux"
+  "owner": "@elastic/appex-sharedux",
+  "group": "platform",
+  "visibility": "private"
 }
diff --git a/src/dev/build/tasks/os_packages/docker_generator/templates/ironbank/hardening_manifest.yaml b/src/dev/build/tasks/os_packages/docker_generator/templates/ironbank/hardening_manifest.yaml
index 287739cc03fea..d1d76367b4ec3 100644
--- a/src/dev/build/tasks/os_packages/docker_generator/templates/ironbank/hardening_manifest.yaml
+++ b/src/dev/build/tasks/os_packages/docker_generator/templates/ironbank/hardening_manifest.yaml
@@ -42,39 +42,47 @@ resources:
       value: 0ce56bde1853fed3e53282505bac65707385275a27816c29712ab04c187aa249797c82c58759b2b36c210d4e2683eda92359d739a8045cb8385c2c34d37cc9e1
 # List of project maintainers
 maintainers:
+  # AppEx Operations Members
+  - email: 'brad.white@elastic.co'
+    name: 'Brad White'
+    username: 'brad.white'
+    cht_member: false
   - email: 'jon@elastic.co'
     name: 'Jonathan Budzenski'
     username: 'jbudz'
     cht_member: false
-  - email: 'brad.white@elastic.co'
-    name: 'Brad White'
-    username: 'brad.white'
+  # AppEx Platform Security Members
+  - email: 'aleh.zasypkin@elastic.co'
+    name: 'Aleh Zasypkin'
+    username: 'azasypkin'
+    cht_member: false
+  - email: 'larry.gregory@elastic.co'
+    name: 'Larry Gregory'
+    username: 'legrego'
+    cht_member: false
+  # InfoSec Members
+  - email: 'abby.zumstein@elastic.co'
+    name: 'Abby Zumstein'
+    username: 'azumstein'
+    cht_member: false
+  - email: 'arsalan.khan@elastic.co'
+    name: 'Arsalan Khan'
+    username: 'khanarsalan'
+    cht_member: false
+  - email: 'iaroslava.zhomir@elastic.co'
+    name: 'Slava Zhomir'
+    username: 'slava-elastic'
+    cht_member: false
+  - email: 'ryan.kam@elastic.co'
+    name: 'Ryan Kam'
+    username: 'ryankam'
+    cht_member: false
+  - email: 'saumya.shree@elastic.co'
+    name: 'Saumya Shree'
+    username: 'shreesaumya'
     cht_member: false
+  # CHT Members
   - email: 'klepal_alexander@bah.com'
     name: 'Alexander Klepal'
     username: 'alexander.klepal'
-    cht_member: true
-  - cht_member: false
-    email: larry.gregory@elastic.co
-    name: Larry Gregory
-    username: legrego
-  - cht_member: false
-    email: aleh.zasypkin@elastic.co
-    name: Aleh Zasypkin
-    username: azasypkin
-  - cht_member: false
-    email: kurt.greiner@elastic.co
-    name: Kurt Greiner
-    username: kc13greiner
-  - cht_member: false
-    email: jeramy.soucy@elastic.co
-    name: Jeramy Soucy
-    username: jeramysoucy
-  - cht_member: false
-    email: sid.mantri@elastic.co
-    name: Sid Mantri
-    username: sidmantri
-  - cht_member: false
-    email: elena.shostak@elastic.co
-    name: Elena Shostak
-    username: elena.shostak
+    cht_member: true
\ No newline at end of file
diff --git a/src/plugins/ai_assistant_management/selection/kibana.jsonc b/src/plugins/ai_assistant_management/selection/kibana.jsonc
index 715b90f1d4d79..74640423685a9 100644
--- a/src/plugins/ai_assistant_management/selection/kibana.jsonc
+++ b/src/plugins/ai_assistant_management/selection/kibana.jsonc
@@ -4,8 +4,9 @@
   "owner": [
     "@elastic/obs-knowledge-team"
   ],
+  // This should probably be platform. While the code owner is currently observability, the package is a platform AI assistant selector.
   "group": "platform",
-  "visibility": "private",
+  "visibility": "shared",
   "plugin": {
     "id": "aiAssistantManagementSelection",
     "browser": true,
@@ -25,4 +26,4 @@
       "kibanaReact"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/src/plugins/dashboard/public/dashboard_app/_dashboard_app_strings.ts b/src/plugins/dashboard/public/dashboard_app/_dashboard_app_strings.ts
index 8a6e24a183f3a..9c6526ce3403e 100644
--- a/src/plugins/dashboard/public/dashboard_app/_dashboard_app_strings.ts
+++ b/src/plugins/dashboard/public/dashboard_app/_dashboard_app_strings.ts
@@ -78,21 +78,6 @@ export const unsavedChangesBadgeStrings = {
     }),
 };
 
-export const leaveConfirmStrings = {
-  getLeaveTitle: () =>
-    i18n.translate('dashboard.appLeaveConfirmModal.unsavedChangesTitle', {
-      defaultMessage: 'Unsaved changes',
-    }),
-  getLeaveSubtitle: () =>
-    i18n.translate('dashboard.appLeaveConfirmModal.unsavedChangesSubtitle', {
-      defaultMessage: 'Leave Dashboard with unsaved work?',
-    }),
-  getLeaveCancelButtonText: () =>
-    i18n.translate('dashboard.appLeaveConfirmModal.cancelButtonLabel', {
-      defaultMessage: 'Cancel',
-    }),
-};
-
 export const getCreateVisualizationButtonTitle = () =>
   i18n.translate('dashboard.solutionToolbar.addPanelButtonLabel', {
     defaultMessage: 'Create visualization',
diff --git a/src/plugins/dashboard/public/dashboard_top_nav/internal_dashboard_top_nav.tsx b/src/plugins/dashboard/public/dashboard_top_nav/internal_dashboard_top_nav.tsx
index bf2be799dcc1f..47a84b620ede3 100644
--- a/src/plugins/dashboard/public/dashboard_top_nav/internal_dashboard_top_nav.tsx
+++ b/src/plugins/dashboard/public/dashboard_top_nav/internal_dashboard_top_nav.tsx
@@ -33,7 +33,6 @@ import {
   dashboardManagedBadge,
   getDashboardBreadcrumb,
   getDashboardTitle,
-  leaveConfirmStrings,
   unsavedChangesBadgeStrings,
 } from '../dashboard_app/_dashboard_app_strings';
 import { useDashboardMountContext } from '../dashboard_app/hooks/dashboard_mount_context';
@@ -48,7 +47,6 @@ import { getDashboardRecentlyAccessedService } from '../services/dashboard_recen
 import {
   coreServices,
   dataService,
-  embeddableService,
   navigationService,
   serverlessService,
 } from '../services/kibana_services';
@@ -195,16 +193,6 @@ export function InternalDashboardTopNav({
    */
   useEffect(() => {
     onAppLeave((actions) => {
-      if (
-        viewMode === 'edit' &&
-        hasUnsavedChanges &&
-        !embeddableService.getStateTransfer().isTransferInProgress
-      ) {
-        return actions.confirm(
-          leaveConfirmStrings.getLeaveSubtitle(),
-          leaveConfirmStrings.getLeaveTitle()
-        );
-      }
       return actions.default();
     });
     return () => {
diff --git a/src/plugins/discover/public/application/main/discover_main_route.tsx b/src/plugins/discover/public/application/main/discover_main_route.tsx
index d86788172386f..205926cf4943b 100644
--- a/src/plugins/discover/public/application/main/discover_main_route.tsx
+++ b/src/plugins/discover/public/application/main/discover_main_route.tsx
@@ -120,14 +120,10 @@ export function DiscoverMainRoute({
         const { dataSource } = stateContainer.appState.getState();
         const isEsqlQuery = isDataSourceType(dataSource, DataSourceType.Esql);
 
-        // ES|QL should work without data views
-        // Given we have a saved search id, we can skip the data/data view check, too
-        // A given nextDataView is provided by the user, and therefore we can skip the data/data view check
-
         if (savedSearchId || isEsqlQuery || nextDataView) {
-          if (!isEsqlQuery) {
-            await stateContainer.actions.loadDataViewList();
-          }
+          // Although ES|QL doesn't need a data view, we still need to load the data view list to
+          // ensure the data view is available for the user to switch to classic mode
+          await stateContainer.actions.loadDataViewList();
           return true;
         }
 
diff --git a/src/plugins/discover/public/components/discover_grid/discover_grid.tsx b/src/plugins/discover/public/components/discover_grid/discover_grid.tsx
index 3b0a2df2582aa..e909d3e256d22 100644
--- a/src/plugins/discover/public/components/discover_grid/discover_grid.tsx
+++ b/src/plugins/discover/public/components/discover_grid/discover_grid.tsx
@@ -58,6 +58,7 @@ export const DiscoverGrid: React.FC<DiscoverGridProps> = ({
   return (
     <UnifiedDataTable
       showColumnTokens
+      canDragAndDropColumns
       enableComparisonMode
       renderCustomToolbar={renderCustomToolbar}
       getRowIndicator={getRowIndicator}
diff --git a/src/plugins/discover/public/components/hits_counter/hits_counter.test.tsx b/src/plugins/discover/public/components/hits_counter/hits_counter.test.tsx
index 18f9c8b629b3b..e34ad87d403e5 100644
--- a/src/plugins/discover/public/components/hits_counter/hits_counter.test.tsx
+++ b/src/plugins/discover/public/components/hits_counter/hits_counter.test.tsx
@@ -14,8 +14,20 @@ import { findTestSubject } from '@elastic/eui/lib/test';
 import { EuiLoadingSpinner } from '@elastic/eui';
 import { BehaviorSubject } from 'rxjs';
 import { getDiscoverStateMock } from '../../__mocks__/discover_state.mock';
-import { DataTotalHits$ } from '../../application/main/state_management/discover_data_state_container';
+import {
+  DataDocuments$,
+  DataTotalHits$,
+} from '../../application/main/state_management/discover_data_state_container';
 import { FetchStatus } from '../../application/types';
+import { dataViewMock, esHitsMock } from '@kbn/discover-utils/src/__mocks__';
+import { buildDataTableRecord } from '@kbn/discover-utils';
+
+function getDocuments$(count: number = 5) {
+  return new BehaviorSubject({
+    fetchStatus: FetchStatus.COMPLETE,
+    result: esHitsMock.map((esHit) => buildDataTableRecord(esHit, dataViewMock)).slice(0, count),
+  }) as DataDocuments$;
+}
 
 describe('hits counter', function () {
   it('expect to render the number of hits', function () {
@@ -24,6 +36,7 @@ describe('hits counter', function () {
       fetchStatus: FetchStatus.COMPLETE,
       result: 1,
     }) as DataTotalHits$;
+    stateContainer.dataState.data$.documents$ = getDocuments$();
     const component1 = mountWithIntl(
       <HitsCounter mode={HitsCounterMode.appended} stateContainer={stateContainer} />
     );
@@ -45,6 +58,7 @@ describe('hits counter', function () {
       fetchStatus: FetchStatus.COMPLETE,
       result: 1899,
     }) as DataTotalHits$;
+    stateContainer.dataState.data$.documents$ = getDocuments$();
     const component1 = mountWithIntl(
       <HitsCounter mode={HitsCounterMode.appended} stateContainer={stateContainer} />
     );
@@ -64,6 +78,7 @@ describe('hits counter', function () {
       fetchStatus: FetchStatus.PARTIAL,
       result: 2,
     }) as DataTotalHits$;
+    stateContainer.dataState.data$.documents$ = getDocuments$();
     const component = mountWithIntl(
       <HitsCounter mode={HitsCounterMode.standalone} stateContainer={stateContainer} />
     );
@@ -76,6 +91,7 @@ describe('hits counter', function () {
       fetchStatus: FetchStatus.PARTIAL,
       result: 2,
     }) as DataTotalHits$;
+    stateContainer.dataState.data$.documents$ = getDocuments$();
     const component = mountWithIntl(
       <HitsCounter mode={HitsCounterMode.standalone} stateContainer={stateContainer} />
     );
@@ -89,9 +105,51 @@ describe('hits counter', function () {
       fetchStatus: FetchStatus.LOADING,
       result: undefined,
     }) as DataTotalHits$;
+    stateContainer.dataState.data$.documents$ = getDocuments$();
     const component = mountWithIntl(
       <HitsCounter mode={HitsCounterMode.standalone} stateContainer={stateContainer} />
     );
     expect(component.isEmptyRender()).toBe(true);
   });
+
+  it('should render discoverQueryHitsPartial when status is error', () => {
+    const stateContainer = getDiscoverStateMock({ isTimeBased: true });
+    stateContainer.dataState.data$.totalHits$ = new BehaviorSubject({
+      fetchStatus: FetchStatus.ERROR,
+      result: undefined,
+    }) as DataTotalHits$;
+    stateContainer.dataState.data$.documents$ = getDocuments$(3);
+    const component = mountWithIntl(
+      <HitsCounter mode={HitsCounterMode.standalone} stateContainer={stateContainer} />
+    );
+    expect(component.find('[data-test-subj="discoverQueryHitsPartial"]').length).toBe(1);
+    expect(findTestSubject(component, 'discoverQueryTotalHits').text()).toBe('≥3 resultsInfo');
+    expect(component.text()).toBe('≥3 resultsInfo');
+
+    stateContainer.dataState.data$.totalHits$ = new BehaviorSubject({
+      fetchStatus: FetchStatus.ERROR,
+      result: 200,
+    }) as DataTotalHits$;
+    stateContainer.dataState.data$.documents$ = getDocuments$(2);
+
+    const component2 = mountWithIntl(
+      <HitsCounter mode={HitsCounterMode.appended} stateContainer={stateContainer} />
+    );
+    expect(component2.find('[data-test-subj="discoverQueryHitsPartial"]').length).toBe(1);
+    expect(findTestSubject(component2, 'discoverQueryTotalHits').text()).toBe('≥200Info');
+    expect(component2.text()).toBe(' (≥200Info)');
+
+    stateContainer.dataState.data$.totalHits$ = new BehaviorSubject({
+      fetchStatus: FetchStatus.ERROR,
+      result: 0,
+    }) as DataTotalHits$;
+    stateContainer.dataState.data$.documents$ = getDocuments$(1);
+
+    const component3 = mountWithIntl(
+      <HitsCounter mode={HitsCounterMode.appended} stateContainer={stateContainer} />
+    );
+    expect(component3.find('[data-test-subj="discoverQueryHitsPartial"]').length).toBe(1);
+    expect(findTestSubject(component3, 'discoverQueryTotalHits').text()).toBe('≥1Info');
+    expect(component3.text()).toBe(' (≥1Info)');
+  });
 });
diff --git a/src/plugins/discover/public/components/hits_counter/hits_counter.tsx b/src/plugins/discover/public/components/hits_counter/hits_counter.tsx
index fc89183ff864d..203d32ce97f58 100644
--- a/src/plugins/discover/public/components/hits_counter/hits_counter.tsx
+++ b/src/plugins/discover/public/components/hits_counter/hits_counter.tsx
@@ -8,7 +8,7 @@
  */
 
 import React from 'react';
-import { EuiFlexGroup, EuiFlexItem, EuiText, EuiLoadingSpinner } from '@elastic/eui';
+import { EuiFlexGroup, EuiFlexItem, EuiText, EuiLoadingSpinner, EuiIconTip } from '@elastic/eui';
 import { FormattedMessage, FormattedNumber } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { css } from '@emotion/react';
@@ -29,18 +29,33 @@ export interface HitsCounterProps {
 export const HitsCounter: React.FC<HitsCounterProps> = ({ mode, stateContainer }) => {
   const totalHits$ = stateContainer.dataState.data$.totalHits$;
   const totalHitsState = useDataState(totalHits$);
-  const hitsTotal = totalHitsState.result;
+  let hitsTotal = totalHitsState.result;
   const hitsStatus = totalHitsState.fetchStatus;
 
+  const documents$ = stateContainer.dataState.data$.documents$;
+  const documentsState = useDataState(documents$);
+  const documentsCount = documentsState.result?.length || 0;
+
   if (!hitsTotal && hitsStatus === FetchStatus.LOADING) {
     return null;
   }
 
+  if (
+    hitsStatus === FetchStatus.ERROR &&
+    documentsState.fetchStatus === FetchStatus.COMPLETE &&
+    documentsCount > (hitsTotal ?? 0)
+  ) {
+    // if histogram returned partial results and which are less than the fetched documents count =>
+    // override hitsTotal with the fetched documents count
+    hitsTotal = documentsCount;
+  }
+
+  const showGreaterOrEqualSign =
+    hitsStatus === FetchStatus.PARTIAL || hitsStatus === FetchStatus.ERROR;
+
   const formattedHits = (
     <span
-      data-test-subj={
-        hitsStatus === FetchStatus.PARTIAL ? 'discoverQueryHitsPartial' : 'discoverQueryHits'
-      }
+      data-test-subj={showGreaterOrEqualSign ? 'discoverQueryHitsPartial' : 'discoverQueryHits'}
     >
       <FormattedNumber value={hitsTotal ?? 0} />
     </span>
@@ -55,7 +70,7 @@ export const HitsCounter: React.FC<HitsCounterProps> = ({ mode, stateContainer }
 
   const element = (
     <EuiFlexGroup
-      gutterSize="s"
+      gutterSize="xs"
       responsive={false}
       justifyContent="center"
       alignItems="center"
@@ -66,8 +81,8 @@ export const HitsCounter: React.FC<HitsCounterProps> = ({ mode, stateContainer }
       <EuiFlexItem grow={false} aria-live="polite" css={hitsCounterTextCss}>
         <EuiText className="eui-textTruncate" size="s">
           <strong>
-            {hitsStatus === FetchStatus.PARTIAL &&
-              (mode === HitsCounterMode.standalone ? (
+            {showGreaterOrEqualSign ? (
+              mode === HitsCounterMode.standalone ? (
                 <FormattedMessage
                   id="discover.hitsCounter.partialHitsPluralTitle"
                   defaultMessage="≥{formattedHits} {hits, plural, one {result} other {results}}"
@@ -79,17 +94,16 @@ export const HitsCounter: React.FC<HitsCounterProps> = ({ mode, stateContainer }
                   defaultMessage="≥{formattedHits}"
                   values={{ formattedHits }}
                 />
-              ))}
-            {hitsStatus !== FetchStatus.PARTIAL &&
-              (mode === HitsCounterMode.standalone ? (
-                <FormattedMessage
-                  id="discover.hitsCounter.hitsPluralTitle"
-                  defaultMessage="{formattedHits} {hits, plural, one {result} other {results}}"
-                  values={{ hits: hitsTotal, formattedHits }}
-                />
-              ) : (
-                formattedHits
-              ))}
+              )
+            ) : mode === HitsCounterMode.standalone ? (
+              <FormattedMessage
+                id="discover.hitsCounter.hitsPluralTitle"
+                defaultMessage="{formattedHits} {hits, plural, one {result} other {results}}"
+                values={{ hits: hitsTotal, formattedHits }}
+              />
+            ) : (
+              formattedHits
+            )}
           </strong>
         </EuiText>
       </EuiFlexItem>
@@ -103,6 +117,19 @@ export const HitsCounter: React.FC<HitsCounterProps> = ({ mode, stateContainer }
           />
         </EuiFlexItem>
       )}
+      {hitsStatus === FetchStatus.ERROR && (
+        <EuiFlexItem grow={false}>
+          <EuiIconTip
+            type="warning"
+            color="warning"
+            size="s"
+            content={i18n.translate('discover.hitsCounter.hitCountWarningTooltip', {
+              defaultMessage: 'Results might be incomplete',
+            })}
+            iconProps={{ css: { display: 'block' } }}
+          />
+        </EuiFlexItem>
+      )}
     </EuiFlexGroup>
   );
 
diff --git a/src/plugins/discover/public/context_awareness/README.md b/src/plugins/discover/public/context_awareness/README.md
index a6e7e3e24a585..31fa5ff9bfcda 100644
--- a/src/plugins/discover/public/context_awareness/README.md
+++ b/src/plugins/discover/public/context_awareness/README.md
@@ -44,6 +44,8 @@ The merging order for profiles is based on the context level hierarchy (`root` >
 The following diagram illustrates the extension point merging process:
 ![image](./docs/merged_accessors.png)
 
+Additionally, extension point implementations are passed an `accessorParams` argument as the second argument after `prev`. This object contains additional parameters that may be useful to extension point implementations, primarily the current `context` object. This is most useful in situations where consumers want to [customize the `context` object](#custom-context-objects) with properties specific to their profile, such as state stores and asynchronously initialized services.
+
 Definitions for composable profiles and the merging routine are located in the [`composable_profile.ts`](./composable_profile.ts) file.
 
 ### Supporting services
@@ -266,7 +268,8 @@ export const createSecurityRootProfileProvider = (): RootProfileProvider => ({
     getCellRenderers: (prev) => (params) => ({
       ...prev(params),
       foo: function FooComponent() {
-        // Since the app wrapper implementation wrapped Discover with a React context provider, we can now access its values from within our extension point implementations
+        // Since the app wrapper implementation wrapped Discover with a React context provider,
+        // we can now access its values from within our extension point implementations
         const { setFlyoutOpen } = useContext(flyoutContext);
 
         return <button onClick={() => setFlyoutOpen(true)}>Click me to open a flyout!</button>;
@@ -286,6 +289,51 @@ export const createSecurityRootProfileProvider = (): RootProfileProvider => ({
 });
 ```
 
+## Custom `context` objects
+
+By default the `context` object returned from each profile provider's `resolve` method conforms to a standard interface specific to their profile's context level. However, in some situations it may be useful for consumers to extend this object with properties specific to their profile implementation. To support this, profile providers can define a strongly typed `context` interface that extends the default interface, and allows passing properties through to their profile's extension point implementations. One potential use case for this is instantiating state stores or asynchronously initialized services, then accessing them within a `getRenderAppWrapper` implementation to pass to a React context provider:
+
+```tsx
+// The profile provider interfaces accept a custom context object type param
+type SecurityRootProfileProvider = RootProfileProvider<{ stateStore: SecurityStateStore }>;
+
+export const createSecurityRootProfileProvider = (
+  services: ProfileProviderServices
+): SecurityRootProfileProvider => ({
+  profileId: 'security-root-profile',
+  profile: {
+    getRenderAppWrapper:
+      (PrevWrapper, { context }) =>
+      ({ children }) =>
+        (
+          <PrevWrapper>
+            // Custom props can be accessed from the context object available in `accessorParams`
+            <SecurityStateProvider stateStore={context.stateStore}>
+              {children}
+            </SecurityStateProvider>
+          </PrevWrapper>
+        ),
+  },
+  resolve: async (params) => {
+    if (params.solutionNavId !== SolutionType.Security) {
+      return { isMatch: false };
+    }
+
+    // Perform async service initialization within the `resolve` method
+    const stateStore = await initializeSecurityStateStore(services);
+
+    return {
+      isMatch: true,
+      context: {
+        solutionType: SolutionType.Security,
+        // Include the custom service in the returned context object
+        stateStore,
+      },
+    };
+  },
+});
+```
+
 ## Overriding defaults
 
 Discover ships with a set of common contextual profiles, shared across Solutions in Kibana (e.g. the current logs data source profile). The goal of these profiles is to provide Solution agnostic contextual features to help improve the default data exploration experience for various data types. They should be generally useful across user types and not be tailored to specific Solution workflows – for example, viewing logs should be a delightful experience regardless of whether it’s done within the Observability Solution, the Search Solution, or the classic on-prem experience.
@@ -335,9 +383,12 @@ export const createSecurityLogsDataSourceProfileProivder = (
       // Completely remove a specific extension point implementation
       getDocViewer: undefined,
       // Modify the result of an existing extension point implementation
-      getCellRenderers: (prev) => (params) => {
+      getCellRenderers: (prev, accessorParams) => (params) => {
         // Retrieve and execute the base implementation
-        const baseImpl = logsDataSourceProfileProvider.profile.getCellRenderers?.(prev);
+        const baseImpl = logsDataSourceProfileProvider.profile.getCellRenderers?.(
+          prev,
+          accessorParams
+        );
         const baseRenderers = baseImpl?.(params);
 
         // Return the modified result
diff --git a/src/plugins/discover/public/context_awareness/composable_profile.test.ts b/src/plugins/discover/public/context_awareness/composable_profile.test.ts
index 34cf44449f20e..bc6a2471c7127 100644
--- a/src/plugins/discover/public/context_awareness/composable_profile.test.ts
+++ b/src/plugins/discover/public/context_awareness/composable_profile.test.ts
@@ -8,7 +8,7 @@
  */
 
 import { DataGridDensity } from '@kbn/unified-data-table';
-import { ComposableProfile, getMergedAccessor } from './composable_profile';
+import { AppliedProfile, getMergedAccessor } from './composable_profile';
 import { Profile } from './types';
 import { dataViewWithTimefieldMock } from '../__mocks__/data_view_with_timefield';
 
@@ -30,13 +30,13 @@ describe('getMergedAccessor', () => {
 
   it('should merge the accessors in the correct order', () => {
     const baseImpl: Profile['getCellRenderers'] = jest.fn(() => ({ base: jest.fn() }));
-    const profile1: ComposableProfile = {
+    const profile1: AppliedProfile = {
       getCellRenderers: jest.fn((prev) => (params) => ({
         ...prev(params),
         profile1: jest.fn(),
       })),
     };
-    const profile2: ComposableProfile = {
+    const profile2: AppliedProfile = {
       getCellRenderers: jest.fn((prev) => (params) => ({
         ...prev(params),
         profile2: jest.fn(),
@@ -57,10 +57,10 @@ describe('getMergedAccessor', () => {
 
   it('should allow overwriting previous accessors', () => {
     const baseImpl: Profile['getCellRenderers'] = jest.fn(() => ({ base: jest.fn() }));
-    const profile1: ComposableProfile = {
+    const profile1: AppliedProfile = {
       getCellRenderers: jest.fn(() => () => ({ profile1: jest.fn() })),
     };
-    const profile2: ComposableProfile = {
+    const profile2: AppliedProfile = {
       getCellRenderers: jest.fn((prev) => (params) => ({
         ...prev(params),
         profile2: jest.fn(),
diff --git a/src/plugins/discover/public/context_awareness/composable_profile.ts b/src/plugins/discover/public/context_awareness/composable_profile.ts
index 84c8b6afca0b3..4779ad724ab2f 100644
--- a/src/plugins/discover/public/context_awareness/composable_profile.ts
+++ b/src/plugins/discover/public/context_awareness/composable_profile.ts
@@ -14,16 +14,41 @@ import type { Profile } from './types';
  */
 export type PartialProfile = Partial<Profile>;
 
+/**
+ * The parameters passed to a composable accessor, such as the current context object
+ */
+export interface ComposableAccessorParams<TContext> {
+  /**
+   * The current context object
+   */
+  context: TContext;
+}
+
 /**
  * An accessor function that allows retrieving the extension point result from previous profiles
  */
-export type ComposableAccessor<T> = (getPrevious: T) => T;
+type ComposableAccessor<TPrev, TContext> = (
+  prev: TPrev,
+  params: ComposableAccessorParams<TContext>
+) => TPrev;
 
 /**
  * A partial profile implementation that supports composition across multiple profiles
  */
-export type ComposableProfile<TProfile extends PartialProfile = Profile> = {
-  [TKey in keyof TProfile]?: ComposableAccessor<TProfile[TKey]>;
+export type ComposableProfile<TProfile extends PartialProfile, TContext> = {
+  [TKey in keyof TProfile]?: ComposableAccessor<TProfile[TKey], TContext>;
+};
+
+/**
+ * A partially applied accessor function with parameters bound to a specific context
+ */
+type AppliedAccessor<TPrev> = (prev: TPrev) => TPrev;
+
+/**
+ * A partial profile implementation with applied accessors
+ */
+export type AppliedProfile = {
+  [TKey in keyof Profile]?: AppliedAccessor<Profile[TKey]>;
 };
 
 /**
@@ -34,7 +59,7 @@ export type ComposableProfile<TProfile extends PartialProfile = Profile> = {
  * @returns The merged extension point accessor function
  */
 export const getMergedAccessor = <TKey extends keyof Profile>(
-  profiles: ComposableProfile[],
+  profiles: AppliedProfile[],
   key: TKey,
   baseImpl: Profile[TKey]
 ) => {
diff --git a/src/plugins/discover/public/context_awareness/hooks/use_profile_accessor.test.ts b/src/plugins/discover/public/context_awareness/hooks/use_profile_accessor.test.ts
index 3fe3c0387149e..65f6f7fb3f30a 100644
--- a/src/plugins/discover/public/context_awareness/hooks/use_profile_accessor.test.ts
+++ b/src/plugins/discover/public/context_awareness/hooks/use_profile_accessor.test.ts
@@ -8,14 +8,14 @@
  */
 
 import { renderHook } from '@testing-library/react-hooks';
-import { ComposableProfile, getMergedAccessor } from '../composable_profile';
+import { AppliedProfile, getMergedAccessor } from '../composable_profile';
 import { useProfileAccessor } from './use_profile_accessor';
 import { getDataTableRecords } from '../../__fixtures__/real_hits';
 import { dataViewWithTimefieldMock } from '../../__mocks__/data_view_with_timefield';
 import { useProfiles } from './use_profiles';
 import { DataGridDensity } from '@kbn/unified-data-table';
 
-let mockProfiles: ComposableProfile[] = [];
+let mockProfiles: AppliedProfile[] = [];
 
 jest.mock('./use_profiles', () => ({
   useProfiles: jest.fn(() => mockProfiles),
diff --git a/src/plugins/discover/public/context_awareness/hooks/use_profiles.test.tsx b/src/plugins/discover/public/context_awareness/hooks/use_profiles.test.tsx
index 014d29321bf87..b42fc1c4b3c49 100644
--- a/src/plugins/discover/public/context_awareness/hooks/use_profiles.test.tsx
+++ b/src/plugins/discover/public/context_awareness/hooks/use_profiles.test.tsx
@@ -8,24 +8,43 @@
  */
 
 import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
-import { renderHook } from '@testing-library/react-hooks';
+import { act, renderHook } from '@testing-library/react-hooks';
 import React from 'react';
 import { discoverServiceMock } from '../../__mocks__/services';
-import { GetProfilesOptions } from '../profiles_manager';
+import type { GetProfilesOptions } from '../profiles_manager';
 import { createContextAwarenessMocks } from '../__mocks__';
 import { useProfiles } from './use_profiles';
+import type { CellRenderersExtensionParams } from '../types';
+import type { AppliedProfile } from '../composable_profile';
+import { SolutionType } from '../profiles';
 
 const {
   rootProfileProviderMock,
   dataSourceProfileProviderMock,
   documentProfileProviderMock,
+  rootProfileServiceMock,
+  dataSourceProfileServiceMock,
+  documentProfileServiceMock,
   contextRecordMock,
   contextRecordMock2,
   profilesManagerMock,
-} = createContextAwarenessMocks();
+} = createContextAwarenessMocks({ shouldRegisterProviders: false });
 
-profilesManagerMock.resolveRootProfile({});
-profilesManagerMock.resolveDataSourceProfile({});
+rootProfileServiceMock.registerProvider({
+  profileId: 'other-root-profile',
+  profile: {},
+  resolve: (params) => {
+    if (params.solutionNavId === 'test') {
+      return { isMatch: true, context: { solutionType: SolutionType.Default } };
+    }
+
+    return { isMatch: false };
+  },
+});
+
+rootProfileServiceMock.registerProvider(rootProfileProviderMock);
+dataSourceProfileServiceMock.registerProvider(dataSourceProfileProviderMock);
+documentProfileServiceMock.registerProvider(documentProfileProviderMock);
 
 const record = profilesManagerMock.resolveDocumentProfile({ record: contextRecordMock });
 const record2 = profilesManagerMock.resolveDocumentProfile({ record: contextRecordMock2 });
@@ -45,22 +64,30 @@ const render = () => {
 };
 
 describe('useProfiles', () => {
-  beforeEach(() => {
+  beforeEach(async () => {
     jest.clearAllMocks();
+    await profilesManagerMock.resolveRootProfile({});
+    await profilesManagerMock.resolveDataSourceProfile({});
   });
 
   it('should return profiles', () => {
     const { result } = render();
     expect(getProfilesSpy).toHaveBeenCalledTimes(2);
     expect(getProfiles$Spy).toHaveBeenCalledTimes(1);
-    expect(result.current).toEqual([
-      rootProfileProviderMock.profile,
-      dataSourceProfileProviderMock.profile,
-      documentProfileProviderMock.profile,
-    ]);
+    expect(result.current).toHaveLength(3);
+    const [rootProfile, dataSourceProfile, documentProfile] = result.current;
+    const baseImpl = () => ({});
+    rootProfile.getCellRenderers?.(baseImpl)({} as unknown as CellRenderersExtensionParams);
+    expect(rootProfileProviderMock.profile.getCellRenderers).toHaveBeenCalledTimes(1);
+    dataSourceProfile.getCellRenderers?.(baseImpl)({} as unknown as CellRenderersExtensionParams);
+    expect(dataSourceProfileProviderMock.profile.getCellRenderers).toHaveBeenCalledTimes(1);
+    documentProfile.getCellRenderers?.(baseImpl)({} as unknown as CellRenderersExtensionParams);
+    expect(
+      (documentProfileProviderMock.profile as AppliedProfile).getCellRenderers
+    ).toHaveBeenCalledTimes(1);
   });
 
-  it('should return the same array reference if profiles do not change', () => {
+  it('should return the same array reference if profiles and record do not change', () => {
     const { result, rerender } = render();
     expect(getProfilesSpy).toHaveBeenCalledTimes(2);
     expect(getProfiles$Spy).toHaveBeenCalledTimes(1);
@@ -69,13 +96,23 @@ describe('useProfiles', () => {
     expect(getProfilesSpy).toHaveBeenCalledTimes(2);
     expect(getProfiles$Spy).toHaveBeenCalledTimes(1);
     expect(result.current).toBe(prevResult);
+  });
+
+  it('should return a different array reference if record changes', () => {
+    const { result, rerender } = render();
+    expect(getProfilesSpy).toHaveBeenCalledTimes(2);
+    expect(getProfiles$Spy).toHaveBeenCalledTimes(1);
+    const prevResult = result.current;
     rerender({ record: record2 });
     expect(getProfilesSpy).toHaveBeenCalledTimes(3);
     expect(getProfiles$Spy).toHaveBeenCalledTimes(2);
-    expect(result.current).toBe(prevResult);
+    expect(result.current).not.toBe(prevResult);
+    expect(result.current[0]).toBe(prevResult[0]);
+    expect(result.current[1]).toBe(prevResult[1]);
+    expect(result.current[2]).not.toBe(prevResult[2]);
   });
 
-  it('should return a different array reference if profiles change', () => {
+  it('should return a different array reference if profiles change', async () => {
     const { result, rerender } = render();
     expect(getProfilesSpy).toHaveBeenCalledTimes(2);
     expect(getProfiles$Spy).toHaveBeenCalledTimes(1);
@@ -84,9 +121,15 @@ describe('useProfiles', () => {
     expect(getProfilesSpy).toHaveBeenCalledTimes(2);
     expect(getProfiles$Spy).toHaveBeenCalledTimes(1);
     expect(result.current).toBe(prevResult);
-    rerender({ record: undefined });
+    await act(async () => {
+      await profilesManagerMock.resolveRootProfile({ solutionNavId: 'test' });
+    });
+    rerender({ record });
     expect(getProfilesSpy).toHaveBeenCalledTimes(3);
-    expect(getProfiles$Spy).toHaveBeenCalledTimes(2);
+    expect(getProfiles$Spy).toHaveBeenCalledTimes(1);
     expect(result.current).not.toBe(prevResult);
+    expect(result.current[0]).not.toBe(prevResult[0]);
+    expect(result.current[1]).toBe(prevResult[1]);
+    expect(result.current[2]).not.toBe(prevResult[2]);
   });
 });
diff --git a/src/plugins/discover/public/context_awareness/profile_providers/common/log_document_profile/profile.test.ts b/src/plugins/discover/public/context_awareness/profile_providers/common/log_document_profile/profile.test.ts
index 87c5ac137380e..394ccdf71da13 100644
--- a/src/plugins/discover/public/context_awareness/profile_providers/common/log_document_profile/profile.test.ts
+++ b/src/plugins/discover/public/context_awareness/profile_providers/common/log_document_profile/profile.test.ts
@@ -101,10 +101,13 @@ describe('logDocumentProfileProvider', () => {
 
   describe('getDocViewer', () => {
     it('adds a log overview doc view to the registry', () => {
-      const getDocViewer = logDocumentProfileProvider.profile.getDocViewer!(() => ({
-        title: 'test title',
-        docViewsRegistry: (registry) => registry,
-      }));
+      const getDocViewer = logDocumentProfileProvider.profile.getDocViewer!(
+        () => ({
+          title: 'test title',
+          docViewsRegistry: (registry) => registry,
+        }),
+        { context: { type: DocumentType.Log } }
+      );
       const docViewer = getDocViewer({
         record: buildDataTableRecord({}),
       });
diff --git a/src/plugins/discover/public/context_awareness/profile_providers/common/logs_data_source_profile/profile.test.ts b/src/plugins/discover/public/context_awareness/profile_providers/common/logs_data_source_profile/profile.test.ts
index 861ef0b590224..9e8f661a61a33 100644
--- a/src/plugins/discover/public/context_awareness/profile_providers/common/logs_data_source_profile/profile.test.ts
+++ b/src/plugins/discover/public/context_awareness/profile_providers/common/logs_data_source_profile/profile.test.ts
@@ -117,7 +117,9 @@ describe('logsDataSourceProfileProvider', () => {
       const row = buildDataTableRecord({ fields: { 'log.level': 'info' } });
       const euiTheme = { euiTheme: { colors: {} } } as unknown as EuiThemeComputed;
       const getRowIndicatorProvider =
-        logsDataSourceProfileProvider.profile.getRowIndicatorProvider?.(() => undefined);
+        logsDataSourceProfileProvider.profile.getRowIndicatorProvider?.(() => undefined, {
+          context: { category: DataSourceCategory.Logs },
+        });
       const getRowIndicator = getRowIndicatorProvider?.({
         dataView: dataViewWithLogLevel,
       });
@@ -130,7 +132,9 @@ describe('logsDataSourceProfileProvider', () => {
       const row = buildDataTableRecord({ fields: { other: 'info' } });
       const euiTheme = { euiTheme: { colors: {} } } as unknown as EuiThemeComputed;
       const getRowIndicatorProvider =
-        logsDataSourceProfileProvider.profile.getRowIndicatorProvider?.(() => undefined);
+        logsDataSourceProfileProvider.profile.getRowIndicatorProvider?.(() => undefined, {
+          context: { category: DataSourceCategory.Logs },
+        });
       const getRowIndicator = getRowIndicatorProvider?.({
         dataView: dataViewWithLogLevel,
       });
@@ -141,7 +145,9 @@ describe('logsDataSourceProfileProvider', () => {
 
     it('should not set the color indicator handler if data view does not have log level field', () => {
       const getRowIndicatorProvider =
-        logsDataSourceProfileProvider.profile.getRowIndicatorProvider?.(() => undefined);
+        logsDataSourceProfileProvider.profile.getRowIndicatorProvider?.(() => undefined, {
+          context: { category: DataSourceCategory.Logs },
+        });
       const getRowIndicator = getRowIndicatorProvider?.({
         dataView: dataViewWithoutLogLevel,
       });
@@ -152,7 +158,12 @@ describe('logsDataSourceProfileProvider', () => {
 
   describe('getCellRenderers', () => {
     it('should return cell renderers for log level fields', () => {
-      const getCellRenderers = logsDataSourceProfileProvider.profile.getCellRenderers?.(() => ({}));
+      const getCellRenderers = logsDataSourceProfileProvider.profile.getCellRenderers?.(
+        () => ({}),
+        {
+          context: { category: DataSourceCategory.Logs },
+        }
+      );
       const getCellRenderersParams = {
         actions: { addFilter: jest.fn() },
         dataView: dataViewWithTimefieldMock,
@@ -172,7 +183,9 @@ describe('logsDataSourceProfileProvider', () => {
   describe('getRowAdditionalLeadingControls', () => {
     it('should return the passed additional controls', () => {
       const getRowAdditionalLeadingControls =
-        logsDataSourceProfileProvider.profile.getRowAdditionalLeadingControls?.(() => undefined);
+        logsDataSourceProfileProvider.profile.getRowAdditionalLeadingControls?.(() => undefined, {
+          context: { category: DataSourceCategory.Logs },
+        });
       const rowAdditionalLeadingControls = getRowAdditionalLeadingControls?.({
         dataView: dataViewWithLogLevel,
       });
diff --git a/src/plugins/discover/public/context_awareness/profile_providers/common/logs_data_source_profile/sub_profiles/apache_error_logs.test.ts b/src/plugins/discover/public/context_awareness/profile_providers/common/logs_data_source_profile/sub_profiles/apache_error_logs.test.ts
index 9b3e64e520be3..bda23309baec3 100644
--- a/src/plugins/discover/public/context_awareness/profile_providers/common/logs_data_source_profile/sub_profiles/apache_error_logs.test.ts
+++ b/src/plugins/discover/public/context_awareness/profile_providers/common/logs_data_source_profile/sub_profiles/apache_error_logs.test.ts
@@ -41,7 +41,9 @@ describe('createApacheErrorLogsDataSourceProfileProvider', () => {
   });
 
   it('should return default app state', () => {
-    const getDefaultAppState = dataSourceProfileProvider.profile.getDefaultAppState?.(() => ({}));
+    const getDefaultAppState = dataSourceProfileProvider.profile.getDefaultAppState?.(() => ({}), {
+      context: { category: DataSourceCategory.Logs },
+    });
     expect(getDefaultAppState?.({ dataView: dataViewWithTimefieldMock })).toEqual({
       columns: [
         { name: 'timestamp', width: 212 },
diff --git a/src/plugins/discover/public/context_awareness/profile_providers/common/logs_data_source_profile/sub_profiles/aws_s3access_logs.test.ts b/src/plugins/discover/public/context_awareness/profile_providers/common/logs_data_source_profile/sub_profiles/aws_s3access_logs.test.ts
index fc97e67b1bee7..c95cc090195a2 100644
--- a/src/plugins/discover/public/context_awareness/profile_providers/common/logs_data_source_profile/sub_profiles/aws_s3access_logs.test.ts
+++ b/src/plugins/discover/public/context_awareness/profile_providers/common/logs_data_source_profile/sub_profiles/aws_s3access_logs.test.ts
@@ -41,7 +41,9 @@ describe('createAwsS3accessLogsDataSourceProfileProvider', () => {
   });
 
   it('should return default app state', () => {
-    const getDefaultAppState = dataSourceProfileProvider.profile.getDefaultAppState?.(() => ({}));
+    const getDefaultAppState = dataSourceProfileProvider.profile.getDefaultAppState?.(() => ({}), {
+      context: { category: DataSourceCategory.Logs },
+    });
     expect(getDefaultAppState?.({ dataView: dataViewWithTimefieldMock })).toEqual({
       columns: [
         { name: 'timestamp', width: 212 },
diff --git a/src/plugins/discover/public/context_awareness/profile_providers/common/logs_data_source_profile/sub_profiles/kubernetes_container_logs.test.ts b/src/plugins/discover/public/context_awareness/profile_providers/common/logs_data_source_profile/sub_profiles/kubernetes_container_logs.test.ts
index 301ef9ca52a86..3f43aa3b6808a 100644
--- a/src/plugins/discover/public/context_awareness/profile_providers/common/logs_data_source_profile/sub_profiles/kubernetes_container_logs.test.ts
+++ b/src/plugins/discover/public/context_awareness/profile_providers/common/logs_data_source_profile/sub_profiles/kubernetes_container_logs.test.ts
@@ -41,7 +41,9 @@ describe('createKubernetesContainerLogsDataSourceProfileProvider', () => {
   });
 
   it('should return default app state', () => {
-    const getDefaultAppState = dataSourceProfileProvider.profile.getDefaultAppState?.(() => ({}));
+    const getDefaultAppState = dataSourceProfileProvider.profile.getDefaultAppState?.(() => ({}), {
+      context: { category: DataSourceCategory.Logs },
+    });
     expect(getDefaultAppState?.({ dataView: dataViewWithTimefieldMock })).toEqual({
       columns: [
         { name: 'timestamp', width: 212 },
diff --git a/src/plugins/discover/public/context_awareness/profile_providers/common/logs_data_source_profile/sub_profiles/nginx_access_logs.test.ts b/src/plugins/discover/public/context_awareness/profile_providers/common/logs_data_source_profile/sub_profiles/nginx_access_logs.test.ts
index 0265c17152177..3116ebd55d3e7 100644
--- a/src/plugins/discover/public/context_awareness/profile_providers/common/logs_data_source_profile/sub_profiles/nginx_access_logs.test.ts
+++ b/src/plugins/discover/public/context_awareness/profile_providers/common/logs_data_source_profile/sub_profiles/nginx_access_logs.test.ts
@@ -41,7 +41,9 @@ describe('createNginxAccessLogsDataSourceProfileProvider', () => {
   });
 
   it('should return default app state', () => {
-    const getDefaultAppState = dataSourceProfileProvider.profile.getDefaultAppState?.(() => ({}));
+    const getDefaultAppState = dataSourceProfileProvider.profile.getDefaultAppState?.(() => ({}), {
+      context: { category: DataSourceCategory.Logs },
+    });
     expect(getDefaultAppState?.({ dataView: dataViewWithTimefieldMock })).toEqual({
       columns: [
         { name: 'timestamp', width: 212 },
diff --git a/src/plugins/discover/public/context_awareness/profile_providers/common/logs_data_source_profile/sub_profiles/nginx_error_logs.test.ts b/src/plugins/discover/public/context_awareness/profile_providers/common/logs_data_source_profile/sub_profiles/nginx_error_logs.test.ts
index 7ce8e49337a51..c5a980c31d21e 100644
--- a/src/plugins/discover/public/context_awareness/profile_providers/common/logs_data_source_profile/sub_profiles/nginx_error_logs.test.ts
+++ b/src/plugins/discover/public/context_awareness/profile_providers/common/logs_data_source_profile/sub_profiles/nginx_error_logs.test.ts
@@ -41,7 +41,9 @@ describe('createNginxErrorLogsDataSourceProfileProvider', () => {
   });
 
   it('should return default app state', () => {
-    const getDefaultAppState = dataSourceProfileProvider.profile.getDefaultAppState?.(() => ({}));
+    const getDefaultAppState = dataSourceProfileProvider.profile.getDefaultAppState?.(() => ({}), {
+      context: { category: DataSourceCategory.Logs },
+    });
     expect(getDefaultAppState?.({ dataView: dataViewWithTimefieldMock })).toEqual({
       columns: [
         { name: 'timestamp', width: 212 },
diff --git a/src/plugins/discover/public/context_awareness/profile_providers/common/logs_data_source_profile/sub_profiles/system_logs.test.ts b/src/plugins/discover/public/context_awareness/profile_providers/common/logs_data_source_profile/sub_profiles/system_logs.test.ts
index 760546b89bc51..f6105d9115fb4 100644
--- a/src/plugins/discover/public/context_awareness/profile_providers/common/logs_data_source_profile/sub_profiles/system_logs.test.ts
+++ b/src/plugins/discover/public/context_awareness/profile_providers/common/logs_data_source_profile/sub_profiles/system_logs.test.ts
@@ -41,7 +41,9 @@ describe('createSystemLogsDataSourceProfileProvider', () => {
   });
 
   it('should return default app state', () => {
-    const getDefaultAppState = dataSourceProfileProvider.profile.getDefaultAppState?.(() => ({}));
+    const getDefaultAppState = dataSourceProfileProvider.profile.getDefaultAppState?.(() => ({}), {
+      context: { category: DataSourceCategory.Logs },
+    });
     expect(getDefaultAppState?.({ dataView: dataViewWithTimefieldMock })).toEqual({
       columns: [
         { name: 'timestamp', width: 212 },
diff --git a/src/plugins/discover/public/context_awareness/profile_providers/common/logs_data_source_profile/sub_profiles/windows_logs.test.ts b/src/plugins/discover/public/context_awareness/profile_providers/common/logs_data_source_profile/sub_profiles/windows_logs.test.ts
index ce144b9167646..b54cdf3787f5a 100644
--- a/src/plugins/discover/public/context_awareness/profile_providers/common/logs_data_source_profile/sub_profiles/windows_logs.test.ts
+++ b/src/plugins/discover/public/context_awareness/profile_providers/common/logs_data_source_profile/sub_profiles/windows_logs.test.ts
@@ -41,7 +41,9 @@ describe('createWindowsLogsDataSourceProfileProvider', () => {
   });
 
   it('should return default app state', () => {
-    const getDefaultAppState = dataSourceProfileProvider.profile.getDefaultAppState?.(() => ({}));
+    const getDefaultAppState = dataSourceProfileProvider.profile.getDefaultAppState?.(() => ({}), {
+      context: { category: DataSourceCategory.Logs },
+    });
     expect(getDefaultAppState?.({ dataView: dataViewWithTimefieldMock })).toEqual({
       columns: [
         { name: 'timestamp', width: 212 },
diff --git a/src/plugins/discover/public/context_awareness/profile_providers/example/example_data_source_profile/profile.tsx b/src/plugins/discover/public/context_awareness/profile_providers/example/example_data_source_profile/profile.tsx
index b32267c0b3fe8..1fe833ba99afe 100644
--- a/src/plugins/discover/public/context_awareness/profile_providers/example/example_data_source_profile/profile.tsx
+++ b/src/plugins/discover/public/context_awareness/profile_providers/example/example_data_source_profile/profile.tsx
@@ -7,7 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-import { EuiBadge, EuiLink, EuiFlyout } from '@elastic/eui';
+import { EuiBadge, EuiLink, EuiFlyout, EuiFlyoutBody } from '@elastic/eui';
 import {
   AppMenuActionId,
   AppMenuActionType,
@@ -23,7 +23,9 @@ import { DataSourceType, isDataSourceType } from '../../../../../common/data_sou
 import { DataSourceCategory, DataSourceProfileProvider } from '../../../profiles';
 import { useExampleContext } from '../example_context';
 
-export const createExampleDataSourceProfileProvider = (): DataSourceProfileProvider => ({
+export const createExampleDataSourceProfileProvider = (): DataSourceProfileProvider<{
+  formatRecord: (flattenedRecord: Record<string, unknown>) => string;
+}> => ({
   profileId: 'example-data-source-profile',
   isExperimental: true,
   profile: {
@@ -74,25 +76,32 @@ export const createExampleDataSourceProfileProvider = (): DataSourceProfileProvi
         );
       },
     }),
-    getDocViewer: (prev) => (params) => {
-      const recordId = params.record.id;
-      const prevValue = prev(params);
-      return {
-        title: `Record #${recordId}`,
-        docViewsRegistry: (registry) => {
-          registry.add({
-            id: 'doc_view_example',
-            title: 'Example',
-            order: 0,
-            component: () => (
-              <div data-test-subj="exampleDataSourceProfileDocView">Example Doc View</div>
-            ),
-          });
+    getDocViewer:
+      (prev, { context }) =>
+      (params) => {
+        const recordId = params.record.id;
+        const prevValue = prev(params);
+        return {
+          title: `Record #${recordId}`,
+          docViewsRegistry: (registry) => {
+            registry.add({
+              id: 'doc_view_example',
+              title: 'Example',
+              order: 0,
+              component: () => (
+                <EuiFlyoutBody>
+                  <div data-test-subj="exampleDataSourceProfileDocView">Example Doc View</div>
+                  <pre data-test-subj="exampleDataSourceProfileDocViewRecord">
+                    {context.formatRecord(params.record.flattened)}
+                  </pre>
+                </EuiFlyoutBody>
+              ),
+            });
 
-          return prevValue.docViewsRegistry(registry);
-        },
-      };
-    },
+            return prevValue.docViewsRegistry(registry);
+          },
+        };
+      },
     /**
      * The `getAppMenu` extension point gives access to AppMenuRegistry with methods registerCustomAction and registerCustomActionUnderSubmenu.
      * The extension also provides the essential params like current dataView, adHocDataViews etc when defining a custom action implementation.
@@ -267,7 +276,10 @@ export const createExampleDataSourceProfileProvider = (): DataSourceProfileProvi
 
     return {
       isMatch: true,
-      context: { category: DataSourceCategory.Logs },
+      context: {
+        category: DataSourceCategory.Logs,
+        formatRecord: (record) => JSON.stringify(record, null, 2),
+      },
     };
   },
 });
diff --git a/src/plugins/discover/public/context_awareness/profile_providers/extend_profile_provider.ts b/src/plugins/discover/public/context_awareness/profile_providers/extend_profile_provider.ts
index 9382101464ec7..9eea569b66217 100644
--- a/src/plugins/discover/public/context_awareness/profile_providers/extend_profile_provider.ts
+++ b/src/plugins/discover/public/context_awareness/profile_providers/extend_profile_provider.ts
@@ -15,7 +15,7 @@ import type { BaseProfileProvider } from '../profile_service';
  * @param extension The extension to apply to the base profile provider
  * @returns The extended profile provider
  */
-export const extendProfileProvider = <TProvider extends BaseProfileProvider<{}>>(
+export const extendProfileProvider = <TProvider extends BaseProfileProvider<{}, {}>>(
   baseProvider: TProvider,
   extension: Partial<TProvider> & Pick<TProvider, 'profileId'>
 ): TProvider => ({
diff --git a/src/plugins/discover/public/context_awareness/profile_providers/register_profile_providers.test.ts b/src/plugins/discover/public/context_awareness/profile_providers/register_profile_providers.test.ts
index ddff243b5117a..69edc5d3b7cd3 100644
--- a/src/plugins/discover/public/context_awareness/profile_providers/register_profile_providers.test.ts
+++ b/src/plugins/discover/public/context_awareness/profile_providers/register_profile_providers.test.ts
@@ -12,17 +12,21 @@ import { createContextAwarenessMocks } from '../__mocks__';
 import { createExampleRootProfileProvider } from './example/example_root_profile';
 import { createExampleDataSourceProfileProvider } from './example/example_data_source_profile/profile';
 import { createExampleDocumentProfileProvider } from './example/example_document_profile';
-
 import {
   registerProfileProviders,
   registerEnabledProfileProviders,
 } from './register_profile_providers';
+import type { CellRenderersExtensionParams } from '../types';
 
 const exampleRootProfileProvider = createExampleRootProfileProvider();
 const exampleDataSourceProfileProvider = createExampleDataSourceProfileProvider();
 const exampleDocumentProfileProvider = createExampleDocumentProfileProvider();
 
 describe('registerEnabledProfileProviders', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
   it('should register all profile providers', async () => {
     const { rootProfileServiceMock, rootProfileProviderMock } = createContextAwarenessMocks({
       shouldRegisterProviders: false,
@@ -33,37 +37,52 @@ describe('registerEnabledProfileProviders', () => {
       enabledExperimentalProfileIds: [],
     });
     const context = await rootProfileServiceMock.resolve({ solutionNavId: null });
-    expect(rootProfileServiceMock.getProfile(context)).toBe(rootProfileProviderMock.profile);
+    const profile = rootProfileServiceMock.getProfile({ context });
+    const baseImpl = () => ({});
+    profile.getCellRenderers?.(baseImpl)({} as unknown as CellRenderersExtensionParams);
+    expect(rootProfileProviderMock.profile.getCellRenderers).toHaveBeenCalledTimes(1);
+    expect(rootProfileProviderMock.profile.getCellRenderers).toHaveBeenCalledWith(baseImpl, {
+      context,
+    });
   });
 
   it('should not register experimental profile providers by default', async () => {
+    jest.spyOn(exampleRootProfileProvider.profile, 'getCellRenderers');
     const { rootProfileServiceMock } = createContextAwarenessMocks({
       shouldRegisterProviders: false,
     });
-
     registerEnabledProfileProviders({
       profileService: rootProfileServiceMock,
       providers: [exampleRootProfileProvider],
       enabledExperimentalProfileIds: [],
     });
     const context = await rootProfileServiceMock.resolve({ solutionNavId: null });
-    expect(rootProfileServiceMock.getProfile(context)).not.toBe(exampleRootProfileProvider.profile);
-    expect(rootProfileServiceMock.getProfile(context)).toMatchObject({});
+    const profile = rootProfileServiceMock.getProfile({ context });
+    const baseImpl = () => ({});
+    profile.getCellRenderers?.(baseImpl)({} as unknown as CellRenderersExtensionParams);
+    expect(exampleRootProfileProvider.profile.getCellRenderers).not.toHaveBeenCalled();
+    expect(profile).toMatchObject({});
   });
 
   it('should register experimental profile providers when enabled by config', async () => {
+    jest.spyOn(exampleRootProfileProvider.profile, 'getCellRenderers');
     const { rootProfileServiceMock, rootProfileProviderMock } = createContextAwarenessMocks({
       shouldRegisterProviders: false,
     });
-
     registerEnabledProfileProviders({
       profileService: rootProfileServiceMock,
       providers: [exampleRootProfileProvider],
       enabledExperimentalProfileIds: [exampleRootProfileProvider.profileId],
     });
     const context = await rootProfileServiceMock.resolve({ solutionNavId: null });
-    expect(rootProfileServiceMock.getProfile(context)).toBe(exampleRootProfileProvider.profile);
-    expect(rootProfileServiceMock.getProfile(context)).not.toBe(rootProfileProviderMock.profile);
+    const profile = rootProfileServiceMock.getProfile({ context });
+    const baseImpl = () => ({});
+    profile.getCellRenderers?.(baseImpl)({} as unknown as CellRenderersExtensionParams);
+    expect(exampleRootProfileProvider.profile.getCellRenderers).toHaveBeenCalledTimes(1);
+    expect(exampleRootProfileProvider.profile.getCellRenderers).toHaveBeenCalledWith(baseImpl, {
+      context,
+    });
+    expect(rootProfileProviderMock.profile.getCellRenderers).not.toHaveBeenCalled();
   });
 });
 
diff --git a/src/plugins/discover/public/context_awareness/profile_providers/register_profile_providers.ts b/src/plugins/discover/public/context_awareness/profile_providers/register_profile_providers.ts
index 2d2377eb423e0..cb4146d1b99bb 100644
--- a/src/plugins/discover/public/context_awareness/profile_providers/register_profile_providers.ts
+++ b/src/plugins/discover/public/context_awareness/profile_providers/register_profile_providers.ts
@@ -87,8 +87,8 @@ export const registerProfileProviders = async ({
  * @param options Register enabled profile providers options
  */
 export const registerEnabledProfileProviders = <
-  TProvider extends BaseProfileProvider<{}>,
-  TService extends BaseProfileService<TProvider, {}>
+  TProvider extends BaseProfileProvider<{}, {}>,
+  TService extends BaseProfileService<TProvider>
 >({
   profileService,
   providers: availableProviders,
diff --git a/src/plugins/discover/public/context_awareness/profile_service.test.ts b/src/plugins/discover/public/context_awareness/profile_service.test.ts
index 22190dcb60da2..20ef2ba4556ae 100644
--- a/src/plugins/discover/public/context_awareness/profile_service.test.ts
+++ b/src/plugins/discover/public/context_awareness/profile_service.test.ts
@@ -9,8 +9,14 @@
 
 /* eslint-disable max-classes-per-file */
 
-import { AsyncProfileService, ContextWithProfileId, ProfileService } from './profile_service';
-import { Profile } from './types';
+import {
+  AsyncProfileProvider,
+  AsyncProfileService,
+  ContextWithProfileId,
+  ProfileProvider,
+  ProfileService,
+} from './profile_service';
+import type { CellRenderersExtensionParams, Profile } from './types';
 
 interface TestParams {
   myParam: string;
@@ -25,7 +31,7 @@ const defaultContext: ContextWithProfileId<TestContext> = {
   myContext: 'test',
 };
 
-class TestProfileService extends ProfileService<Profile, TestParams, TestContext> {
+class TestProfileService extends ProfileService<ProfileProvider<Profile, TestParams, TestContext>> {
   constructor() {
     super(defaultContext);
   }
@@ -33,7 +39,9 @@ class TestProfileService extends ProfileService<Profile, TestParams, TestContext
 
 type TestProfileProvider = Parameters<TestProfileService['registerProvider']>[0];
 
-class TestAsyncProfileService extends AsyncProfileService<Profile, TestParams, TestContext> {
+class TestAsyncProfileService extends AsyncProfileService<
+  AsyncProfileProvider<Profile, TestParams, TestContext>
+> {
   constructor() {
     super(defaultContext);
   }
@@ -43,25 +51,27 @@ type TestAsyncProfileProvider = Parameters<TestAsyncProfileService['registerProv
 
 const provider: TestProfileProvider = {
   profileId: 'test-profile-1',
-  profile: { getCellRenderers: jest.fn() },
+  profile: {
+    getCellRenderers: jest.fn((prev) => (params) => prev(params)),
+  },
   resolve: jest.fn(() => ({ isMatch: false })),
 };
 
 const provider2: TestProfileProvider = {
   profileId: 'test-profile-2',
-  profile: { getCellRenderers: jest.fn() },
+  profile: { getCellRenderers: jest.fn((prev) => (params) => prev(params)) },
   resolve: jest.fn(({ myParam }) => ({ isMatch: true, context: { myContext: myParam } })),
 };
 
 const provider3: TestProfileProvider = {
   profileId: 'test-profile-3',
-  profile: { getCellRenderers: jest.fn() },
+  profile: { getCellRenderers: jest.fn((prev) => (params) => prev(params)) },
   resolve: jest.fn(({ myParam }) => ({ isMatch: true, context: { myContext: myParam } })),
 };
 
 const asyncProvider2: TestAsyncProfileProvider = {
   profileId: 'test-profile-2',
-  profile: { getCellRenderers: jest.fn() },
+  profile: { getCellRenderers: jest.fn((prev) => (params) => prev(params)) },
   resolve: jest.fn(async ({ myParam }) => ({ isMatch: true, context: { myContext: myParam } })),
 };
 
@@ -80,17 +90,30 @@ describe('ProfileService', () => {
   it('should allow registering providers and getting profiles', () => {
     service.registerProvider(provider);
     service.registerProvider(provider2);
-    expect(service.getProfile({ profileId: 'test-profile-1', myContext: 'test' })).toBe(
-      provider.profile
-    );
-    expect(service.getProfile({ profileId: 'test-profile-2', myContext: 'test' })).toBe(
-      provider2.profile
-    );
+    const params = {
+      context: { profileId: 'test-profile-1', myContext: 'test' },
+    };
+    const params2 = {
+      context: { profileId: 'test-profile-2', myContext: 'test' },
+    };
+    const profile = service.getProfile(params);
+    const profile2 = service.getProfile(params2);
+    const baseImpl = jest.fn(() => ({}));
+    profile.getCellRenderers?.(baseImpl)({} as unknown as CellRenderersExtensionParams);
+    expect(provider.profile.getCellRenderers).toHaveBeenCalledTimes(1);
+    expect(provider.profile.getCellRenderers).toHaveBeenCalledWith(baseImpl, params);
+    expect(baseImpl).toHaveBeenCalledTimes(1);
+    profile2.getCellRenderers?.(baseImpl)({} as unknown as CellRenderersExtensionParams);
+    expect(provider2.profile.getCellRenderers).toHaveBeenCalledTimes(1);
+    expect(provider2.profile.getCellRenderers).toHaveBeenCalledWith(baseImpl, params2);
+    expect(baseImpl).toHaveBeenCalledTimes(2);
   });
 
   it('should return empty profile if no provider is found', () => {
     service.registerProvider(provider);
-    expect(service.getProfile({ profileId: 'test-profile-2', myContext: 'test' })).toEqual({});
+    expect(
+      service.getProfile({ context: { profileId: 'test-profile-2', myContext: 'test' } })
+    ).toEqual({});
   });
 
   it('should resolve to first matching context', () => {
diff --git a/src/plugins/discover/public/context_awareness/profile_service.ts b/src/plugins/discover/public/context_awareness/profile_service.ts
index aaeb7664aa5cd..e520b42083f1e 100644
--- a/src/plugins/discover/public/context_awareness/profile_service.ts
+++ b/src/plugins/discover/public/context_awareness/profile_service.ts
@@ -9,13 +9,18 @@
 
 /* eslint-disable max-classes-per-file */
 
-import type { ComposableProfile, PartialProfile } from './composable_profile';
-import type { Profile } from './types';
+import { isFunction } from 'lodash';
+import type {
+  AppliedProfile,
+  ComposableAccessorParams,
+  ComposableProfile,
+  PartialProfile,
+} from './composable_profile';
 
 /**
  * The profile provider resolution result
  */
-export type ResolveProfileResult<TContext> =
+type ResolveProfileResult<TContext> =
   | {
       /**
        * `true` if the associated profile is a match
@@ -33,15 +38,10 @@ export type ResolveProfileResult<TContext> =
       isMatch: false;
     };
 
-/**
- * Context object with an injected profile ID
- */
-export type ContextWithProfileId<TContext> = TContext & { profileId: string };
-
 /**
  * The base profile provider interface
  */
-export interface BaseProfileProvider<TProfile extends PartialProfile> {
+export interface BaseProfileProvider<TProfile extends PartialProfile, TContext> {
   /**
    * The unique profile ID
    */
@@ -49,7 +49,7 @@ export interface BaseProfileProvider<TProfile extends PartialProfile> {
   /**
    * The composable profile implementation
    */
-  profile: ComposableProfile<TProfile>;
+  profile: ComposableProfile<TProfile, TContext>;
   /**
    * Set the `isExperimental` flag to `true` for any profile which is under development and should not be enabled by default.
    *
@@ -68,7 +68,7 @@ export interface BaseProfileProvider<TProfile extends PartialProfile> {
  * A synchronous profile provider interface
  */
 export interface ProfileProvider<TProfile extends PartialProfile, TParams, TContext>
-  extends BaseProfileProvider<TProfile> {
+  extends BaseProfileProvider<TProfile, TContext> {
   /**
    * The method responsible for context resolution and determining if the associated profile is a match
    * @param params Parameters specific to the provider context level
@@ -81,7 +81,7 @@ export interface ProfileProvider<TProfile extends PartialProfile, TParams, TCont
  * An asynchronous profile provider interface
  */
 export interface AsyncProfileProvider<TProfile extends PartialProfile, TParams, TContext>
-  extends BaseProfileProvider<TProfile> {
+  extends BaseProfileProvider<TProfile, TContext> {
   /**
    * The method responsible for context resolution and determining if the associated profile is a match
    * @param params Parameters specific to the provider context level
@@ -92,12 +92,36 @@ export interface AsyncProfileProvider<TProfile extends PartialProfile, TParams,
   ) => ResolveProfileResult<TContext> | Promise<ResolveProfileResult<TContext>>;
 }
 
+/**
+ * Context object with an injected profile ID
+ */
+export type ContextWithProfileId<TContext> = TContext &
+  Pick<BaseProfileProvider<{}, {}>, 'profileId'>;
+
+/**
+ * Used to extract the profile type from a profile provider
+ */
+type ExtractProfile<TProvider> = TProvider extends BaseProfileProvider<infer TProfile, {}>
+  ? TProfile
+  : never;
+
+/**
+ * Used to extract the context type from a profile provider
+ */
+type ExtractContext<TProvider> = TProvider extends BaseProfileProvider<{}, infer TContext>
+  ? TContext
+  : never;
+
 const EMPTY_PROFILE = {};
 
 /**
  * The base profile service implementation
  */
-export abstract class BaseProfileService<TProvider extends BaseProfileProvider<{}>, TContext> {
+export abstract class BaseProfileService<
+  TProvider extends BaseProfileProvider<TProfile, TContext>,
+  TProfile extends PartialProfile = ExtractProfile<TProvider>,
+  TContext = ExtractContext<TProvider>
+> {
   protected readonly providers: TProvider[] = [];
 
   /**
@@ -114,31 +138,59 @@ export abstract class BaseProfileService<TProvider extends BaseProfileProvider<{
   }
 
   /**
-   * Returns the composable profile associated with the provided context object
+   * Returns the profile associated with the provided context object
    * @param context A context object returned by a provider's `resolve` method
-   * @returns The composable profile associated with the context
+   * @returns The profile associated with the context
    */
-  public getProfile(context: ContextWithProfileId<TContext>): ComposableProfile<Profile> {
-    const provider = this.providers.find((current) => current.profileId === context.profileId);
-    return provider?.profile ?? EMPTY_PROFILE;
+  public getProfile(
+    params: ComposableAccessorParams<ContextWithProfileId<TContext>>
+  ): AppliedProfile {
+    const provider = this.providers.find(
+      (current) => current.profileId === params.context.profileId
+    );
+
+    if (!provider?.profile) {
+      return EMPTY_PROFILE;
+    }
+
+    return new Proxy(provider.profile, {
+      get: (target, prop, receiver) => {
+        const accessor = Reflect.get(target, prop, receiver);
+
+        if (!isFunction(accessor)) {
+          return accessor;
+        }
+
+        return (prev: Parameters<typeof accessor>[0]) => accessor(prev, params);
+      },
+    }) as AppliedProfile;
   }
 }
 
+/**
+ * Used to extract the parameters type from a profile provider
+ */
+type ExtractParams<TProvider> = TProvider extends ProfileProvider<{}, infer P, {}>
+  ? P
+  : TProvider extends AsyncProfileProvider<{}, infer P, {}>
+  ? P
+  : never;
+
 /**
  * A synchronous profile service implementation
  */
 export class ProfileService<
-  TProfile extends PartialProfile,
-  TParams,
-  TContext
-> extends BaseProfileService<ProfileProvider<TProfile, TParams, TContext>, TContext> {
+  TProvider extends ProfileProvider<{}, TParams, TContext>,
+  TParams = ExtractParams<TProvider>,
+  TContext = ExtractContext<TProvider>
+> extends BaseProfileService<TProvider> {
   /**
    * Performs context resolution based on the provided context level parameters,
    * returning the resolved context from the first matching profile provider
    * @param params Parameters specific to the service context level
    * @returns The resolved context object with an injected profile ID
    */
-  public resolve(params: TParams) {
+  public resolve(params: TParams): ContextWithProfileId<TContext> {
     for (const provider of this.providers) {
       const result = provider.resolve(params);
 
@@ -158,17 +210,17 @@ export class ProfileService<
  * An asynchronous profile service implementation
  */
 export class AsyncProfileService<
-  TProfile extends PartialProfile,
-  TParams,
-  TContext
-> extends BaseProfileService<AsyncProfileProvider<TProfile, TParams, TContext>, TContext> {
+  TProvider extends AsyncProfileProvider<{}, TParams, TContext>,
+  TParams = ExtractParams<TProvider>,
+  TContext = ExtractContext<TProvider>
+> extends BaseProfileService<TProvider> {
   /**
    * Performs context resolution based on the provided context level parameters,
    * returning the resolved context from the first matching profile provider
    * @param params Parameters specific to the service context level
    * @returns The resolved context object with an injected profile ID
    */
-  public async resolve(params: TParams) {
+  public async resolve(params: TParams): Promise<ContextWithProfileId<TContext>> {
     for (const provider of this.providers) {
       const result = await provider.resolve(params);
 
diff --git a/src/plugins/discover/public/context_awareness/profiles/data_source_profile.ts b/src/plugins/discover/public/context_awareness/profiles/data_source_profile.ts
index c4d06e0a502cb..7f3933de185a6 100644
--- a/src/plugins/discover/public/context_awareness/profiles/data_source_profile.ts
+++ b/src/plugins/discover/public/context_awareness/profiles/data_source_profile.ts
@@ -59,17 +59,13 @@ export interface DataSourceContext {
   category: DataSourceCategory;
 }
 
-export type DataSourceProfileProvider = AsyncProfileProvider<
+export type DataSourceProfileProvider<TProviderContext = {}> = AsyncProfileProvider<
   DataSourceProfile,
   DataSourceProfileProviderParams,
-  DataSourceContext
+  DataSourceContext & TProviderContext
 >;
 
-export class DataSourceProfileService extends AsyncProfileService<
-  DataSourceProfile,
-  DataSourceProfileProviderParams,
-  DataSourceContext
-> {
+export class DataSourceProfileService extends AsyncProfileService<DataSourceProfileProvider> {
   constructor() {
     super({
       profileId: 'default-data-source-profile',
diff --git a/src/plugins/discover/public/context_awareness/profiles/document_profile.ts b/src/plugins/discover/public/context_awareness/profiles/document_profile.ts
index cd14e9cdec010..f555dfe8c4292 100644
--- a/src/plugins/discover/public/context_awareness/profiles/document_profile.ts
+++ b/src/plugins/discover/public/context_awareness/profiles/document_profile.ts
@@ -54,17 +54,13 @@ export interface DocumentContext {
   type: DocumentType;
 }
 
-export type DocumentProfileProvider = ProfileProvider<
+export type DocumentProfileProvider<TProviderContext = {}> = ProfileProvider<
   DocumentProfile,
   DocumentProfileProviderParams,
-  DocumentContext
+  DocumentContext & TProviderContext
 >;
 
-export class DocumentProfileService extends ProfileService<
-  DocumentProfile,
-  DocumentProfileProviderParams,
-  DocumentContext
-> {
+export class DocumentProfileService extends ProfileService<DocumentProfileProvider> {
   constructor() {
     super({
       profileId: 'default-document-profile',
diff --git a/src/plugins/discover/public/context_awareness/profiles/root_profile.ts b/src/plugins/discover/public/context_awareness/profiles/root_profile.ts
index 853c93c05cf64..0a5909538c498 100644
--- a/src/plugins/discover/public/context_awareness/profiles/root_profile.ts
+++ b/src/plugins/discover/public/context_awareness/profiles/root_profile.ts
@@ -45,17 +45,13 @@ export interface RootContext {
   solutionType: SolutionType;
 }
 
-export type RootProfileProvider = AsyncProfileProvider<
+export type RootProfileProvider<TProviderContext = {}> = AsyncProfileProvider<
   RootProfile,
   RootProfileProviderParams,
-  RootContext
+  RootContext & TProviderContext
 >;
 
-export class RootProfileService extends AsyncProfileService<
-  RootProfile,
-  RootProfileProviderParams,
-  RootContext
-> {
+export class RootProfileService extends AsyncProfileService<RootProfileProvider> {
   constructor() {
     super({
       profileId: 'default-root-profile',
diff --git a/src/plugins/discover/public/context_awareness/profiles_manager.test.ts b/src/plugins/discover/public/context_awareness/profiles_manager.test.ts
index da5ad8b56dcf3..4e1608961f7f5 100644
--- a/src/plugins/discover/public/context_awareness/profiles_manager.test.ts
+++ b/src/plugins/discover/public/context_awareness/profiles_manager.test.ts
@@ -12,11 +12,15 @@ import { createEsqlDataSource } from '../../common/data_sources';
 import { addLog } from '../utils/add_log';
 import { SolutionType } from './profiles/root_profile';
 import { createContextAwarenessMocks } from './__mocks__';
+import type { ComposableProfile } from './composable_profile';
 
 jest.mock('../utils/add_log');
 
 let mocks = createContextAwarenessMocks();
 
+const toAppliedProfile = (profile: ComposableProfile<{}, {}>) =>
+  Object.keys(profile).reduce((acc, key) => ({ ...acc, [key]: expect.any(Function) }), {});
+
 describe('ProfilesManager', () => {
   beforeEach(() => {
     jest.clearAllMocks();
@@ -32,13 +36,17 @@ describe('ProfilesManager', () => {
   it('should resolve root profile', async () => {
     await mocks.profilesManagerMock.resolveRootProfile({});
     const profiles = mocks.profilesManagerMock.getProfiles();
-    expect(profiles).toEqual([mocks.rootProfileProviderMock.profile, {}, {}]);
+    expect(profiles).toEqual([toAppliedProfile(mocks.rootProfileProviderMock.profile), {}, {}]);
   });
 
   it('should resolve data source profile', async () => {
     await mocks.profilesManagerMock.resolveDataSourceProfile({});
     const profiles = mocks.profilesManagerMock.getProfiles();
-    expect(profiles).toEqual([{}, mocks.dataSourceProfileProviderMock.profile, {}]);
+    expect(profiles).toEqual([
+      {},
+      toAppliedProfile(mocks.dataSourceProfileProviderMock.profile),
+      {},
+    ]);
   });
 
   it('should resolve document profile', async () => {
@@ -46,7 +54,7 @@ describe('ProfilesManager', () => {
       record: mocks.contextRecordMock,
     });
     const profiles = mocks.profilesManagerMock.getProfiles({ record });
-    expect(profiles).toEqual([{}, {}, mocks.documentProfileProviderMock.profile]);
+    expect(profiles).toEqual([{}, {}, toAppliedProfile(mocks.documentProfileProviderMock.profile)]);
   });
 
   it('should resolve multiple profiles', async () => {
@@ -57,9 +65,9 @@ describe('ProfilesManager', () => {
     });
     const profiles = mocks.profilesManagerMock.getProfiles({ record });
     expect(profiles).toEqual([
-      mocks.rootProfileProviderMock.profile,
-      mocks.dataSourceProfileProviderMock.profile,
-      mocks.documentProfileProviderMock.profile,
+      toAppliedProfile(mocks.rootProfileProviderMock.profile),
+      toAppliedProfile(mocks.dataSourceProfileProviderMock.profile),
+      toAppliedProfile(mocks.documentProfileProviderMock.profile),
     ]);
 
     expect(mocks.ebtManagerMock.updateProfilesContextWith).toHaveBeenCalledWith([
@@ -77,20 +85,24 @@ describe('ProfilesManager', () => {
     const next = jest.fn();
     profiles$.subscribe(next);
     expect(getProfilesSpy).toHaveBeenCalledTimes(1);
-    expect(next).toHaveBeenCalledWith([{}, {}, mocks.documentProfileProviderMock.profile]);
+    expect(next).toHaveBeenCalledWith([
+      {},
+      {},
+      toAppliedProfile(mocks.documentProfileProviderMock.profile),
+    ]);
     await mocks.profilesManagerMock.resolveRootProfile({});
     expect(getProfilesSpy).toHaveBeenCalledTimes(2);
     expect(next).toHaveBeenCalledWith([
-      mocks.rootProfileProviderMock.profile,
+      toAppliedProfile(mocks.rootProfileProviderMock.profile),
       {},
-      mocks.documentProfileProviderMock.profile,
+      toAppliedProfile(mocks.documentProfileProviderMock.profile),
     ]);
     await mocks.profilesManagerMock.resolveDataSourceProfile({});
     expect(getProfilesSpy).toHaveBeenCalledTimes(3);
     expect(next).toHaveBeenCalledWith([
-      mocks.rootProfileProviderMock.profile,
-      mocks.dataSourceProfileProviderMock.profile,
-      mocks.documentProfileProviderMock.profile,
+      toAppliedProfile(mocks.rootProfileProviderMock.profile),
+      toAppliedProfile(mocks.dataSourceProfileProviderMock.profile),
+      toAppliedProfile(mocks.documentProfileProviderMock.profile),
     ]);
   });
 
@@ -135,7 +147,7 @@ describe('ProfilesManager', () => {
   it('should log an error and fall back to the default profile if root profile resolution fails', async () => {
     await mocks.profilesManagerMock.resolveRootProfile({ solutionNavId: 'solutionNavId' });
     let profiles = mocks.profilesManagerMock.getProfiles();
-    expect(profiles).toEqual([mocks.rootProfileProviderMock.profile, {}, {}]);
+    expect(profiles).toEqual([toAppliedProfile(mocks.rootProfileProviderMock.profile), {}, {}]);
     const resolveSpy = jest.spyOn(mocks.rootProfileProviderMock, 'resolve');
     resolveSpy.mockRejectedValue(new Error('Failed to resolve'));
     await mocks.profilesManagerMock.resolveRootProfile({ solutionNavId: 'newSolutionNavId' });
@@ -153,7 +165,11 @@ describe('ProfilesManager', () => {
       query: { esql: 'from *' },
     });
     let profiles = mocks.profilesManagerMock.getProfiles();
-    expect(profiles).toEqual([{}, mocks.dataSourceProfileProviderMock.profile, {}]);
+    expect(profiles).toEqual([
+      {},
+      toAppliedProfile(mocks.dataSourceProfileProviderMock.profile),
+      {},
+    ]);
     const resolveSpy = jest.spyOn(mocks.dataSourceProfileProviderMock, 'resolve');
     resolveSpy.mockRejectedValue(new Error('Failed to resolve'));
     await mocks.profilesManagerMock.resolveDataSourceProfile({
@@ -173,7 +189,7 @@ describe('ProfilesManager', () => {
       record: mocks.contextRecordMock,
     });
     let profiles = mocks.profilesManagerMock.getProfiles({ record });
-    expect(profiles).toEqual([{}, {}, mocks.documentProfileProviderMock.profile]);
+    expect(profiles).toEqual([{}, {}, toAppliedProfile(mocks.documentProfileProviderMock.profile)]);
     const resolveSpy = jest.spyOn(mocks.documentProfileProviderMock, 'resolve');
     resolveSpy.mockImplementation(() => {
       throw new Error('Failed to resolve');
@@ -220,7 +236,7 @@ describe('ProfilesManager', () => {
     resolvedDeferredResult2$.next(undefined);
     await promise2;
     expect(mocks.profilesManagerMock.getProfiles()).toEqual([
-      mocks.rootProfileProviderMock.profile,
+      toAppliedProfile(mocks.rootProfileProviderMock.profile),
       {},
       {},
     ]);
@@ -266,7 +282,7 @@ describe('ProfilesManager', () => {
     await promise2;
     expect(mocks.profilesManagerMock.getProfiles()).toEqual([
       {},
-      mocks.dataSourceProfileProviderMock.profile,
+      toAppliedProfile(mocks.dataSourceProfileProviderMock.profile),
       {},
     ]);
   });
diff --git a/src/plugins/discover/public/context_awareness/profiles_manager.ts b/src/plugins/discover/public/context_awareness/profiles_manager.ts
index a209e5dfc9f7c..d5714565dacd2 100644
--- a/src/plugins/discover/public/context_awareness/profiles_manager.ts
+++ b/src/plugins/discover/public/context_awareness/profiles_manager.ts
@@ -10,7 +10,7 @@
 import type { DataTableRecord } from '@kbn/discover-utils';
 import { isOfAggregateQueryType } from '@kbn/es-query';
 import { isEqual } from 'lodash';
-import { BehaviorSubject, combineLatest, map } from 'rxjs';
+import { BehaviorSubject, combineLatest, map, skip } from 'rxjs';
 import { DataSourceType, isDataSourceType } from '../../common/data_sources';
 import { addLog } from '../utils/add_log';
 import type {
@@ -26,6 +26,7 @@ import type {
 } from './profiles';
 import type { ContextWithProfileId } from './profile_service';
 import type { DiscoverEBTManager } from '../services/discover_ebt_manager';
+import type { AppliedProfile } from './composable_profile';
 
 interface SerializedRootProfileParams {
   solutionNavId: RootProfileProviderParams['solutionNavId'];
@@ -53,8 +54,9 @@ export interface GetProfilesOptions {
 export class ProfilesManager {
   private readonly rootContext$: BehaviorSubject<ContextWithProfileId<RootContext>>;
   private readonly dataSourceContext$: BehaviorSubject<ContextWithProfileId<DataSourceContext>>;
-  private readonly ebtManager: DiscoverEBTManager;
 
+  private rootProfile: AppliedProfile;
+  private dataSourceProfile: AppliedProfile;
   private prevRootProfileParams?: SerializedRootProfileParams;
   private prevDataSourceProfileParams?: SerializedDataSourceProfileParams;
   private rootProfileAbortController?: AbortController;
@@ -64,11 +66,22 @@ export class ProfilesManager {
     private readonly rootProfileService: RootProfileService,
     private readonly dataSourceProfileService: DataSourceProfileService,
     private readonly documentProfileService: DocumentProfileService,
-    ebtManager: DiscoverEBTManager
+    private readonly ebtManager: DiscoverEBTManager
   ) {
     this.rootContext$ = new BehaviorSubject(rootProfileService.defaultContext);
     this.dataSourceContext$ = new BehaviorSubject(dataSourceProfileService.defaultContext);
-    this.ebtManager = ebtManager;
+    this.rootProfile = rootProfileService.getProfile({ context: this.rootContext$.getValue() });
+    this.dataSourceProfile = dataSourceProfileService.getProfile({
+      context: this.dataSourceContext$.getValue(),
+    });
+
+    this.rootContext$.pipe(skip(1)).subscribe((context) => {
+      this.rootProfile = rootProfileService.getProfile({ context });
+    });
+
+    this.dataSourceContext$.pipe(skip(1)).subscribe((context) => {
+      this.dataSourceProfile = dataSourceProfileService.getProfile({ context });
+    });
   }
 
   /**
@@ -79,7 +92,7 @@ export class ProfilesManager {
     const serializedParams = serializeRootProfileParams(params);
 
     if (isEqual(this.prevRootProfileParams, serializedParams)) {
-      return { getRenderAppWrapper: this.getRootRenderAppWrapper() };
+      return { getRenderAppWrapper: this.rootProfile.getRenderAppWrapper };
     }
 
     const abortController = new AbortController();
@@ -95,13 +108,13 @@ export class ProfilesManager {
     }
 
     if (abortController.signal.aborted) {
-      return { getRenderAppWrapper: this.getRootRenderAppWrapper() };
+      return { getRenderAppWrapper: this.rootProfile.getRenderAppWrapper };
     }
 
     this.rootContext$.next(context);
     this.prevRootProfileParams = serializedParams;
 
-    return { getRenderAppWrapper: this.getRootRenderAppWrapper() };
+    return { getRenderAppWrapper: this.rootProfile.getRenderAppWrapper };
   }
 
   /**
@@ -183,11 +196,13 @@ export class ProfilesManager {
    */
   public getProfiles({ record }: GetProfilesOptions = {}) {
     return [
-      this.rootProfileService.getProfile(this.rootContext$.getValue()),
-      this.dataSourceProfileService.getProfile(this.dataSourceContext$.getValue()),
-      this.documentProfileService.getProfile(
-        recordHasContext(record) ? record.context : this.documentProfileService.defaultContext
-      ),
+      this.rootProfile,
+      this.dataSourceProfile,
+      this.documentProfileService.getProfile({
+        context: recordHasContext(record)
+          ? record.context
+          : this.documentProfileService.defaultContext,
+      }),
     ];
   }
 
@@ -210,11 +225,6 @@ export class ProfilesManager {
 
     this.ebtManager.updateProfilesContextWith(dscProfiles);
   }
-
-  private getRootRenderAppWrapper() {
-    const rootProfile = this.rootProfileService.getProfile(this.rootContext$.getValue());
-    return rootProfile.getRenderAppWrapper;
-  }
 }
 
 const serializeRootProfileParams = (
diff --git a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/rollups/integration_tests/daily_rollups.test.ts b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/rollups/integration_tests/daily_rollups.test.ts
index c29f8041d8044..3433af684e92c 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/rollups/integration_tests/daily_rollups.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/event_loop_delays/rollups/integration_tests/daily_rollups.test.ts
@@ -8,7 +8,12 @@
  */
 
 import moment, { type MomentInput } from 'moment';
-import type { Logger, ISavedObjectsRepository, SavedObject } from '@kbn/core/server';
+import type {
+  Logger,
+  ISavedObjectsRepository,
+  SavedObject,
+  ElasticsearchClient,
+} from '@kbn/core/server';
 import {
   type TestElasticsearchUtils,
   type TestKibanaUtils,
@@ -72,11 +77,11 @@ function createRawEventLoopDelaysDailyDocs() {
   return { rawEventLoopDelaysDaily, outdatedRawEventLoopDelaysDaily };
 }
 
-// Failing: See https://github.com/elastic/kibana/issues/111821
-describe.skip(`daily rollups integration test`, () => {
+describe(`daily rollups integration test`, () => {
   let esServer: TestElasticsearchUtils;
   let root: TestKibanaUtils['root'];
   let internalRepository: ISavedObjectsRepository;
+  let esClient: ElasticsearchClient;
   let logger: Logger;
   let rawEventLoopDelaysDaily: Array<SavedObject<EventLoopDelaysDaily>>;
   let outdatedRawEventLoopDelaysDaily: Array<SavedObject<EventLoopDelaysDaily>>;
@@ -94,6 +99,7 @@ describe.skip(`daily rollups integration test`, () => {
     const start = await root.start();
     logger = root.logger.get('test daily rollups');
     internalRepository = start.savedObjects.createInternalRepository([SAVED_OBJECTS_DAILY_TYPE]);
+    esClient = start.elasticsearch.client.asInternalUser;
 
     // Create the docs now
     const rawDailyDocs = createRawEventLoopDelaysDailyDocs();
@@ -113,6 +119,7 @@ describe.skip(`daily rollups integration test`, () => {
 
   it('deletes documents older that 3 days from the saved objects repository', async () => {
     await rollDailyData(logger, internalRepository);
+    await esClient.indices.refresh({ index: `.kibana` }); // Make sure that the changes are searchable
     const { total, saved_objects: savedObjects } =
       await internalRepository.find<EventLoopDelaysDaily>({ type: SAVED_OBJECTS_DAILY_TYPE });
     expect(total).toBe(rawEventLoopDelaysDaily.length);
diff --git a/src/plugins/saved_objects/public/save_modal/saved_object_save_modal.test.tsx b/src/plugins/saved_objects/public/save_modal/saved_object_save_modal.test.tsx
index 82e8051b897c7..273a79c307001 100644
--- a/src/plugins/saved_objects/public/save_modal/saved_object_save_modal.test.tsx
+++ b/src/plugins/saved_objects/public/save_modal/saved_object_save_modal.test.tsx
@@ -121,4 +121,54 @@ describe('SavedObjectSaveModal', () => {
       expect(onSave.mock.calls[0][0].newCopyOnSave).toBe(true);
     });
   });
+
+  describe('handle title duplication logic', () => {
+    it('should append "[1]" to title if no number is present', async () => {
+      const onSave = jest.fn();
+
+      render(
+        <I18nProvider>
+          <SavedObjectSaveModal
+            onSave={onSave}
+            onClose={() => {}}
+            title="Saved Object"
+            objectType="visualization"
+            showDescription={true}
+            showCopyOnSave={true}
+          />
+        </I18nProvider>
+      );
+
+      const switchElement = screen.getByTestId('saveAsNewCheckbox');
+      await userEvent.click(switchElement);
+
+      await waitFor(() => {
+        expect(screen.getByTestId('savedObjectTitle')).toHaveValue('Saved Object [1]');
+      });
+    });
+
+    it('should increment the number by one when a number is already present', async () => {
+      const onSave = jest.fn();
+
+      render(
+        <I18nProvider>
+          <SavedObjectSaveModal
+            onSave={onSave}
+            onClose={() => {}}
+            title="Saved Object [1]"
+            objectType="visualization"
+            showDescription={true}
+            showCopyOnSave={true}
+          />
+        </I18nProvider>
+      );
+
+      const switchElement = screen.getByTestId('saveAsNewCheckbox');
+      await userEvent.click(switchElement);
+
+      await waitFor(() => {
+        expect(screen.getByTestId('savedObjectTitle')).toHaveValue('Saved Object [2]');
+      });
+    });
+  });
 });
diff --git a/src/plugins/saved_objects/public/save_modal/saved_object_save_modal.tsx b/src/plugins/saved_objects/public/save_modal/saved_object_save_modal.tsx
index aa82feafb60aa..a3e6d1cc22b2a 100644
--- a/src/plugins/saved_objects/public/save_modal/saved_object_save_modal.tsx
+++ b/src/plugins/saved_objects/public/save_modal/saved_object_save_modal.tsx
@@ -276,7 +276,28 @@ export class SavedObjectSaveModal extends React.Component<Props, SaveModalState>
     });
   };
 
+  private handleTitleDuplication = () => {
+    const regex = /\s*\[(\d+)\]$/;
+    const match = this.state.title.match(regex);
+
+    if (match) {
+      const newNumber = Number(match[1]) + 1;
+
+      this.setState({
+        title: this.state.title.replace(regex, ` [${newNumber}]`),
+      });
+    } else {
+      this.setState({
+        title: this.state.title + ' [1]',
+      });
+    }
+  };
+
   private onCopyOnSaveChange = (event: EuiSwitchEvent) => {
+    if (this.props.title === this.state.title && event.target.checked) {
+      this.handleTitleDuplication();
+    }
+
     this.setState({
       copyOnSave: event.target.checked,
     });
diff --git a/src/plugins/unified_histogram/public/chart/histogram.test.tsx b/src/plugins/unified_histogram/public/chart/histogram.test.tsx
index 26bdc0c505234..72b5c0cc0b791 100644
--- a/src/plugins/unified_histogram/public/chart/histogram.test.tsx
+++ b/src/plugins/unified_histogram/public/chart/histogram.test.tsx
@@ -240,7 +240,7 @@ describe('Histogram', () => {
       onLoad(false, adapters);
     });
     expect(props.onTotalHitsChange).toHaveBeenLastCalledWith(
-      UnifiedHistogramFetchStatus.complete,
+      UnifiedHistogramFetchStatus.error,
       100
     );
     expect(props.onChartLoad).toHaveBeenLastCalledWith({ adapters });
diff --git a/src/plugins/unified_histogram/public/chart/histogram.tsx b/src/plugins/unified_histogram/public/chart/histogram.tsx
index faa5ddd2b1fc3..e63cf775158aa 100644
--- a/src/plugins/unified_histogram/public/chart/histogram.tsx
+++ b/src/plugins/unified_histogram/public/chart/histogram.tsx
@@ -130,9 +130,6 @@ export function Histogram({
         | undefined;
       const response = json?.rawResponse;
 
-      // The response can have `response?._shards.failed` but we should still be able to show hits number
-      // TODO: show shards warnings as a badge next to the total hits number
-
       if (requestFailed) {
         onTotalHitsChange?.(UnifiedHistogramFetchStatus.error, undefined);
         onChartLoad?.({ adapters: adapters ?? {} });
@@ -142,10 +139,14 @@ export function Histogram({
       const adapterTables = adapters?.tables?.tables;
       const totalHits = computeTotalHits(hasLensSuggestions, adapterTables, isPlainRecord);
 
-      onTotalHitsChange?.(
-        isLoading ? UnifiedHistogramFetchStatus.loading : UnifiedHistogramFetchStatus.complete,
-        totalHits ?? hits?.total
-      );
+      if (response?._shards?.failed || response?.timed_out) {
+        onTotalHitsChange?.(UnifiedHistogramFetchStatus.error, totalHits);
+      } else {
+        onTotalHitsChange?.(
+          isLoading ? UnifiedHistogramFetchStatus.loading : UnifiedHistogramFetchStatus.complete,
+          totalHits ?? hits?.total
+        );
+      }
 
       if (response) {
         const newBucketInterval = buildBucketInterval({
diff --git a/test/functional/apps/dashboard/group1/edit_visualizations.js b/test/functional/apps/dashboard/group1/edit_visualizations.js
index f065748f09b00..9e91ed1ea112f 100644
--- a/test/functional/apps/dashboard/group1/edit_visualizations.js
+++ b/test/functional/apps/dashboard/group1/edit_visualizations.js
@@ -10,7 +10,7 @@
 import expect from '@kbn/expect';
 
 export default function ({ getService, getPageObjects }) {
-  const { dashboard, header, visualize, common, visEditor } = getPageObjects([
+  const { dashboard, header, visualize, visEditor } = getPageObjects([
     'dashboard',
     'header',
     'visualize',
@@ -114,7 +114,6 @@ export default function ({ getService, getPageObjects }) {
 
       await header.waitUntilLoadingHasFinished();
       await appsMenu.clickLink('Visualize Library');
-      await common.clickConfirmOnModal();
       expect(await testSubjects.exists('visualizationLandingPage')).to.be(true);
     });
 
@@ -132,7 +131,6 @@ export default function ({ getService, getPageObjects }) {
 
       await header.waitUntilLoadingHasFinished();
       await appsMenu.clickLink('Visualize Library');
-      await common.clickConfirmOnModal();
       expect(await testSubjects.exists('visualizationLandingPage')).to.be(true);
     });
 
diff --git a/test/functional/apps/discover/ccs_compatibility/_search_errors.ts b/test/functional/apps/discover/ccs_compatibility/_search_errors.ts
index 7045e0e7d1a3b..96db6e2f7a347 100644
--- a/test/functional/apps/discover/ccs_compatibility/_search_errors.ts
+++ b/test/functional/apps/discover/ccs_compatibility/_search_errors.ts
@@ -65,7 +65,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
       // Ensure documents are still returned for the successful shards
       await retry.try(async function tryingForTime() {
-        const hitCount = await discover.getHitCount();
+        const hitCount = await discover.getHitCount({ isPartial: true });
         expect(hitCount).to.be('9,247');
       });
 
diff --git a/test/functional/apps/discover/context_awareness/_data_source_profile.ts b/test/functional/apps/discover/context_awareness/_data_source_profile.ts
index 35e3552afa655..eeffafa38cd4e 100644
--- a/test/functional/apps/discover/context_awareness/_data_source_profile.ts
+++ b/test/functional/apps/discover/context_awareness/_data_source_profile.ts
@@ -20,6 +20,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
   const dataViews = getService('dataViews');
   const dataGrid = getService('dataGrid');
+  const retry = getService('retry');
 
   describe('data source profile', () => {
     describe('ES|QL mode', () => {
@@ -98,6 +99,41 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
           expect(await testSubjects.getVisibleText('docViewerRowDetailsTitle')).to.be('Record #0');
         });
       });
+
+      describe('custom context', () => {
+        it('should render formatted record in doc viewer using formatter from custom context', async () => {
+          const state = kbnRison.encode({
+            dataSource: { type: 'esql' },
+            query: { esql: 'from my-example-logs | sort @timestamp desc' },
+          });
+          await common.navigateToActualUrl('discover', `?_a=${state}`, {
+            ensureCurrentUrl: false,
+          });
+          await discover.waitUntilSearchingHasFinished();
+          await dataGrid.clickRowToggle({ rowIndex: 0, defaultTabId: 'doc_view_example' });
+          await retry.try(async () => {
+            const formattedRecord = await testSubjects.find(
+              'exampleDataSourceProfileDocViewRecord'
+            );
+            expect(await formattedRecord.getVisibleText()).to.be(
+              JSON.stringify(
+                {
+                  '@timestamp': '2024-06-10T16:00:00.000Z',
+                  'agent.name': 'java',
+                  'agent.name.text': 'java',
+                  'data_stream.type': 'logs',
+                  'log.level': 'debug',
+                  message: 'This is a debug log',
+                  'service.name': 'product',
+                  'service.name.text': 'product',
+                },
+                null,
+                2
+              )
+            );
+          });
+        });
+      });
     });
 
     describe('data view mode', () => {
@@ -166,6 +202,41 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
           );
         });
       });
+
+      describe('custom context', () => {
+        it('should render formatted record in doc viewer using formatter from custom context', async () => {
+          await common.navigateToActualUrl('discover', undefined, {
+            ensureCurrentUrl: false,
+          });
+          await dataViews.switchTo('my-example-logs');
+          await discover.waitUntilSearchingHasFinished();
+          await dataGrid.clickRowToggle({ rowIndex: 0, defaultTabId: 'doc_view_example' });
+          await retry.try(async () => {
+            const formattedRecord = await testSubjects.find(
+              'exampleDataSourceProfileDocViewRecord'
+            );
+            expect(await formattedRecord.getVisibleText()).to.be(
+              JSON.stringify(
+                {
+                  '@timestamp': ['2024-06-10T16:00:00.000Z'],
+                  'agent.name': ['java'],
+                  'agent.name.text': ['java'],
+                  'data_stream.type': ['logs'],
+                  'log.level': ['debug'],
+                  message: ['This is a debug log'],
+                  'service.name': ['product'],
+                  'service.name.text': ['product'],
+                  _id: 'XdQFDpABfGznVC1bCHLo',
+                  _index: 'my-example-logs',
+                  _score: null,
+                },
+                null,
+                2
+              )
+            );
+          });
+        });
+      });
     });
   });
 }
diff --git a/test/functional/apps/discover/esql/_esql_view.ts b/test/functional/apps/discover/esql/_esql_view.ts
index dc550ac5be93d..272de320d2051 100644
--- a/test/functional/apps/discover/esql/_esql_view.ts
+++ b/test/functional/apps/discover/esql/_esql_view.ts
@@ -25,14 +25,17 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const find = getService('find');
   const esql = getService('esql');
   const dashboardAddPanel = getService('dashboardAddPanel');
-  const { common, discover, dashboard, header, timePicker, unifiedFieldList } = getPageObjects([
-    'common',
-    'discover',
-    'dashboard',
-    'header',
-    'timePicker',
-    'unifiedFieldList',
-  ]);
+  const dataViews = getService('dataViews');
+  const { common, discover, dashboard, header, timePicker, unifiedFieldList, unifiedSearch } =
+    getPageObjects([
+      'common',
+      'discover',
+      'dashboard',
+      'header',
+      'timePicker',
+      'unifiedFieldList',
+      'unifiedSearch',
+    ]);
 
   const defaultSettings = {
     defaultIndex: 'logstash-*',
@@ -305,6 +308,24 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
           await testSubjects.existOrFail('discover-esql-to-dataview-modal');
         });
       });
+
+      it('should show available data views after switching to classic mode', async () => {
+        await discover.selectTextBaseLang();
+        await header.waitUntilLoadingHasFinished();
+        await discover.waitUntilSearchingHasFinished();
+
+        await browser.refresh();
+        await header.waitUntilLoadingHasFinished();
+        await discover.waitUntilSearchingHasFinished();
+        await unifiedSearch.switchToDataViewMode();
+        await header.waitUntilLoadingHasFinished();
+        await discover.waitUntilSearchingHasFinished();
+        const availableDataViews = await unifiedSearch.getDataViewList(
+          'discover-dataView-switch-link'
+        );
+        expect(availableDataViews).to.eql(['kibana_sample_data_flights', 'logstash-*']);
+        await dataViews.switchToAndValidate('kibana_sample_data_flights');
+      });
     });
 
     describe('inspector', () => {
diff --git a/test/functional/apps/discover/group2_data_grid3/_data_grid_column_widths.ts b/test/functional/apps/discover/group2_data_grid3/_data_grid_column_widths.ts
index ba6f64d929fb1..a56248d2174c3 100644
--- a/test/functional/apps/discover/group2_data_grid3/_data_grid_column_widths.ts
+++ b/test/functional/apps/discover/group2_data_grid3/_data_grid_column_widths.ts
@@ -56,11 +56,15 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
     it('should not show reset width button for auto width column', async () => {
       await unifiedFieldList.clickFieldListItemAdd('@message');
+      await header.waitUntilLoadingHasFinished();
+      await discover.waitUntilSearchingHasFinished();
       expect(await dataGrid.resetColumnWidthExists('@message')).to.be(false);
     });
 
     it('should show reset width button for absolute width column, and allow resetting to auto width', async () => {
       await unifiedFieldList.clickFieldListItemAdd('@message');
+      await header.waitUntilLoadingHasFinished();
+      await discover.waitUntilSearchingHasFinished();
       await testResizeColumn('@message');
     });
 
diff --git a/test/functional/page_objects/discover_page.ts b/test/functional/page_objects/discover_page.ts
index 979e4341931ab..e8a0de7fbc340 100644
--- a/test/functional/page_objects/discover_page.ts
+++ b/test/functional/page_objects/discover_page.ts
@@ -339,9 +339,11 @@ export class DiscoverPageObject extends FtrService {
     return await this.header.waitUntilLoadingHasFinished();
   }
 
-  public async getHitCount() {
+  public async getHitCount({ isPartial }: { isPartial?: boolean } = {}) {
     await this.header.waitUntilLoadingHasFinished();
-    return await this.testSubjects.getVisibleText('discoverQueryHits');
+    return await this.testSubjects.getVisibleText(
+      isPartial ? 'discoverQueryHitsPartial' : 'discoverQueryHits'
+    );
   }
 
   public async getHitCountInt() {
diff --git a/test/functional/page_objects/unified_search_page.ts b/test/functional/page_objects/unified_search_page.ts
index 0ccfb388f1f15..4c9c9e5f4976b 100644
--- a/test/functional/page_objects/unified_search_page.ts
+++ b/test/functional/page_objects/unified_search_page.ts
@@ -27,6 +27,28 @@ export class UnifiedSearchPageObject extends FtrService {
     );
   }
 
+  public async getDataViewList(switchButtonSelector: string) {
+    await this.testSubjects.click(switchButtonSelector);
+
+    await this.retry.waitFor(
+      'wait for popover',
+      async () => await this.testSubjects.exists('indexPattern-switcher')
+    );
+
+    const indexPatternSwitcher = await this.testSubjects.find('indexPattern-switcher', 500);
+    const availableDataViews = await Promise.all(
+      (
+        await indexPatternSwitcher.findAllByCssSelector('.euiSelectableListItem')
+      ).map(async (item) => {
+        return await item.getAttribute('title');
+      })
+    );
+
+    await this.testSubjects.click(switchButtonSelector);
+
+    return availableDataViews;
+  }
+
   public async getSelectedDataView(switchButtonSelector: string) {
     let visibleText = '';
 
@@ -46,6 +68,12 @@ export class UnifiedSearchPageObject extends FtrService {
 
   public async switchToDataViewMode() {
     await this.testSubjects.click('switch-to-dataviews');
+    await this.retry.waitFor('the modal to open', async () => {
+      return await this.testSubjects.exists('discover-esql-to-dataview-modal');
+    });
     await this.testSubjects.click('discover-esql-to-dataview-no-save-btn');
+    await this.retry.waitFor('the modal to close', async () => {
+      return !(await this.testSubjects.exists('discover-esql-to-dataview-modal'));
+    });
   }
 }
diff --git a/test/functional/services/data_grid.ts b/test/functional/services/data_grid.ts
index 07a723857088c..f56b58cfa88f1 100644
--- a/test/functional/services/data_grid.ts
+++ b/test/functional/services/data_grid.ts
@@ -102,9 +102,38 @@ export class DataGridService extends FtrService {
   public async resizeColumn(field: string, delta: number) {
     const header = await this.getHeaderElement(field);
     const originalWidth = (await header.getSize()).width;
-    const resizer = await header.findByCssSelector(
-      this.testSubjects.getCssSelector('dataGridColumnResizer')
-    );
+
+    let resizer: WebElementWrapper | undefined;
+
+    if (await this.testSubjects.exists('euiDataGridHeaderDroppable')) {
+      // if drag & drop is enabled for data grid columns
+      const headerDraggableColumns = await this.find.allByCssSelector(
+        '[data-test-subj="euiDataGridHeaderDroppable"] > div'
+      );
+      // searching for a common parent of the field column header and its resizer
+      const fieldHeader: WebElementWrapper | null | undefined = (
+        await Promise.all(
+          headerDraggableColumns.map(async (column) => {
+            const hasFieldColumn =
+              (await column.findAllByCssSelector(`[data-gridcell-column-id="${field}"]`)).length >
+              0;
+            return hasFieldColumn ? column : null;
+          })
+        )
+      ).find(Boolean);
+
+      resizer = await fieldHeader?.findByTestSubject('dataGridColumnResizer');
+    } else {
+      // if drag & drop is not enabled for data grid columns
+      resizer = await header.findByCssSelector(
+        this.testSubjects.getCssSelector('dataGridColumnResizer')
+      );
+    }
+
+    if (!resizer) {
+      throw new Error(`Unable to find column resizer for field ${field}`);
+    }
+
     await this.browser.dragAndDrop({ location: resizer }, { location: { x: delta, y: 0 } });
     return { originalWidth, newWidth: (await header.getSize()).width };
   }
diff --git a/x-pack/examples/exploratory_view_example/kibana.jsonc b/x-pack/examples/exploratory_view_example/kibana.jsonc
index 6cf8fa64983ac..cf077336b0f90 100644
--- a/x-pack/examples/exploratory_view_example/kibana.jsonc
+++ b/x-pack/examples/exploratory_view_example/kibana.jsonc
@@ -2,6 +2,8 @@
   "type": "plugin",
   "id": "@kbn/exploratory-view-example-plugin",
   "owner": "@elastic/obs-ux-infra_services-team",
+  "group": "observability",
+  "visibility": "private",
   "plugin": {
     "id": "exploratoryViewExample",
     "server": false,
diff --git a/x-pack/examples/screenshotting_example/kibana.jsonc b/x-pack/examples/screenshotting_example/kibana.jsonc
index 127706ad42e3d..3519bc91caa66 100644
--- a/x-pack/examples/screenshotting_example/kibana.jsonc
+++ b/x-pack/examples/screenshotting_example/kibana.jsonc
@@ -2,6 +2,10 @@
   "type": "plugin",
   "id": "@kbn/screenshotting-example-plugin",
   "owner": "@elastic/appex-sharedux",
+  // This plugin is not meant to be referenced or imported
+  "visibility": "private",
+  // If cloned / used as an inspiration, please bear in mind that your plugin might belong to a specific solution group
+  "group": "platform",
   "description": "An example integration with the screenshotting plugin.",
   "plugin": {
     "id": "screenshottingExample",
diff --git a/x-pack/examples/testing_embedded_lens/public/controls.tsx b/x-pack/examples/testing_embedded_lens/public/controls.tsx
index 6cfcd414ed66d..6f7658e981e4d 100644
--- a/x-pack/examples/testing_embedded_lens/public/controls.tsx
+++ b/x-pack/examples/testing_embedded_lens/public/controls.tsx
@@ -150,7 +150,7 @@ export function OverrideSwitch({
         </EuiToolTip>
       }
       helpText={helpText}
-      display="columnCompressedSwitch"
+      display="columnCompressed"
       hasChildLabel={false}
     >
       <EuiSwitch
@@ -249,7 +249,7 @@ export function AttributesMenu({
           </EuiFormRow>
         ) : null}
         {isPieChart(currentAttributes) ? (
-          <EuiFormRow label="Show values" display="columnCompressedSwitch">
+          <EuiFormRow label="Show values" display="columnCompressed">
             <EuiSwitch
               label="As percentage"
               name="switch"
@@ -269,7 +269,7 @@ export function AttributesMenu({
           </EuiFormRow>
         ) : null}
         {isHeatmapChart(currentAttributes) ? (
-          <EuiFormRow label="Show values" display="columnCompressedSwitch">
+          <EuiFormRow label="Show values" display="columnCompressed">
             <EuiSwitch
               label="As percentage"
               name="switch"
@@ -287,7 +287,7 @@ export function AttributesMenu({
           </EuiFormRow>
         ) : null}
         {isGaugeChart(currentAttributes) ? (
-          <EuiFormRow label="Ticks visibility" display="columnCompressedSwitch">
+          <EuiFormRow label="Ticks visibility" display="columnCompressed">
             <EuiSwitch
               label="Show ticks"
               name="switch"
@@ -522,7 +522,7 @@ export function PanelMenu({
         <EuiSpacer />
         <EuiFormRow
           label="Enable triggers"
-          display="columnCompressedSwitch"
+          display="columnCompressed"
           helpText="This setting controls the interactivity of the chart: when disabled the chart won't bubble any event on user action."
         >
           <EuiSwitch
@@ -538,7 +538,7 @@ export function PanelMenu({
         </EuiFormRow>
         <EuiFormRow
           label="Enable default action"
-          display="columnCompressedSwitch"
+          display="columnCompressed"
           helpText="When disabled the default panel actions (i.e. CSV download)"
         >
           <EuiSwitch
@@ -589,7 +589,7 @@ export function PanelMenu({
               </span>
             </EuiToolTip>
           }
-          display="columnCompressedSwitch"
+          display="columnCompressed"
           helpText="Pass a consumer defined action to show in the panel context menu."
         >
           <EuiSwitch
diff --git a/x-pack/examples/ui_actions_enhanced_examples/kibana.jsonc b/x-pack/examples/ui_actions_enhanced_examples/kibana.jsonc
index 1da3e4f182875..25211ae2063bd 100644
--- a/x-pack/examples/ui_actions_enhanced_examples/kibana.jsonc
+++ b/x-pack/examples/ui_actions_enhanced_examples/kibana.jsonc
@@ -2,6 +2,10 @@
   "type": "plugin",
   "id": "@kbn/ui-actions-enhanced-examples-plugin",
   "owner": "@elastic/appex-sharedux",
+  // This plugin is not meant to be referenced or imported
+  "visibility": "private",
+  // If cloned / used as an inspiration, please bear in mind that your plugin might belong to a specific solution group
+  "group": "platform",
   "plugin": {
     "id": "uiActionsEnhancedExamples",
     "server": false,
diff --git a/x-pack/packages/kbn-ai-assistant/kibana.jsonc b/x-pack/packages/kbn-ai-assistant/kibana.jsonc
index f8da31c9d6749..625dedc6c99f4 100644
--- a/x-pack/packages/kbn-ai-assistant/kibana.jsonc
+++ b/x-pack/packages/kbn-ai-assistant/kibana.jsonc
@@ -2,6 +2,6 @@
   "id": "@kbn/ai-assistant",
   "owner": "@elastic/search-kibana",
   "type": "shared-browser",
-  "group": "observability",
-  "visibility": "private"
+  "group": "platform",
+  "visibility": "shared"
 }
diff --git a/x-pack/packages/kbn-cloud-security-posture/common/utils/ui_metrics.ts b/x-pack/packages/kbn-cloud-security-posture/common/utils/ui_metrics.ts
index 252252b08e976..c7baeb47bc214 100644
--- a/x-pack/packages/kbn-cloud-security-posture/common/utils/ui_metrics.ts
+++ b/x-pack/packages/kbn-cloud-security-posture/common/utils/ui_metrics.ts
@@ -10,6 +10,15 @@ import type { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 
 export const APP_NAME = 'cloud-security';
 
+export const MISCONFIGURATION_INSIGHT = 'misconfiguration-insight';
+export const VULNERABILITIES_INSIGHT = 'vulnerabilities-insight';
+export const MISCONFIGURATION_INSIGHT_HOST_DETAILS = `${MISCONFIGURATION_INSIGHT}-host-details`;
+export const MISCONFIGURATION_INSIGHT_USER_DETAILS = `${MISCONFIGURATION_INSIGHT}-user-details`;
+export const MISCONFIGURATION_INSIGHT_HOST_ENTITY_OVERVIEW = `${MISCONFIGURATION_INSIGHT}-host-entity-overview`;
+export const MISCONFIGURATION_INSIGHT_USER_ENTITY_OVERVIEW = `${MISCONFIGURATION_INSIGHT}-user-entity-overview`;
+export const VULNERABILITIES_INSIGHT_HOST_DETAILS = `${VULNERABILITIES_INSIGHT}-host-details`;
+export const VULNERABILITIES_INSIGHT_HOST_ENTITY_OVERVIEW = `${VULNERABILITIES_INSIGHT}-host-entity-overview`;
+
 export const ENTITY_FLYOUT_WITH_MISCONFIGURATION_VISIT =
   'entity-flyout-with-misconfiguration-visits';
 export const ENTITY_FLYOUT_WITH_VULNERABILITY_PREVIEW =
@@ -41,7 +50,13 @@ type CloudSecurityUiCounters =
   | typeof CREATE_DETECTION_RULE_FROM_FLYOUT
   | typeof CREATE_DETECTION_FROM_TABLE_ROW_ACTION
   | typeof GROUP_BY_CLICK
-  | typeof CHANGE_RULE_STATE;
+  | typeof CHANGE_RULE_STATE
+  | typeof MISCONFIGURATION_INSIGHT_HOST_DETAILS
+  | typeof MISCONFIGURATION_INSIGHT_USER_DETAILS
+  | typeof MISCONFIGURATION_INSIGHT_HOST_ENTITY_OVERVIEW
+  | typeof MISCONFIGURATION_INSIGHT_USER_ENTITY_OVERVIEW
+  | typeof VULNERABILITIES_INSIGHT_HOST_DETAILS
+  | typeof VULNERABILITIES_INSIGHT_HOST_ENTITY_OVERVIEW;
 
 export class UiMetricService {
   private usageCollection: UsageCollectionSetup | undefined;
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/settings/alerts_settings/alerts_settings.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/settings/alerts_settings/alerts_settings.tsx
index 57ad1312a271e..4aa3611f523c3 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/settings/alerts_settings/alerts_settings.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/settings/alerts_settings/alerts_settings.tsx
@@ -28,7 +28,7 @@ const AlertsSettingsComponent = ({ knowledgeBase, setUpdatedKnowledgeBaseSetting
   return (
     <>
       <EuiFormRow
-        display="columnCompressedSwitch"
+        display="columnCompressed"
         label={i18n.ALERTS_LABEL}
         css={css`
           .euiFormRow__labelWrapper {
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/knowledge_base/knowledge_base_settings.tsx b/x-pack/packages/kbn-elastic-assistant/impl/knowledge_base/knowledge_base_settings.tsx
index 18bc0cbe5a384..49830d337e7cb 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/knowledge_base/knowledge_base_settings.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/knowledge_base/knowledge_base_settings.tsx
@@ -149,7 +149,7 @@ export const KnowledgeBaseSettings: React.FC<Props> = React.memo(
         <EuiHorizontalRule margin={'s'} />
 
         <EuiFormRow
-          display="columnCompressedSwitch"
+          display="columnCompressed"
           label={i18n.KNOWLEDGE_BASE_LABEL}
           css={css`
             .euiFormRow__labelWrapper {
diff --git a/x-pack/packages/security-solution/data_table/kibana.jsonc b/x-pack/packages/security-solution/data_table/kibana.jsonc
index 5298db752359f..9695411a65301 100644
--- a/x-pack/packages/security-solution/data_table/kibana.jsonc
+++ b/x-pack/packages/security-solution/data_table/kibana.jsonc
@@ -1,5 +1,7 @@
 {
   "type": "shared-common",
   "id": "@kbn/securitysolution-data-table",
-  "owner": "@elastic/security-threat-hunting-investigations"
+  "owner": "@elastic/security-threat-hunting-investigations",
+  "group": "security",
+  "visibility": "private"
 }
diff --git a/x-pack/plugins/alerting/server/saved_objects/index.ts b/x-pack/plugins/alerting/server/saved_objects/index.ts
index 8e76f28ff7fb8..8f11020ee6285 100644
--- a/x-pack/plugins/alerting/server/saved_objects/index.ts
+++ b/x-pack/plugins/alerting/server/saved_objects/index.ts
@@ -217,6 +217,11 @@ export function setupSavedObjects(
   // Encrypted attributes
   encryptedSavedObjects.registerType({
     type: RULE_SAVED_OBJECT_TYPE,
+    /**
+     * We disable enforcing random SO IDs for the rule SO
+     * to allow users creating rules with a predefined ID.
+     */
+    enforceRandomId: false,
     attributesToEncrypt: new Set(RuleAttributesToEncrypt),
     attributesToIncludeInAAD: new Set(RuleAttributesIncludedInAAD),
   });
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/partition_labels/extended_template.tsx b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/partition_labels/extended_template.tsx
index 8884533fb7ce3..1be1d50824cfd 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/partition_labels/extended_template.tsx
+++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/partition_labels/extended_template.tsx
@@ -116,7 +116,7 @@ export const ExtendedTemplate: FunctionComponent<Props> = ({ onValueChange, argV
         />
       </EuiFormRow>
       <EuiSpacer size="s" />
-      <EuiFormRow label={strings.getValuesLabel()} display="columnCompressedSwitch">
+      <EuiFormRow label={strings.getValuesLabel()} display="columnCompressed">
         <EuiSwitch
           compressed
           checked={showValues}
diff --git a/x-pack/plugins/canvas/public/state/actions/elements.js b/x-pack/plugins/canvas/public/state/actions/elements.js
index 57b7da1ce1fef..dc21cf1b8f2bc 100644
--- a/x-pack/plugins/canvas/public/state/actions/elements.js
+++ b/x-pack/plugins/canvas/public/state/actions/elements.js
@@ -65,9 +65,12 @@ function getBareElement(el, includeId = false) {
 
 export const elementLayer = createAction('elementLayer');
 
-export const setMultiplePositions = createAction('setMultiplePosition', (repositionedElements) => ({
-  repositionedElements,
-}));
+export const setMultiplePositions = createAction(
+  'setMultiplePositions',
+  (repositionedElements) => ({
+    repositionedElements,
+  })
+);
 
 export const flushContext = createAction('flushContext');
 export const flushContextAfterIndex = createAction('flushContextAfterIndex');
diff --git a/x-pack/plugins/cases/public/components/all_cases/all_cases_list.test.tsx b/x-pack/plugins/cases/public/components/all_cases/all_cases_list.test.tsx
index b0c57d0cc3dd5..bc540040cce57 100644
--- a/x-pack/plugins/cases/public/components/all_cases/all_cases_list.test.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/all_cases_list.test.tsx
@@ -92,7 +92,8 @@ const mockKibana = () => {
   } as unknown as ReturnType<typeof useKibana>);
 };
 
-describe('AllCasesListGeneric', () => {
+// FLAKY: https://github.com/elastic/kibana/issues/192739
+describe.skip('AllCasesListGeneric', () => {
   const onRowClick = jest.fn();
   const updateCaseProperty = jest.fn();
 
diff --git a/x-pack/plugins/cases/public/components/case_view/components/custom_fields.test.tsx b/x-pack/plugins/cases/public/components/case_view/components/custom_fields.test.tsx
index 67d8f8fd05764..31d4395fc3d7a 100644
--- a/x-pack/plugins/cases/public/components/case_view/components/custom_fields.test.tsx
+++ b/x-pack/plugins/cases/public/components/case_view/components/custom_fields.test.tsx
@@ -16,7 +16,8 @@ import { customFieldsMock, customFieldsConfigurationMock } from '../../../contai
 import userEvent from '@testing-library/user-event';
 import { CustomFieldTypes } from '../../../../common/types/domain';
 
-describe('Case View Page files tab', () => {
+// Failing: See https://github.com/elastic/kibana/issues/185046
+describe.skip('Case View Page files tab', () => {
   const onSubmit = jest.fn();
   let appMockRender: AppMockRenderer;
 
diff --git a/x-pack/plugins/cases/public/components/description/index.test.tsx b/x-pack/plugins/cases/public/components/description/index.test.tsx
index 5ce8909a65dc6..678b46eabfbe8 100644
--- a/x-pack/plugins/cases/public/components/description/index.test.tsx
+++ b/x-pack/plugins/cases/public/components/description/index.test.tsx
@@ -27,7 +27,8 @@ const defaultProps = {
   isLoadingDescription: false,
 };
 
-describe('Description', () => {
+// Failing: See https://github.com/elastic/kibana/issues/185879
+describe.skip('Description', () => {
   const onUpdateField = jest.fn();
   let appMockRender: AppMockRenderer;
 
diff --git a/x-pack/plugins/cases/public/components/links/index.tsx b/x-pack/plugins/cases/public/components/links/index.tsx
index f1e8ca5cdb4af..9b610db63ed10 100644
--- a/x-pack/plugins/cases/public/components/links/index.tsx
+++ b/x-pack/plugins/cases/public/components/links/index.tsx
@@ -12,7 +12,7 @@ import { useCaseViewNavigation, useConfigureCasesNavigation } from '../../common
 import * as i18n from './translations';
 
 export interface CasesNavigation<T = React.MouseEvent | MouseEvent | null, K = null> {
-  href: K extends 'configurable' ? (arg: T) => string : string;
+  href?: K extends 'configurable' ? (arg: T) => string : string;
   onClick: K extends 'configurable'
     ? (arg: T, arg2: React.MouseEvent | MouseEvent) => Promise<void> | void
     : (arg: T) => Promise<void> | void;
diff --git a/x-pack/plugins/cases/public/components/user_actions/comment/alert_event.test.tsx b/x-pack/plugins/cases/public/components/user_actions/comment/alert_event.test.tsx
index 60d5759de6e21..d060f1d9d71ac 100644
--- a/x-pack/plugins/cases/public/components/user_actions/comment/alert_event.test.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/comment/alert_event.test.tsx
@@ -47,10 +47,38 @@ describe('Alert events', () => {
       expect(wrapper.text()).toBe('added an alert from Awesome rule');
     });
 
-    it('does NOT render the link when the rule id is null', async () => {
+    it('renders the link when onClick is provided but href is not valid', async () => {
       const wrapper = mount(
         <TestProviders>
-          <SingleAlertCommentEvent {...props} ruleId={null} />
+          <SingleAlertCommentEvent {...props} getRuleDetailsHref={undefined} />
+        </TestProviders>
+      );
+
+      expect(
+        wrapper.find(`[data-test-subj="alert-rule-link-action-id-1"]`).first().exists()
+      ).toBeTruthy();
+    });
+
+    it('renders the link when href is valid but onClick is not available', async () => {
+      const wrapper = mount(
+        <TestProviders>
+          <SingleAlertCommentEvent {...props} onRuleDetailsClick={undefined} />
+        </TestProviders>
+      );
+
+      expect(
+        wrapper.find(`[data-test-subj="alert-rule-link-action-id-1"]`).first().exists()
+      ).toBeTruthy();
+    });
+
+    it('does NOT render the link when the href and onclick are invalid but it shows the rule name', async () => {
+      const wrapper = mount(
+        <TestProviders>
+          <SingleAlertCommentEvent
+            {...props}
+            getRuleDetailsHref={undefined}
+            onRuleDetailsClick={undefined}
+          />
         </TestProviders>
       );
 
@@ -61,10 +89,10 @@ describe('Alert events', () => {
       expect(wrapper.text()).toBe('added an alert from Awesome rule');
     });
 
-    it('does NOT render the link when the href is invalid but it shows the rule name', async () => {
+    it('does NOT render the link when the rule id is null', async () => {
       const wrapper = mount(
         <TestProviders>
-          <SingleAlertCommentEvent {...props} getRuleDetailsHref={undefined} />
+          <SingleAlertCommentEvent {...props} ruleId={null} />
         </TestProviders>
       );
 
@@ -131,9 +159,28 @@ describe('Alert events', () => {
       expect(result.getByTestId('alert-rule-link-action-id-1')).toHaveTextContent('Awesome rule');
     });
 
-    it('does NOT render the link when the rule id is null', async () => {
+    it('renders the link when onClick is provided but href is not valid', async () => {
       const result = appMock.render(
-        <MultipleAlertsCommentEvent {...props} totalAlerts={2} ruleId={null} />
+        <MultipleAlertsCommentEvent {...props} totalAlerts={2} getRuleDetailsHref={undefined} />
+      );
+      expect(result.getByTestId('alert-rule-link-action-id-1')).toHaveTextContent('Awesome rule');
+    });
+
+    it('renders the link when href is valid but onClick is not available', async () => {
+      const result = appMock.render(
+        <MultipleAlertsCommentEvent {...props} totalAlerts={2} onRuleDetailsClick={undefined} />
+      );
+      expect(result.getByTestId('alert-rule-link-action-id-1')).toHaveTextContent('Awesome rule');
+    });
+
+    it('does NOT render the link when the href and onclick are invalid but it shows the rule name', async () => {
+      const result = appMock.render(
+        <MultipleAlertsCommentEvent
+          {...props}
+          totalAlerts={2}
+          getRuleDetailsHref={undefined}
+          onRuleDetailsClick={undefined}
+        />
       );
 
       expect(result.getByTestId('multiple-alerts-user-action-action-id-1')).toHaveTextContent(
@@ -142,9 +189,9 @@ describe('Alert events', () => {
       expect(result.queryByTestId('alert-rule-link-action-id-1')).toBeFalsy();
     });
 
-    it('does NOT render the link when the href is invalid but it shows the rule name', async () => {
+    it('does NOT render the link when the rule id is null', async () => {
       const result = appMock.render(
-        <MultipleAlertsCommentEvent {...props} totalAlerts={2} getRuleDetailsHref={undefined} />
+        <MultipleAlertsCommentEvent {...props} totalAlerts={2} ruleId={null} />
       );
 
       expect(result.getByTestId('multiple-alerts-user-action-action-id-1')).toHaveTextContent(
diff --git a/x-pack/plugins/cases/public/components/user_actions/comment/alert_event.tsx b/x-pack/plugins/cases/public/components/user_actions/comment/alert_event.tsx
index 42e5e6b9d4427..a8ffbb987a021 100644
--- a/x-pack/plugins/cases/public/components/user_actions/comment/alert_event.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/comment/alert_event.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { memo, useCallback } from 'react';
+import React, { memo, useCallback, useMemo } from 'react';
 import { isEmpty } from 'lodash';
 import { EuiLoadingSpinner } from '@elastic/eui';
 
@@ -38,12 +38,18 @@ const RuleLink: React.FC<SingleAlertProps> = memo(
 
     const ruleDetailsHref = getRuleDetailsHref?.(ruleId);
     const finalRuleName = ruleName ?? i18n.UNKNOWN_RULE;
+    const isValidLink = useMemo(() => {
+      if (!onRuleDetailsClick && !ruleDetailsHref) {
+        return false;
+      }
+      return !isEmpty(ruleId);
+    }, [onRuleDetailsClick, ruleDetailsHref, ruleId]);
 
     if (loadingAlertData) {
       return <EuiLoadingSpinner size="m" data-test-subj={`alert-loading-spinner-${actionId}`} />;
     }
 
-    if (!isEmpty(ruleId) && ruleDetailsHref != null) {
+    if (isValidLink) {
       return (
         <LinkAnchor
           onClick={onLinkClick}
diff --git a/x-pack/plugins/cases/public/components/user_actions/delete_attachment_confirmation_modal.test.tsx b/x-pack/plugins/cases/public/components/user_actions/delete_attachment_confirmation_modal.test.tsx
index aa19cc2a473a4..0d9d90058eaf9 100644
--- a/x-pack/plugins/cases/public/components/user_actions/delete_attachment_confirmation_modal.test.tsx
+++ b/x-pack/plugins/cases/public/components/user_actions/delete_attachment_confirmation_modal.test.tsx
@@ -11,7 +11,8 @@ import type { AppMockRenderer } from '../../common/mock';
 import { createAppMockRenderer } from '../../common/mock';
 import { DeleteAttachmentConfirmationModal } from './delete_attachment_confirmation_modal';
 
-describe('DeleteAttachmentConfirmationModal', () => {
+// FLAKY: https://github.com/elastic/kibana/issues/195672
+describe.skip('DeleteAttachmentConfirmationModal', () => {
   let appMock: AppMockRenderer;
   const props = {
     title: 'My title',
diff --git a/x-pack/plugins/cloud_security_posture/public/components/empty_states_illustration_container.tsx b/x-pack/plugins/cloud_security_posture/public/components/empty_states_illustration_container.tsx
new file mode 100644
index 0000000000000..3ae4b64b1c848
--- /dev/null
+++ b/x-pack/plugins/cloud_security_posture/public/components/empty_states_illustration_container.tsx
@@ -0,0 +1,21 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+
+// dimensions of the SVGs used in the empty states illustrations
+// e.g. x-pack/plugins/cloud_security_posture/public/assets/illustrations/clouds.svg
+const SVG_HEIGHT = 209;
+const SVG_WIDTH = 376;
+
+/**
+ * A container component that maintains a fixed size for child elements.
+ * used for displaying the empty state illustrations and prevent flickering while the SVGs are loading.
+ */
+export const EmptyStatesIllustrationContainer: React.FC<{ children: React.ReactNode }> = ({
+  children,
+}) => <div style={{ height: SVG_HEIGHT, width: SVG_WIDTH }}>{children}</div>;
diff --git a/x-pack/plugins/cloud_security_posture/public/components/no_findings_states/no_findings_states.tsx b/x-pack/plugins/cloud_security_posture/public/components/no_findings_states/no_findings_states.tsx
index 5a8db618d5495..a475d35cd6885 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/no_findings_states/no_findings_states.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/no_findings_states/no_findings_states.tsx
@@ -26,6 +26,7 @@ import type { IndexDetails, CspStatusCode } from '@kbn/cloud-security-posture-co
 import { useCspSetupStatusApi } from '@kbn/cloud-security-posture/src/hooks/use_csp_setup_status_api';
 import { useLocation } from 'react-router-dom';
 import { findingsNavigation } from '@kbn/cloud-security-posture';
+import { EmptyStatesIllustrationContainer } from '../empty_states_illustration_container';
 import { useAdd3PIntegrationRoute } from '../../common/api/use_wiz_integration_route';
 import { FullSizeCenteredPage } from '../full_size_centered_page';
 import { useCISIntegrationPoliciesLink } from '../../common/navigation/use_navigate_to_cis_integration_policies';
@@ -191,7 +192,11 @@ const EmptySecurityFindingsPrompt = () => {
         <EuiEmptyPrompt
           style={{ padding: euiTheme.size.l }}
           data-test-subj={PACKAGE_NOT_INSTALLED_TEST_SUBJECT}
-          icon={<EuiImage size="fullWidth" src={cloudsSVG} alt="clouds" role="presentation" />}
+          icon={
+            <EmptyStatesIllustrationContainer>
+              <EuiImage size="fullWidth" src={cloudsSVG} alt="clouds" role="presentation" />
+            </EmptyStatesIllustrationContainer>
+          }
           title={
             <h2>
               <FormattedMessage
@@ -264,12 +269,14 @@ const EmptySecurityFindingsPrompt = () => {
             style={{ padding: euiTheme.size.l }}
             data-test-subj={THIRD_PARTY_INTEGRATIONS_NO_MISCONFIGURATIONS_FINDINGS_PROMPT}
             icon={
-              <EuiImage
-                size="fullWidth"
-                src={misconfigurationsVendorsSVG}
-                alt="misconfigurationsVendorsSVG"
-                role="presentation"
-              />
+              <EmptyStatesIllustrationContainer>
+                <EuiImage
+                  size="fullWidth"
+                  src={misconfigurationsVendorsSVG}
+                  alt="misconfigurationsVendorsSVG"
+                  role="presentation"
+                />
+              </EmptyStatesIllustrationContainer>
             }
             title={
               <h2>
diff --git a/x-pack/plugins/cloud_security_posture/public/components/no_vulnerabilities_states.tsx b/x-pack/plugins/cloud_security_posture/public/components/no_vulnerabilities_states.tsx
index 20438aa341ad6..4e6b487f73cbc 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/no_vulnerabilities_states.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/no_vulnerabilities_states.tsx
@@ -25,6 +25,7 @@ import type { IndexDetails } from '@kbn/cloud-security-posture-common';
 import { useCspSetupStatusApi } from '@kbn/cloud-security-posture/src/hooks/use_csp_setup_status_api';
 import { useLocation } from 'react-router-dom';
 import { findingsNavigation } from '@kbn/cloud-security-posture';
+import { EmptyStatesIllustrationContainer } from './empty_states_illustration_container';
 import { VULN_MGMT_POLICY_TEMPLATE } from '../../common/constants';
 import { FullSizeCenteredPage } from './full_size_centered_page';
 import { CloudPosturePage } from './cloud_posture_page';
@@ -84,7 +85,11 @@ const CnvmIntegrationNotInstalledEmptyPrompt = ({
         <EuiEmptyPrompt
           style={{ padding: euiTheme.size.l }}
           data-test-subj={NO_VULNERABILITIES_STATUS_TEST_SUBJ.NOT_INSTALLED}
-          icon={<EuiImage size="fullWidth" src={cloudsSVG} alt="clouds" role="presentation" />}
+          icon={
+            <EmptyStatesIllustrationContainer>
+              <EuiImage size="fullWidth" src={cloudsSVG} alt="clouds" role="presentation" />
+            </EmptyStatesIllustrationContainer>
+          }
           title={
             <h2>
               <FormattedMessage
@@ -144,12 +149,14 @@ const CnvmIntegrationNotInstalledEmptyPrompt = ({
             style={{ padding: euiTheme.size.l }}
             data-test-subj={THIRD_PARTY_INTEGRATIONS_NO_VULNERABILITIES_FINDINGS_PROMPT}
             icon={
-              <EuiImage
-                size="fullWidth"
-                src={vulnerabilitiesVendorsSVG}
-                alt="vulnerabilitiesVendorsSVG"
-                role="presentation"
-              />
+              <EmptyStatesIllustrationContainer>
+                <EuiImage
+                  size="fullWidth"
+                  src={vulnerabilitiesVendorsSVG}
+                  alt="vulnerabilitiesVendorsSVG"
+                  role="presentation"
+                />
+              </EmptyStatesIllustrationContainer>
             }
             title={
               <h2>
diff --git a/x-pack/plugins/dashboard_enhanced/kibana.jsonc b/x-pack/plugins/dashboard_enhanced/kibana.jsonc
index 36f8a02e65ce9..ae6902cc3c714 100644
--- a/x-pack/plugins/dashboard_enhanced/kibana.jsonc
+++ b/x-pack/plugins/dashboard_enhanced/kibana.jsonc
@@ -5,7 +5,7 @@
     "@elastic/kibana-presentation"
   ],
   "group": "platform",
-  "visibility": "private",
+  "visibility": "shared",
   "plugin": {
     "id": "dashboardEnhanced",
     "browser": true,
@@ -31,4 +31,4 @@
       "uiActions"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/plugins/data_quality/kibana.jsonc b/x-pack/plugins/data_quality/kibana.jsonc
index ad1a64d4ed140..dc54e20f40bd7 100644
--- a/x-pack/plugins/data_quality/kibana.jsonc
+++ b/x-pack/plugins/data_quality/kibana.jsonc
@@ -2,6 +2,8 @@
   "type": "plugin",
   "id": "@kbn/data-quality-plugin",
   "owner": "@elastic/obs-ux-logs-team",
+  "group": "observability",
+  "visibility": "private",
   "plugin": {
     "id": "dataQuality",
     "server": true,
diff --git a/x-pack/plugins/data_usage/common/rest_types/usage_metrics.ts b/x-pack/plugins/data_usage/common/rest_types/usage_metrics.ts
index 40194494854fc..853da3b3f8cbd 100644
--- a/x-pack/plugins/data_usage/common/rest_types/usage_metrics.ts
+++ b/x-pack/plugins/data_usage/common/rest_types/usage_metrics.ts
@@ -123,6 +123,13 @@ export const UsageMetricsAutoOpsResponseSchema = {
       ),
     }),
 };
-export type UsageMetricsAutoOpsResponseSchemaBody = TypeOf<
+export type UsageMetricsAutoOpsResponseMetricSeries = TypeOf<
   typeof UsageMetricsAutoOpsResponseSchema.body
->;
+>['metrics'][MetricTypes][number];
+
+export type UsageMetricsAutoOpsResponseSchemaBody = Omit<
+  TypeOf<typeof UsageMetricsAutoOpsResponseSchema.body>,
+  'metrics'
+> & {
+  metrics: Partial<Record<MetricTypes, UsageMetricsAutoOpsResponseMetricSeries[]>>;
+};
diff --git a/x-pack/plugins/data_usage/server/routes/internal/usage_metrics_handler.ts b/x-pack/plugins/data_usage/server/routes/internal/usage_metrics_handler.ts
index 93b31033fc4fb..a714259e1e11c 100644
--- a/x-pack/plugins/data_usage/server/routes/internal/usage_metrics_handler.ts
+++ b/x-pack/plugins/data_usage/server/routes/internal/usage_metrics_handler.ts
@@ -6,7 +6,6 @@
  */
 
 import { RequestHandler } from '@kbn/core/server';
-import { IndicesGetDataStreamResponse } from '@elastic/elasticsearch/lib/api/types';
 import {
   MetricTypes,
   UsageMetricsAutoOpsResponseSchemaBody,
@@ -44,12 +43,22 @@ export const getUsageMetricsHandler = (
           new CustomHttpRequestError('[request body.dataStreams]: no data streams selected', 400)
         );
       }
+      let dataStreamsResponse;
 
-      const { data_streams: dataStreamsResponse }: IndicesGetDataStreamResponse =
-        await esClient.indices.getDataStream({
+      try {
+        // Attempt to fetch data streams
+        const { data_streams: dataStreams } = await esClient.indices.getDataStream({
           name: requestDsNames,
           expand_wildcards: 'all',
         });
+        dataStreamsResponse = dataStreams;
+      } catch (error) {
+        return errorHandler(
+          logger,
+          response,
+          new CustomHttpRequestError('Failed to retrieve data streams', 400)
+        );
+      }
       const metrics = await dataUsageService.getMetrics({
         from,
         to,
@@ -69,7 +78,7 @@ export const getUsageMetricsHandler = (
   };
 };
 
-function transformMetricsData(
+export function transformMetricsData(
   data: UsageMetricsAutoOpsResponseSchemaBody
 ): UsageMetricsResponseSchemaBody {
   return {
diff --git a/x-pack/plugins/data_usage/server/services/autoops_api.ts b/x-pack/plugins/data_usage/server/services/autoops_api.ts
index e5ffe24c6167a..6a9de27f996f1 100644
--- a/x-pack/plugins/data_usage/server/services/autoops_api.ts
+++ b/x-pack/plugins/data_usage/server/services/autoops_api.ts
@@ -13,6 +13,7 @@ import type { AxiosError, AxiosRequestConfig } from 'axios';
 import axios from 'axios';
 import { LogMeta } from '@kbn/core/server';
 import {
+  UsageMetricsAutoOpsResponseSchema,
   UsageMetricsAutoOpsResponseSchemaBody,
   UsageMetricsRequestBody,
 } from '../../common/rest_types';
@@ -134,8 +135,10 @@ export class AutoOpsAPIService {
       }
     );
 
+    const validatedResponse = UsageMetricsAutoOpsResponseSchema.body().validate(response.data);
+
     logger.debug(`[AutoOps API] Successfully created an autoops agent ${response}`);
-    return response;
+    return validatedResponse;
   }
 
   private createTlsConfig(autoopsConfig: AutoOpsConfig | undefined) {
diff --git a/x-pack/plugins/data_usage/server/services/index.ts b/x-pack/plugins/data_usage/server/services/index.ts
index 9ccd08861a26c..3752553e50e9f 100644
--- a/x-pack/plugins/data_usage/server/services/index.ts
+++ b/x-pack/plugins/data_usage/server/services/index.ts
@@ -41,7 +41,7 @@ export class DataUsageService {
         metricTypes,
         dataStreams,
       });
-      return response.data;
+      return response;
     } catch (error) {
       if (error instanceof ValidationError) {
         throw new AutoOpsError(error.message);
diff --git a/x-pack/plugins/data_visualizer/public/application/data_drift/data_drift_view.tsx b/x-pack/plugins/data_visualizer/public/application/data_drift/data_drift_view.tsx
index 170c96d1e0682..06f600928e2a2 100644
--- a/x-pack/plugins/data_visualizer/public/application/data_drift/data_drift_view.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/data_drift/data_drift_view.tsx
@@ -216,7 +216,7 @@ export const DataDriftView = ({
         runAnalysisDisabled={!dataView || requiresWindowParameters}
       >
         <EuiFlexItem grow={false}>
-          <EuiFormRow display="columnCompressedSwitch">
+          <EuiFormRow display="columnCompressed">
             <EuiSwitch
               label={showOnlyDriftedFieldsOptionLabel}
               aria-label={showOnlyDriftedFieldsOptionLabel}
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/new_index/method_connector/new_connector_logic.ts b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/new_index/method_connector/new_connector_logic.ts
index 0d21db6e03baf..0c8a81d90149a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/new_index/method_connector/new_connector_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/new_index/method_connector/new_connector_logic.ts
@@ -7,8 +7,7 @@
 
 import { kea, MakeLogicType } from 'kea';
 
-import { Connector } from '@kbn/search-connectors';
-import { ConnectorDefinition } from '@kbn/search-connectors-plugin/public';
+import { Connector, ConnectorDefinition } from '@kbn/search-connectors';
 
 import { Status } from '../../../../../../common/types/api';
 import { Actions } from '../../../../shared/api_logic/create_api_logic';
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/new_index/new_search_index_page.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/new_index/new_search_index_page.tsx
index 1b2889301d6a9..7aac8d87b89b4 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/new_index/new_search_index_page.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/new_index/new_search_index_page.tsx
@@ -15,7 +15,7 @@ import { EuiBadge, EuiFlexGroup, EuiFlexItem, EuiIcon } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { ConnectorDefinition } from '@kbn/search-connectors-plugin/public';
+import { ConnectorDefinition } from '@kbn/search-connectors';
 
 import {
   CONNECTOR_CLIENTS_TYPE,
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/native_connector_configuration/native_connector_configuration_config.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/native_connector_configuration/native_connector_configuration_config.tsx
index d2681a5d3df97..d0edaacb3c712 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/native_connector_configuration/native_connector_configuration_config.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/native_connector_configuration/native_connector_configuration_config.tsx
@@ -14,11 +14,12 @@ import { EuiSpacer, EuiLink, EuiFlexGroup, EuiFlexItem, EuiCallOut } from '@elas
 import { i18n } from '@kbn/i18n';
 
 import { FormattedMessage } from '@kbn/i18n-react';
-import { Connector, ConnectorStatus } from '@kbn/search-connectors';
-
-import { ConnectorConfigurationComponent } from '@kbn/search-connectors/components/configuration/connector_configuration';
-
-import { ConnectorDefinition } from '@kbn/search-connectors-plugin/common/types';
+import {
+  Connector,
+  ConnectorConfigurationComponent,
+  ConnectorDefinition,
+  ConnectorStatus,
+} from '@kbn/search-connectors';
 
 import { Status } from '../../../../../../../common/types/api';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/native_connector_configuration/research_configuration.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/native_connector_configuration/research_configuration.tsx
index 0625c60a354f7..764f952e0c02d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/native_connector_configuration/research_configuration.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search_content/components/search_index/connector/native_connector_configuration/research_configuration.tsx
@@ -11,8 +11,7 @@ import { EuiText, EuiFlexGroup, EuiFlexItem, EuiLink, EuiCallOut } from '@elasti
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
-
-import { ConnectorDefinition } from '@kbn/search-connectors-plugin/common/types';
+import { ConnectorDefinition } from '@kbn/search-connectors';
 
 interface ResearchConfigurationProps {
   nativeConnector: ConnectorDefinition;
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/api_key/api_key_panel.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/api_key/api_key_panel.tsx
index b9d5cf8c414d6..2a99b60f3745f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/api_key/api_key_panel.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/api_key/api_key_panel.tsx
@@ -141,7 +141,7 @@ export const ApiKeyPanel: React.FC = () => {
               >
                 <FormattedMessage
                   id="xpack.enterpriseSearch.apiKey.activeKeys"
-                  defaultMessage="{number} active API keys."
+                  defaultMessage="{number} active API keys"
                   values={{
                     number: apiKeys.length,
                   }}
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/getting_started/panels/api_key_panel_content.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/getting_started/panels/api_key_panel_content.tsx
index a220e077f0824..117c817ac8bf1 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/getting_started/panels/api_key_panel_content.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/getting_started/panels/api_key_panel_content.tsx
@@ -108,7 +108,7 @@ export const ApiKeyPanelContent: React.FC<ApiKeyPanelContent> = ({ apiKeys, open
               >
                 <FormattedMessage
                   id="xpack.enterpriseSearch.apiKey.activeKeys"
-                  defaultMessage="{number} active API keys."
+                  defaultMessage="{number} active API keys"
                   values={{
                     number: apiKeys?.length || 0,
                   }}
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/kibana/kibana_logic.ts b/x-pack/plugins/enterprise_search/public/applications/shared/kibana/kibana_logic.ts
index 6cd6e5410ef11..592e20f25f382 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/kibana/kibana_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/kibana/kibana_logic.ts
@@ -28,7 +28,7 @@ import { IndexMappingProps } from '@kbn/index-management-shared-types';
 import { LensPublicStart } from '@kbn/lens-plugin/public';
 import { MlPluginStart } from '@kbn/ml-plugin/public';
 import { ELASTICSEARCH_URL_PLACEHOLDER } from '@kbn/search-api-panels/constants';
-import { ConnectorDefinition } from '@kbn/search-connectors-plugin/public';
+import { ConnectorDefinition } from '@kbn/search-connectors';
 import { SearchInferenceEndpointsPluginStart } from '@kbn/search-inference-endpoints/public';
 import { SearchPlaygroundPluginStart } from '@kbn/search-playground/public';
 import { AuthenticatedUser, SecurityPluginStart } from '@kbn/security-plugin/public';
diff --git a/x-pack/plugins/enterprise_search/server/utils/search_result_provider.ts b/x-pack/plugins/enterprise_search/server/utils/search_result_provider.ts
index 15b1971c6aecd..a5ce3aeb367da 100644
--- a/x-pack/plugins/enterprise_search/server/utils/search_result_provider.ts
+++ b/x-pack/plugins/enterprise_search/server/utils/search_result_provider.ts
@@ -10,7 +10,7 @@ import { takeUntil, of, map } from 'rxjs';
 import { GlobalSearchResultProvider } from '@kbn/global-search-plugin/server';
 import { i18n } from '@kbn/i18n';
 
-import { ConnectorServerSideDefinition } from '@kbn/search-connectors-plugin/server';
+import { ConnectorServerSideDefinition } from '@kbn/search-connectors';
 
 import { ConfigType } from '..';
 import {
diff --git a/x-pack/plugins/features/server/mocks.ts b/x-pack/plugins/features/server/mocks.ts
index bb2292a45377f..15339b068e7e8 100644
--- a/x-pack/plugins/features/server/mocks.ts
+++ b/x-pack/plugins/features/server/mocks.ts
@@ -25,8 +25,8 @@ const createSetup = (): jest.Mocked<FeaturesPluginSetup> => {
 
 const createStart = (): jest.Mocked<FeaturesPluginStart> => {
   return {
-    getKibanaFeatures: jest.fn(),
-    getElasticsearchFeatures: jest.fn(),
+    getKibanaFeatures: jest.fn().mockReturnValue([]),
+    getElasticsearchFeatures: jest.fn().mockReturnValue([]),
   };
 };
 
diff --git a/x-pack/plugins/features/server/plugin.ts b/x-pack/plugins/features/server/plugin.ts
index 15888358bb773..9f6cae36f6aee 100644
--- a/x-pack/plugins/features/server/plugin.ts
+++ b/x-pack/plugins/features/server/plugin.ts
@@ -138,7 +138,8 @@ export class FeaturesPlugin
     this.featureRegistry.validateFeatures();
 
     this.capabilities = uiCapabilitiesForFeatures(
-      this.featureRegistry.getAllKibanaFeatures(),
+      // Don't expose capabilities of the deprecated features.
+      this.featureRegistry.getAllKibanaFeatures({ omitDeprecated: true }),
       this.featureRegistry.getAllElasticsearchFeatures()
     );
 
diff --git a/x-pack/plugins/file_upload/public/components/geo_upload_form/geo_upload_form.tsx b/x-pack/plugins/file_upload/public/components/geo_upload_form/geo_upload_form.tsx
index 05b6c6244810f..d5720e4f2f556 100644
--- a/x-pack/plugins/file_upload/public/components/geo_upload_form/geo_upload_form.tsx
+++ b/x-pack/plugins/file_upload/public/components/geo_upload_form/geo_upload_form.tsx
@@ -142,7 +142,7 @@ export class GeoUploadForm extends Component<Props, State> {
               onIndexNameValidationEnd={this.props.onIndexNameValidationEnd}
             />
             <EuiSpacer size="m" />
-            <EuiFormRow display="columnCompressedSwitch">
+            <EuiFormRow display="columnCompressed">
               <EuiToolTip
                 position="top"
                 content={i18n.translate('xpack.fileUpload.smallChunks.tooltip', {
diff --git a/x-pack/plugins/fleet/common/constants/routes.ts b/x-pack/plugins/fleet/common/constants/routes.ts
index 61d50d0f9e073..436d476db16d2 100644
--- a/x-pack/plugins/fleet/common/constants/routes.ts
+++ b/x-pack/plugins/fleet/common/constants/routes.ts
@@ -23,19 +23,21 @@ export const LIMITED_CONCURRENCY_ROUTE_TAG = 'ingest:limited-concurrency';
 const EPM_PACKAGES_MANY = `${EPM_API_ROOT}/packages`;
 const EPM_PACKAGES_INSTALLED = `${EPM_API_ROOT}/packages/installed`;
 const EPM_PACKAGES_BULK = `${EPM_PACKAGES_MANY}/_bulk`;
-const EPM_PACKAGES_ONE_DEPRECATED = `${EPM_PACKAGES_MANY}/{pkgkey}`;
+const EPM_PACKAGES_ONE_WITHOUT_VERSION = `${EPM_PACKAGES_MANY}/{pkgName}`;
 const EPM_PACKAGES_ONE = `${EPM_PACKAGES_MANY}/{pkgName}/{pkgVersion}`;
+const EPM_PACKAGES_ONE_WITH_OPTIONAL_VERSION = `${EPM_PACKAGES_MANY}/{pkgName}/{pkgVersion?}`;
 export const EPM_API_ROUTES = {
   BULK_INSTALL_PATTERN: EPM_PACKAGES_BULK,
   LIST_PATTERN: EPM_PACKAGES_MANY,
   INSTALLED_LIST_PATTERN: EPM_PACKAGES_INSTALLED,
   LIMITED_LIST_PATTERN: `${EPM_PACKAGES_MANY}/limited`,
-  INFO_PATTERN: EPM_PACKAGES_ONE,
+  INFO_WITHOUT_VERSION_PATTERN: EPM_PACKAGES_ONE_WITHOUT_VERSION,
+  INFO_PATTERN: EPM_PACKAGES_ONE_WITH_OPTIONAL_VERSION,
   DATA_STREAMS_PATTERN: `${EPM_API_ROOT}/data_streams`,
-  INSTALL_FROM_REGISTRY_PATTERN: EPM_PACKAGES_ONE,
+  INSTALL_FROM_REGISTRY_PATTERN: EPM_PACKAGES_ONE_WITH_OPTIONAL_VERSION,
   INSTALL_BY_UPLOAD_PATTERN: EPM_PACKAGES_MANY,
   CUSTOM_INTEGRATIONS_PATTERN: `${EPM_API_ROOT}/custom_integrations`,
-  DELETE_PATTERN: EPM_PACKAGES_ONE,
+  DELETE_PATTERN: EPM_PACKAGES_ONE_WITH_OPTIONAL_VERSION,
   INSTALL_KIBANA_ASSETS_PATTERN: `${EPM_PACKAGES_ONE}/kibana_assets`,
   DELETE_KIBANA_ASSETS_PATTERN: `${EPM_PACKAGES_ONE}/kibana_assets`,
   FILEPATH_PATTERN: `${EPM_PACKAGES_ONE}/{filePath*}`,
@@ -45,10 +47,6 @@ export const EPM_API_ROUTES = {
   BULK_ASSETS_PATTERN: `${EPM_API_ROOT}/bulk_assets`,
   INPUTS_PATTERN: `${EPM_API_ROOT}/templates/{pkgName}/{pkgVersion}/inputs`,
 
-  INFO_PATTERN_DEPRECATED: EPM_PACKAGES_ONE_DEPRECATED,
-  INSTALL_FROM_REGISTRY_PATTERN_DEPRECATED: EPM_PACKAGES_ONE_DEPRECATED,
-  DELETE_PATTERN_DEPRECATED: EPM_PACKAGES_ONE_DEPRECATED,
-
   REAUTHORIZE_TRANSFORMS: `${EPM_PACKAGES_ONE}/transforms/authorize`,
 };
 
@@ -171,11 +169,6 @@ export const ENROLLMENT_API_KEY_ROUTES = {
   LIST_PATTERN: `${API_ROOT}/enrollment_api_keys`,
   INFO_PATTERN: `${API_ROOT}/enrollment_api_keys/{keyId}`,
   DELETE_PATTERN: `${API_ROOT}/enrollment_api_keys/{keyId}`,
-  // deprecated since 8.0
-  CREATE_PATTERN_DEPRECATED: `${API_ROOT}/enrollment-api-keys`,
-  LIST_PATTERN_DEPRECATED: `${API_ROOT}/enrollment-api-keys`,
-  INFO_PATTERN_DEPRECATED: `${API_ROOT}/enrollment-api-keys/{keyId}`,
-  DELETE_PATTERN_DEPRECATED: `${API_ROOT}/enrollment-api-keys/{keyId}`,
 };
 
 export const UNINSTALL_TOKEN_ROUTES = {
diff --git a/x-pack/plugins/fleet/common/services/route.test.ts b/x-pack/plugins/fleet/common/services/route.test.ts
new file mode 100644
index 0000000000000..1075f4f2605ea
--- /dev/null
+++ b/x-pack/plugins/fleet/common/services/route.test.ts
@@ -0,0 +1,43 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { epmRouteService } from './routes';
+
+describe('Route services', () => {
+  describe('epmRouteService', () => {
+    describe('getInfoPath', () => {
+      it('should generate path with pkgVersion', () => {
+        expect(epmRouteService.getInfoPath('test', '1.0.0')).toBe(
+          '/api/fleet/epm/packages/test/1.0.0'
+        );
+      });
+      it('should generate path without pkgVersion', () => {
+        expect(epmRouteService.getInfoPath('test')).toBe('/api/fleet/epm/packages/test');
+      });
+    });
+    describe('getInstallPath', () => {
+      it('should generate path with pkgVersion', () => {
+        expect(epmRouteService.getInstallPath('test', '1.0.0')).toBe(
+          '/api/fleet/epm/packages/test/1.0.0'
+        );
+      });
+      it('should generate path without pkgVersion', () => {
+        expect(epmRouteService.getInstallPath('test')).toBe('/api/fleet/epm/packages/test');
+      });
+    });
+    describe('getRemovePath', () => {
+      it('should generate path with pkgVersion', () => {
+        expect(epmRouteService.getRemovePath('test', '1.0.0')).toBe(
+          '/api/fleet/epm/packages/test/1.0.0'
+        );
+      });
+      it('should generate path without pkgVersion', () => {
+        expect(epmRouteService.getRemovePath('test')).toBe('/api/fleet/epm/packages/test');
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/fleet/common/services/routes.ts b/x-pack/plugins/fleet/common/services/routes.ts
index 520a71e1bdc0a..56f7096cf9766 100644
--- a/x-pack/plugins/fleet/common/services/routes.ts
+++ b/x-pack/plugins/fleet/common/services/routes.ts
@@ -47,11 +47,14 @@ export const epmRouteService = {
   getInfoPath: (pkgName: string, pkgVersion?: string) => {
     if (pkgVersion) {
       return EPM_API_ROUTES.INFO_PATTERN.replace('{pkgName}', pkgName).replace(
-        '{pkgVersion}',
+        '{pkgVersion?}',
         pkgVersion
       );
     } else {
-      return EPM_API_ROUTES.INFO_PATTERN.replace('{pkgName}', pkgName).replace('/{pkgVersion}', '');
+      return EPM_API_ROUTES.INFO_PATTERN.replace('{pkgName}', pkgName).replace(
+        '/{pkgVersion?}',
+        ''
+      );
     }
   },
 
@@ -63,20 +66,32 @@ export const epmRouteService = {
     return `${EPM_API_ROOT}${filePath.replace('/package', '/packages')}`;
   },
 
-  getInstallPath: (pkgName: string, pkgVersion: string) => {
-    return EPM_API_ROUTES.INSTALL_FROM_REGISTRY_PATTERN.replace('{pkgName}', pkgName)
-      .replace('{pkgVersion}', pkgVersion)
-      .replace(/\/$/, ''); // trim trailing slash
+  getInstallPath: (pkgName: string, pkgVersion?: string) => {
+    if (pkgVersion) {
+      return EPM_API_ROUTES.INSTALL_FROM_REGISTRY_PATTERN.replace('{pkgName}', pkgName)
+        .replace('{pkgVersion?}', pkgVersion)
+        .replace(/\/$/, ''); // trim trailing slash
+    } else {
+      return EPM_API_ROUTES.INSTALL_FROM_REGISTRY_PATTERN.replace('{pkgName}', pkgName)
+        .replace('/{pkgVersion?}', '')
+        .replace(/\/$/, ''); // trim trailing slash
+    }
   },
 
   getBulkInstallPath: () => {
     return EPM_API_ROUTES.BULK_INSTALL_PATTERN;
   },
 
-  getRemovePath: (pkgName: string, pkgVersion: string) => {
-    return EPM_API_ROUTES.DELETE_PATTERN.replace('{pkgName}', pkgName)
-      .replace('{pkgVersion}', pkgVersion)
-      .replace(/\/$/, ''); // trim trailing slash
+  getRemovePath: (pkgName: string, pkgVersion?: string) => {
+    if (pkgVersion) {
+      return EPM_API_ROUTES.DELETE_PATTERN.replace('{pkgName}', pkgName)
+        .replace('{pkgVersion?}', pkgVersion)
+        .replace(/\/$/, ''); // trim trailing slash
+    } else {
+      return EPM_API_ROUTES.DELETE_PATTERN.replace('{pkgName}', pkgName)
+        .replace('/{pkgVersion?}', '')
+        .replace(/\/$/, ''); // trim trailing slash
+    }
   },
 
   getInstallKibanaAssetsPath: (pkgName: string, pkgVersion: string) => {
diff --git a/x-pack/plugins/fleet/common/types/models/epm.ts b/x-pack/plugins/fleet/common/types/models/epm.ts
index 827130d802f22..f1cd9e5ee4a7f 100644
--- a/x-pack/plugins/fleet/common/types/models/epm.ts
+++ b/x-pack/plugins/fleet/common/types/models/epm.ts
@@ -546,8 +546,8 @@ export type PackageList = PackageListItem[];
 export type PackageListItem = Installable<RegistrySearchResult> & {
   id: string;
   integration?: string;
-  installationInfo?: InstallationInfo;
   savedObject?: InstallableSavedObject;
+  installationInfo?: InstallationInfo;
 };
 export type PackagesGroupedByStatus = Record<ValueOf<InstallationStatus>, PackageList>;
 export type PackageInfo =
diff --git a/x-pack/plugins/fleet/common/types/models/settings.ts b/x-pack/plugins/fleet/common/types/models/settings.ts
index a63211ef14c55..15b74645b16b3 100644
--- a/x-pack/plugins/fleet/common/types/models/settings.ts
+++ b/x-pack/plugins/fleet/common/types/models/settings.ts
@@ -7,7 +7,6 @@
 
 export interface BaseSettings {
   has_seen_add_data_notice?: boolean;
-  fleet_server_hosts?: string[];
   prerelease_integrations_enabled?: boolean;
 }
 
diff --git a/x-pack/plugins/fleet/common/types/rest_spec/enrollment_api_key.ts b/x-pack/plugins/fleet/common/types/rest_spec/enrollment_api_key.ts
index 7fa724e5079c8..e1509d551bdef 100644
--- a/x-pack/plugins/fleet/common/types/rest_spec/enrollment_api_key.ts
+++ b/x-pack/plugins/fleet/common/types/rest_spec/enrollment_api_key.ts
@@ -13,10 +13,7 @@ export interface GetEnrollmentAPIKeysRequest {
   query: ListWithKuery;
 }
 
-export type GetEnrollmentAPIKeysResponse = ListResult<EnrollmentAPIKey> & {
-  // deprecated in 8.x
-  list?: EnrollmentAPIKey[];
-};
+export type GetEnrollmentAPIKeysResponse = ListResult<EnrollmentAPIKey>;
 
 export interface GetOneEnrollmentAPIKeyRequest {
   params: {
diff --git a/x-pack/plugins/fleet/common/types/rest_spec/epm.ts b/x-pack/plugins/fleet/common/types/rest_spec/epm.ts
index e8dee14e40b30..68c09eeb5e9dc 100644
--- a/x-pack/plugins/fleet/common/types/rest_spec/epm.ts
+++ b/x-pack/plugins/fleet/common/types/rest_spec/epm.ts
@@ -25,8 +25,6 @@ import type {
 
 export interface GetCategoriesRequest {
   query: {
-    // deprecated in 8.6
-    experimental?: boolean;
     prerelease?: boolean;
     include_policy_templates?: boolean;
   };
@@ -34,15 +32,11 @@ export interface GetCategoriesRequest {
 
 export interface GetCategoriesResponse {
   items: CategorySummaryList;
-  // deprecated in 8.0
-  response?: CategorySummaryList;
 }
 
 export interface GetPackagesRequest {
   query: {
     category?: string;
-    // deprecated in 8.6
-    experimental?: boolean;
     prerelease?: boolean;
     excludeInstallStatus?: boolean;
   };
@@ -50,8 +44,6 @@ export interface GetPackagesRequest {
 
 export interface GetPackagesResponse {
   items: PackageList;
-  // deprecated in 8.0
-  response?: PackageList;
 }
 
 export interface InstalledPackage {
@@ -79,8 +71,6 @@ export interface GetEpmDataStreamsResponse {
 }
 export interface GetLimitedPackagesResponse {
   items: string[];
-  // deprecated in 8.0
-  response?: string[];
 }
 
 export interface GetFileRequest {
@@ -93,8 +83,6 @@ export interface GetFileRequest {
 
 export interface GetInfoRequest {
   params: {
-    // deprecated in 8.0
-    pkgkey?: string;
     pkgName: string;
     pkgVersion: string;
   };
@@ -103,14 +91,10 @@ export interface GetInfoRequest {
 export interface GetInfoResponse {
   item: PackageInfo;
   metadata?: PackageMetadata;
-  // deprecated in 8.0
-  response?: PackageInfo;
 }
 
 export interface UpdatePackageRequest {
   params: {
-    // deprecated in 8.0
-    pkgkey?: string;
     pkgName: string;
     pkgVersion: string;
   };
@@ -121,8 +105,6 @@ export interface UpdatePackageRequest {
 
 export interface UpdatePackageResponse {
   item: PackageInfo;
-  // deprecated in 8.0
-  response?: PackageInfo;
 }
 
 export interface GetStatsRequest {
@@ -137,8 +119,6 @@ export interface GetStatsResponse {
 
 export interface InstallPackageRequest {
   params: {
-    // deprecated in 8.0
-    pkgkey?: string;
     pkgName: string;
     pkgVersion: string;
   };
@@ -149,8 +129,6 @@ export interface InstallPackageResponse {
   _meta: {
     install_source: InstallSource;
   };
-  // deprecated in 8.0
-  response?: AssetReference[];
 }
 
 export interface IBulkInstallPackageHTTPError {
@@ -175,8 +153,6 @@ export interface BulkInstallPackageInfo {
 
 export interface BulkInstallPackagesResponse {
   items: Array<BulkInstallPackageInfo | IBulkInstallPackageHTTPError>;
-  // deprecated in 8.0
-  response?: Array<BulkInstallPackageInfo | IBulkInstallPackageHTTPError>;
 }
 
 export interface BulkInstallPackagesRequest {
@@ -191,8 +167,6 @@ export interface MessageResponse {
 
 export interface DeletePackageRequest {
   params: {
-    // deprecated in 8.0
-    pkgkey?: string;
     pkgName: string;
     pkgVersion: string;
   };
@@ -202,8 +176,6 @@ export interface DeletePackageRequest {
 }
 
 export interface DeletePackageResponse {
-  // deprecated in 8.0
-  response?: AssetReference[];
   items: AssetReference[];
 }
 export interface GetVerificationKeyIdResponse {
diff --git a/x-pack/plugins/fleet/common/types/rest_spec/health_check.ts b/x-pack/plugins/fleet/common/types/rest_spec/health_check.ts
index 4b25d958d21ad..5554dde4e2484 100644
--- a/x-pack/plugins/fleet/common/types/rest_spec/health_check.ts
+++ b/x-pack/plugins/fleet/common/types/rest_spec/health_check.ts
@@ -8,14 +8,10 @@
 export interface PostHealthCheckRequest {
   body: {
     id: string;
-    /** @deprecated use id field instead */
-    host?: string;
   };
 }
 
 export interface PostHealthCheckResponse {
   host_id: string;
-  // deprecated
-  host?: string;
   status: string;
 }
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/index.test.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/index.test.tsx
index 3cd1a310208bf..6c9be4796f205 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/index.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/index.test.tsx
@@ -106,7 +106,7 @@ describe('When on integration detail', () => {
   describe('and the package is not installed and prerelease enabled', () => {
     beforeEach(async () => {
       mockedApi.responseProvider.getSettings.mockReturnValue({
-        item: { prerelease_integrations_enabled: true, id: '', fleet_server_hosts: [] },
+        item: { prerelease_integrations_enabled: true, id: '' },
       });
       mockGAAndPrereleaseVersions('1.0.0-beta');
       await render();
@@ -145,7 +145,7 @@ describe('When on integration detail', () => {
     beforeEach(async () => {
       mockGAAndPrereleaseVersions('1.0.0');
       mockedApi.responseProvider.getSettings.mockReturnValue({
-        item: { prerelease_integrations_enabled: false, id: '', fleet_server_hosts: [] },
+        item: { prerelease_integrations_enabled: false, id: '' },
       });
       await render();
       await act(() => mockedApi.waitForApi());
@@ -172,7 +172,7 @@ describe('When on integration detail', () => {
   describe('and a custom UI extension is NOT registered', () => {
     beforeEach(async () => {
       mockedApi.responseProvider.getSettings.mockReturnValue({
-        item: { prerelease_integrations_enabled: false, id: '', fleet_server_hosts: [] },
+        item: { prerelease_integrations_enabled: false, id: '' },
       });
       await render();
       await act(() => mockedApi.waitForApi());
@@ -211,7 +211,7 @@ describe('When on integration detail', () => {
     beforeEach(async () => {
       let setWasRendered: () => void;
       mockedApi.responseProvider.getSettings.mockReturnValue({
-        item: { prerelease_integrations_enabled: false, id: '', fleet_server_hosts: [] },
+        item: { prerelease_integrations_enabled: false, id: '' },
       });
       lazyComponentWasRendered = new Promise((resolve) => {
         setWasRendered = resolve;
diff --git a/x-pack/plugins/fleet/public/components/cloud_security_posture/hooks/use_create_azure_arm_template_url.ts b/x-pack/plugins/fleet/public/components/cloud_security_posture/hooks/use_create_azure_arm_template_url.ts
index ea20d14fdb868..47237ac962bfd 100644
--- a/x-pack/plugins/fleet/public/components/cloud_security_posture/hooks/use_create_azure_arm_template_url.ts
+++ b/x-pack/plugins/fleet/public/components/cloud_security_posture/hooks/use_create_azure_arm_template_url.ts
@@ -7,10 +7,9 @@
 
 import { i18n } from '@kbn/i18n';
 
+import { useGetFleetServerHosts } from '../../../hooks';
 import type { AzureArmTemplateProps } from '../../agent_enrollment_flyout/types';
 
-import { useGetSettings } from '../../../hooks';
-
 const ARM_TEMPLATE_DEFAULT_ACCOUNT_TYPE = 'single-account';
 
 export const useCreateAzureArmTemplateUrl = ({
@@ -20,13 +19,13 @@ export const useCreateAzureArmTemplateUrl = ({
   enrollmentAPIKey: string | undefined;
   azureArmTemplateProps: AzureArmTemplateProps | undefined;
 }) => {
-  const { data, isLoading } = useGetSettings();
+  const { data, isLoading } = useGetFleetServerHosts();
 
   let isError = false;
   let error: string | undefined;
 
   // Default fleet server host
-  const fleetServerHost = data?.item.fleet_server_hosts?.[0];
+  const fleetServerHost = data?.items?.find((item) => item.is_default)?.host_urls?.[0];
 
   if (!fleetServerHost && !isLoading) {
     isError = true;
diff --git a/x-pack/plugins/fleet/public/components/cloud_security_posture/hooks/use_create_cloud_shell_url.ts b/x-pack/plugins/fleet/public/components/cloud_security_posture/hooks/use_create_cloud_shell_url.ts
index f1543e337180b..34ab224b2028c 100644
--- a/x-pack/plugins/fleet/public/components/cloud_security_posture/hooks/use_create_cloud_shell_url.ts
+++ b/x-pack/plugins/fleet/public/components/cloud_security_posture/hooks/use_create_cloud_shell_url.ts
@@ -9,7 +9,7 @@ import { i18n } from '@kbn/i18n';
 
 import type { PackagePolicy } from '../../../../common';
 
-import { useGetSettings } from '../../../hooks';
+import { useGetFleetServerHosts } from '../../../hooks';
 
 import { getCloudShellUrlFromPackagePolicy } from '../services';
 
@@ -20,13 +20,13 @@ export const useCreateCloudShellUrl = ({
   enrollmentAPIKey: string | undefined;
   packagePolicy?: PackagePolicy;
 }) => {
-  const { data, isLoading } = useGetSettings();
+  const { data, isLoading } = useGetFleetServerHosts();
 
   let isError = false;
   let error: string | undefined;
 
   // Default fleet server host
-  const fleetServerHost = data?.item.fleet_server_hosts?.[0];
+  const fleetServerHost = data?.items?.find((item) => item.is_default)?.host_urls?.[0];
 
   if (!fleetServerHost && !isLoading) {
     isError = true;
diff --git a/x-pack/plugins/fleet/public/components/home_integration/tutorial_module_notice.tsx b/x-pack/plugins/fleet/public/components/home_integration/tutorial_module_notice.tsx
index 905f2c82e85c7..f3b7b0cb77f84 100644
--- a/x-pack/plugins/fleet/public/components/home_integration/tutorial_module_notice.tsx
+++ b/x-pack/plugins/fleet/public/components/home_integration/tutorial_module_notice.tsx
@@ -23,8 +23,8 @@ const TutorialModuleNotice: TutorialModuleNoticeComponent = memo(({ moduleName }
 
   const pkgInfo =
     !isLoading &&
-    packagesData?.response &&
-    packagesData.response.find((pkg) => pkg.name === moduleName && pkg.name !== FLEET_APM_PACKAGE); // APM needs special handling
+    packagesData?.items &&
+    packagesData.items.find((pkg) => pkg.name === moduleName && pkg.name !== FLEET_APM_PACKAGE); // APM needs special handling
 
   if (hasIntegrationsPermissions && pkgInfo) {
     return (
diff --git a/x-pack/plugins/fleet/public/search_provider.test.ts b/x-pack/plugins/fleet/public/search_provider.test.ts
index 5f95eef60546c..68ba3042a8e76 100644
--- a/x-pack/plugins/fleet/public/search_provider.test.ts
+++ b/x-pack/plugins/fleet/public/search_provider.test.ts
@@ -133,7 +133,7 @@ describe('Package search provider', () => {
     test('returns formatted results', () => {
       getTestScheduler().run(({ expectObservable, hot }) => {
         mockSendGetPackages.mockReturnValue(
-          hot('--(a|)', { a: { data: { response: testResponse } } })
+          hot('--(a|)', { a: { data: { items: testResponse } } })
         );
         setupMock.getStartServices.mockReturnValue(
           hot('--(a|)', { a: [coreMock.createStart()] }) as any
@@ -217,7 +217,7 @@ describe('Package search provider', () => {
 
     test('calls EPR once only', () => {
       getTestScheduler().run(({ hot }) => {
-        mockSendGetPackages.mockReturnValue(hot('--(a|)', { a: { data: { response: [] } } }));
+        mockSendGetPackages.mockReturnValue(hot('--(a|)', { a: { data: { items: [] } } }));
         setupMock.getStartServices.mockReturnValue(
           hot('--(a|)', { a: [coreMock.createStart()] }) as any
         );
@@ -237,7 +237,7 @@ describe('Package search provider', () => {
 
     test('completes without returning results if aborted', () => {
       getTestScheduler().run(({ expectObservable, hot }) => {
-        mockSendGetPackages.mockReturnValue(hot('--(a|)', { a: { data: { response: [] } } }));
+        mockSendGetPackages.mockReturnValue(hot('--(a|)', { a: { data: { items: [] } } }));
         setupMock.getStartServices.mockReturnValue(
           hot('--(a|)', { a: [coreMock.createStart()] }) as any
         );
@@ -258,7 +258,7 @@ describe('Package search provider', () => {
     test('respect maximum results', () => {
       getTestScheduler().run(({ hot, expectObservable }) => {
         mockSendGetPackages.mockReturnValue(
-          hot('--(a|)', { a: { data: { response: testResponse } } })
+          hot('--(a|)', { a: { data: { items: testResponse } } })
         );
         setupMock.getStartServices.mockReturnValue(
           hot('--(a|)', { a: [coreMock.createStart()] }) as any
@@ -292,7 +292,7 @@ describe('Package search provider', () => {
       test('without packages tag, without search term', () => {
         getTestScheduler().run(({ hot, expectObservable }) => {
           mockSendGetPackages.mockReturnValue(
-            hot('--(a|)', { a: { data: { response: testResponse } } })
+            hot('--(a|)', { a: { data: { items: testResponse } } })
           );
           setupMock.getStartServices.mockReturnValue(
             hot('--(a|)', { a: [coreMock.createStart()] }) as any
@@ -314,7 +314,7 @@ describe('Package search provider', () => {
       test('with integration tag, with no search term', () => {
         getTestScheduler().run(({ hot, expectObservable }) => {
           mockSendGetPackages.mockReturnValue(
-            hot('--(a|)', { a: { data: { response: testResponse } } })
+            hot('--(a|)', { a: { data: { items: testResponse } } })
           );
           setupMock.getStartServices.mockReturnValue(
             hot('--(a|)', { a: [coreMock.createStart()] }) as any
@@ -397,7 +397,7 @@ describe('Package search provider', () => {
       test('with integration tag, with search term', () => {
         getTestScheduler().run(({ hot, expectObservable }) => {
           mockSendGetPackages.mockReturnValue(
-            hot('--(a|)', { a: { data: { response: testResponse } } })
+            hot('--(a|)', { a: { data: { items: testResponse } } })
           );
           setupMock.getStartServices.mockReturnValue(
             hot('--(a|)', { a: [coreMock.createStart()] }) as any
diff --git a/x-pack/plugins/fleet/public/search_provider.ts b/x-pack/plugins/fleet/public/search_provider.ts
index ce1ddd10ac5a2..a6810633c428e 100644
--- a/x-pack/plugins/fleet/public/search_provider.ts
+++ b/x-pack/plugins/fleet/public/search_provider.ts
@@ -30,7 +30,7 @@ const createPackages$ = () =>
       if (error) {
         throw error;
       }
-      return data?.response ?? [];
+      return data?.items ?? [];
     }),
     shareReplay(1)
   );
@@ -86,7 +86,7 @@ export const createPackageSearchProvider = (core: CoreSetup): GlobalSearchResult
     shareReplay(1)
   );
 
-  let packages$: undefined | Observable<GetPackagesResponse['response']>;
+  let packages$: undefined | Observable<GetPackagesResponse['items']>;
 
   const getPackages$ = () => {
     if (!packages$) {
diff --git a/x-pack/plugins/fleet/server/routes/enrollment_api_key/handler.ts b/x-pack/plugins/fleet/server/routes/enrollment_api_key/handler.ts
index a38f5bdadc617..cfce60b0f18f5 100644
--- a/x-pack/plugins/fleet/server/routes/enrollment_api_key/handler.ts
+++ b/x-pack/plugins/fleet/server/routes/enrollment_api_key/handler.ts
@@ -43,7 +43,6 @@ export const getEnrollmentApiKeysHandler: RequestHandler<
       spaceId: useSpaceAwareness ? getCurrentNamespace(soClient) : undefined,
     });
     const body: GetEnrollmentAPIKeysResponse = {
-      list: items, // deprecated
       items,
       total,
       page,
diff --git a/x-pack/plugins/fleet/server/routes/enrollment_api_key/index.ts b/x-pack/plugins/fleet/server/routes/enrollment_api_key/index.ts
index bcf4448420919..bc6c61dc8ffe4 100644
--- a/x-pack/plugins/fleet/server/routes/enrollment_api_key/index.ts
+++ b/x-pack/plugins/fleet/server/routes/enrollment_api_key/index.ts
@@ -109,10 +109,7 @@ export const registerRoutes = (router: FleetAuthzRouter) => {
           request: GetEnrollmentAPIKeysRequestSchema,
           response: {
             200: {
-              body: () =>
-                ListResponseSchema(EnrollmentAPIKeySchema).extends({
-                  list: schema.arrayOf(EnrollmentAPIKeySchema, { meta: { deprecated: true } }),
-                }),
+              body: () => ListResponseSchema(EnrollmentAPIKeySchema),
             },
             400: {
               body: genericErrorResponse,
@@ -154,72 +151,4 @@ export const registerRoutes = (router: FleetAuthzRouter) => {
       },
       postEnrollmentApiKeyHandler
     );
-
-  router.versioned
-    .get({
-      path: ENROLLMENT_API_KEY_ROUTES.INFO_PATTERN_DEPRECATED,
-      fleetAuthz: {
-        fleet: { readEnrollmentTokens: true },
-      },
-      // @ts-expect-error TODO(https://github.com/elastic/kibana/issues/196095): Replace {RouteDeprecationInfo}
-      deprecated: true,
-    })
-    .addVersion(
-      {
-        version: API_VERSIONS.public.v1,
-        validate: { request: GetOneEnrollmentAPIKeyRequestSchema },
-      },
-      getOneEnrollmentApiKeyHandler
-    );
-
-  router.versioned
-    .delete({
-      path: ENROLLMENT_API_KEY_ROUTES.DELETE_PATTERN_DEPRECATED,
-      fleetAuthz: {
-        fleet: { allAgents: true },
-      },
-      // @ts-expect-error TODO(https://github.com/elastic/kibana/issues/196095): Replace {RouteDeprecationInfo}
-      deprecated: true,
-    })
-    .addVersion(
-      {
-        version: API_VERSIONS.public.v1,
-        validate: { request: DeleteEnrollmentAPIKeyRequestSchema },
-      },
-      deleteEnrollmentApiKeyHandler
-    );
-
-  router.versioned
-    .get({
-      path: ENROLLMENT_API_KEY_ROUTES.LIST_PATTERN_DEPRECATED,
-      fleetAuthz: {
-        fleet: { readEnrollmentTokens: true },
-      },
-      // @ts-expect-error TODO(https://github.com/elastic/kibana/issues/196095): Replace {RouteDeprecationInfo}
-      deprecated: true,
-    })
-    .addVersion(
-      {
-        version: API_VERSIONS.public.v1,
-        validate: { request: GetEnrollmentAPIKeysRequestSchema },
-      },
-      getEnrollmentApiKeysHandler
-    );
-
-  router.versioned
-    .post({
-      path: ENROLLMENT_API_KEY_ROUTES.CREATE_PATTERN_DEPRECATED,
-      fleetAuthz: {
-        fleet: { allAgents: true },
-      },
-      // @ts-expect-error TODO(https://github.com/elastic/kibana/issues/196095): Replace {RouteDeprecationInfo}
-      deprecated: true,
-    })
-    .addVersion(
-      {
-        version: API_VERSIONS.public.v1,
-        validate: { request: PostEnrollmentAPIKeyRequestSchema },
-      },
-      postEnrollmentApiKeyHandler
-    );
 };
diff --git a/x-pack/plugins/fleet/server/routes/epm/handlers.ts b/x-pack/plugins/fleet/server/routes/epm/handlers.ts
index 7d7fea6d693a7..1fcd0e26a6ef0 100644
--- a/x-pack/plugins/fleet/server/routes/epm/handlers.ts
+++ b/x-pack/plugins/fleet/server/routes/epm/handlers.ts
@@ -9,7 +9,7 @@ import type { TypeOf } from '@kbn/config-schema';
 import semverValid from 'semver/functions/valid';
 import type { HttpResponseOptions } from '@kbn/core/server';
 
-import { pick } from 'lodash';
+import { omit, pick } from 'lodash';
 
 import { PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '../../../common';
 
@@ -98,12 +98,11 @@ export const getCategoriesHandler: FleetRequestHandler<
   TypeOf<typeof GetCategoriesRequestSchema.query>
 > = async (context, request, response) => {
   try {
-    const res = await getCategories({
+    const items = await getCategories({
       ...request.query,
     });
     const body: GetCategoriesResponse = {
-      items: res,
-      response: res,
+      items,
     };
     return response.ok({ body, headers: { ...CACHE_CONTROL_10_MINUTES_HEADER } });
   } catch (error) {
@@ -124,7 +123,6 @@ export const getListHandler: FleetRequestHandler<
     const flattenedRes = res.map((pkg) => soToInstallationInfo(pkg)) as PackageList;
     const body: GetPackagesResponse = {
       items: flattenedRes,
-      response: res,
     };
     return response.ok({
       body,
@@ -199,7 +197,6 @@ export const getLimitedListHandler: FleetRequestHandler<
     });
     const body: GetLimitedPackagesResponse = {
       items: res,
-      response: res,
     };
     return response.ok({
       body,
@@ -460,7 +457,6 @@ export const bulkInstallPackagesFromRegistryHandler: FleetRequestHandler<
   const payload = bulkInstalledResponses.map(bulkInstallServiceResponseToHttpEntry);
   const body: BulkInstallPackagesResponse = {
     items: payload,
-    response: payload,
   };
   return response.ok({ body });
 };
@@ -494,7 +490,6 @@ export const installPackageByUploadHandler: FleetRequestHandler<
   if (!res.error) {
     const body: InstallPackageResponse = {
       items: res.assets || [],
-      response: res.assets || [],
       _meta: {
         install_source: res.installSource ?? installSource,
       },
@@ -519,8 +514,7 @@ export const installPackageByUploadHandler: FleetRequestHandler<
 
 export const deletePackageHandler: FleetRequestHandler<
   TypeOf<typeof DeletePackageRequestSchema.params>,
-  TypeOf<typeof DeletePackageRequestSchema.query>,
-  TypeOf<typeof DeletePackageRequestSchema.body>
+  TypeOf<typeof DeletePackageRequestSchema.query>
 > = async (context, request, response) => {
   try {
     const { pkgName, pkgVersion } = request.params;
@@ -676,8 +670,7 @@ const soToInstallationInfo = (pkg: PackageListItem | PackageInfo) => {
     };
 
     return {
-      // When savedObject gets removed, replace `pkg` with `...omit(pkg, 'savedObject')`
-      ...pkg,
+      ...omit(pkg, 'savedObject'),
       installationInfo,
     };
   }
diff --git a/x-pack/plugins/fleet/server/routes/epm/index.test.ts b/x-pack/plugins/fleet/server/routes/epm/index.test.ts
index a054b02aae1d1..d736cb7c318ba 100644
--- a/x-pack/plugins/fleet/server/routes/epm/index.test.ts
+++ b/x-pack/plugins/fleet/server/routes/epm/index.test.ts
@@ -323,7 +323,6 @@ describe('schema validation', () => {
     };
     const expectedResponse: GetCategoriesResponse = {
       items: [category],
-      response: [category],
     };
     (getCategoriesHandler as jest.Mock).mockImplementation((ctx, request, res) => {
       return res.ok({ body: expectedResponse });
@@ -386,7 +385,6 @@ describe('schema validation', () => {
     };
     const expectedResponse: GetPackagesResponse = {
       items: [packageItem],
-      response: [packageItem],
     };
     (getListHandler as jest.Mock).mockImplementation((ctx, request, res) => {
       return res.ok({ body: expectedResponse });
@@ -444,7 +442,6 @@ describe('schema validation', () => {
   it('get limited packages should return valid response', async () => {
     const expectedResponse: GetLimitedPackagesResponse = {
       items: ['test'],
-      response: ['test'],
     };
     (getLimitedListHandler as jest.Mock).mockImplementation((ctx, request, res) => {
       return res.ok({ body: expectedResponse });
@@ -513,7 +510,6 @@ describe('schema validation', () => {
       metadata: {
         has_policies: true,
       },
-      response: packageInfo,
     };
     (getInfoHandler as jest.Mock).mockImplementation((ctx, request, res) => {
       return res.ok({ body: expectedResponse });
@@ -530,7 +526,6 @@ describe('schema validation', () => {
   it('update package should return valid response', async () => {
     const expectedResponse: UpdatePackageResponse = {
       item: packageInfo,
-      response: packageInfo,
     };
     (updatePackageHandler as jest.Mock).mockImplementation((ctx, request, res) => {
       return res.ok({ body: expectedResponse });
@@ -556,13 +551,6 @@ describe('schema validation', () => {
       _meta: {
         install_source: 'registry',
       },
-      response: [
-        {
-          id: 'test',
-          type: KibanaSavedObjectType.dashboard,
-          originId: 'test',
-        },
-      ],
     };
     (installPackageFromRegistryHandler as jest.Mock).mockImplementation((ctx, request, res) => {
       return res.ok({ body: expectedResponse });
@@ -612,7 +600,6 @@ describe('schema validation', () => {
     };
     const expectedResponse: BulkInstallPackagesResponse = {
       items: [item, { name: 'test', statusCode: 400, error: 'test' }],
-      response: [item],
     };
     (bulkInstallPackagesFromRegistryHandler as jest.Mock).mockImplementation(
       (ctx, request, res) => {
diff --git a/x-pack/plugins/fleet/server/routes/epm/index.ts b/x-pack/plugins/fleet/server/routes/epm/index.ts
index 0e3c5e76eb825..283f8d6a1b0a0 100644
--- a/x-pack/plugins/fleet/server/routes/epm/index.ts
+++ b/x-pack/plugins/fleet/server/routes/epm/index.ts
@@ -5,8 +5,6 @@
  * 2.0.
  */
 
-import type { IKibanaResponse } from '@kbn/core/server';
-
 import { parseExperimentalConfigValue } from '../../../common/experimental_features';
 
 import { API_VERSIONS } from '../../../common/constants';
@@ -20,32 +18,20 @@ import {
 } from '../../services/security';
 import type { FleetAuthzRouteConfig } from '../../services/security/types';
 
-import type {
-  DeletePackageResponse,
-  GetInfoResponse,
-  InstallPackageResponse,
-  UpdatePackageResponse,
-} from '../../../common/types';
-
 import { EPM_API_ROUTES } from '../../constants';
-import { splitPkgKey } from '../../services/epm/registry';
 import {
   GetCategoriesRequestSchema,
   GetPackagesRequestSchema,
   GetInstalledPackagesRequestSchema,
   GetFileRequestSchema,
   GetInfoRequestSchema,
-  GetInfoRequestSchemaDeprecated,
   GetBulkAssetsRequestSchema,
   InstallPackageFromRegistryRequestSchema,
-  InstallPackageFromRegistryRequestSchemaDeprecated,
   InstallPackageByUploadRequestSchema,
   DeletePackageRequestSchema,
-  DeletePackageRequestSchemaDeprecated,
   BulkInstallPackagesFromRegistryRequestSchema,
   GetStatsRequestSchema,
   UpdatePackageRequestSchema,
-  UpdatePackageRequestSchemaDeprecated,
   ReauthorizeTransformRequestSchema,
   GetDataStreamsRequestSchema,
   CreateCustomIntegrationRequestSchema,
@@ -648,124 +634,6 @@ export const registerRoutes = (router: FleetAuthzRouter, config: FleetConfigType
       getBulkAssetsHandler
     );
 
-  // deprecated since 8.0
-  // This endpoint should be marked as internal but the router selects this endpoint over the new GET one
-  // For now keeping it public
-  router.versioned
-    .get({
-      path: EPM_API_ROUTES.INFO_PATTERN_DEPRECATED,
-      fleetAuthz: (fleetAuthz: FleetAuthz): boolean =>
-        calculateRouteAuthz(
-          fleetAuthz,
-          getRouteRequiredAuthz('get', EPM_API_ROUTES.INFO_PATTERN_DEPRECATED)
-        ).granted,
-      // @ts-expect-error TODO(https://github.com/elastic/kibana/issues/196095): Replace {RouteDeprecationInfo}
-      deprecated: true,
-    })
-    .addVersion(
-      {
-        version: API_VERSIONS.public.v1,
-        validate: { request: GetInfoRequestSchemaDeprecated },
-      },
-      async (context, request, response) => {
-        const newRequest = { ...request, params: splitPkgKey(request.params.pkgkey) } as any;
-        const resp: IKibanaResponse<GetInfoResponse> = await getInfoHandler(
-          context,
-          newRequest,
-          response
-        );
-        if (resp.payload?.item) {
-          // returning item as well here, because pkgVersion is optional in new GET endpoint, and if not specified, the router selects the deprecated route
-          return response.ok({ body: { item: resp.payload.item, response: resp.payload.item } });
-        }
-        return resp;
-      }
-    );
-
-  router.versioned
-    .put({
-      path: EPM_API_ROUTES.INFO_PATTERN_DEPRECATED,
-      fleetAuthz: {
-        integrations: { writePackageSettings: true },
-      },
-      // @ts-expect-error TODO(https://github.com/elastic/kibana/issues/196095): Replace {RouteDeprecationInfo}
-      deprecated: true,
-    })
-    .addVersion(
-      {
-        version: API_VERSIONS.public.v1,
-        validate: { request: UpdatePackageRequestSchemaDeprecated },
-      },
-      async (context, request, response) => {
-        const newRequest = { ...request, params: splitPkgKey(request.params.pkgkey) } as any;
-        const resp: IKibanaResponse<UpdatePackageResponse> = await updatePackageHandler(
-          context,
-          newRequest,
-          response
-        );
-        if (resp.payload?.item) {
-          return response.ok({ body: { response: resp.payload.item } });
-        }
-        return resp;
-      }
-    );
-
-  // This endpoint should be marked as internal but the router selects this endpoint over the new POST
-  router.versioned
-    .post({
-      path: EPM_API_ROUTES.INSTALL_FROM_REGISTRY_PATTERN_DEPRECATED,
-      fleetAuthz: INSTALL_PACKAGES_AUTHZ,
-      // @ts-expect-error TODO(https://github.com/elastic/kibana/issues/196095): Replace {RouteDeprecationInfo}
-      deprecated: true,
-    })
-    .addVersion(
-      {
-        version: API_VERSIONS.public.v1,
-        validate: { request: InstallPackageFromRegistryRequestSchemaDeprecated },
-      },
-      async (context, request, response) => {
-        const newRequest = {
-          ...request,
-          params: splitPkgKey(request.params.pkgkey),
-          query: request.query,
-        } as any;
-        const resp: IKibanaResponse<InstallPackageResponse> =
-          await installPackageFromRegistryHandler(context, newRequest, response);
-        if (resp.payload?.items) {
-          return response.ok({ body: { ...resp.payload, response: resp.payload.items } });
-        }
-        return resp;
-      }
-    );
-
-  router.versioned
-    .delete({
-      path: EPM_API_ROUTES.DELETE_PATTERN_DEPRECATED,
-      fleetAuthz: {
-        integrations: { removePackages: true },
-      },
-      // @ts-expect-error TODO(https://github.com/elastic/kibana/issues/196095): Replace {RouteDeprecationInfo}
-      deprecated: true,
-    })
-    .addVersion(
-      {
-        version: API_VERSIONS.public.v1,
-        validate: { request: DeletePackageRequestSchemaDeprecated },
-      },
-      async (context, request, response) => {
-        const newRequest = { ...request, params: splitPkgKey(request.params.pkgkey) } as any;
-        const resp: IKibanaResponse<DeletePackageResponse> = await deletePackageHandler(
-          context,
-          newRequest,
-          response
-        );
-        if (resp.payload?.items) {
-          return response.ok({ body: { response: resp.payload.items } });
-        }
-        return resp;
-      }
-    );
-
   // Update transforms with es-secondary-authorization headers,
   // append authorized_by to transform's _meta, and start transforms
   router.versioned
diff --git a/x-pack/plugins/fleet/server/routes/health_check/handler.test.ts b/x-pack/plugins/fleet/server/routes/health_check/handler.test.ts
index bb36c2ec8146b..37c204c141a04 100644
--- a/x-pack/plugins/fleet/server/routes/health_check/handler.test.ts
+++ b/x-pack/plugins/fleet/server/routes/health_check/handler.test.ts
@@ -63,21 +63,6 @@ describe('Fleet server health_check handler', () => {
     });
   });
 
-  it('should return a bad request error if body contains deprecated parameter `host`', async () => {
-    const res = await postHealthCheckHandler(
-      mockContext,
-      { body: { host: 'https://localhost:8220' } } as any,
-      mockResponse as any
-    );
-
-    expect(res).toEqual({
-      body: {
-        message: `Property 'host' is deprecated. Please use id instead.`,
-      },
-      statusCode: 400,
-    });
-  });
-
   it('should return 200 and active status when fetch response is `active`', async () => {
     const activeRes = {
       status: 'ONLINE',
@@ -105,7 +90,6 @@ describe('Fleet server health_check handler', () => {
     );
 
     const expectedResponse = {
-      host: 'https://localhost:8220',
       host_id: 'default-fleet-server',
       name: 'Default',
       status: 'ONLINE',
diff --git a/x-pack/plugins/fleet/server/routes/health_check/handler.ts b/x-pack/plugins/fleet/server/routes/health_check/handler.ts
index f191caa3fff1b..16114217bee2b 100644
--- a/x-pack/plugins/fleet/server/routes/health_check/handler.ts
+++ b/x-pack/plugins/fleet/server/routes/health_check/handler.ts
@@ -20,17 +20,10 @@ export const postHealthCheckHandler: FleetRequestHandler<
   TypeOf<typeof PostHealthCheckRequestSchema.body>
 > = async (context, request, response) => {
   const abortController = new AbortController();
-  const { id, host: deprecatedField } = request.body;
+  const { id } = request.body;
   const coreContext = await context.core;
   const soClient = coreContext.savedObjects.client;
 
-  if (deprecatedField) {
-    return response.badRequest({
-      body: {
-        message: `Property 'host' is deprecated. Please use id instead.`,
-      },
-    });
-  }
   try {
     const fleetServerHost = await getFleetServerHost(soClient, id);
 
@@ -61,7 +54,7 @@ export const postHealthCheckHandler: FleetRequestHandler<
       signal: abortController.signal,
     });
     const bodyRes = await res.json();
-    const body = { ...bodyRes, host };
+    const body = { ...bodyRes };
 
     return response.ok({ body });
   } catch (error) {
diff --git a/x-pack/plugins/fleet/server/routes/settings/settings_handler.test.ts b/x-pack/plugins/fleet/server/routes/settings/settings_handler.test.ts
index 73641bfaed71a..151a0a2ba2af8 100644
--- a/x-pack/plugins/fleet/server/routes/settings/settings_handler.test.ts
+++ b/x-pack/plugins/fleet/server/routes/settings/settings_handler.test.ts
@@ -29,7 +29,6 @@ jest.mock('../../services', () => ({
       secret_storage_requirements_met: true,
       output_secret_storage_requirements_met: true,
       has_seen_add_data_notice: true,
-      fleet_server_hosts: ['http://localhost:8220'],
       prerelease_integrations_enabled: true,
       delete_unenrolled_agents: {
         enabled: true,
@@ -76,7 +75,6 @@ describe('SettingsHandler', () => {
         secret_storage_requirements_met: true,
         output_secret_storage_requirements_met: true,
         has_seen_add_data_notice: true,
-        fleet_server_hosts: ['http://localhost:8220'],
         prerelease_integrations_enabled: true,
         delete_unenrolled_agents: {
           enabled: true,
diff --git a/x-pack/plugins/fleet/server/services/agent_policies/package_policies_to_agent_inputs.ts b/x-pack/plugins/fleet/server/services/agent_policies/package_policies_to_agent_inputs.ts
index 807312fe5e7cb..f2a39c6f8800b 100644
--- a/x-pack/plugins/fleet/server/services/agent_policies/package_policies_to_agent_inputs.ts
+++ b/x-pack/plugins/fleet/server/services/agent_policies/package_policies_to_agent_inputs.ts
@@ -112,7 +112,8 @@ export const mergeInputsOverrides = (
 
 export const getFullInputStreams = (
   input: PackagePolicyInput,
-  allStreamEnabled: boolean = false
+  allStreamEnabled: boolean = false,
+  streamsOriginalIdsMap?: Map<string, string> // Map of stream ids <destinationId, originalId>
 ): FullAgentPolicyInputStream => {
   return {
     ...(input.compiled_input || {}),
@@ -121,8 +122,9 @@ export const getFullInputStreams = (
           streams: input.streams
             .filter((stream) => stream.enabled || allStreamEnabled)
             .map((stream) => {
+              const streamId = stream.id;
               const fullStream: FullAgentPolicyInputStream = {
-                id: stream.id,
+                id: streamId,
                 data_stream: stream.data_stream,
                 ...stream.compiled_stream,
                 ...Object.entries(stream.config || {}).reduce((acc, [key, { value }]) => {
@@ -130,6 +132,8 @@ export const getFullInputStreams = (
                   return acc;
                 }, {} as { [k: string]: any }),
               };
+              streamsOriginalIdsMap?.set(fullStream.id, streamId);
+
               return fullStream;
             }),
         }
diff --git a/x-pack/plugins/fleet/server/services/epm/kibana/assets/install.ts b/x-pack/plugins/fleet/server/services/epm/kibana/assets/install.ts
index bf5684f29c205..6361aa1bf935b 100644
--- a/x-pack/plugins/fleet/server/services/epm/kibana/assets/install.ts
+++ b/x-pack/plugins/fleet/server/services/epm/kibana/assets/install.ts
@@ -133,6 +133,20 @@ export async function installKibanaAssets(options: {
     return [];
   }
 
+  await createDefaultIndexPatterns(savedObjectsImporter);
+  await makeManagedIndexPatternsGlobal(savedObjectsClient);
+
+  return await installKibanaSavedObjects({
+    logger,
+    savedObjectsImporter,
+    kibanaAssets: assetsToInstall,
+    assetsChunkSize: MAX_ASSETS_TO_INSTALL_IN_PARALLEL,
+  });
+}
+
+export async function createDefaultIndexPatterns(
+  savedObjectsImporter: SavedObjectsImporterContract
+) {
   // Create index patterns separately with `overwrite: false` to prevent blowing away users' runtime fields.
   // These don't get retried on conflict, because we expect that they exist once an integration has been installed.
   const indexPatternSavedObjects = getIndexPatternSavedObjects() as ArchiveAsset[];
@@ -143,15 +157,6 @@ export async function installKibanaAssets(options: {
     refresh: false,
     managed: true,
   });
-
-  await makeManagedIndexPatternsGlobal(savedObjectsClient);
-
-  return await installKibanaSavedObjects({
-    logger,
-    savedObjectsImporter,
-    kibanaAssets: assetsToInstall,
-    assetsChunkSize: MAX_ASSETS_TO_INSTALL_IN_PARALLEL,
-  });
 }
 
 export async function installKibanaAssetsAndReferencesMultispace({
diff --git a/x-pack/plugins/fleet/server/services/epm/kibana/assets/install_with_streaming.ts b/x-pack/plugins/fleet/server/services/epm/kibana/assets/install_with_streaming.ts
index fca6cf27a0cd7..45c4aee73b583 100644
--- a/x-pack/plugins/fleet/server/services/epm/kibana/assets/install_with_streaming.ts
+++ b/x-pack/plugins/fleet/server/services/epm/kibana/assets/install_with_streaming.ts
@@ -5,17 +5,20 @@
  * 2.0.
  */
 
-import type { SavedObject, SavedObjectsClientContract } from '@kbn/core/server';
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 
-import type { Installation, PackageInstallContext } from '../../../../../common/types';
+import type { PackageInstallContext } from '../../../../../common/types';
 import type { KibanaAssetReference, KibanaAssetType } from '../../../../types';
 import { getPathParts } from '../../archive';
 
 import { saveKibanaAssetsRefs } from '../../packages/install';
 
+import { makeManagedIndexPatternsGlobal } from '../index_pattern/install';
+
 import type { ArchiveAsset } from './install';
 import {
   KibanaSavedObjectTypeMapping,
+  createDefaultIndexPatterns,
   createSavedObjectKibanaAsset,
   isKibanaAssetType,
   toAssetReference,
@@ -27,7 +30,6 @@ interface InstallKibanaAssetsWithStreamingArgs {
   packageInstallContext: PackageInstallContext;
   spaceId: string;
   savedObjectsClient: SavedObjectsClientContract;
-  installedPkg?: SavedObject<Installation> | undefined;
 }
 
 const MAX_ASSETS_TO_INSTALL_IN_PARALLEL = 100;
@@ -37,11 +39,14 @@ export async function installKibanaAssetsWithStreaming({
   packageInstallContext,
   savedObjectsClient,
   pkgName,
-  installedPkg,
 }: InstallKibanaAssetsWithStreamingArgs): Promise<KibanaAssetReference[]> {
   const { archiveIterator } = packageInstallContext;
 
-  const { savedObjectClientWithSpace } = getSpaceAwareSaveobjectsClients(spaceId);
+  const { savedObjectClientWithSpace, savedObjectsImporter } =
+    getSpaceAwareSaveobjectsClients(spaceId);
+
+  await createDefaultIndexPatterns(savedObjectsImporter);
+  await makeManagedIndexPatternsGlobal(savedObjectsClient);
 
   const assetRefs: KibanaAssetReference[] = [];
   let batch: ArchiveAsset[] = [];
diff --git a/x-pack/plugins/fleet/server/services/epm/packages/__fixtures__/docker_2_11_0.ts b/x-pack/plugins/fleet/server/services/epm/packages/__fixtures__/docker_2_11_0.ts
new file mode 100644
index 0000000000000..67bde1882cfed
--- /dev/null
+++ b/x-pack/plugins/fleet/server/services/epm/packages/__fixtures__/docker_2_11_0.ts
@@ -0,0 +1,230 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export const DOCKER_2_11_0_PACKAGE_INFO = {
+  name: 'docker',
+  title: 'Docker',
+  version: '2.11.0',
+  release: 'ga',
+  description: 'Collect metrics and logs from Docker instances with Elastic Agent.',
+  type: 'integration',
+  download: '/epr/docker/docker-2.11.0.zip',
+  path: '/package/docker/2.11.0',
+  icons: [
+    {
+      src: '/img/logo_docker.svg',
+      path: '/package/docker/2.11.0/img/logo_docker.svg',
+      title: 'logo docker',
+      size: '32x32',
+      type: 'image/svg+xml',
+    },
+  ],
+  conditions: {
+    kibana: {
+      version: '^8.8.0',
+    },
+  },
+  owner: {
+    type: 'elastic',
+    github: 'elastic/obs-cloudnative-monitoring',
+  },
+  categories: ['observability', 'containers'],
+  signature_path: '/epr/docker/docker-2.11.0.zip.sig',
+  format_version: '3.2.2',
+  readme: '/package/docker/2.11.0/docs/README.md',
+  license: 'basic',
+  screenshots: [
+    {
+      src: '/img/docker-overview.png',
+      path: '/package/docker/2.11.0/img/docker-overview.png',
+      title: 'Docker Overview',
+      size: '5120x2562',
+      type: 'image/png',
+    },
+  ],
+  assets: [
+    '/package/docker/2.11.0/LICENSE.txt',
+    '/package/docker/2.11.0/changelog.yml',
+    '/package/docker/2.11.0/manifest.yml',
+    '/package/docker/2.11.0/docs/README.md',
+    '/package/docker/2.11.0/img/docker-overview.png',
+    '/package/docker/2.11.0/img/logo_docker.svg',
+    '/package/docker/2.11.0/data_stream/container/manifest.yml',
+    '/package/docker/2.11.0/data_stream/container/sample_event.json',
+    '/package/docker/2.11.0/data_stream/container_logs/manifest.yml',
+    '/package/docker/2.11.0/data_stream/container_logs/sample_event.json',
+    '/package/docker/2.11.0/data_stream/cpu/manifest.yml',
+    '/package/docker/2.11.0/data_stream/cpu/sample_event.json',
+    '/package/docker/2.11.0/data_stream/diskio/manifest.yml',
+    '/package/docker/2.11.0/data_stream/diskio/sample_event.json',
+    '/package/docker/2.11.0/data_stream/event/manifest.yml',
+    '/package/docker/2.11.0/data_stream/event/sample_event.json',
+    '/package/docker/2.11.0/data_stream/healthcheck/manifest.yml',
+    '/package/docker/2.11.0/data_stream/healthcheck/sample_event.json',
+    '/package/docker/2.11.0/data_stream/image/manifest.yml',
+    '/package/docker/2.11.0/data_stream/image/sample_event.json',
+    '/package/docker/2.11.0/data_stream/info/manifest.yml',
+    '/package/docker/2.11.0/data_stream/info/sample_event.json',
+    '/package/docker/2.11.0/data_stream/memory/manifest.yml',
+    '/package/docker/2.11.0/data_stream/memory/sample_event.json',
+    '/package/docker/2.11.0/data_stream/network/manifest.yml',
+    '/package/docker/2.11.0/data_stream/network/sample_event.json',
+    '/package/docker/2.11.0/kibana/dashboard/docker-AV4REOpp5NkDleZmzKkE.json',
+    '/package/docker/2.11.0/kibana/search/docker-Metrics-Docker.json',
+    '/package/docker/2.11.0/data_stream/container/fields/base-fields.yml',
+    '/package/docker/2.11.0/data_stream/container/fields/ecs.yml',
+    '/package/docker/2.11.0/data_stream/container/fields/fields.yml',
+    '/package/docker/2.11.0/data_stream/container_logs/fields/agent.yml',
+    '/package/docker/2.11.0/data_stream/container_logs/fields/base-fields.yml',
+    '/package/docker/2.11.0/data_stream/container_logs/fields/ecs.yml',
+    '/package/docker/2.11.0/data_stream/container_logs/fields/fields.yml',
+    '/package/docker/2.11.0/data_stream/cpu/fields/base-fields.yml',
+    '/package/docker/2.11.0/data_stream/cpu/fields/ecs.yml',
+    '/package/docker/2.11.0/data_stream/cpu/fields/fields.yml',
+    '/package/docker/2.11.0/data_stream/diskio/fields/base-fields.yml',
+    '/package/docker/2.11.0/data_stream/diskio/fields/ecs.yml',
+    '/package/docker/2.11.0/data_stream/diskio/fields/fields.yml',
+    '/package/docker/2.11.0/data_stream/event/fields/base-fields.yml',
+    '/package/docker/2.11.0/data_stream/event/fields/ecs.yml',
+    '/package/docker/2.11.0/data_stream/event/fields/fields.yml',
+    '/package/docker/2.11.0/data_stream/healthcheck/fields/base-fields.yml',
+    '/package/docker/2.11.0/data_stream/healthcheck/fields/ecs.yml',
+    '/package/docker/2.11.0/data_stream/healthcheck/fields/fields.yml',
+    '/package/docker/2.11.0/data_stream/image/fields/base-fields.yml',
+    '/package/docker/2.11.0/data_stream/image/fields/ecs.yml',
+    '/package/docker/2.11.0/data_stream/image/fields/fields.yml',
+    '/package/docker/2.11.0/data_stream/info/fields/base-fields.yml',
+    '/package/docker/2.11.0/data_stream/info/fields/ecs.yml',
+    '/package/docker/2.11.0/data_stream/info/fields/fields.yml',
+    '/package/docker/2.11.0/data_stream/memory/fields/base-fields.yml',
+    '/package/docker/2.11.0/data_stream/memory/fields/ecs.yml',
+    '/package/docker/2.11.0/data_stream/memory/fields/fields.yml',
+    '/package/docker/2.11.0/data_stream/network/fields/base-fields.yml',
+    '/package/docker/2.11.0/data_stream/network/fields/ecs.yml',
+    '/package/docker/2.11.0/data_stream/network/fields/fields.yml',
+    '/package/docker/2.11.0/data_stream/container/agent/stream/stream.yml.hbs',
+    '/package/docker/2.11.0/data_stream/container_logs/agent/stream/stream.yml.hbs',
+    '/package/docker/2.11.0/data_stream/cpu/agent/stream/stream.yml.hbs',
+    '/package/docker/2.11.0/data_stream/diskio/agent/stream/stream.yml.hbs',
+    '/package/docker/2.11.0/data_stream/event/agent/stream/stream.yml.hbs',
+    '/package/docker/2.11.0/data_stream/healthcheck/agent/stream/stream.yml.hbs',
+    '/package/docker/2.11.0/data_stream/image/agent/stream/stream.yml.hbs',
+    '/package/docker/2.11.0/data_stream/info/agent/stream/stream.yml.hbs',
+    '/package/docker/2.11.0/data_stream/memory/agent/stream/stream.yml.hbs',
+    '/package/docker/2.11.0/data_stream/network/agent/stream/stream.yml.hbs',
+  ],
+  policy_templates: [
+    {
+      name: 'docker',
+      title: 'Docker logs and metrics',
+      description: 'Collect logs and metrics from Docker instances',
+      inputs: [
+        {
+          type: 'filestream',
+          title: 'Collect Docker container logs',
+          description: 'Collecting docker container logs',
+        },
+      ],
+      multiple: true,
+    },
+  ],
+  data_streams: [
+    {
+      type: 'logs',
+      dataset: 'docker.container_logs',
+      title: 'Docker container logs',
+      release: 'ga',
+      streams: [
+        {
+          input: 'filestream',
+          vars: [
+            {
+              name: 'paths',
+              type: 'text',
+              title: 'Docker container log path',
+              multi: true,
+              required: true,
+              show_user: false,
+              default: ['/var/lib/docker/containers/${docker.container.id}/*-json.log'],
+            },
+            {
+              name: 'containerParserStream',
+              type: 'text',
+              title: "Container parser's stream configuration",
+              multi: false,
+              required: true,
+              show_user: false,
+              default: 'all',
+            },
+            {
+              name: 'condition',
+              type: 'text',
+              title: 'Condition',
+              description:
+                'Condition to filter when to apply this datastream. Refer to [Docker provider](https://www.elastic.co/guide/en/fleet/current/docker-provider.html) to find the available keys and to [Conditions](https://www.elastic.co/guide/en/fleet/current/dynamic-input-configuration.html#conditions) on how to use the available keys in conditions.',
+              multi: false,
+              required: false,
+              show_user: true,
+            },
+            {
+              name: 'additionalParsersConfig',
+              type: 'yaml',
+              title: 'Additional parsers configuration',
+              multi: false,
+              required: true,
+              show_user: false,
+              default:
+                "# - ndjson:\n#     target: json\n#     ignore_decoding_error: true\n# - multiline:\n#     type: pattern\n#     pattern: '^\\['\n#     negate: true\n#     match: after\n",
+            },
+            {
+              name: 'processors',
+              type: 'yaml',
+              title: 'Processors',
+              description:
+                'Processors are used to reduce the number of fields in the exported event or to enhance the event with metadata. This executes in the agent before the events are shipped. See [Processors](https://www.elastic.co/guide/en/beats/filebeat/current/filtering-and-enhancing-data.html) for details.',
+              multi: false,
+              required: false,
+              show_user: false,
+            },
+          ],
+          template_path: 'stream.yml.hbs',
+          title: 'Collect Docker container logs',
+          description: 'Collect Docker container logs',
+          enabled: true,
+        },
+      ],
+      package: 'docker',
+      elasticsearch: {},
+      path: 'container_logs',
+    },
+  ],
+};
+
+export const DOCKER_2_11_0_ASSETS_MAP = new Map([
+  [
+    'docker-2.11.0/data_stream/container_logs/agent/stream/stream.yml.hbs',
+    Buffer.from(`id: docker-container-logs-\${docker.container.name}-\${docker.container.id}
+paths:
+{{#each paths}}
+  - {{this}}
+{{/each}}
+{{#if condition}}
+condition: {{ condition }}
+{{/if}}
+parsers:
+- container:
+    stream: {{ containerParserStream }}
+    format: docker
+{{ additionalParsersConfig }}
+
+{{#if processors}}
+processors:
+{{processors}}
+{{/if}}
+`),
+  ],
+]);
diff --git a/x-pack/plugins/fleet/server/services/epm/packages/__fixtures__/redis_1_18_0_package_info.json b/x-pack/plugins/fleet/server/services/epm/packages/__fixtures__/redis_1_18_0_package_info.json
index 57c9b0c68fac9..5aa5c4a878baf 100644
--- a/x-pack/plugins/fleet/server/services/epm/packages/__fixtures__/redis_1_18_0_package_info.json
+++ b/x-pack/plugins/fleet/server/services/epm/packages/__fixtures__/redis_1_18_0_package_info.json
@@ -139,6 +139,15 @@
               "show_user": false,
               "default": "20s"
             },
+            {
+              "name": "tags",
+              "type": "text",
+              "title": "Tags",
+              "multi": true,
+              "required": false,
+              "show_user": false,
+              "default": ""
+            },
             {
               "name": "maxconn",
               "type": "integer",
@@ -203,6 +212,15 @@
         {
           "input": "redis/metrics",
           "vars": [
+            {
+              "name": "tags_streams",
+              "type": "text",
+              "title": "Tags in streams",
+              "multi": true,
+              "required": false,
+              "show_user": false,
+              "default": ""
+            },
             {
               "name": "key.patterns",
               "type": "yaml",
diff --git a/x-pack/plugins/fleet/server/services/epm/packages/__fixtures__/redis_1_18_0_streams_template.ts b/x-pack/plugins/fleet/server/services/epm/packages/__fixtures__/redis_1_18_0_streams_template.ts
index 5ff46f358bbe7..207a48d7132a5 100644
--- a/x-pack/plugins/fleet/server/services/epm/packages/__fixtures__/redis_1_18_0_streams_template.ts
+++ b/x-pack/plugins/fleet/server/services/epm/packages/__fixtures__/redis_1_18_0_streams_template.ts
@@ -76,6 +76,15 @@ period: {{period}}
 processors:
 {{processors}}
 {{/if}}
+tags:
+  - test
+{{#each tags as |tag i|}}
+  - {{tag}}
+{{/each}}
+tags_streams: 
+{{#each tags_streams as |tag i|}}
+  - {{tag}}
+{{/each}}
 `),
   ],
 ]);
diff --git a/x-pack/plugins/fleet/server/services/epm/packages/__snapshots__/get_templates_inputs.test.ts.snap b/x-pack/plugins/fleet/server/services/epm/packages/__snapshots__/get_templates_inputs.test.ts.snap
index b3a428c0e5a55..56e4f7ee09319 100644
--- a/x-pack/plugins/fleet/server/services/epm/packages/__snapshots__/get_templates_inputs.test.ts.snap
+++ b/x-pack/plugins/fleet/server/services/epm/packages/__snapshots__/get_templates_inputs.test.ts.snap
@@ -8,17 +8,16 @@ exports[`Fleet - getTemplateInputs should work for input package 1`] = `
     streams:
       # Custom log file: Custom log file
       - id: logfile-log.logs
-        data_stream:
-          dataset: <DATA_STREAM.DATASET>
-            # Dataset name: Set the name for your dataset. Changing the dataset will send the data to a different index. You can't use \`-\` in the name of a dataset and only valid characters for [Elasticsearch index names](https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-index_.html).
-
-        paths:
-          - <PATHS> # Log file path: Path to log files to be collected
-        exclude_files:
-          - <EXCLUDE_FILES> # Exclude files: Patterns to be ignored
         ignore_older: 72h
-        tags:
-          - <TAGS> # Tags: Tags to include in the published event
+        # data_stream:
+        #  dataset: <DATA_STREAM.DATASET>
+        #    # Dataset name: Set the name for your dataset. Changing the dataset will send the data to a different index. You can't use \`-\` in the name of a dataset and only valid characters for [Elasticsearch index names](https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-index_.html).
+        # paths:
+        #  - <PATHS> # Log file path: Path to log files to be collected
+        # exclude_files:
+        #  - <EXCLUDE_FILES> # Exclude files: Patterns to be ignored
+        # tags:
+        #  - <TAGS> # Tags: Tags to include in the published event
 "
 `;
 
@@ -49,8 +48,34 @@ exports[`Fleet - getTemplateInputs should work for integration package 1`] = `
             pattern: '*'
         maxconn: 10
         network: tcp
-        username: <USERNAME> # Username
-        password: <PASSWORD> # Password
         period: 10s
+        tags:
+          - test
+          # - <TAGS> # Tags
+        # username: <USERNAME> # Username
+        # password: <PASSWORD> # Password
+        # tags_streams:
+        #  - <TAGS_STREAMS> # Tags in streams
+"
+`;
+
+exports[`Fleet - getTemplateInputs should work for package with dynamic ids 1`] = `
+"inputs:
+  # Collect Docker container logs: Collecting docker container logs
+  - id: docker-filestream
+    type: filestream
+    streams:
+      # Collect Docker container logs: Collect Docker container logs
+      - id: docker-container-logs-\${docker.container.name}-\${docker.container.id}
+        data_stream:
+          dataset: docker.container_logs
+          type: logs
+        paths:
+          - /var/lib/docker/containers/\${docker.container.id}/*-json.log
+        parsers:
+          - container:
+              stream: all
+              format: docker
+        # condition: <CONDITION> # Condition: Condition to filter when to apply this datastream. Refer to [Docker provider](https://www.elastic.co/guide/en/fleet/current/docker-provider.html) to find the available keys and to [Conditions](https://www.elastic.co/guide/en/fleet/current/dynamic-input-configuration.html#conditions) on how to use the available keys in conditions.
 "
 `;
diff --git a/x-pack/plugins/fleet/server/services/epm/packages/get_template_inputs.ts b/x-pack/plugins/fleet/server/services/epm/packages/get_template_inputs.ts
index 8c63f4b093dd0..f76b739904f3f 100644
--- a/x-pack/plugins/fleet/server/services/epm/packages/get_template_inputs.ts
+++ b/x-pack/plugins/fleet/server/services/epm/packages/get_template_inputs.ts
@@ -51,20 +51,31 @@ type PackageWithInputAndStreamIndexed = Record<
 
 // Function based off storedPackagePolicyToAgentInputs, it only creates the `streams` section instead of the FullAgentPolicyInput
 export const templatePackagePolicyToFullInputStreams = (
-  packagePolicyInputs: PackagePolicyInput[]
+  packagePolicyInputs: PackagePolicyInput[],
+  inputAndStreamsIdsMap?: Map<string, { originalId: string; streams: Map<string, string> }>
 ): TemplateAgentPolicyInput[] => {
   const fullInputsStreams: TemplateAgentPolicyInput[] = [];
 
   if (!packagePolicyInputs || packagePolicyInputs.length === 0) return fullInputsStreams;
 
   packagePolicyInputs.forEach((input) => {
+    const streamsIdsMap = new Map();
+
+    const inputId = input.policy_template
+      ? `${input.policy_template}-${input.type}`
+      : `${input.type}`;
     const fullInputStream = {
       // @ts-ignore-next-line the following id is actually one level above the one in fullInputStream, but the linter thinks it gets overwritten
-      id: input.policy_template ? `${input.policy_template}-${input.type}` : `${input.type}`,
+      id: inputId,
       type: input.type,
-      ...getFullInputStreams(input, true),
+      ...getFullInputStreams(input, true, streamsIdsMap),
     };
 
+    inputAndStreamsIdsMap?.set(fullInputStream.id, {
+      originalId: inputId,
+      streams: streamsIdsMap,
+    });
+
     // deeply merge the input.config values with the full policy input stream
     merge(
       fullInputStream,
@@ -167,8 +178,13 @@ export async function getTemplateInputs(
     ...emptyPackagePolicy,
     inputs: compiledInputs,
   };
+  const inputIdsDestinationMap = new Map<
+    string,
+    { originalId: string; streams: Map<string, string> }
+  >();
   const inputs = templatePackagePolicyToFullInputStreams(
-    packagePolicyWithInputs.inputs as PackagePolicyInput[]
+    packagePolicyWithInputs.inputs as PackagePolicyInput[],
+    inputIdsDestinationMap
   );
 
   if (format === 'json') {
@@ -181,7 +197,7 @@ export async function getTemplateInputs(
         sortKeys: _sortYamlKeys,
       }
     );
-    return addCommentsToYaml(yaml, buildIndexedPackage(packageInfo));
+    return addCommentsToYaml(yaml, buildIndexedPackage(packageInfo), inputIdsDestinationMap);
   }
 
   return { inputs: [] };
@@ -247,7 +263,8 @@ function buildIndexedPackage(packageInfo: PackageInfo): PackageWithInputAndStrea
 
 function addCommentsToYaml(
   yaml: string,
-  packageIndexInputAndStreams: PackageWithInputAndStreamIndexed
+  packageIndexInputAndStreams: PackageWithInputAndStreamIndexed,
+  inputIdsDestinationMap: Map<string, { originalId: string; streams: Map<string, string> }>
 ) {
   const doc = yamlDoc.parseDocument(yaml);
   // Add input and streams comments
@@ -261,28 +278,16 @@ function addCommentsToYaml(
       if (!yamlDoc.isScalar(inputIdNode)) {
         return;
       }
-      const inputId = inputIdNode.value as string;
+      const inputId =
+        inputIdsDestinationMap.get(inputIdNode.value as string)?.originalId ??
+        (inputIdNode.value as string);
       const pkgInput = packageIndexInputAndStreams[inputId];
       if (pkgInput) {
         inputItem.commentBefore = ` ${pkgInput.title}${
           pkgInput.description ? `: ${pkgInput.description}` : ''
         }`;
 
-        yamlDoc.visit(inputItem, {
-          Scalar(key, node) {
-            if (node.value) {
-              const val = node.value.toString();
-              for (const varDef of pkgInput.vars ?? []) {
-                const placeholder = getPlaceholder(varDef);
-                if (val.includes(placeholder)) {
-                  node.comment = ` ${varDef.title}${
-                    varDef.description ? `: ${varDef.description}` : ''
-                  }`;
-                }
-              }
-            }
-          },
-        });
+        commentVariablesInYaml(inputItem, pkgInput.vars ?? []);
 
         const yamlStreams = inputItem.get('streams');
         if (!yamlDoc.isCollection(yamlStreams)) {
@@ -294,27 +299,16 @@ function addCommentsToYaml(
           }
           const streamIdNode = streamItem.get('id', true);
           if (yamlDoc.isScalar(streamIdNode)) {
-            const streamId = streamIdNode.value as string;
+            const streamId =
+              inputIdsDestinationMap
+                .get(inputIdNode.value as string)
+                ?.streams?.get(streamIdNode.value as string) ?? (streamIdNode.value as string);
             const pkgStream = pkgInput.streams[streamId];
             if (pkgStream) {
               streamItem.commentBefore = ` ${pkgStream.title}${
                 pkgStream.description ? `: ${pkgStream.description}` : ''
               }`;
-              yamlDoc.visit(streamItem, {
-                Scalar(key, node) {
-                  if (node.value) {
-                    const val = node.value.toString();
-                    for (const varDef of pkgStream.vars ?? []) {
-                      const placeholder = getPlaceholder(varDef);
-                      if (val.includes(placeholder)) {
-                        node.comment = ` ${varDef.title}${
-                          varDef.description ? `: ${varDef.description}` : ''
-                        }`;
-                      }
-                    }
-                  }
-                },
-              });
+              commentVariablesInYaml(streamItem, pkgStream.vars ?? []);
             }
           }
         });
@@ -324,3 +318,71 @@ function addCommentsToYaml(
 
   return doc.toString();
 }
+
+function commentVariablesInYaml(rootNode: yamlDoc.Node, vars: RegistryVarsEntry[] = []) {
+  // Node need to be deleted after the end of the visit to be able to visit every node
+  const toDeleteFn: Array<() => void> = [];
+  yamlDoc.visit(rootNode, {
+    Scalar(key, node, path) {
+      if (node.value) {
+        const val = node.value.toString();
+        for (const varDef of vars) {
+          const placeholder = getPlaceholder(varDef);
+          if (val.includes(placeholder)) {
+            node.comment = ` ${varDef.title}${varDef.description ? `: ${varDef.description}` : ''}`;
+
+            const paths = [...path].reverse();
+
+            let prevPart: yamlDoc.Node | yamlDoc.Document | yamlDoc.Pair = node;
+
+            for (const pathPart of paths) {
+              if (yamlDoc.isCollection(pathPart)) {
+                // If only one items in the collection comment the whole collection
+                if (pathPart.items.length === 1) {
+                  continue;
+                }
+              }
+              if (yamlDoc.isSeq(pathPart)) {
+                const commentDoc = new yamlDoc.Document(new yamlDoc.YAMLSeq());
+                commentDoc.add(prevPart);
+                const commentStr = commentDoc.toString().trimEnd();
+                pathPart.comment = pathPart.comment
+                  ? `${pathPart.comment} ${commentStr}`
+                  : ` ${commentStr}`;
+                const keyToDelete = prevPart;
+
+                toDeleteFn.push(() => {
+                  pathPart.items.forEach((item, index) => {
+                    if (item === keyToDelete) {
+                      pathPart.delete(new yamlDoc.Scalar(index));
+                    }
+                  });
+                });
+                return;
+              }
+
+              if (yamlDoc.isMap(pathPart)) {
+                if (yamlDoc.isPair(prevPart)) {
+                  const commentDoc = new yamlDoc.Document(new yamlDoc.YAMLMap());
+                  commentDoc.add(prevPart);
+                  const commentStr = commentDoc.toString().trimEnd();
+
+                  pathPart.comment = pathPart.comment
+                    ? `${pathPart.comment}\n ${commentStr.toString()}`
+                    : ` ${commentStr.toString()}`;
+                  const keyToDelete = prevPart.key;
+                  toDeleteFn.push(() => pathPart.delete(keyToDelete));
+                }
+                return;
+              }
+
+              prevPart = pathPart;
+            }
+          }
+        }
+      }
+    },
+  });
+
+  toDeleteFn.forEach((deleteFn) => deleteFn());
+}
diff --git a/x-pack/plugins/fleet/server/services/epm/packages/get_templates_inputs.test.ts b/x-pack/plugins/fleet/server/services/epm/packages/get_templates_inputs.test.ts
index 087002f212852..1a3738d8eaa82 100644
--- a/x-pack/plugins/fleet/server/services/epm/packages/get_templates_inputs.test.ts
+++ b/x-pack/plugins/fleet/server/services/epm/packages/get_templates_inputs.test.ts
@@ -16,6 +16,7 @@ import REDIS_1_18_0_PACKAGE_INFO from './__fixtures__/redis_1_18_0_package_info.
 import { getPackageAssetsMap, getPackageInfo } from './get';
 import { REDIS_ASSETS_MAP } from './__fixtures__/redis_1_18_0_streams_template';
 import { LOGS_2_3_0_ASSETS_MAP, LOGS_2_3_0_PACKAGE_INFO } from './__fixtures__/logs_2_3_0';
+import { DOCKER_2_11_0_PACKAGE_INFO, DOCKER_2_11_0_ASSETS_MAP } from './__fixtures__/docker_2_11_0';
 
 jest.mock('./get');
 
@@ -41,6 +42,7 @@ packageInfoCache.set('limited_package-0.0.0', {
 
 packageInfoCache.set('redis-1.18.0', REDIS_1_18_0_PACKAGE_INFO);
 packageInfoCache.set('log-2.3.0', LOGS_2_3_0_PACKAGE_INFO);
+packageInfoCache.set('docker-2.11.0', DOCKER_2_11_0_PACKAGE_INFO);
 
 describe('Fleet - templatePackagePolicyToFullInputStreams', () => {
   const mockInput: PackagePolicyInput = {
@@ -330,6 +332,9 @@ describe('Fleet - getTemplateInputs', () => {
       if (packageInfo.name === 'log') {
         return LOGS_2_3_0_ASSETS_MAP;
       }
+      if (packageInfo.name === 'docker') {
+        return DOCKER_2_11_0_ASSETS_MAP;
+      }
 
       return new Map();
     });
@@ -350,6 +355,14 @@ describe('Fleet - getTemplateInputs', () => {
     expect(template).toMatchSnapshot();
   });
 
+  it('should work for package with dynamic ids', async () => {
+    const soMock = savedObjectsClientMock.create();
+    soMock.get.mockResolvedValue({ attributes: {} } as any);
+    const template = await getTemplateInputs(soMock, 'docker', '2.11.0', 'yml');
+
+    expect(template).toMatchSnapshot();
+  });
+
   it('should work for input package', async () => {
     const soMock = savedObjectsClientMock.create();
     soMock.get.mockResolvedValue({ attributes: {} } as any);
diff --git a/x-pack/plugins/fleet/server/services/epm/packages/install_state_machine/steps/step_install_kibana_assets.ts b/x-pack/plugins/fleet/server/services/epm/packages/install_state_machine/steps/step_install_kibana_assets.ts
index aabd23f2eb9cc..22c785f568402 100644
--- a/x-pack/plugins/fleet/server/services/epm/packages/install_state_machine/steps/step_install_kibana_assets.ts
+++ b/x-pack/plugins/fleet/server/services/epm/packages/install_state_machine/steps/step_install_kibana_assets.ts
@@ -40,7 +40,7 @@ export async function stepInstallKibanaAssets(context: InstallContext) {
 }
 
 export async function stepInstallKibanaAssetsWithStreaming(context: InstallContext) {
-  const { savedObjectsClient, installedPkg, packageInstallContext, spaceId } = context;
+  const { savedObjectsClient, packageInstallContext, spaceId } = context;
   const { packageInfo } = packageInstallContext;
   const { name: pkgName } = packageInfo;
 
@@ -51,7 +51,6 @@ export async function stepInstallKibanaAssetsWithStreaming(context: InstallConte
         savedObjectsClient,
         pkgName,
         packageInstallContext,
-        installedPkg,
         spaceId,
       })
   );
diff --git a/x-pack/plugins/fleet/server/services/epm/packages/remove.ts b/x-pack/plugins/fleet/server/services/epm/packages/remove.ts
index 3892eaa951e5f..84c8a8eb9e104 100644
--- a/x-pack/plugins/fleet/server/services/epm/packages/remove.ts
+++ b/x-pack/plugins/fleet/server/services/epm/packages/remove.ts
@@ -57,14 +57,15 @@ const MAX_ASSETS_TO_DELETE = 1000;
 export async function removeInstallation(options: {
   savedObjectsClient: SavedObjectsClientContract;
   pkgName: string;
-  pkgVersion: string;
+  pkgVersion?: string;
   esClient: ElasticsearchClient;
   force?: boolean;
 }): Promise<AssetReference[]> {
-  const { savedObjectsClient, pkgName, pkgVersion, esClient } = options;
+  const { savedObjectsClient, pkgName, esClient } = options;
   const installation = await getInstallation({ savedObjectsClient, pkgName });
-  if (!installation) throw new PackageRemovalError(`${pkgName} is not installed`);
-
+  if (!installation) {
+    throw new PackageRemovalError(`${pkgName} is not installed`);
+  }
   const { total, items } = await packagePolicyService.list(
     appContextService.getInternalUserSOClientWithoutSpaceExtension(),
     {
@@ -115,7 +116,7 @@ export async function removeInstallation(options: {
   // a fresh copy from the registry
   deletePackageCache({
     name: pkgName,
-    version: pkgVersion,
+    version: installation.version,
   });
 
   await removeArchiveEntries({ savedObjectsClient, refs: installation.package_assets });
diff --git a/x-pack/plugins/fleet/server/services/security/route_required_authz.ts b/x-pack/plugins/fleet/server/services/security/route_required_authz.ts
index bbc1b07010fb7..37ab96b96afb7 100644
--- a/x-pack/plugins/fleet/server/services/security/route_required_authz.ts
+++ b/x-pack/plugins/fleet/server/services/security/route_required_authz.ts
@@ -164,7 +164,7 @@ const ROUTE_AUTHZ_REQUIREMENTS = deepFreeze<Record<string, FleetRouteRequiredAut
       },
     },
   },
-  [`get:${EPM_API_ROUTES.INFO_PATTERN_DEPRECATED}`]: {
+  [`get:${EPM_API_ROUTES.INFO_WITHOUT_VERSION_PATTERN}`]: {
     any: {
       integrations: {
         readPackageInfo: true,
diff --git a/x-pack/plugins/fleet/server/services/settings.test.ts b/x-pack/plugins/fleet/server/services/settings.test.ts
index 92fb85a335775..f88e735dfcb69 100644
--- a/x-pack/plugins/fleet/server/services/settings.test.ts
+++ b/x-pack/plugins/fleet/server/services/settings.test.ts
@@ -151,7 +151,7 @@ describe('saveSettings', () => {
       const soClient = savedObjectsClientMock.create();
 
       const newData: Partial<Omit<Settings, 'id'>> = {
-        fleet_server_hosts: ['http://localhost:8220'],
+        output_secret_storage_requirements_met: true,
       };
 
       soClient.find.mockResolvedValueOnce({
@@ -205,7 +205,7 @@ describe('saveSettings', () => {
         const soClient = savedObjectsClientMock.create();
 
         const newData: Partial<Omit<Settings, 'id'>> = {
-          fleet_server_hosts: ['http://localhost:8220'],
+          output_secret_storage_requirements_met: true,
         };
 
         soClient.find.mockRejectedValueOnce(Boom.notFound('not found'));
diff --git a/x-pack/plugins/fleet/server/services/settings.ts b/x-pack/plugins/fleet/server/services/settings.ts
index 5f7433403c4e6..3288ec1090e41 100644
--- a/x-pack/plugins/fleet/server/services/settings.ts
+++ b/x-pack/plugins/fleet/server/services/settings.ts
@@ -7,8 +7,8 @@
 
 import Boom from '@hapi/boom';
 import type { SavedObjectsClientContract, SavedObjectsUpdateOptions } from '@kbn/core/server';
+import { omit } from 'lodash';
 
-import { normalizeHostsForAgents } from '../../common/services';
 import { GLOBAL_SETTINGS_SAVED_OBJECT_TYPE, GLOBAL_SETTINGS_ID } from '../../common/constants';
 import type { Settings, BaseSettings } from '../../common/types';
 import type { SettingsSOAttributes } from '../types';
@@ -16,7 +16,6 @@ import type { SettingsSOAttributes } from '../types';
 import { DeleteUnenrolledAgentsPreconfiguredError } from '../errors';
 
 import { appContextService } from './app_context';
-import { listFleetServerHosts } from './fleet_server_host';
 import { auditLoggingService } from './audit_logging';
 
 export async function getSettings(soClient: SavedObjectsClientContract): Promise<Settings> {
@@ -33,7 +32,6 @@ export async function getSettings(soClient: SavedObjectsClientContract): Promise
     throw Boom.notFound('Global settings not found');
   }
   const settingsSo = res.saved_objects[0];
-  const fleetServerHosts = await listFleetServerHosts(soClient);
 
   return {
     id: settingsSo.id,
@@ -47,7 +45,6 @@ export async function getSettings(soClient: SavedObjectsClientContract): Promise
       settingsSo.attributes.use_space_awareness_migration_status,
     use_space_awareness_migration_started_at:
       settingsSo.attributes.use_space_awareness_migration_started_at,
-    fleet_server_hosts: fleetServerHosts.items.flatMap((item) => item.host_urls),
     preconfigured_fields: getConfigFleetServerHosts() ? ['fleet_server_hosts'] : [],
     delete_unenrolled_agents: settingsSo.attributes.delete_unenrolled_agents,
   };
@@ -88,10 +85,8 @@ export async function saveSettings(
     fromSetup?: boolean;
   }
 ): Promise<Partial<Settings> & Pick<Settings, 'id'>> {
-  const data = { ...newData };
-  if (data.fleet_server_hosts) {
-    data.fleet_server_hosts = data.fleet_server_hosts.map(normalizeHostsForAgents);
-  }
+  const data = omit({ ...newData }, 'fleet_server_hosts');
+
   const { createWithOverwrite, ...updateOptions } = options ?? {};
 
   try {
diff --git a/x-pack/plugins/fleet/server/types/rest_spec/epm.ts b/x-pack/plugins/fleet/server/types/rest_spec/epm.ts
index f08ccd9ff1248..827ffb2404a1b 100644
--- a/x-pack/plugins/fleet/server/types/rest_spec/epm.ts
+++ b/x-pack/plugins/fleet/server/types/rest_spec/epm.ts
@@ -12,7 +12,6 @@ import { ExperimentalDataStreamFeaturesSchema } from '../models/package_policy';
 export const GetCategoriesRequestSchema = {
   query: schema.object({
     prerelease: schema.maybe(schema.boolean()),
-    experimental: schema.maybe(schema.boolean()), // deprecated
     include_policy_templates: schema.maybe(schema.boolean()),
   }),
 };
@@ -27,16 +26,12 @@ const CategorySummaryItemSchema = schema.object({
 
 export const GetCategoriesResponseSchema = schema.object({
   items: schema.arrayOf(CategorySummaryItemSchema),
-  response: schema.maybe(
-    schema.arrayOf(CategorySummaryItemSchema.extends({}, { meta: { deprecated: true } }))
-  ),
 });
 
 export const GetPackagesRequestSchema = {
   query: schema.object({
     category: schema.maybe(schema.string()),
     prerelease: schema.maybe(schema.boolean()),
-    experimental: schema.maybe(schema.boolean()), // deprecated
     excludeInstallStatus: schema.maybe(schema.boolean({ defaultValue: false })),
   }),
 };
@@ -142,7 +137,6 @@ const PackageIconSchema = schema.object({
 export const PackageInfoSchema = schema
   .object({
     status: schema.maybe(schema.string()),
-    savedObject: schema.maybe(schema.any({ meta: { deprecated: true } })),
     installationInfo: schema.maybe(InstallationInfoSchema),
     name: schema.string(),
     version: schema.string(),
@@ -216,9 +210,6 @@ export const PackageListItemSchema = PackageInfoSchema.extends({
 
 export const GetPackagesResponseSchema = schema.object({
   items: schema.arrayOf(PackageListItemSchema),
-  response: schema.maybe(
-    schema.arrayOf(PackageListItemSchema.extends({}, { meta: { deprecated: true } }))
-  ),
 });
 
 export const InstalledPackageSchema = schema.object({
@@ -254,7 +245,6 @@ export const GetInstalledPackagesResponseSchema = schema.object({
 
 export const GetLimitedPackagesResponseSchema = schema.object({
   items: schema.arrayOf(schema.string()),
-  response: schema.maybe(schema.arrayOf(schema.string(), { meta: { deprecated: true } })),
 });
 
 export const GetStatsResponseSchema = schema.object({
@@ -327,12 +317,10 @@ export const GetPackageInfoSchema = PackageInfoSchema.extends({
 export const GetInfoResponseSchema = schema.object({
   item: GetPackageInfoSchema,
   metadata: schema.maybe(PackageMetadataSchema),
-  response: schema.maybe(GetPackageInfoSchema.extends({}, { meta: { deprecated: true } })),
 });
 
 export const UpdatePackageResponseSchema = schema.object({
   item: GetPackageInfoSchema,
-  response: schema.maybe(GetPackageInfoSchema.extends({}, { meta: { deprecated: true } })),
 });
 
 export const AssetReferenceSchema = schema.oneOf([
@@ -345,7 +333,6 @@ export const InstallPackageResponseSchema = schema.object({
   _meta: schema.object({
     install_source: schema.string(),
   }),
-  response: schema.maybe(schema.arrayOf(AssetReferenceSchema, { meta: { deprecated: true } })),
 });
 
 export const InstallKibanaAssetsResponseSchema = schema.object({
@@ -375,14 +362,10 @@ export const BulkInstallPackagesResponseItemSchema = schema.oneOf([
 
 export const BulkInstallPackagesFromRegistryResponseSchema = schema.object({
   items: schema.arrayOf(BulkInstallPackagesResponseItemSchema),
-  response: schema.maybe(
-    schema.arrayOf(BulkInstallPackagesResponseItemSchema, { meta: { deprecated: true } })
-  ),
 });
 
 export const DeletePackageResponseSchema = schema.object({
   items: schema.arrayOf(AssetReferenceSchema),
-  response: schema.maybe(schema.arrayOf(AssetReferenceSchema, { meta: { deprecated: true } })),
 });
 
 export const GetVerificationKeyIdResponseSchema = schema.object({
@@ -494,18 +477,6 @@ export const GetBulkAssetsRequestSchema = {
   }),
 };
 
-export const GetInfoRequestSchemaDeprecated = {
-  params: schema.object({
-    pkgkey: schema.string(),
-  }),
-  query: schema.object({
-    ignoreUnverified: schema.maybe(schema.boolean()),
-    prerelease: schema.maybe(schema.boolean()),
-    full: schema.maybe(schema.boolean()),
-    withMetadata: schema.boolean({ defaultValue: false }),
-  }),
-};
-
 export const UpdatePackageRequestSchema = {
   params: schema.object({
     pkgName: schema.string(),
@@ -516,15 +487,6 @@ export const UpdatePackageRequestSchema = {
   }),
 };
 
-export const UpdatePackageRequestSchemaDeprecated = {
-  params: schema.object({
-    pkgkey: schema.string(),
-  }),
-  body: schema.object({
-    keepPoliciesUpToDate: schema.boolean(),
-  }),
-};
-
 export const GetStatsRequestSchema = {
   params: schema.object({
     pkgName: schema.string(),
@@ -562,22 +524,6 @@ export const ReauthorizeTransformRequestSchema = {
   }),
 };
 
-export const InstallPackageFromRegistryRequestSchemaDeprecated = {
-  params: schema.object({
-    pkgkey: schema.string(),
-  }),
-  query: schema.object({
-    prerelease: schema.maybe(schema.boolean()),
-    ignoreMappingUpdateErrors: schema.boolean({ defaultValue: false }),
-    skipDataStreamRollover: schema.boolean({ defaultValue: false }),
-  }),
-  body: schema.nullable(
-    schema.object({
-      force: schema.boolean(),
-    })
-  ),
-};
-
 export const BulkInstallPackagesFromRegistryRequestSchema = {
   query: schema.object({
     prerelease: schema.maybe(schema.boolean()),
@@ -628,17 +574,11 @@ export const CreateCustomIntegrationRequestSchema = {
 export const DeletePackageRequestSchema = {
   params: schema.object({
     pkgName: schema.string(),
-    pkgVersion: schema.string(),
+    pkgVersion: schema.maybe(schema.string()),
   }),
   query: schema.object({
     force: schema.maybe(schema.boolean()),
   }),
-  // body is deprecated on delete request
-  body: schema.nullable(
-    schema.object({
-      force: schema.boolean(),
-    })
-  ),
 };
 
 export const InstallKibanaAssetsRequestSchema = {
@@ -661,17 +601,6 @@ export const DeleteKibanaAssetsRequestSchema = {
   }),
 };
 
-export const DeletePackageRequestSchemaDeprecated = {
-  params: schema.object({
-    pkgkey: schema.string(),
-  }),
-  body: schema.nullable(
-    schema.object({
-      force: schema.boolean(),
-    })
-  ),
-};
-
 export const GetInputsRequestSchema = {
   params: schema.object({
     pkgName: schema.string(),
diff --git a/x-pack/plugins/fleet/server/types/rest_spec/health_check.ts b/x-pack/plugins/fleet/server/types/rest_spec/health_check.ts
index 72c40e5bd6a68..c83d516c67f5a 100644
--- a/x-pack/plugins/fleet/server/types/rest_spec/health_check.ts
+++ b/x-pack/plugins/fleet/server/types/rest_spec/health_check.ts
@@ -10,20 +10,11 @@ import { schema } from '@kbn/config-schema';
 export const PostHealthCheckRequestSchema = {
   body: schema.object({
     id: schema.string(),
-    // deprecated
-    host: schema.maybe(schema.uri({ scheme: ['http', 'https'] })),
   }),
 };
 
 export const PostHealthCheckResponseSchema = schema.object({
   status: schema.string(),
   name: schema.maybe(schema.string()),
-  host: schema.maybe(
-    schema.string({
-      meta: {
-        deprecated: true,
-      },
-    })
-  ),
   host_id: schema.maybe(schema.string()),
 });
diff --git a/x-pack/plugins/fleet/server/types/rest_spec/settings.ts b/x-pack/plugins/fleet/server/types/rest_spec/settings.ts
index 459070fa9591a..c40dcc0b63596 100644
--- a/x-pack/plugins/fleet/server/types/rest_spec/settings.ts
+++ b/x-pack/plugins/fleet/server/types/rest_spec/settings.ts
@@ -17,15 +17,6 @@ export const GetSettingsRequestSchema = {};
 
 export const PutSettingsRequestSchema = {
   body: schema.object({
-    fleet_server_hosts: schema.maybe(
-      schema.arrayOf(schema.uri({ scheme: ['http', 'https'] }), {
-        validate: (value) => {
-          if (value.length && isDiffPathProtocol(value)) {
-            return 'Protocol and path must be the same for each URL';
-          }
-        },
-      })
-    ),
     has_seen_add_data_notice: schema.maybe(schema.boolean()),
     additional_yaml_config: schema.maybe(schema.string()),
     // Deprecated not used
@@ -61,7 +52,6 @@ export const SpaceSettingsResponseSchema = schema.object({
 export const SettingsResponseSchema = schema.object({
   item: schema.object({
     has_seen_add_data_notice: schema.maybe(schema.boolean()),
-    fleet_server_hosts: schema.maybe(schema.arrayOf(schema.string())),
     prerelease_integrations_enabled: schema.maybe(schema.boolean()),
     id: schema.string(),
     version: schema.maybe(schema.string()),
diff --git a/x-pack/plugins/index_management/public/application/sections/home/index_list/details_page/trained_models_deployment_modal.tsx b/x-pack/plugins/index_management/public/application/sections/home/index_list/details_page/trained_models_deployment_modal.tsx
index b2e9a1339c3fb..b3dc5244165fb 100644
--- a/x-pack/plugins/index_management/public/application/sections/home/index_list/details_page/trained_models_deployment_modal.tsx
+++ b/x-pack/plugins/index_management/public/application/sections/home/index_list/details_page/trained_models_deployment_modal.tsx
@@ -26,10 +26,8 @@ import React from 'react';
 import { EuiLink } from '@elastic/eui';
 import { useEffect, useMemo, useState } from 'react';
 import { i18n } from '@kbn/i18n';
-import { ModelIdMapEntry } from '../../../../components/mappings_editor/components/document_fields/fields';
 import { isSemanticTextField } from '../../../../components/mappings_editor/lib/utils';
 import { deNormalize } from '../../../../components/mappings_editor/lib';
-import { useMLModelNotificationToasts } from '../../../../../hooks/use_ml_model_status_toasts';
 import { useMappingsState } from '../../../../components/mappings_editor/mappings_state_context';
 import { useAppContext } from '../../../../app_context';
 
@@ -55,15 +53,11 @@ export function TrainedModelsDeploymentModal({
 }: TrainedModelsDeploymentModalProps) {
   const modalTitleId = useGeneratedHtmlId();
   const { fields, inferenceToModelIdMap } = useMappingsState();
-  const {
-    plugins: { ml },
-    url,
-  } = useAppContext();
+  const { url } = useAppContext();
   const [isModalVisible, setIsModalVisible] = useState<boolean>(false);
   const closeModal = () => setIsModalVisible(false);
   const [mlManagementPageUrl, setMlManagementPageUrl] = useState<string>('');
   const [allowForceSaveMappings, setAllowForceSaveMappings] = useState<boolean>(false);
-  const { showErrorToasts, showSuccessfullyDeployedToast } = useMLModelNotificationToasts();
 
   useEffect(() => {
     const mlLocator = url?.locators.get(ML_APP_LOCATOR);
@@ -86,25 +80,6 @@ export function TrainedModelsDeploymentModal({
 
   const [pendingDeployments, setPendingDeployments] = useState<string[]>([]);
 
-  const startModelAllocation = async (entry: ModelIdMapEntry & { inferenceId: string }) => {
-    try {
-      await ml?.mlApi?.trainedModels.startModelAllocation(entry.trainedModelId, {
-        number_of_allocations: 1,
-        threads_per_allocation: 1,
-        priority: 'normal',
-        deployment_id: entry.inferenceId,
-      });
-      showSuccessfullyDeployedToast(entry.trainedModelId);
-    } catch (error) {
-      setErrorsInTrainedModelDeployment((previousState) => ({
-        ...previousState,
-        [entry.inferenceId]: error.message,
-      }));
-      showErrorToasts(error);
-      setIsModalVisible(true);
-    }
-  };
-
   useEffect(() => {
     const models = inferenceIdsInPendingList.map((inferenceId) =>
       inferenceToModelIdMap?.[inferenceId]
@@ -114,18 +89,6 @@ export function TrainedModelsDeploymentModal({
           }
         : undefined
     ); // filter out third-party models
-    for (const model of models) {
-      if (
-        model?.trainedModelId &&
-        model.isDeployable &&
-        !model.isDownloading &&
-        !model.isDeployed
-      ) {
-        // Sometimes the model gets stuck in a ready to deploy state, so we need to trigger deployment manually
-        // This is currently the only way to surface a specific error message to the user
-        startModelAllocation(model);
-      }
-    }
     const allPendingDeployments = models
       .map((model) => {
         return model?.trainedModelId && !model?.isDeployed ? model?.inferenceId : '';
@@ -135,7 +98,6 @@ export function TrainedModelsDeploymentModal({
       (deployment, index) => allPendingDeployments.indexOf(deployment) === index
     );
     setPendingDeployments(uniqueDeployments);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [inferenceIdsInPendingList, inferenceToModelIdMap]);
 
   const erroredDeployments = pendingDeployments.filter(
diff --git a/x-pack/plugins/ingest_pipelines/kibana.jsonc b/x-pack/plugins/ingest_pipelines/kibana.jsonc
index 55fa46c61b377..85b3e43aedf4d 100644
--- a/x-pack/plugins/ingest_pipelines/kibana.jsonc
+++ b/x-pack/plugins/ingest_pipelines/kibana.jsonc
@@ -2,6 +2,8 @@
   "type": "plugin",
   "id": "@kbn/ingest-pipelines-plugin",
   "owner": "@elastic/kibana-management",
+  "group": "platform",
+  "visibility": "shared",
   "plugin": {
     "id": "ingestPipelines",
     "server": true,
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.tsx
index cfdcdba4632e3..a60d7006ee337 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_panel.tsx
@@ -684,9 +684,6 @@ export function LayerPanel(props: LayerPanelProps) {
               {layerDatasource?.LayerSettingsComponent && (
                 <layerDatasource.LayerSettingsComponent {...layerDatasourceConfigProps} />
               )}
-              {layerDatasource?.LayerSettingsComponent && visualizationLayerSettings.data ? (
-                <EuiSpacer size="m" />
-              ) : null}
               {activeVisualization?.LayerSettingsComponent && visualizationLayerSettings.data ? (
                 <activeVisualization.LayerSettingsComponent
                   {...{
diff --git a/x-pack/plugins/lens/public/shared_components/axis/extent/axis_extent_settings.tsx b/x-pack/plugins/lens/public/shared_components/axis/extent/axis_extent_settings.tsx
index 27a03b49e8e7f..ef0a17fe8353c 100644
--- a/x-pack/plugins/lens/public/shared_components/axis/extent/axis_extent_settings.tsx
+++ b/x-pack/plugins/lens/public/shared_components/axis/extent/axis_extent_settings.tsx
@@ -111,7 +111,7 @@ export function AxisBoundsControl({
           label={i18n.translate('xpack.lens.fullExtent.niceValues', {
             defaultMessage: 'Round to nice values',
           })}
-          display="columnCompressedSwitch"
+          display="columnCompressed"
           fullWidth
         >
           <EuiSwitch
diff --git a/x-pack/plugins/lens/public/shared_components/axis/ticks/axis_ticks_settings.tsx b/x-pack/plugins/lens/public/shared_components/axis/ticks/axis_ticks_settings.tsx
index 8f47307d19d36..3ce579ea22f61 100644
--- a/x-pack/plugins/lens/public/shared_components/axis/ticks/axis_ticks_settings.tsx
+++ b/x-pack/plugins/lens/public/shared_components/axis/ticks/axis_ticks_settings.tsx
@@ -40,7 +40,7 @@ export const AxisTicksSettings: React.FunctionComponent<AxisTicksSettingsProps>
   return (
     <>
       <EuiFormRow
-        display="columnCompressedSwitch"
+        display="columnCompressed"
         label={i18n.translate('xpack.lens.shared.tickLabels', {
           defaultMessage: 'Tick labels',
         })}
diff --git a/x-pack/plugins/lens/public/shared_components/ignore_global_filter/settings_control.tsx b/x-pack/plugins/lens/public/shared_components/ignore_global_filter/settings_control.tsx
index df1af5f084c55..3bea37c67edb4 100644
--- a/x-pack/plugins/lens/public/shared_components/ignore_global_filter/settings_control.tsx
+++ b/x-pack/plugins/lens/public/shared_components/ignore_global_filter/settings_control.tsx
@@ -18,7 +18,7 @@ export function IgnoreGlobalFilterRowControl({
 }) {
   return (
     <EuiFormRow
-      display="columnCompressedSwitch"
+      display="columnCompressed"
       label={i18n.translate('xpack.lens.layerSettings.ignoreGlobalFilters', {
         defaultMessage: 'Use global filters',
       })}
diff --git a/x-pack/plugins/lens/public/shared_components/legend/legend_settings_popover.tsx b/x-pack/plugins/lens/public/shared_components/legend/legend_settings_popover.tsx
index ae82ffa43e628..0daac4b7a2ebb 100644
--- a/x-pack/plugins/lens/public/shared_components/legend/legend_settings_popover.tsx
+++ b/x-pack/plugins/lens/public/shared_components/legend/legend_settings_popover.tsx
@@ -360,7 +360,7 @@ export function LegendSettingsPopover<LegendStats extends LegendValue = XYLegend
       )}
       {showsShowValueSetting && (
         <EuiFormRow
-          display="columnCompressedSwitch"
+          display="columnCompressed"
           label={i18n.translate('xpack.lens.shared.valueInLegendLabel', {
             defaultMessage: 'Show value',
           })}
@@ -415,7 +415,7 @@ export function LegendSettingsPopover<LegendStats extends LegendValue = XYLegend
 
       {isLegendNotHidden && renderNestedLegendSwitch && (
         <EuiFormRow
-          display="columnCompressedSwitch"
+          display="columnCompressed"
           label={i18n.translate('xpack.lens.shared.nestedLegendLabel', {
             defaultMessage: 'Nested',
           })}
diff --git a/x-pack/plugins/lens/public/visualizations/datatable/components/dimension_editor.tsx b/x-pack/plugins/lens/public/visualizations/datatable/components/dimension_editor.tsx
index 9fb71142d2402..c67cf3cdb9b1a 100644
--- a/x-pack/plugins/lens/public/visualizations/datatable/components/dimension_editor.tsx
+++ b/x-pack/plugins/lens/public/visualizations/datatable/components/dimension_editor.tsx
@@ -256,7 +256,7 @@ export function TableDimensionEditor(props: TableDimensionEditorProps) {
           label={i18n.translate('xpack.lens.table.columnVisibilityLabel', {
             defaultMessage: 'Hide column',
           })}
-          display="columnCompressedSwitch"
+          display="columnCompressed"
         >
           <EuiSwitch
             compressed
@@ -292,7 +292,7 @@ export function TableDimensionEditor(props: TableDimensionEditorProps) {
           label={i18n.translate('xpack.lens.table.columnFilterClickLabel', {
             defaultMessage: 'Directly filter on click',
           })}
-          display="columnCompressedSwitch"
+          display="columnCompressed"
         >
           <EuiSwitch
             compressed
diff --git a/x-pack/plugins/lens/public/visualizations/datatable/components/toolbar.tsx b/x-pack/plugins/lens/public/visualizations/datatable/components/toolbar.tsx
index a9d983b65e210..6795a53298306 100644
--- a/x-pack/plugins/lens/public/visualizations/datatable/components/toolbar.tsx
+++ b/x-pack/plugins/lens/public/visualizations/datatable/components/toolbar.tsx
@@ -112,7 +112,7 @@ export function DataTableToolbar(props: VisualizationToolbarProps<DatatableVisua
           label={i18n.translate('xpack.lens.table.visualOptionsPaginateTable', {
             defaultMessage: 'Paginate table',
           })}
-          display="columnCompressedSwitch"
+          display="columnCompressed"
         >
           <EuiToolTip
             content={i18n.translate('xpack.lens.table.visualOptionsPaginateTableTooltip', {
diff --git a/x-pack/plugins/lens/public/visualizations/gauge/dimension_editor.tsx b/x-pack/plugins/lens/public/visualizations/gauge/dimension_editor.tsx
index b30e36cfefa37..fdbe6913d21c9 100644
--- a/x-pack/plugins/lens/public/visualizations/gauge/dimension_editor.tsx
+++ b/x-pack/plugins/lens/public/visualizations/gauge/dimension_editor.tsx
@@ -143,7 +143,7 @@ export function GaugeDimensionEditor(
             </PalettePanelContainer>
           </EuiFormRow>
           <EuiFormRow
-            display="columnCompressedSwitch"
+            display="columnCompressed"
             fullWidth
             label={
               <TooltipWrapper
diff --git a/x-pack/plugins/lens/public/visualizations/partition/layer_settings.tsx b/x-pack/plugins/lens/public/visualizations/partition/layer_settings.tsx
index 6f13800a91a2c..6e9912b7043bd 100644
--- a/x-pack/plugins/lens/public/visualizations/partition/layer_settings.tsx
+++ b/x-pack/plugins/lens/public/visualizations/partition/layer_settings.tsx
@@ -30,7 +30,7 @@ export function LayerSettings(
 
   return (
     <EuiFormRow
-      display="columnCompressedSwitch"
+      display="columnCompressed"
       label={i18n.translate('xpack.lens.pieChart.multipleMetrics', {
         defaultMessage: 'Multiple metrics',
       })}
diff --git a/x-pack/plugins/lens/public/visualizations/tagcloud/tagcloud_toolbar/tagcloud_toolbar.tsx b/x-pack/plugins/lens/public/visualizations/tagcloud/tagcloud_toolbar/tagcloud_toolbar.tsx
index 12e4bbcab4021..07d847e7be0e5 100644
--- a/x-pack/plugins/lens/public/visualizations/tagcloud/tagcloud_toolbar/tagcloud_toolbar.tsx
+++ b/x-pack/plugins/lens/public/visualizations/tagcloud/tagcloud_toolbar/tagcloud_toolbar.tsx
@@ -100,7 +100,7 @@ export function TagcloudToolbar(props: VisualizationToolbarProps<TagcloudState>)
               />
             </EuiFormRow>
             <EuiFormRow
-              display="columnCompressedSwitch"
+              display="columnCompressed"
               label={i18n.translate('xpack.lens.label.tagcloud.showLabel', {
                 defaultMessage: 'Show label',
               })}
diff --git a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/axis_settings_popover.tsx b/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/axis_settings_popover.tsx
index 1bf00cb0afb6f..9b03ac7c72a31 100644
--- a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/axis_settings_popover.tsx
+++ b/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/axis_settings_popover.tsx
@@ -279,7 +279,7 @@ export const AxisSettingsPopover: React.FunctionComponent<AxisSettingsPopoverPro
         isTitleVisible={isTitleVisible}
       />
       <EuiFormRow
-        display="columnCompressedSwitch"
+        display="columnCompressed"
         label={i18n.translate('xpack.lens.xyChart.Gridlines', {
           defaultMessage: 'Gridlines',
         })}
@@ -332,7 +332,7 @@ export const AxisSettingsPopover: React.FunctionComponent<AxisSettingsPopoverPro
       )}
       {setEndzoneVisibility && (
         <EuiFormRow
-          display="columnCompressedSwitch"
+          display="columnCompressed"
           label={i18n.translate('xpack.lens.xyChart.showEnzones', {
             defaultMessage: 'Show partial data markers',
           })}
@@ -352,7 +352,7 @@ export const AxisSettingsPopover: React.FunctionComponent<AxisSettingsPopoverPro
       )}
       {setCurrentTimeMarkerVisibility && (
         <EuiFormRow
-          display="columnCompressedSwitch"
+          display="columnCompressed"
           label={i18n.translate('xpack.lens.xyChart.showCurrenTimeMarker', {
             defaultMessage: 'Show current time marker',
           })}
diff --git a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/visual_options_popover/missing_values_option.tsx b/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/visual_options_popover/missing_values_option.tsx
index c600f4fa4bae4..d39a1a410d6aa 100644
--- a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/visual_options_popover/missing_values_option.tsx
+++ b/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/visual_options_popover/missing_values_option.tsx
@@ -120,7 +120,7 @@ export const MissingValuesOptions: React.FC<MissingValuesOptionProps> = ({
                 label={i18n.translate('xpack.lens.xyChart.missingValuesStyle', {
                   defaultMessage: 'Show as dotted line',
                 })}
-                display="columnCompressedSwitch"
+                display="columnCompressed"
               >
                 <EuiSwitch
                   showLabel={false}
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/components/__snapshots__/vector_style_editor.test.tsx.snap b/x-pack/plugins/maps/public/classes/styles/vector/components/__snapshots__/vector_style_editor.test.tsx.snap
index c0ff79d051e62..691327928eb67 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/components/__snapshots__/vector_style_editor.test.tsx.snap
+++ b/x-pack/plugins/maps/public/classes/styles/vector/components/__snapshots__/vector_style_editor.test.tsx.snap
@@ -392,7 +392,7 @@ exports[`should render 1`] = `
     size="m"
   />
   <EuiFormRow
-    display="columnCompressedSwitch"
+    display="columnCompressed"
   >
     <EuiSwitch
       checked={true}
@@ -741,7 +741,7 @@ exports[`should render with no style fields 1`] = `
     size="m"
   />
   <EuiFormRow
-    display="columnCompressedSwitch"
+    display="columnCompressed"
   >
     <EuiSwitch
       checked={true}
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/components/color/dynamic_color_form.tsx b/x-pack/plugins/maps/public/classes/styles/vector/components/color/dynamic_color_form.tsx
index 27641aca604bb..5ce192ec6e377 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/components/color/dynamic_color_form.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/components/color/dynamic_color_form.tsx
@@ -159,7 +159,7 @@ export function DynamicColorForm({
           invert={invert}
         />
         {!!styleOptions.useCustomColorRamp ? null : (
-          <EuiFormRow display="columnCompressedSwitch">
+          <EuiFormRow display="columnCompressed">
             <EuiSwitch
               label={i18n.translate('xpack.maps.style.revereseColorsLabel', {
                 defaultMessage: `Reverse colors`,
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/components/data_mapping/categorical_data_mapping_popover.tsx b/x-pack/plugins/maps/public/classes/styles/vector/components/data_mapping/categorical_data_mapping_popover.tsx
index 8990e086b4c6b..7193680d4a6f8 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/components/data_mapping/categorical_data_mapping_popover.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/components/data_mapping/categorical_data_mapping_popover.tsx
@@ -31,7 +31,7 @@ export function CategoricalDataMappingPopover<DynamicOptions>(props: Props<Dynam
 
   return (
     <DataMappingPopover>
-      <EuiFormRow display="columnCompressedSwitch">
+      <EuiFormRow display="columnCompressed">
         <>
           <EuiSwitch
             label={i18n.translate('xpack.maps.styles.fieldMetaOptions.isEnabled.categoricalLabel', {
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/components/data_mapping/ordinal_data_mapping_popover.tsx b/x-pack/plugins/maps/public/classes/styles/vector/components/data_mapping/ordinal_data_mapping_popover.tsx
index a614d707d0c83..d599000322d69 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/components/data_mapping/ordinal_data_mapping_popover.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/components/data_mapping/ordinal_data_mapping_popover.tsx
@@ -161,7 +161,7 @@ export function OrdinalDataMappingPopover<DynamicOptions>(props: Props<DynamicOp
 
     return (
       <Fragment>
-        <EuiFormRow display="columnCompressedSwitch">
+        <EuiFormRow display="columnCompressed">
           <>
             <EuiSwitch
               label={i18n.translate('xpack.maps.styles.ordinalDataMapping.isEnabledSwitchLabel', {
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/components/size/dynamic_size_form.tsx b/x-pack/plugins/maps/public/classes/styles/vector/components/size/dynamic_size_form.tsx
index 8efe05bc2644c..87e59546ae6ca 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/components/size/dynamic_size_form.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/components/size/dynamic_size_form.tsx
@@ -72,7 +72,7 @@ export function DynamicSizeForm({
           showLabels
           compressed
         />
-        <EuiFormRow display="columnCompressedSwitch">
+        <EuiFormRow display="columnCompressed">
           <EuiSwitch
             label={i18n.translate('xpack.maps.style.revereseSizeLabel', {
               defaultMessage: `Reverse size`,
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/components/vector_style_editor.tsx b/x-pack/plugins/maps/public/classes/styles/vector/components/vector_style_editor.tsx
index e1b23aa28f5a1..1c8bd5534a55d 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/components/vector_style_editor.tsx
+++ b/x-pack/plugins/maps/public/classes/styles/vector/components/vector_style_editor.tsx
@@ -616,7 +616,7 @@ export class VectorStyleEditor extends Component<Props, State> {
     }
 
     return (
-      <EuiFormRow display="columnCompressedSwitch">
+      <EuiFormRow display="columnCompressed">
         <EuiSwitch
           label={i18n.translate('xpack.maps.vectorStyleEditor.isTimeAwareLabel', {
             defaultMessage: 'Apply global time to style metadata requests',
diff --git a/x-pack/plugins/maps/public/components/force_refresh_checkbox.tsx b/x-pack/plugins/maps/public/components/force_refresh_checkbox.tsx
index 0cbd02ec7b0a7..82d65d132f976 100644
--- a/x-pack/plugins/maps/public/components/force_refresh_checkbox.tsx
+++ b/x-pack/plugins/maps/public/components/force_refresh_checkbox.tsx
@@ -20,7 +20,7 @@ export function ForceRefreshCheckbox({ applyForceRefresh, setApplyForceRefresh }
   };
 
   return (
-    <EuiFormRow display="columnCompressedSwitch">
+    <EuiFormRow display="columnCompressed">
       <EuiToolTip
         position="top"
         content={i18n.translate('xpack.maps.filterEditor.applyForceRefreshTooltip', {
diff --git a/x-pack/plugins/maps/public/components/global_filter_checkbox.tsx b/x-pack/plugins/maps/public/components/global_filter_checkbox.tsx
index 502cc1973d329..3aef7a98e5b44 100644
--- a/x-pack/plugins/maps/public/components/global_filter_checkbox.tsx
+++ b/x-pack/plugins/maps/public/components/global_filter_checkbox.tsx
@@ -35,7 +35,7 @@ export function GlobalFilterCheckbox({
       });
 
   return (
-    <EuiFormRow display="columnCompressedSwitch">
+    <EuiFormRow display="columnCompressed">
       <EuiToolTip position="top" content={tooltipMessage}>
         <EuiSwitch
           label={label}
diff --git a/x-pack/plugins/maps/public/components/global_time_checkbox.tsx b/x-pack/plugins/maps/public/components/global_time_checkbox.tsx
index 4db771c1edbaf..2277873115170 100644
--- a/x-pack/plugins/maps/public/components/global_time_checkbox.tsx
+++ b/x-pack/plugins/maps/public/components/global_time_checkbox.tsx
@@ -34,7 +34,7 @@ export function GlobalTimeCheckbox({
       });
 
   return (
-    <EuiFormRow display="columnCompressedSwitch">
+    <EuiFormRow display="columnCompressed">
       <EuiToolTip position="top" content={tooltipMessage}>
         <EuiSwitch
           label={label}
diff --git a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/layer_settings/layer_settings.tsx b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/layer_settings/layer_settings.tsx
index 3513e0939eb08..17c6aac4a8f39 100644
--- a/x-pack/plugins/maps/public/connected_components/edit_layer_panel/layer_settings/layer_settings.tsx
+++ b/x-pack/plugins/maps/public/connected_components/edit_layer_panel/layer_settings/layer_settings.tsx
@@ -94,7 +94,7 @@ export function LayerSettings(props: Props) {
       return null;
     }
     return (
-      <EuiFormRow display="columnCompressedSwitch">
+      <EuiFormRow display="columnCompressed">
         <EuiToolTip
           position="top"
           content={i18n.translate('xpack.maps.layerPanel.settingsPanel.fittableFlagTooltip', {
@@ -157,7 +157,7 @@ export function LayerSettings(props: Props) {
     }
 
     return (
-      <EuiFormRow display="columnCompressedSwitch">
+      <EuiFormRow display="columnCompressed">
         <EuiSwitch
           label={i18n.translate('xpack.maps.layerPanel.settingsPanel.labelsOnTop', {
             defaultMessage: `Show labels on top`,
@@ -173,7 +173,7 @@ export function LayerSettings(props: Props) {
 
   const renderDisableTooltips = () => {
     return !isVectorLayer(props.layer) ? null : (
-      <EuiFormRow display="columnCompressedSwitch">
+      <EuiFormRow display="columnCompressed">
         <EuiSwitch
           label={i18n.translate('xpack.maps.layerPanel.settingsPanel.DisableTooltips', {
             defaultMessage: `Show tooltips`,
diff --git a/x-pack/plugins/maps/public/trigger_actions/filter_by_map_extent/modal.tsx b/x-pack/plugins/maps/public/trigger_actions/filter_by_map_extent/modal.tsx
index 0a992e02a6cfd..7d2e757518224 100644
--- a/x-pack/plugins/maps/public/trigger_actions/filter_by_map_extent/modal.tsx
+++ b/x-pack/plugins/maps/public/trigger_actions/filter_by_map_extent/modal.tsx
@@ -34,7 +34,7 @@ class FilterByMapExtentModal extends Component<Props> {
   _renderSwitches() {
     return mapEmbeddablesSingleton.getMapPanels().map((mapPanel) => {
       return (
-        <EuiFormRow display="columnCompressedSwitch" key={mapPanel.id}>
+        <EuiFormRow display="columnCompressed" key={mapPanel.id}>
           <EuiSwitch
             label={mapPanel.getTitle()}
             checked={mapPanel.getIsFilterByMapExtent()}
diff --git a/x-pack/plugins/maps/public/trigger_actions/synchronize_movement/modal.tsx b/x-pack/plugins/maps/public/trigger_actions/synchronize_movement/modal.tsx
index a51a9e59dbae3..ff0584c5cbb0c 100644
--- a/x-pack/plugins/maps/public/trigger_actions/synchronize_movement/modal.tsx
+++ b/x-pack/plugins/maps/public/trigger_actions/synchronize_movement/modal.tsx
@@ -42,7 +42,7 @@ class SynchronizeMovementModal extends Component<Props> {
       const hasErrors = synchronizedPanels.length === 1 && mapPanel.getIsMovementSynchronized();
       return (
         <EuiFormRow
-          display="columnCompressedSwitch"
+          display="columnCompressed"
           key={mapPanel.id}
           isInvalid={hasErrors}
           error={
diff --git a/x-pack/plugins/ml/public/application/_index.scss b/x-pack/plugins/ml/public/application/_index.scss
index 3025b8f7d921b..95fbbf4cb112a 100644
--- a/x-pack/plugins/ml/public/application/_index.scss
+++ b/x-pack/plugins/ml/public/application/_index.scss
@@ -11,7 +11,6 @@
   // Components
   @import 'components/annotations/annotation_description_list/index'; // SASSTODO: This file overwrites EUI directly
   @import 'components/anomalies_table/index'; // SASSTODO: This file overwrites EUI directly
-  @import 'components/color_range_legend/index';
   @import 'components/entity_cell/index';
   @import 'components/influencers_list/index';
   @import 'components/job_selector/index';
diff --git a/x-pack/plugins/ml/public/application/components/color_range_legend/_color_range_legend.scss b/x-pack/plugins/ml/public/application/components/color_range_legend/_color_range_legend.scss
deleted file mode 100644
index b164e605a2488..0000000000000
--- a/x-pack/plugins/ml/public/application/components/color_range_legend/_color_range_legend.scss
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Overrides for d3/svg default styles */
-.mlColorRangeLegend {
-  text {
-    @include fontSize($euiFontSizeXS - 2px);
-    fill: $euiColorDarkShade;
-  }
-
-  .axis path {
-    fill: none;
-    stroke: none;
-  }
-
-  .axis line {
-    fill: none;
-    stroke: $euiColorMediumShade;
-    shape-rendering: crispEdges;
-  }
-}
diff --git a/x-pack/plugins/ml/public/application/components/color_range_legend/_index.scss b/x-pack/plugins/ml/public/application/components/color_range_legend/_index.scss
deleted file mode 100644
index c7cd3faac0dcf..0000000000000
--- a/x-pack/plugins/ml/public/application/components/color_range_legend/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import 'color_range_legend';
diff --git a/x-pack/plugins/ml/public/application/components/color_range_legend/color_range_legend.tsx b/x-pack/plugins/ml/public/application/components/color_range_legend/color_range_legend.tsx
index f6a301f5eacce..9c121853cf6b4 100644
--- a/x-pack/plugins/ml/public/application/components/color_range_legend/color_range_legend.tsx
+++ b/x-pack/plugins/ml/public/application/components/color_range_legend/color_range_legend.tsx
@@ -7,12 +7,36 @@
 
 import type { FC } from 'react';
 import React, { useEffect, useRef } from 'react';
+import { css } from '@emotion/react';
 import d3 from 'd3';
 
 import { EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui';
 
+import { euiThemeVars } from '@kbn/ui-theme';
+
 const COLOR_RANGE_RESOLUTION = 10;
 
+// Overrides for d3/svg default styles
+const cssOverride = css({
+  // Override default font size and color for axis
+  text: {
+    fontSize: `calc(${euiThemeVars.euiFontSizeXS} - 2px)`,
+    fill: euiThemeVars.euiColorDarkShade,
+  },
+  // Override default styles for axis lines
+  '.axis': {
+    path: {
+      fill: 'none',
+      stroke: 'none',
+    },
+    line: {
+      fill: 'none',
+      stroke: euiThemeVars.euiColorMediumShade,
+      shapeRendering: 'crispEdges',
+    },
+  },
+});
+
 interface ColorRangeLegendProps {
   colorRange: (d: number) => string;
   justifyTicks?: boolean;
@@ -65,7 +89,6 @@ export const ColorRangeLegend: FC<ColorRangeLegendProps> = ({
 
     const wrapper = d3
       .select(d3Container.current)
-      .classed('mlColorRangeLegend', true)
       .attr('width', wrapperWidth)
       .attr('height', wrapperHeight)
       .append('g')
@@ -144,7 +167,7 @@ export const ColorRangeLegend: FC<ColorRangeLegendProps> = ({
         </EuiText>
       </EuiFlexItem>
       <EuiFlexItem grow={false}>
-        <svg ref={d3Container} />
+        <svg ref={d3Container} css={cssOverride} />
       </EuiFlexItem>
     </EuiFlexGroup>
   );
diff --git a/x-pack/plugins/monitoring/server/telemetry_collection/get_licenses.ts b/x-pack/plugins/monitoring/server/telemetry_collection/get_licenses.ts
index 4ea0077c21ba8..98f3932984546 100644
--- a/x-pack/plugins/monitoring/server/telemetry_collection/get_licenses.ts
+++ b/x-pack/plugins/monitoring/server/telemetry_collection/get_licenses.ts
@@ -7,7 +7,7 @@
 
 import { ElasticsearchClient } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { ESLicense } from '@kbn/telemetry-collection-xpack-plugin/server';
+import type { LicenseGetLicenseInformation } from '@elastic/elasticsearch/lib/api/types';
 import { INDEX_PATTERN_ELASTICSEARCH, USAGE_FETCH_INTERVAL } from '../../common/constants';
 
 /**
@@ -18,7 +18,7 @@ export async function getLicenses(
   callCluster: ElasticsearchClient,
   timestamp: number,
   maxBucketSize: number
-): Promise<{ [clusterUuid: string]: ESLicense | undefined }> {
+): Promise<{ [clusterUuid: string]: LicenseGetLicenseInformation | undefined }> {
   const response = await fetchLicenses(callCluster, clusterUuids, timestamp, maxBucketSize);
   return handleLicenses(response);
 }
@@ -76,7 +76,7 @@ export async function fetchLicenses(
 export interface ESClusterStatsWithLicense {
   cluster_uuid: string;
   type: 'cluster_stats';
-  license?: ESLicense;
+  license?: LicenseGetLicenseInformation;
 }
 
 /**
diff --git a/x-pack/plugins/monitoring/tsconfig.json b/x-pack/plugins/monitoring/tsconfig.json
index 957b256bd726b..3b78104e65b8c 100644
--- a/x-pack/plugins/monitoring/tsconfig.json
+++ b/x-pack/plugins/monitoring/tsconfig.json
@@ -19,7 +19,6 @@
     "@kbn/features-plugin",
     "@kbn/infra-plugin",
     "@kbn/licensing-plugin",
-    "@kbn/telemetry-collection-xpack-plugin",
     "@kbn/triggers-actions-ui-plugin",
     "@kbn/expect",
     "@kbn/i18n",
diff --git a/x-pack/plugins/observability_solution/dataset_quality/common/api_types.ts b/x-pack/plugins/observability_solution/dataset_quality/common/api_types.ts
index 903d7f0607663..51a1421aec918 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/common/api_types.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/common/api_types.ts
@@ -37,6 +37,25 @@ export const dataStreamStatRt = rt.intersection([
 
 export type DataStreamStat = rt.TypeOf<typeof dataStreamStatRt>;
 
+export const dataStreamDocsStatRt = rt.type({
+  dataset: rt.string,
+  count: rt.number,
+});
+
+export type DataStreamDocsStat = rt.TypeOf<typeof dataStreamDocsStatRt>;
+
+export const getDataStreamTotalDocsResponseRt = rt.type({
+  totalDocs: rt.array(dataStreamDocsStatRt),
+});
+
+export type DataStreamTotalDocsResponse = rt.TypeOf<typeof getDataStreamTotalDocsResponseRt>;
+
+export const getDataStreamDegradedDocsResponseRt = rt.type({
+  degradedDocs: rt.array(dataStreamDocsStatRt),
+});
+
+export type DataStreamDegradedDocsResponse = rt.TypeOf<typeof getDataStreamDegradedDocsResponseRt>;
+
 export const integrationDashboardRT = rt.type({
   id: rt.string,
   title: rt.string,
@@ -84,15 +103,6 @@ export const getIntegrationsResponseRt = rt.exact(
 
 export type IntegrationResponse = rt.TypeOf<typeof getIntegrationsResponseRt>;
 
-export const degradedDocsRt = rt.type({
-  dataset: rt.string,
-  count: rt.number,
-  docsCount: rt.number,
-  percentage: rt.number,
-});
-
-export type DegradedDocs = rt.TypeOf<typeof degradedDocsRt>;
-
 export const degradedFieldRt = rt.type({
   name: rt.string,
   count: rt.number,
@@ -188,12 +198,6 @@ export const getDataStreamsStatsResponseRt = rt.exact(
   })
 );
 
-export const getDataStreamsDegradedDocsStatsResponseRt = rt.exact(
-  rt.type({
-    degradedDocs: rt.array(degradedDocsRt),
-  })
-);
-
 export const getDataStreamsSettingsResponseRt = rt.exact(dataStreamSettingsRt);
 
 export const getDataStreamsDetailsResponseRt = rt.exact(dataStreamDetailsRt);
diff --git a/x-pack/plugins/observability_solution/dataset_quality/common/constants.ts b/x-pack/plugins/observability_solution/dataset_quality/common/constants.ts
index 1b822c6c111d9..74809e0e19420 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/common/constants.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/common/constants.ts
@@ -11,6 +11,7 @@ export const DATASET_QUALITY_APP_ID = 'dataset_quality';
 export const DEFAULT_DATASET_TYPE: DataStreamType = 'logs';
 export const DEFAULT_LOGS_DATA_VIEW = 'logs-*-*';
 
+export const DEFAULT_DATASET_QUALITY: QualityIndicators = 'good';
 export const POOR_QUALITY_MINIMUM_PERCENTAGE = 3;
 export const DEGRADED_QUALITY_MINIMUM_PERCENTAGE = 0;
 
@@ -26,10 +27,8 @@ export const DEFAULT_TIME_RANGE = { from: 'now-24h', to: 'now' };
 export const DEFAULT_DATEPICKER_REFRESH = { value: 60000, pause: false };
 
 export const DEFAULT_DEGRADED_DOCS = {
-  percentage: 0,
   count: 0,
-  docsCount: 0,
-  quality: 'good' as QualityIndicators,
+  percentage: 0,
 };
 
 export const NUMBER_FORMAT = '0,0.[000]';
diff --git a/x-pack/plugins/observability_solution/dataset_quality/common/data_streams_stats/data_stream_stat.ts b/x-pack/plugins/observability_solution/dataset_quality/common/data_streams_stats/data_stream_stat.ts
index 164a43c625fb1..094d92ff3fea6 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/common/data_streams_stats/data_stream_stat.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/common/data_streams_stats/data_stream_stat.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { DEFAULT_DEGRADED_DOCS } from '../constants';
+import { DataStreamDocsStat } from '../api_types';
+import { DEFAULT_DATASET_QUALITY, DEFAULT_DEGRADED_DOCS } from '../constants';
 import { DataStreamType, QualityIndicators } from '../types';
 import { indexNameToDataStreamParts, mapPercentageToQuality } from '../utils';
 import { Integration } from './integration';
-import { DegradedDocsStat } from './malformed_docs_stat';
 import { DataStreamStatType } from './types';
 
 export class DataStreamStat {
@@ -24,11 +24,11 @@ export class DataStreamStat {
   userPrivileges?: DataStreamStatType['userPrivileges'];
   totalDocs?: DataStreamStatType['totalDocs']; // total datastream docs count
   integration?: Integration;
+  quality: QualityIndicators;
+  docsInTimeRange?: number;
   degradedDocs: {
     percentage: number;
     count: number;
-    docsCount: number; // docs count in the filtered time range
-    quality: QualityIndicators;
   };
 
   private constructor(dataStreamStat: DataStreamStat) {
@@ -43,12 +43,9 @@ export class DataStreamStat {
     this.userPrivileges = dataStreamStat.userPrivileges;
     this.totalDocs = dataStreamStat.totalDocs;
     this.integration = dataStreamStat.integration;
-    this.degradedDocs = {
-      percentage: dataStreamStat.degradedDocs.percentage,
-      count: dataStreamStat.degradedDocs.count,
-      docsCount: dataStreamStat.degradedDocs.docsCount,
-      quality: dataStreamStat.degradedDocs.quality,
-    };
+    this.quality = dataStreamStat.quality;
+    this.docsInTimeRange = dataStreamStat.docsInTimeRange;
+    this.degradedDocs = dataStreamStat.degradedDocs;
   }
 
   public static create(dataStreamStat: DataStreamStatType) {
@@ -65,6 +62,7 @@ export class DataStreamStat {
       lastActivity: dataStreamStat.lastActivity,
       userPrivileges: dataStreamStat.userPrivileges,
       totalDocs: dataStreamStat.totalDocs,
+      quality: DEFAULT_DATASET_QUALITY,
       degradedDocs: DEFAULT_DEGRADED_DOCS,
     };
 
@@ -74,9 +72,11 @@ export class DataStreamStat {
   public static fromDegradedDocStat({
     degradedDocStat,
     datasetIntegrationMap,
+    totalDocs,
   }: {
-    degradedDocStat: DegradedDocsStat;
+    degradedDocStat: DataStreamDocsStat & { percentage: number };
     datasetIntegrationMap: Record<string, { integration: Integration; title: string }>;
+    totalDocs: number;
   }) {
     const { type, dataset, namespace } = indexNameToDataStreamParts(degradedDocStat.dataset);
 
@@ -87,19 +87,23 @@ export class DataStreamStat {
       title: datasetIntegrationMap[dataset]?.title || dataset,
       namespace,
       integration: datasetIntegrationMap[dataset]?.integration,
+      quality: mapPercentageToQuality(degradedDocStat.percentage),
+      docsInTimeRange: totalDocs,
       degradedDocs: {
         percentage: degradedDocStat.percentage,
         count: degradedDocStat.count,
-        docsCount: degradedDocStat.docsCount,
-        quality: mapPercentageToQuality(degradedDocStat.percentage),
       },
     };
 
     return new DataStreamStat(dataStreamStatProps);
   }
 
-  public static calculateFilteredSize({ sizeBytes, totalDocs, degradedDocs }: DataStreamStat) {
+  public static calculateFilteredSize({ sizeBytes, totalDocs, docsInTimeRange }: DataStreamStat) {
     const avgDocSize = sizeBytes && totalDocs ? sizeBytes / totalDocs : 0;
-    return avgDocSize * degradedDocs.docsCount;
+    return avgDocSize * (docsInTimeRange ?? 0);
+  }
+
+  public static calculatePercentage({ totalDocs, count }: { totalDocs?: number; count?: number }) {
+    return totalDocs && count ? (count / totalDocs) * 100 : 0;
   }
 }
diff --git a/x-pack/plugins/observability_solution/dataset_quality/common/data_streams_stats/malformed_docs_stat.ts b/x-pack/plugins/observability_solution/dataset_quality/common/data_streams_stats/malformed_docs_stat.ts
deleted file mode 100644
index c86b802ea42da..0000000000000
--- a/x-pack/plugins/observability_solution/dataset_quality/common/data_streams_stats/malformed_docs_stat.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { QualityIndicators } from '../types';
-import { mapPercentageToQuality } from '../utils';
-import { DegradedDocsStatType } from './types';
-
-export class DegradedDocsStat {
-  dataset: DegradedDocsStatType['dataset'];
-  percentage: DegradedDocsStatType['percentage'];
-  count: DegradedDocsStatType['count'];
-  docsCount: DegradedDocsStatType['docsCount'];
-  quality: QualityIndicators;
-
-  private constructor(degradedDocsStat: DegradedDocsStat) {
-    this.dataset = degradedDocsStat.dataset;
-    this.percentage = degradedDocsStat.percentage;
-    this.count = degradedDocsStat.count;
-    this.docsCount = degradedDocsStat.docsCount;
-    this.quality = degradedDocsStat.quality;
-  }
-
-  public static create(degradedDocsStat: DegradedDocsStatType) {
-    const quality = mapPercentageToQuality(degradedDocsStat.percentage);
-    return new DegradedDocsStat({ ...degradedDocsStat, quality });
-  }
-}
diff --git a/x-pack/plugins/observability_solution/dataset_quality/common/data_streams_stats/types.ts b/x-pack/plugins/observability_solution/dataset_quality/common/data_streams_stats/types.ts
index 1e5adedc20f3a..bc0c12d234d26 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/common/data_streams_stats/types.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/common/data_streams_stats/types.ts
@@ -18,10 +18,14 @@ export type DataStreamStatServiceResponse = GetDataStreamsStatsResponse;
 export type GetDataStreamsDegradedDocsStatsParams =
   APIClientRequestParamsOf<`GET /internal/dataset_quality/data_streams/degraded_docs`>['params'];
 export type GetDataStreamsDegradedDocsStatsQuery = GetDataStreamsDegradedDocsStatsParams['query'];
-export type GetDataStreamsDegradedDocsStatsResponse =
-  APIReturnType<`GET /internal/dataset_quality/data_streams/degraded_docs`>;
-export type DegradedDocsStatType = GetDataStreamsDegradedDocsStatsResponse['degradedDocs'][0];
-export type DataStreamDegradedDocsStatServiceResponse = DegradedDocsStatType[];
+
+/*
+Types for stats based in documents inside a DataStream
+*/
+
+export type GetDataStreamsTotalDocsParams =
+  APIClientRequestParamsOf<`GET /internal/dataset_quality/data_streams/total_docs`>['params'];
+export type GetDataStreamsTotalDocsQuery = GetDataStreamsTotalDocsParams['query'];
 
 /*
 Types for Degraded Fields inside a DataStream
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/components/quality_indicator/dataset_quality_indicator.tsx b/x-pack/plugins/observability_solution/dataset_quality/public/components/quality_indicator/dataset_quality_indicator.tsx
index 419a13272dbc8..78c6d3bff9331 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/public/components/quality_indicator/dataset_quality_indicator.tsx
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/components/quality_indicator/dataset_quality_indicator.tsx
@@ -19,9 +19,7 @@ export const DatasetQualityIndicator = ({
   isLoading: boolean;
   dataStreamStat: DataStreamStat;
 }) => {
-  const {
-    degradedDocs: { quality },
-  } = dataStreamStat;
+  const { quality } = dataStreamStat;
 
   const translatedQuality = i18n.translate('xpack.datasetQuality.datasetQualityIdicator', {
     defaultMessage: '{quality}',
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_dataset_quality_filters.ts b/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_dataset_quality_filters.ts
index e370e7c22d469..056bba2304144 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_dataset_quality_filters.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_dataset_quality_filters.ts
@@ -49,7 +49,7 @@ export const useDatasetQualityFilters = () => {
       datasets.reduce(
         (acc: Filters, dataset) => ({
           namespaces: [...new Set([...acc.namespaces, dataset.namespace])],
-          qualities: [...new Set([...acc.qualities, dataset.degradedDocs.quality])],
+          qualities: [...new Set([...acc.qualities, dataset.quality])],
           filteredIntegrations: [
             ...new Set([...acc.filteredIntegrations, dataset.integration?.name ?? 'none']),
           ],
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_dataset_quality_table.tsx b/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_dataset_quality_table.tsx
index 55265a250bb75..6529ae1841ee3 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_dataset_quality_table.tsx
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_dataset_quality_table.tsx
@@ -132,8 +132,7 @@ export const useDatasetQualityTable = () => {
       const passesNamespaceFilter =
         namespaces.length === 0 || namespaces.includes(dataset.namespace);
 
-      const passesQualityFilter =
-        qualities.length === 0 || qualities.includes(dataset.degradedDocs.quality);
+      const passesQualityFilter = qualities.length === 0 || qualities.includes(dataset.quality);
 
       const passesQueryFilter = !query || dataset.rawName.includes(query);
 
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_dataset_telemetry.ts b/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_dataset_telemetry.ts
index 167ebd37fe81a..7d486f94f2607 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_dataset_telemetry.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_dataset_telemetry.ts
@@ -77,7 +77,7 @@ function getDatasetEbtProps(
       namespace: dataset.namespace,
       type: dataset.type,
     },
-    data_stream_health: dataset.degradedDocs.quality,
+    data_stream_health: dataset.quality,
     data_stream_aggregatable: nonAggregatableDatasets.some(
       (indexName) => indexName === dataset.rawName
     ),
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_summary_panel.ts b/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_summary_panel.ts
index a85dc9c21d222..014d9f578eb60 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_summary_panel.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_summary_panel.ts
@@ -84,7 +84,7 @@ const useSummaryPanel = () => {
     datasetsActivity,
 
     numberOfDatasets: filteredItems.length,
-    numberOfDocuments: filteredItems.reduce((acc, curr) => acc + curr.degradedDocs.docsCount, 0),
+    numberOfDocuments: filteredItems.reduce((acc, curr) => acc + curr.docsInTimeRange!, 0),
   };
 };
 
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/services/data_streams_stats/data_streams_stats_client.ts b/x-pack/plugins/observability_solution/dataset_quality/public/services/data_streams_stats/data_streams_stats_client.ts
index 8642a863726df..8e218819315b2 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/public/services/data_streams_stats/data_streams_stats_client.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/services/data_streams_stats/data_streams_stats_client.ts
@@ -10,8 +10,11 @@ import { decodeOrThrow } from '@kbn/io-ts-utils';
 import rison from '@kbn/rison';
 import { KNOWN_TYPES } from '../../../common/constants';
 import {
-  getDataStreamsDegradedDocsStatsResponseRt,
+  DataStreamDegradedDocsResponse,
+  DataStreamTotalDocsResponse,
+  getDataStreamDegradedDocsResponseRt,
   getDataStreamsStatsResponseRt,
+  getDataStreamTotalDocsResponseRt,
   getIntegrationsResponseRt,
   getNonAggregatableDatasetsRt,
   IntegrationResponse,
@@ -20,9 +23,9 @@ import {
 import {
   DataStreamStatServiceResponse,
   GetDataStreamsDegradedDocsStatsQuery,
-  GetDataStreamsDegradedDocsStatsResponse,
   GetDataStreamsStatsQuery,
   GetDataStreamsStatsResponse,
+  GetDataStreamsTotalDocsQuery,
   GetNonAggregatableDataStreamsParams,
 } from '../../../common/data_streams_stats';
 import { Integration } from '../../../common/data_streams_stats/integration';
@@ -56,16 +59,37 @@ export class DataStreamsStatsClient implements IDataStreamsStatsClient {
     return { dataStreamsStats, datasetUserPrivileges };
   }
 
+  public async getDataStreamsTotalDocs(params: GetDataStreamsTotalDocsQuery) {
+    const response = await this.http
+      .get<DataStreamTotalDocsResponse>('/internal/dataset_quality/data_streams/total_docs', {
+        query: {
+          ...params,
+        },
+      })
+      .catch((error) => {
+        throw new DatasetQualityError(`Failed to fetch data streams total docs: ${error}`, error);
+      });
+
+    const { totalDocs } = decodeOrThrow(
+      getDataStreamTotalDocsResponseRt,
+      (message: string) =>
+        new DatasetQualityError(
+          `Failed to decode data streams total docs stats response: ${message}`
+        )
+    )(response);
+
+    return totalDocs;
+  }
+
   public async getDataStreamsDegradedStats(params: GetDataStreamsDegradedDocsStatsQuery) {
+    const types = params.types.length === 0 ? KNOWN_TYPES : params.types;
     const response = await this.http
-      .get<GetDataStreamsDegradedDocsStatsResponse>(
-        '/internal/dataset_quality/data_streams/degraded_docs',
-        {
-          query: {
-            ...params,
-          },
-        }
-      )
+      .get<DataStreamDegradedDocsResponse>('/internal/dataset_quality/data_streams/degraded_docs', {
+        query: {
+          ...params,
+          types: rison.encodeArray(types),
+        },
+      })
       .catch((error) => {
         throw new DatasetQualityError(
           `Failed to fetch data streams degraded stats: ${error}`,
@@ -74,7 +98,7 @@ export class DataStreamsStatsClient implements IDataStreamsStatsClient {
       });
 
     const { degradedDocs } = decodeOrThrow(
-      getDataStreamsDegradedDocsStatsResponseRt,
+      getDataStreamDegradedDocsResponseRt,
       (message: string) =>
         new DatasetQualityError(
           `Failed to decode data streams degraded docs stats response: ${message}`
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/services/data_streams_stats/types.ts b/x-pack/plugins/observability_solution/dataset_quality/public/services/data_streams_stats/types.ts
index dd057ee7f3062..240e5519cfc3d 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/public/services/data_streams_stats/types.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/services/data_streams_stats/types.ts
@@ -7,14 +7,14 @@
 
 import { HttpStart } from '@kbn/core/public';
 import {
-  DataStreamDegradedDocsStatServiceResponse,
   DataStreamStatServiceResponse,
   GetDataStreamsDegradedDocsStatsQuery,
   GetDataStreamsStatsQuery,
+  GetDataStreamsTotalDocsQuery,
   GetNonAggregatableDataStreamsParams,
 } from '../../../common/data_streams_stats';
 import { Integration } from '../../../common/data_streams_stats/integration';
-import { NonAggregatableDatasets } from '../../../common/api_types';
+import { DataStreamDocsStat, NonAggregatableDatasets } from '../../../common/api_types';
 
 export type DataStreamsStatsServiceSetup = void;
 
@@ -30,7 +30,8 @@ export interface IDataStreamsStatsClient {
   getDataStreamsStats(params?: GetDataStreamsStatsQuery): Promise<DataStreamStatServiceResponse>;
   getDataStreamsDegradedStats(
     params?: GetDataStreamsDegradedDocsStatsQuery
-  ): Promise<DataStreamDegradedDocsStatServiceResponse>;
+  ): Promise<DataStreamDocsStat[]>;
+  getDataStreamsTotalDocs(params: GetDataStreamsTotalDocsQuery): Promise<DataStreamDocsStat[]>;
   getIntegrations(): Promise<Integration[]>;
   getNonAggregatableDatasets(
     params: GetNonAggregatableDataStreamsParams
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/state_machines/dataset_quality_controller/src/defaults.ts b/x-pack/plugins/observability_solution/dataset_quality/public/state_machines/dataset_quality_controller/src/defaults.ts
index 41cfa859ec977..7c77fe9d59422 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/public/state_machines/dataset_quality_controller/src/defaults.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/state_machines/dataset_quality_controller/src/defaults.ts
@@ -37,7 +37,8 @@ export const DEFAULT_CONTEXT: DefaultDatasetQualityControllerState = {
     canViewIntegrations: true,
   },
   dataStreamStats: [],
-  degradedDocStats: DEFAULT_DICTIONARY_TYPE,
+  degradedDocStats: [],
+  totalDocsStats: DEFAULT_DICTIONARY_TYPE,
   filters: {
     inactive: true,
     fullNames: false,
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/state_machines/dataset_quality_controller/src/notifications.ts b/x-pack/plugins/observability_solution/dataset_quality/public/state_machines/dataset_quality_controller/src/notifications.ts
index a21cc85aac449..0dea80104245f 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/public/state_machines/dataset_quality_controller/src/notifications.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/state_machines/dataset_quality_controller/src/notifications.ts
@@ -7,6 +7,7 @@
 
 import { IToasts } from '@kbn/core/public';
 import { i18n } from '@kbn/i18n';
+import { DataStreamType } from '../../../../common/types';
 
 export const fetchDatasetStatsFailedNotifier = (toasts: IToasts, error: Error) => {
   toasts.addDanger({
@@ -26,6 +27,18 @@ export const fetchDegradedStatsFailedNotifier = (toasts: IToasts, error: Error)
   });
 };
 
+export const fetchTotalDocsFailedNotifier = (toasts: IToasts, error: Error, meta: any) => {
+  const dataStreamType = meta._event.origin as DataStreamType;
+
+  toasts.addDanger({
+    title: i18n.translate('xpack.datasetQuality.fetchTotalDocsFailed', {
+      defaultMessage: "We couldn't get total docs information for {dataStreamType}.",
+      values: { dataStreamType },
+    }),
+    text: error.message,
+  });
+};
+
 export const fetchIntegrationsFailedNotifier = (toasts: IToasts, error: Error) => {
   toasts.addDanger({
     title: i18n.translate('xpack.datasetQuality.fetchIntegrationsFailed', {
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/state_machines/dataset_quality_controller/src/state_machine.ts b/x-pack/plugins/observability_solution/dataset_quality/public/state_machines/dataset_quality_controller/src/state_machine.ts
index a803d73448263..1217e52894ce7 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/public/state_machines/dataset_quality_controller/src/state_machine.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/state_machines/dataset_quality_controller/src/state_machine.ts
@@ -8,12 +8,13 @@
 import { IToasts } from '@kbn/core/public';
 import { getDateISORange } from '@kbn/timerange';
 import { assign, createMachine, DoneInvokeEvent, InterpreterFrom } from 'xstate';
-import { DataStreamStat, NonAggregatableDatasets } from '../../../../common/api_types';
-import { KNOWN_TYPES } from '../../../../common/constants';
 import {
-  DataStreamDegradedDocsStatServiceResponse,
-  DataStreamStatServiceResponse,
-} from '../../../../common/data_streams_stats';
+  DataStreamDocsStat,
+  DataStreamStat,
+  NonAggregatableDatasets,
+} from '../../../../common/api_types';
+import { KNOWN_TYPES } from '../../../../common/constants';
+import { DataStreamStatServiceResponse } from '../../../../common/data_streams_stats';
 import { Integration } from '../../../../common/data_streams_stats/integration';
 import { DataStreamType } from '../../../../common/types';
 import { IDataStreamsStatsClient } from '../../../services/data_streams_stats';
@@ -24,6 +25,7 @@ import {
   fetchDatasetStatsFailedNotifier,
   fetchDegradedStatsFailedNotifier,
   fetchIntegrationsFailedNotifier,
+  fetchTotalDocsFailedNotifier,
 } from './notifications';
 import {
   DatasetQualityControllerContext,
@@ -92,34 +94,69 @@ export const createPureDatasetQualityControllerStateMachine = (
               initial: 'fetching',
               states: {
                 fetching: {
-                  ...generateInvokePerType({
+                  invoke: {
                     src: 'loadDegradedDocs',
+                    onDone: {
+                      target: 'loaded',
+                      actions: ['storeDegradedDocStats', 'storeDatasets'],
+                    },
+                    onError: [
+                      {
+                        target: 'unauthorized',
+                        cond: 'checkIfActionForbidden',
+                      },
+                      {
+                        target: 'loaded',
+                        actions: ['notifyFetchDegradedStatsFailed'],
+                      },
+                    ],
+                  },
+                },
+                loaded: {},
+                unauthorized: { type: 'final' },
+              },
+              on: {
+                UPDATE_TIME_RANGE: {
+                  target: 'degradedDocs.fetching',
+                  actions: ['storeTimeRange'],
+                },
+                REFRESH_DATA: {
+                  target: 'degradedDocs.fetching',
+                },
+              },
+            },
+            docsStats: {
+              initial: 'fetching',
+              states: {
+                fetching: {
+                  ...generateInvokePerType({
+                    src: 'loadDataStreamDocsStats',
                   }),
                 },
                 loaded: {},
                 unauthorized: { type: 'final' },
               },
               on: {
-                SAVE_DEGRADED_DOCS_STATS: {
-                  target: 'degradedDocs.loaded',
-                  actions: ['storeDegradedDocStats', 'storeDatasets'],
+                SAVE_TOTAL_DOCS_STATS: {
+                  target: 'docsStats.loaded',
+                  actions: ['storeTotalDocStats', 'storeDatasets'],
                 },
-                NOTIFY_DEGRADED_DOCS_STATS_FAILED: [
+                NOTIFY_TOTAL_DOCS_STATS_FAILED: [
                   {
-                    target: 'degradedDocs.unauthorized',
+                    target: 'docsStats.unauthorized',
                     cond: 'checkIfActionForbidden',
                   },
                   {
-                    target: 'degradedDocs.loaded',
-                    actions: ['notifyFetchDegradedStatsFailed'],
+                    target: 'docsStats.loaded',
+                    actions: ['notifyFetchTotalDocsFailed'],
                   },
                 ],
                 UPDATE_TIME_RANGE: {
-                  target: 'degradedDocs.fetching',
+                  target: 'docsStats.fetching',
                   actions: ['storeTimeRange'],
                 },
                 REFRESH_DATA: {
-                  target: 'degradedDocs.fetching',
+                  target: 'docsStats.fetching',
                 },
               },
             },
@@ -329,18 +366,21 @@ export const createPureDatasetQualityControllerStateMachine = (
             };
           }
         ),
-        storeDegradedDocStats: assign(
-          (context, event: DoneInvokeEvent<DataStreamDegradedDocsStatServiceResponse>, meta) => {
+        storeTotalDocStats: assign(
+          (context, event: DoneInvokeEvent<DataStreamDocsStat[]>, meta) => {
             const type = meta._event.origin as DataStreamType;
 
             return {
-              degradedDocStats: {
-                ...context.degradedDocStats,
+              totalDocsStats: {
+                ...context.totalDocsStats,
                 [type]: event.data,
               },
             };
           }
         ),
+        storeDegradedDocStats: assign((_context, event: DoneInvokeEvent<DataStreamDocsStat[]>) => ({
+          degradedDocStats: event.data,
+        })),
         storeNonAggregatableDatasets: assign(
           (_context, event: DoneInvokeEvent<NonAggregatableDatasets>) => ({
             nonAggregatableDatasets: event.data.datasets,
@@ -364,7 +404,8 @@ export const createPureDatasetQualityControllerStateMachine = (
                 datasets: generateDatasets(
                   context.dataStreamStats,
                   context.degradedDocStats,
-                  context.integrations
+                  context.integrations,
+                  context.totalDocsStats
                 ),
               }
             : {};
@@ -404,6 +445,8 @@ export const createDatasetQualityControllerStateMachine = ({
         fetchNonAggregatableDatasetsFailedNotifier(toasts, event.data),
       notifyFetchIntegrationsFailed: (_context, event: DoneInvokeEvent<Error>) =>
         fetchIntegrationsFailedNotifier(toasts, event.data),
+      notifyFetchTotalDocsFailed: (_context, event: DoneInvokeEvent<Error>, meta) =>
+        fetchTotalDocsFailedNotifier(toasts, event.data, meta),
     },
     services: {
       loadDataStreamStats: (context, _event) =>
@@ -411,32 +454,41 @@ export const createDatasetQualityControllerStateMachine = ({
           types: context.filters.types as DataStreamType[],
           datasetQuery: context.filters.query,
         }),
-      loadDegradedDocs:
+      loadDataStreamDocsStats:
         (context, _event, { data: { type } }) =>
         async (send) => {
           try {
             const { startDate: start, endDate: end } = getDateISORange(context.filters.timeRange);
 
-            const degradedDocsStats = await (isTypeSelected(type, context)
-              ? dataStreamStatsClient.getDataStreamsDegradedStats({
+            const totalDocsStats = await (isTypeSelected(type, context)
+              ? dataStreamStatsClient.getDataStreamsTotalDocs({
                   type,
-                  datasetQuery: context.filters.query,
                   start,
                   end,
                 })
               : Promise.resolve([]));
 
             send({
-              type: 'SAVE_DEGRADED_DOCS_STATS',
-              data: degradedDocsStats,
+              type: 'SAVE_TOTAL_DOCS_STATS',
+              data: totalDocsStats,
             });
           } catch (e) {
             send({
-              type: 'NOTIFY_DEGRADED_DOCS_STATS_FAILED',
+              type: 'NOTIFY_TOTAL_DOCS_STATS_FAILED',
               data: e,
             });
           }
         },
+      loadDegradedDocs: (context) => {
+        const { startDate: start, endDate: end } = getDateISORange(context.filters.timeRange);
+
+        return dataStreamStatsClient.getDataStreamsDegradedStats({
+          types: context.filters.types as DataStreamType[],
+          datasetQuery: context.filters.query,
+          start,
+          end,
+        });
+      },
       loadNonAggregatableDatasets: (context) => {
         const { startDate: start, endDate: end } = getDateISORange(context.filters.timeRange);
 
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/state_machines/dataset_quality_controller/src/types.ts b/x-pack/plugins/observability_solution/dataset_quality/public/state_machines/dataset_quality_controller/src/types.ts
index a5e03cfb480ff..de7fdbf9fbd77 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/public/state_machines/dataset_quality_controller/src/types.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/state_machines/dataset_quality_controller/src/types.ts
@@ -6,16 +6,18 @@
  */
 
 import { DoneInvokeEvent } from 'xstate';
-import { DatasetUserPrivileges, NonAggregatableDatasets } from '../../../../common/api_types';
 import {
-  DataStreamDegradedDocsStatServiceResponse,
+  DataStreamDocsStat,
+  DatasetUserPrivileges,
+  NonAggregatableDatasets,
+} from '../../../../common/api_types';
+import {
   DataStreamDetails,
   DataStreamStat,
   DataStreamStatServiceResponse,
   DataStreamStatType,
 } from '../../../../common/data_streams_stats';
 import { Integration } from '../../../../common/data_streams_stats/integration';
-import { DegradedDocsStat } from '../../../../common/data_streams_stats/malformed_docs_stat';
 import {
   DataStreamType,
   QualityIndicators,
@@ -50,8 +52,12 @@ export interface WithDataStreamStats {
   dataStreamStats: DataStreamStatType[];
 }
 
+export interface WithTotalDocs {
+  totalDocsStats: DictionaryType<DataStreamDocsStat>;
+}
+
 export interface WithDegradedDocs {
-  degradedDocStats: DictionaryType<DegradedDocsStat>;
+  degradedDocStats: DataStreamDocsStat[];
 }
 
 export interface WithNonAggregatableDatasets {
@@ -68,6 +74,7 @@ export interface WithIntegrations {
 
 export type DefaultDatasetQualityControllerState = WithTableOptions &
   WithDataStreamStats &
+  WithTotalDocs &
   WithDegradedDocs &
   WithDatasets &
   WithFilters &
@@ -146,7 +153,7 @@ export type DatasetQualityControllerEvent =
       type: 'UPDATE_TYPES';
       types: DataStreamType[];
     }
-  | DoneInvokeEvent<DataStreamDegradedDocsStatServiceResponse>
+  | DoneInvokeEvent<DataStreamDocsStat[]>
   | DoneInvokeEvent<NonAggregatableDatasets>
   | DoneInvokeEvent<DataStreamDetails>
   | DoneInvokeEvent<DataStreamStatServiceResponse>
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/utils/generate_datasets.test.ts b/x-pack/plugins/observability_solution/dataset_quality/public/utils/generate_datasets.test.ts
index 6f2e46baacf8c..b75c74c2fd728 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/public/utils/generate_datasets.test.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/utils/generate_datasets.test.ts
@@ -5,11 +5,10 @@
  * 2.0.
  */
 
-import { indexNameToDataStreamParts } from '../../common/utils';
-import { Integration } from '../../common/data_streams_stats/integration';
-import { generateDatasets } from './generate_datasets';
 import { DataStreamStatType } from '../../common/data_streams_stats';
+import { Integration } from '../../common/data_streams_stats/integration';
 import { DEFAULT_DICTIONARY_TYPE } from '../state_machines/dataset_quality_controller';
+import { generateDatasets } from './generate_datasets';
 
 describe('generateDatasets', () => {
   const integrations: Integration[] = [
@@ -41,6 +40,7 @@ describe('generateDatasets', () => {
       lastActivity: 1712911241117,
       size: '82.1kb',
       sizeBytes: 84160,
+      totalDocs: 100,
       integration: 'system',
       userPrivileges: {
         canMonitor: true,
@@ -51,182 +51,337 @@ describe('generateDatasets', () => {
       lastActivity: 1712911241117,
       size: '62.5kb',
       sizeBytes: 64066,
+      totalDocs: 100,
       userPrivileges: {
         canMonitor: true,
       },
     },
   ];
 
-  const degradedDocs = {
+  const totalDocs = {
     ...DEFAULT_DICTIONARY_TYPE,
     logs: [
       {
         dataset: 'logs-system.application-default',
-        percentage: 0,
-        count: 0,
-        docsCount: 0,
-        quality: 'good' as const,
+        count: 100,
       },
       {
         dataset: 'logs-synth-default',
-        percentage: 11.320754716981131,
-        count: 6,
-        docsCount: 0,
-        quality: 'poor' as const,
+        count: 100,
       },
     ],
   };
 
-  it('merges integrations information with dataStreamStats', () => {
-    const datasets = generateDatasets(dataStreamStats, DEFAULT_DICTIONARY_TYPE, integrations);
+  const degradedDocs = [
+    {
+      dataset: 'logs-system.application-default',
+      count: 0,
+    },
+    {
+      dataset: 'logs-synth-default',
+      count: 6,
+    },
+  ];
+
+  it('merges integrations information with dataStreamStats and degradedDocs', () => {
+    const datasets = generateDatasets(dataStreamStats, degradedDocs, integrations, totalDocs);
 
     expect(datasets).toEqual([
       {
-        ...dataStreamStats[0],
-        name: indexNameToDataStreamParts(dataStreamStats[0].name).dataset,
-        namespace: indexNameToDataStreamParts(dataStreamStats[0].name).namespace,
-        title:
-          integrations[0].datasets[indexNameToDataStreamParts(dataStreamStats[0].name).dataset],
-        type: indexNameToDataStreamParts(dataStreamStats[0].name).type,
-        rawName: dataStreamStats[0].name,
+        name: 'system.application',
+        type: 'logs',
+        namespace: 'default',
+        title: 'Windows Application Events',
+        rawName: 'logs-system.application-default',
+        lastActivity: 1712911241117,
+        size: '82.1kb',
+        sizeBytes: 84160,
         integration: integrations[0],
+        totalDocs: 100,
+        userPrivileges: {
+          canMonitor: true,
+        },
+        docsInTimeRange: 100,
+        quality: 'good',
+        degradedDocs: {
+          percentage: 0,
+          count: 0,
+        },
+      },
+      {
+        name: 'synth',
+        type: 'logs',
+        namespace: 'default',
+        title: 'synth',
+        rawName: 'logs-synth-default',
+        lastActivity: 1712911241117,
+        size: '62.5kb',
+        sizeBytes: 64066,
+        integration: undefined,
+        totalDocs: 100,
+        userPrivileges: {
+          canMonitor: true,
+        },
+        docsInTimeRange: 100,
+        quality: 'poor',
         degradedDocs: {
-          percentage: degradedDocs.logs[0].percentage,
-          count: degradedDocs.logs[0].count,
-          docsCount: degradedDocs.logs[0].docsCount,
-          quality: degradedDocs.logs[0].quality,
+          count: 6,
+          percentage: 6,
         },
       },
+    ]);
+  });
+
+  it('merges integrations information with dataStreamStats and degradedDocs when no docs in timerange', () => {
+    const datasets = generateDatasets(
+      dataStreamStats,
+      degradedDocs,
+      integrations,
+      DEFAULT_DICTIONARY_TYPE
+    );
+
+    expect(datasets).toEqual([
       {
-        ...dataStreamStats[1],
-        name: indexNameToDataStreamParts(dataStreamStats[1].name).dataset,
-        namespace: indexNameToDataStreamParts(dataStreamStats[1].name).namespace,
-        title: indexNameToDataStreamParts(dataStreamStats[1].name).dataset,
-        type: indexNameToDataStreamParts(dataStreamStats[1].name).type,
-        rawName: dataStreamStats[1].name,
+        name: 'system.application',
+        type: 'logs',
+        namespace: 'default',
+        title: 'Windows Application Events',
+        rawName: 'logs-system.application-default',
+        lastActivity: 1712911241117,
+        size: '82.1kb',
+        sizeBytes: 84160,
+        integration: integrations[0],
+        totalDocs: 100,
+        userPrivileges: {
+          canMonitor: true,
+        },
+        docsInTimeRange: 0,
+        quality: 'good',
         degradedDocs: {
+          percentage: 0,
           count: 0,
+        },
+      },
+      {
+        name: 'synth',
+        type: 'logs',
+        namespace: 'default',
+        title: 'synth',
+        rawName: 'logs-synth-default',
+        lastActivity: 1712911241117,
+        size: '62.5kb',
+        sizeBytes: 64066,
+        integration: undefined,
+        totalDocs: 100,
+        userPrivileges: {
+          canMonitor: true,
+        },
+        docsInTimeRange: 0,
+        quality: 'good',
+        degradedDocs: {
+          count: 6,
           percentage: 0,
-          docsCount: 0,
-          quality: 'good',
         },
       },
     ]);
   });
 
   it('merges integrations information with degradedDocs', () => {
-    const datasets = generateDatasets(undefined, degradedDocs, integrations);
+    const datasets = generateDatasets([], degradedDocs, integrations, totalDocs);
 
     expect(datasets).toEqual([
       {
-        rawName: degradedDocs.logs[0].dataset,
-        name: indexNameToDataStreamParts(degradedDocs.logs[0].dataset).dataset,
-        type: indexNameToDataStreamParts(degradedDocs.logs[0].dataset).type,
+        name: 'system.application',
+        type: 'logs',
+        namespace: 'default',
+        title: 'Windows Application Events',
+        rawName: 'logs-system.application-default',
+        lastActivity: undefined,
+        size: undefined,
+        sizeBytes: undefined,
+        integration: integrations[0],
+        totalDocs: undefined,
+        userPrivileges: undefined,
+        docsInTimeRange: 100,
+        quality: 'good',
+        degradedDocs: {
+          percentage: 0,
+          count: 0,
+        },
+      },
+      {
+        name: 'synth',
+        type: 'logs',
+        namespace: 'default',
+        title: 'synth',
+        rawName: 'logs-synth-default',
         lastActivity: undefined,
         size: undefined,
         sizeBytes: undefined,
+        integration: undefined,
+        totalDocs: undefined,
         userPrivileges: undefined,
-        namespace: indexNameToDataStreamParts(degradedDocs.logs[0].dataset).namespace,
-        title:
-          integrations[0].datasets[
-            indexNameToDataStreamParts(degradedDocs.logs[0].dataset).dataset
-          ],
+        docsInTimeRange: 100,
+        quality: 'poor',
+        degradedDocs: {
+          count: 6,
+          percentage: 6,
+        },
+      },
+    ]);
+  });
+
+  it('merges integrations information with degradedDocs and totalDocs', () => {
+    const datasets = generateDatasets([], degradedDocs, integrations, {
+      ...totalDocs,
+      logs: [...totalDocs.logs, { dataset: 'logs-another-default', count: 100 }],
+    });
+
+    expect(datasets).toEqual([
+      {
+        name: 'system.application',
+        type: 'logs',
+        namespace: 'default',
+        title: 'Windows Application Events',
+        rawName: 'logs-system.application-default',
+        lastActivity: undefined,
+        size: undefined,
+        sizeBytes: undefined,
         integration: integrations[0],
+        totalDocs: undefined,
+        userPrivileges: undefined,
+        docsInTimeRange: 100,
+        quality: 'good',
         degradedDocs: {
-          percentage: degradedDocs.logs[0].percentage,
-          count: degradedDocs.logs[0].count,
-          docsCount: degradedDocs.logs[0].docsCount,
-          quality: degradedDocs.logs[0].quality,
+          percentage: 0,
+          count: 0,
         },
       },
       {
-        rawName: degradedDocs.logs[1].dataset,
-        name: indexNameToDataStreamParts(degradedDocs.logs[1].dataset).dataset,
-        type: indexNameToDataStreamParts(degradedDocs.logs[1].dataset).type,
+        name: 'synth',
+        type: 'logs',
+        namespace: 'default',
+        title: 'synth',
+        rawName: 'logs-synth-default',
         lastActivity: undefined,
         size: undefined,
         sizeBytes: undefined,
+        integration: undefined,
+        totalDocs: undefined,
         userPrivileges: undefined,
-        namespace: indexNameToDataStreamParts(degradedDocs.logs[1].dataset).namespace,
-        title: indexNameToDataStreamParts(degradedDocs.logs[1].dataset).dataset,
+        docsInTimeRange: 100,
+        quality: 'poor',
+        degradedDocs: {
+          count: 6,
+          percentage: 6,
+        },
+      },
+      {
+        name: 'another',
+        type: 'logs',
+        namespace: 'default',
+        title: 'another',
+        rawName: 'logs-another-default',
+        lastActivity: undefined,
+        size: undefined,
+        sizeBytes: undefined,
         integration: undefined,
+        totalDocs: undefined,
+        userPrivileges: undefined,
+        docsInTimeRange: 100,
+        quality: 'good',
         degradedDocs: {
-          percentage: degradedDocs.logs[1].percentage,
-          count: degradedDocs.logs[1].count,
-          docsCount: degradedDocs.logs[1].docsCount,
-          quality: degradedDocs.logs[1].quality,
+          percentage: 0,
+          count: 0,
         },
       },
     ]);
   });
 
-  it('merges integrations information with dataStreamStats and degradedDocs', () => {
-    const datasets = generateDatasets(dataStreamStats, degradedDocs, integrations);
+  it('merges integrations information with dataStreamStats', () => {
+    const datasets = generateDatasets(dataStreamStats, [], integrations, totalDocs);
 
     expect(datasets).toEqual([
       {
-        ...dataStreamStats[0],
-        name: indexNameToDataStreamParts(dataStreamStats[0].name).dataset,
-        namespace: indexNameToDataStreamParts(dataStreamStats[0].name).namespace,
-        title:
-          integrations[0].datasets[indexNameToDataStreamParts(dataStreamStats[0].name).dataset],
-        type: indexNameToDataStreamParts(dataStreamStats[0].name).type,
-        rawName: dataStreamStats[0].name,
+        name: 'system.application',
+        type: 'logs',
+        namespace: 'default',
+        title: 'Windows Application Events',
+        rawName: 'logs-system.application-default',
+        lastActivity: 1712911241117,
+        size: '82.1kb',
+        sizeBytes: 84160,
         integration: integrations[0],
+        totalDocs: 100,
+        userPrivileges: {
+          canMonitor: true,
+        },
+        quality: 'good',
+        docsInTimeRange: 100,
         degradedDocs: {
-          percentage: degradedDocs.logs[0].percentage,
-          count: degradedDocs.logs[0].count,
-          docsCount: degradedDocs.logs[0].docsCount,
-          quality: degradedDocs.logs[0].quality,
+          count: 0,
+          percentage: 0,
         },
       },
       {
-        ...dataStreamStats[1],
-        name: indexNameToDataStreamParts(dataStreamStats[1].name).dataset,
-        namespace: indexNameToDataStreamParts(dataStreamStats[1].name).namespace,
-        title: indexNameToDataStreamParts(dataStreamStats[1].name).dataset,
-        type: indexNameToDataStreamParts(dataStreamStats[1].name).type,
-        rawName: dataStreamStats[1].name,
+        name: 'synth',
+        type: 'logs',
+        namespace: 'default',
+        title: 'synth',
+        rawName: 'logs-synth-default',
+        lastActivity: 1712911241117,
+        size: '62.5kb',
+        sizeBytes: 64066,
+        integration: undefined,
+        totalDocs: 100,
+        userPrivileges: {
+          canMonitor: true,
+        },
+        quality: 'good',
+        docsInTimeRange: 100,
         degradedDocs: {
-          percentage: degradedDocs.logs[1].percentage,
-          count: degradedDocs.logs[1].count,
-          docsCount: degradedDocs.logs[1].docsCount,
-          quality: degradedDocs.logs[1].quality,
+          count: 0,
+          percentage: 0,
         },
       },
     ]);
   });
 
   it('merges integration information with dataStreamStats when dataset is not an integration default one', () => {
-    const dataset = 'logs-system.custom-default';
-
     const nonDefaultDataset = {
-      name: dataset,
+      name: 'logs-system.custom-default',
       lastActivity: 1712911241117,
       size: '82.1kb',
       sizeBytes: 84160,
+      totalDocs: 100,
       integration: 'system',
       userPrivileges: {
         canMonitor: true,
       },
     };
 
-    const datasets = generateDatasets([nonDefaultDataset], DEFAULT_DICTIONARY_TYPE, integrations);
+    const datasets = generateDatasets([nonDefaultDataset], [], integrations, totalDocs);
 
     expect(datasets).toEqual([
       {
-        ...nonDefaultDataset,
-        title: indexNameToDataStreamParts(dataset).dataset,
-        name: indexNameToDataStreamParts(dataset).dataset,
-        namespace: indexNameToDataStreamParts(dataset).namespace,
-        type: indexNameToDataStreamParts(dataset).type,
-        rawName: nonDefaultDataset.name,
+        name: 'system.custom',
+        type: 'logs',
+        namespace: 'default',
+        title: 'system.custom',
+        rawName: 'logs-system.custom-default',
+        lastActivity: 1712911241117,
+        size: '82.1kb',
+        sizeBytes: 84160,
         integration: integrations[0],
+        userPrivileges: {
+          canMonitor: true,
+        },
+        quality: 'good',
+        totalDocs: 100,
+        docsInTimeRange: 0,
         degradedDocs: {
           count: 0,
           percentage: 0,
-          docsCount: 0,
-          quality: 'good',
         },
       },
     ]);
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/utils/generate_datasets.ts b/x-pack/plugins/observability_solution/dataset_quality/public/utils/generate_datasets.ts
index fb479198bbac3..8e9f2f3db7083 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/public/utils/generate_datasets.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/utils/generate_datasets.ts
@@ -5,23 +5,20 @@
  * 2.0.
  */
 
+import { DEFAULT_DEGRADED_DOCS } from '../../common/constants';
+import { DataStreamDocsStat } from '../../common/api_types';
 import { DataStreamStatType } from '../../common/data_streams_stats/types';
 import { mapPercentageToQuality } from '../../common/utils';
 import { Integration } from '../../common/data_streams_stats/integration';
 import { DataStreamStat } from '../../common/data_streams_stats/data_stream_stat';
-import { DegradedDocsStat } from '../../common/data_streams_stats/malformed_docs_stat';
 import { DictionaryType } from '../state_machines/dataset_quality_controller/src/types';
 import { flattenStats } from './flatten_stats';
-
 export function generateDatasets(
   dataStreamStats: DataStreamStatType[] = [],
-  degradedDocStats: DictionaryType<DegradedDocsStat>,
-  integrations: Integration[]
+  degradedDocStats: DataStreamDocsStat[] = [],
+  integrations: Integration[],
+  totalDocsStats: DictionaryType<DataStreamDocsStat>
 ): DataStreamStat[] {
-  if (!dataStreamStats.length && !integrations.length) {
-    return [];
-  }
-
   const {
     datasetIntegrationMap,
     integrationsMap,
@@ -50,35 +47,42 @@ export function generateDatasets(
     { datasetIntegrationMap: {}, integrationsMap: {} }
   );
 
-  const degradedDocs = flattenStats(degradedDocStats);
-
-  if (!dataStreamStats.length) {
-    return degradedDocs.map((degradedDocStat) =>
-      DataStreamStat.fromDegradedDocStat({ degradedDocStat, datasetIntegrationMap })
-    );
-  }
+  const totalDocs = flattenStats(totalDocsStats);
+  const totalDocsMap: Record<DataStreamDocsStat['dataset'], DataStreamDocsStat['count']> =
+    Object.fromEntries(totalDocs.map(({ dataset, count }) => [dataset, count]));
 
   const degradedMap: Record<
-    DegradedDocsStat['dataset'],
+    DataStreamDocsStat['dataset'],
     {
-      percentage: DegradedDocsStat['percentage'];
-      count: DegradedDocsStat['count'];
-      docsCount: DegradedDocsStat['docsCount'];
-      quality: DegradedDocsStat['quality'];
+      percentage: number;
+      count: DataStreamDocsStat['count'];
     }
-  > = degradedDocs.reduce(
-    (degradedMapAcc, { dataset, percentage, count, docsCount }) =>
+  > = degradedDocStats.reduce(
+    (degradedMapAcc, { dataset, count }) =>
       Object.assign(degradedMapAcc, {
         [dataset]: {
-          percentage,
           count,
-          docsCount,
-          quality: mapPercentageToQuality(percentage),
+          percentage: DataStreamStat.calculatePercentage({
+            totalDocs: totalDocsMap[dataset],
+            count,
+          }),
         },
       }),
     {}
   );
 
+  if (!dataStreamStats.length) {
+    // We want to pick up all datasets even when they don't have degraded docs
+    const dataStreams = [...new Set([...Object.keys(totalDocsMap), ...Object.keys(degradedMap)])];
+    return dataStreams.map((dataset) =>
+      DataStreamStat.fromDegradedDocStat({
+        degradedDocStat: { dataset, ...(degradedMap[dataset] || DEFAULT_DEGRADED_DOCS) },
+        datasetIntegrationMap,
+        totalDocs: totalDocsMap[dataset] ?? 0,
+      })
+    );
+  }
+
   return dataStreamStats?.map((dataStream) => {
     const dataset = DataStreamStat.create(dataStream);
 
@@ -89,6 +93,10 @@ export function generateDatasets(
         datasetIntegrationMap[dataset.name]?.integration ??
         integrationsMap[dataStream.integration ?? ''],
       degradedDocs: degradedMap[dataset.rawName] || dataset.degradedDocs,
+      docsInTimeRange: totalDocsMap[dataset.rawName] ?? 0,
+      quality: mapPercentageToQuality(
+        (degradedMap[dataset.rawName] || dataset.degradedDocs).percentage
+      ),
     };
   });
 }
diff --git a/x-pack/plugins/observability_solution/dataset_quality/server/routes/data_streams/get_dataset_aggregated_paginated_results.ts b/x-pack/plugins/observability_solution/dataset_quality/server/routes/data_streams/get_dataset_aggregated_paginated_results.ts
new file mode 100644
index 0000000000000..062dcd2f16cf7
--- /dev/null
+++ b/x-pack/plugins/observability_solution/dataset_quality/server/routes/data_streams/get_dataset_aggregated_paginated_results.ts
@@ -0,0 +1,94 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ElasticsearchClient } from '@kbn/core/server';
+import { rangeQuery } from '@kbn/observability-plugin/server';
+import { QueryDslBoolQuery } from '@elastic/elasticsearch/lib/api/types';
+import { DataStreamDocsStat } from '../../../common/api_types';
+import { createDatasetQualityESClient } from '../../utils';
+
+interface Dataset {
+  type: string;
+  dataset: string;
+  namespace: string;
+}
+
+const SIZE_LIMIT = 10000;
+
+export async function getAggregatedDatasetPaginatedResults(options: {
+  esClient: ElasticsearchClient;
+  index: string;
+  start: number;
+  end: number;
+  query?: QueryDslBoolQuery;
+  after?: Dataset;
+  prevResults?: DataStreamDocsStat[];
+}): Promise<DataStreamDocsStat[]> {
+  const { esClient, index, query, start, end, after, prevResults = [] } = options;
+
+  const datasetQualityESClient = createDatasetQualityESClient(esClient);
+
+  const aggs = (afterKey?: Dataset) => ({
+    datasets: {
+      composite: {
+        ...(afterKey ? { after: afterKey } : {}),
+        size: SIZE_LIMIT,
+        sources: [
+          { type: { terms: { field: 'data_stream.type' } } },
+          { dataset: { terms: { field: 'data_stream.dataset' } } },
+          { namespace: { terms: { field: 'data_stream.namespace' } } },
+        ],
+      },
+    },
+  });
+
+  const bool = {
+    ...query,
+    filter: [
+      ...(query?.filter ? (Array.isArray(query.filter) ? query.filter : [query.filter]) : []),
+      ...[...rangeQuery(start, end)],
+    ],
+  };
+
+  const response = await datasetQualityESClient.search({
+    index,
+    size: 0,
+    query: {
+      bool,
+    },
+    aggs: aggs(after),
+  });
+
+  const currResults =
+    response.aggregations?.datasets.buckets.map((bucket) => ({
+      dataset: `${bucket.key.type}-${bucket.key.dataset}-${bucket.key.namespace}`,
+      count: bucket.doc_count,
+    })) ?? [];
+
+  const results = [...prevResults, ...currResults];
+
+  if (
+    response.aggregations?.datasets.after_key &&
+    response.aggregations?.datasets.buckets.length === SIZE_LIMIT
+  ) {
+    return getAggregatedDatasetPaginatedResults({
+      esClient,
+      index,
+      start,
+      end,
+      after:
+        (response.aggregations?.datasets.after_key as {
+          type: string;
+          dataset: string;
+          namespace: string;
+        }) || after,
+      prevResults: results,
+    });
+  }
+
+  return results;
+}
diff --git a/x-pack/plugins/observability_solution/dataset_quality/server/routes/data_streams/get_degraded_docs.ts b/x-pack/plugins/observability_solution/dataset_quality/server/routes/data_streams/get_degraded_docs.ts
index 454fdb7e1a8b8..48b50c4b8680d 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/server/routes/data_streams/get_degraded_docs.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/server/routes/data_streams/get_degraded_docs.ts
@@ -6,161 +6,37 @@
  */
 
 import type { ElasticsearchClient } from '@kbn/core/server';
-import { rangeQuery, termQuery } from '@kbn/observability-plugin/server';
-import { DEFAULT_DATASET_TYPE } from '../../../common/constants';
+import { streamPartsToIndexPattern } from '../../../common/utils';
 import { DataStreamType } from '../../../common/types';
-import { DegradedDocs } from '../../../common/api_types';
-import {
-  DATA_STREAM_DATASET,
-  DATA_STREAM_NAMESPACE,
-  DATA_STREAM_TYPE,
-  _IGNORED,
-} from '../../../common/es_fields';
-import { createDatasetQualityESClient, wildcardQuery } from '../../utils';
-
-interface ResultBucket {
-  dataset: string;
-  count: number;
-}
-
-const SIZE_LIMIT = 10000;
+import { DataStreamDocsStat } from '../../../common/api_types';
+import { _IGNORED } from '../../../common/es_fields';
+import { getAggregatedDatasetPaginatedResults } from './get_dataset_aggregated_paginated_results';
 
 export async function getDegradedDocsPaginated(options: {
   esClient: ElasticsearchClient;
-  type?: DataStreamType;
+  types: DataStreamType[];
+  datasetQuery?: string;
   start: number;
   end: number;
-  datasetQuery?: string;
-  after?: {
-    degradedDocs?: { dataset: string; namespace: string };
-    docsCount?: { dataset: string; namespace: string };
-  };
-  prevResults?: { degradedDocs: ResultBucket[]; docsCount: ResultBucket[] };
-}): Promise<DegradedDocs[]> {
-  const {
+}): Promise<DataStreamDocsStat[]> {
+  const { esClient, types, datasetQuery, start, end } = options;
+
+  const datasetNames = datasetQuery
+    ? [datasetQuery]
+    : types.map((type) =>
+        streamPartsToIndexPattern({
+          typePattern: type,
+          datasetPattern: '*-*',
+        })
+      );
+
+  return await getAggregatedDatasetPaginatedResults({
     esClient,
-    type = DEFAULT_DATASET_TYPE,
-    datasetQuery,
     start,
     end,
-    after,
-    prevResults = { degradedDocs: [], docsCount: [] },
-  } = options;
-
-  const datasetQualityESClient = createDatasetQualityESClient(esClient);
-
-  const datasetFilter = {
-    ...(datasetQuery
-      ? {
-          should: [
-            ...wildcardQuery(DATA_STREAM_DATASET, datasetQuery),
-            ...wildcardQuery(DATA_STREAM_NAMESPACE, datasetQuery),
-          ],
-          minimum_should_match: 1,
-        }
-      : {}),
-  };
-
-  const otherFilters = [...rangeQuery(start, end), ...termQuery(DATA_STREAM_TYPE, type)];
-
-  const aggs = (afterKey?: { dataset: string; namespace: string }) => ({
-    datasets: {
-      composite: {
-        ...(afterKey ? { after: afterKey } : {}),
-        size: SIZE_LIMIT,
-        sources: [
-          { dataset: { terms: { field: 'data_stream.dataset' } } },
-          { namespace: { terms: { field: 'data_stream.namespace' } } },
-        ],
-      },
+    index: datasetNames.join(','),
+    query: {
+      must: { exists: { field: _IGNORED } },
     },
   });
-
-  const response = await datasetQualityESClient.msearch({ index: `${type}-*-*` }, [
-    // degraded docs per dataset
-    {
-      size: 0,
-      query: {
-        bool: {
-          ...datasetFilter,
-          filter: otherFilters,
-          must: { exists: { field: _IGNORED } },
-        },
-      },
-      aggs: aggs(after?.degradedDocs),
-    },
-    // total docs per dataset
-    {
-      size: 0,
-      query: {
-        bool: {
-          ...datasetFilter,
-          filter: otherFilters,
-        },
-      },
-      aggs: aggs(after?.docsCount),
-    },
-  ]);
-  const [degradedDocsResponse, totalDocsResponse] = response.responses;
-
-  const currDegradedDocs =
-    degradedDocsResponse.aggregations?.datasets.buckets.map((bucket) => ({
-      dataset: `${type}-${bucket.key.dataset}-${bucket.key.namespace}`,
-      count: bucket.doc_count,
-    })) ?? [];
-
-  const degradedDocs = [...prevResults.degradedDocs, ...currDegradedDocs];
-
-  const currTotalDocs =
-    totalDocsResponse.aggregations?.datasets.buckets.map((bucket) => ({
-      dataset: `${type}-${bucket.key.dataset}-${bucket.key.namespace}`,
-      count: bucket.doc_count,
-    })) ?? [];
-
-  const docsCount = [...prevResults.docsCount, ...currTotalDocs];
-
-  if (
-    totalDocsResponse.aggregations?.datasets.after_key &&
-    totalDocsResponse.aggregations?.datasets.buckets.length === SIZE_LIMIT
-  ) {
-    return getDegradedDocsPaginated({
-      esClient,
-      type,
-      start,
-      end,
-      datasetQuery,
-      after: {
-        degradedDocs:
-          (degradedDocsResponse.aggregations?.datasets.after_key as {
-            dataset: string;
-            namespace: string;
-          }) || after?.degradedDocs,
-        docsCount:
-          (totalDocsResponse.aggregations?.datasets.after_key as {
-            dataset: string;
-            namespace: string;
-          }) || after?.docsCount,
-      },
-      prevResults: { degradedDocs, docsCount },
-    });
-  }
-
-  const degradedDocsMap = degradedDocs.reduce(
-    (acc, curr) => ({
-      ...acc,
-      [curr.dataset]: curr.count,
-    }),
-    {}
-  );
-
-  return docsCount.map((curr) => {
-    const degradedDocsCount = degradedDocsMap[curr.dataset as keyof typeof degradedDocsMap] || 0;
-
-    return {
-      ...curr,
-      docsCount: curr.count,
-      count: degradedDocsCount,
-      percentage: (degradedDocsCount / curr.count) * 100,
-    };
-  });
 }
diff --git a/x-pack/plugins/observability_solution/dataset_quality/server/routes/data_streams/routes.ts b/x-pack/plugins/observability_solution/dataset_quality/server/routes/data_streams/routes.ts
index 41ba3ee8c7299..3a60f0b9a8ef3 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/server/routes/data_streams/routes.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/server/routes/data_streams/routes.ts
@@ -10,12 +10,12 @@ import {
   DataStreamDetails,
   DataStreamSettings,
   DataStreamStat,
-  DegradedDocs,
   NonAggregatableDatasets,
   DegradedFieldResponse,
   DatasetUserPrivileges,
   DegradedFieldValues,
   DegradedFieldAnalysis,
+  DataStreamDocsStat,
   UpdateFieldLimitResponse,
   DataStreamRolloverResponse,
 } from '../../../common/api_types';
@@ -31,6 +31,7 @@ import { getDegradedFields } from './get_degraded_fields';
 import { getDegradedFieldValues } from './get_degraded_field_values';
 import { analyzeDegradedField } from './get_degraded_field_analysis';
 import { getDataStreamsMeteringStats } from './get_data_streams_metering_stats';
+import { getAggregatedDatasetPaginatedResults } from './get_dataset_aggregated_paginated_results';
 import { updateFieldLimit } from './update_field_limit';
 import { createDatasetQualityESClient } from '../../utils';
 
@@ -97,7 +98,7 @@ const degradedDocsRoute = createDatasetQualityServerRoute({
   params: t.type({
     query: t.intersection([
       rangeRt,
-      typeRt,
+      t.type({ types: typesRt }),
       t.partial({
         datasetQuery: t.string,
       }),
@@ -107,19 +108,13 @@ const degradedDocsRoute = createDatasetQualityServerRoute({
     tags: [],
   },
   async handler(resources): Promise<{
-    degradedDocs: DegradedDocs[];
+    degradedDocs: DataStreamDocsStat[];
   }> {
     const { context, params } = resources;
     const coreContext = await context.core;
 
     const esClient = coreContext.elasticsearch.client.asCurrentUser;
 
-    await datasetQualityPrivileges.throwIfCannotReadDataset(
-      esClient,
-      params.query.type,
-      params.query.datasetQuery
-    );
-
     const degradedDocs = await getDegradedDocsPaginated({
       esClient,
       ...params.query,
@@ -131,6 +126,39 @@ const degradedDocsRoute = createDatasetQualityServerRoute({
   },
 });
 
+const totalDocsRoute = createDatasetQualityServerRoute({
+  endpoint: 'GET /internal/dataset_quality/data_streams/total_docs',
+  params: t.type({
+    query: t.intersection([rangeRt, typeRt]),
+  }),
+  options: {
+    tags: [],
+  },
+  async handler(resources): Promise<{
+    totalDocs: DataStreamDocsStat[];
+  }> {
+    const { context, params } = resources;
+    const coreContext = await context.core;
+
+    const esClient = coreContext.elasticsearch.client.asCurrentUser;
+
+    await datasetQualityPrivileges.throwIfCannotReadDataset(esClient, params.query.type);
+
+    const { type, start, end } = params.query;
+
+    const totalDocs = await getAggregatedDatasetPaginatedResults({
+      esClient,
+      start,
+      end,
+      index: `${type}-*-*`,
+    });
+
+    return {
+      totalDocs,
+    };
+  },
+});
+
 const nonAggregatableDatasetsRoute = createDatasetQualityServerRoute({
   endpoint: 'GET /internal/dataset_quality/data_streams/non_aggregatable',
   params: t.type({
@@ -383,6 +411,7 @@ const rolloverDataStream = createDatasetQualityServerRoute({
 export const dataStreamsRouteRepository = {
   ...statsRoute,
   ...degradedDocsRoute,
+  ...totalDocsRoute,
   ...nonAggregatableDatasetsRoute,
   ...nonAggregatableDatasetRoute,
   ...degradedFieldsRoute,
diff --git a/x-pack/plugins/observability_solution/infra/kibana.jsonc b/x-pack/plugins/observability_solution/infra/kibana.jsonc
index 0f039fb02e356..6bcc6ef7259b4 100644
--- a/x-pack/plugins/observability_solution/infra/kibana.jsonc
+++ b/x-pack/plugins/observability_solution/infra/kibana.jsonc
@@ -2,6 +2,8 @@
   "type": "plugin",
   "id": "@kbn/infra-plugin",
   "owner": ["@elastic/obs-ux-logs-team", "@elastic/obs-ux-infra_services-team"],
+  "group": "observability",
+  "visibility": "private",
   "description": "This plugin visualizes data from Filebeat and Metricbeat, and integrates with other Observability solutions",
   "plugin": {
     "id": "infra",
diff --git a/x-pack/plugins/observability_solution/infra/public/pages/metrics/metrics_explorer/components/helpers/create_tsvb_link.ts b/x-pack/plugins/observability_solution/infra/public/pages/metrics/metrics_explorer/components/helpers/create_tsvb_link.ts
index 3192ccbf6f980..e41d191549c5a 100644
--- a/x-pack/plugins/observability_solution/infra/public/pages/metrics/metrics_explorer/components/helpers/create_tsvb_link.ts
+++ b/x-pack/plugins/observability_solution/infra/public/pages/metrics/metrics_explorer/components/helpers/create_tsvb_link.ts
@@ -114,7 +114,7 @@ export const createFilterFromOptions = (
     filters.push(options.filterQuery);
   }
   if (options.groupBy) {
-    const id = series.id.replace(/"/g, '\\"');
+    const id = series.id.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
     const groupByFilters = Array.isArray(options.groupBy)
       ? options.groupBy
           .map((field, index) => {
diff --git a/x-pack/plugins/observability_solution/inventory/kibana.jsonc b/x-pack/plugins/observability_solution/inventory/kibana.jsonc
index fc77163ae3c5f..e7cc398c9c655 100644
--- a/x-pack/plugins/observability_solution/inventory/kibana.jsonc
+++ b/x-pack/plugins/observability_solution/inventory/kibana.jsonc
@@ -2,6 +2,8 @@
   "type": "plugin",
   "id": "@kbn/inventory-plugin",
   "owner": "@elastic/obs-ux-infra_services-team",
+  "group": "observability",
+  "visibility": "private",
   "plugin": {
     "id": "inventory",
     "server": true,
diff --git a/x-pack/plugins/observability_solution/investigate_app/kibana.jsonc b/x-pack/plugins/observability_solution/investigate_app/kibana.jsonc
index e55dc03c83266..9b8284808a657 100644
--- a/x-pack/plugins/observability_solution/investigate_app/kibana.jsonc
+++ b/x-pack/plugins/observability_solution/investigate_app/kibana.jsonc
@@ -2,6 +2,8 @@
   "type": "plugin",
   "id": "@kbn/investigate-app-plugin",
   "owner": "@elastic/obs-ux-management-team",
+  "group": "observability",
+  "visibility": "private",
   "plugin": {
     "id": "investigateApp",
     "server": true,
diff --git a/x-pack/plugins/observability_solution/metrics_data_access/server/lib/adapters/framework/adapter_types.ts b/x-pack/plugins/observability_solution/metrics_data_access/server/lib/adapters/framework/adapter_types.ts
index daea1177b19f8..246988ed96307 100644
--- a/x-pack/plugins/observability_solution/metrics_data_access/server/lib/adapters/framework/adapter_types.ts
+++ b/x-pack/plugins/observability_solution/metrics_data_access/server/lib/adapters/framework/adapter_types.ts
@@ -17,7 +17,6 @@ import {
 } from '@kbn/data-plugin/server';
 import { PluginStart as DataViewsPluginStart } from '@kbn/data-views-plugin/server';
 import { HomeServerPluginSetup } from '@kbn/home-plugin/server';
-import { VisTypeTimeseriesSetup } from '@kbn/vis-type-timeseries-plugin/server';
 import { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { SpacesPluginSetup } from '@kbn/spaces-plugin/server';
 import { PluginSetupContract as AlertingPluginContract } from '@kbn/alerting-plugin/server';
@@ -37,7 +36,6 @@ export interface InfraServerPluginSetupDeps {
   share: SharePluginSetup;
   spaces: SpacesPluginSetup;
   usageCollection: UsageCollectionSetup;
-  visTypeTimeseries: VisTypeTimeseriesSetup;
   ml?: MlPluginSetup;
   metricsDataAccess: MetricsDataPluginSetup;
 }
diff --git a/x-pack/plugins/observability_solution/metrics_data_access/tsconfig.json b/x-pack/plugins/observability_solution/metrics_data_access/tsconfig.json
index 0c2c471a6bf77..2889bddc82393 100644
--- a/x-pack/plugins/observability_solution/metrics_data_access/tsconfig.json
+++ b/x-pack/plugins/observability_solution/metrics_data_access/tsconfig.json
@@ -16,7 +16,6 @@
     "@kbn/data-plugin",
     "@kbn/data-views-plugin",
     "@kbn/home-plugin",
-    "@kbn/vis-type-timeseries-plugin",
     "@kbn/features-plugin",
     "@kbn/spaces-plugin",
     "@kbn/alerting-plugin",
diff --git a/x-pack/plugins/observability_solution/observability/common/typings.ts b/x-pack/plugins/observability_solution/observability/common/typings.ts
index 03981f5941dc2..6c4eb09b284b7 100644
--- a/x-pack/plugins/observability_solution/observability/common/typings.ts
+++ b/x-pack/plugins/observability_solution/observability/common/typings.ts
@@ -11,7 +11,7 @@ import {
   ALERT_STATUS_RECOVERED,
   ALERT_STATUS_UNTRACKED,
 } from '@kbn/rule-data-utils';
-import { Filter } from '@kbn/es-query';
+import type { Filter } from '@kbn/es-query';
 import { ALERT_STATUS_ALL } from './constants';
 
 export type Maybe<T> = T | null | undefined;
@@ -54,5 +54,10 @@ export interface TimeRange {
   to?: string;
 }
 
+export interface EventNonEcsData {
+  field: string;
+  value?: Maybe<string[]>;
+}
+
 // Alert fields['kibana.alert.group] type
 export type GroupBy = Group[];
diff --git a/x-pack/plugins/observability_solution/observability/public/components/alerts_table/common/get_columns.tsx b/x-pack/plugins/observability_solution/observability/public/components/alerts_table/common/get_columns.tsx
index 2d2c1b1c299cf..fa2f10c3516e7 100644
--- a/x-pack/plugins/observability_solution/observability/public/components/alerts_table/common/get_columns.tsx
+++ b/x-pack/plugins/observability_solution/observability/public/components/alerts_table/common/get_columns.tsx
@@ -5,11 +5,7 @@
  * 2.0.
  */
 
-/**
- * We need to produce types and code transpilation at different folders during the build of the package.
- * We have types and code at different imports because we don't want to import the whole package in the resulting webpack bundle for the plugin.
- * This way plugins can do targeted imports to reduce the final code bundle
- */
+import type { EuiDataGridColumn } from '@elastic/eui';
 import {
   ALERT_EVALUATION_VALUE,
   ALERT_EVALUATION_THRESHOLD,
@@ -21,30 +17,18 @@ import {
   ALERT_INSTANCE_ID,
   TAGS,
 } from '@kbn/rule-data-utils';
-import { EuiDataGridColumn } from '@elastic/eui';
-import type { ColumnHeaderOptions } from '@kbn/timelines-plugin/common';
 import { i18n } from '@kbn/i18n';
 
-/**
- * columns implements a subset of `EuiDataGrid`'s `EuiDataGridColumn` interface,
- * plus additional TGrid column properties
- */
 export const getColumns = (
   {
     showRuleName,
   }: {
     showRuleName?: boolean;
   } = { showRuleName: false }
-): Array<
-  Pick<EuiDataGridColumn, 'display' | 'displayAsText' | 'id' | 'initialWidth'> & ColumnHeaderOptions
-> => {
-  const ruleNameColumn: Array<
-    Pick<EuiDataGridColumn, 'display' | 'displayAsText' | 'id' | 'initialWidth'> &
-      ColumnHeaderOptions
-  > = showRuleName
+): EuiDataGridColumn[] => {
+  const ruleNameColumn: EuiDataGridColumn[] = showRuleName
     ? [
         {
-          columnHeaderType: 'not-filtered',
           displayAsText: i18n.translate(
             'xpack.observability.alertsTGrid.ruleNameColumnDescription',
             {
@@ -59,7 +43,6 @@ export const getColumns = (
 
   return [
     {
-      columnHeaderType: 'not-filtered',
       displayAsText: i18n.translate('xpack.observability.alertsTGrid.statusColumnDescription', {
         defaultMessage: 'Alert Status',
       }),
@@ -67,7 +50,6 @@ export const getColumns = (
       initialWidth: 120,
     },
     {
-      columnHeaderType: 'not-filtered',
       displayAsText: i18n.translate('xpack.observability.alertsTGrid.triggeredColumnDescription', {
         defaultMessage: 'Triggered',
       }),
@@ -76,7 +58,6 @@ export const getColumns = (
       schema: 'datetime',
     },
     {
-      columnHeaderType: 'not-filtered',
       displayAsText: i18n.translate('xpack.observability.alertsTGrid.durationColumnDescription', {
         defaultMessage: 'Duration',
       }),
@@ -85,7 +66,6 @@ export const getColumns = (
     },
     ...ruleNameColumn,
     {
-      columnHeaderType: 'not-filtered',
       displayAsText: i18n.translate('xpack.observability.alertsTGrid.sourceColumnDescription', {
         defaultMessage: 'Group',
       }),
@@ -93,7 +73,6 @@ export const getColumns = (
       initialWidth: 100,
     },
     {
-      columnHeaderType: 'not-filtered',
       displayAsText: i18n.translate(
         'xpack.observability.alertsTGrid.observedValueColumnDescription',
         {
@@ -104,7 +83,6 @@ export const getColumns = (
       initialWidth: 100,
     },
     {
-      columnHeaderType: 'not-filtered',
       displayAsText: i18n.translate('xpack.observability.alertsTGrid.thresholdColumnDescription', {
         defaultMessage: 'Threshold',
       }),
@@ -112,7 +90,6 @@ export const getColumns = (
       initialWidth: 100,
     },
     {
-      columnHeaderType: 'not-filtered',
       displayAsText: i18n.translate('xpack.observability.alertsTGrid.tagsColumnDescription', {
         defaultMessage: 'Tags',
       }),
@@ -120,12 +97,10 @@ export const getColumns = (
       initialWidth: 150,
     },
     {
-      columnHeaderType: 'not-filtered',
       displayAsText: i18n.translate('xpack.observability.alertsTGrid.reasonColumnDescription', {
         defaultMessage: 'Reason',
       }),
       id: ALERT_REASON,
-      linkField: '*',
     },
   ];
 };
diff --git a/x-pack/plugins/observability_solution/observability/public/components/alerts_table/common/render_cell_value.test.tsx b/x-pack/plugins/observability_solution/observability/public/components/alerts_table/common/render_cell_value.test.tsx
index d551f90f1097f..d9d01d85c5303 100644
--- a/x-pack/plugins/observability_solution/observability/public/components/alerts_table/common/render_cell_value.test.tsx
+++ b/x-pack/plugins/observability_solution/observability/public/components/alerts_table/common/render_cell_value.test.tsx
@@ -6,7 +6,6 @@
  */
 
 import { ALERT_STATUS, ALERT_STATUS_ACTIVE, ALERT_STATUS_RECOVERED } from '@kbn/rule-data-utils';
-import type { DeprecatedCellValueElementProps } from '@kbn/timelines-plugin/common';
 import { render } from '../../../utils/test_helper';
 import { getRenderCellValue } from './render_cell_value';
 
@@ -19,7 +18,6 @@ describe('getRenderCellValue', () => {
     it('should return an active indicator when alert status is active', async () => {
       const cell = render(
         getRenderCellValue({
-          ...requiredProperties,
           columnId: ALERT_STATUS,
           data: makeAlertsTableRow({ alertStatus: ALERT_STATUS_ACTIVE }),
         })
@@ -31,7 +29,6 @@ describe('getRenderCellValue', () => {
     it('should return a recovered indicator when alert status is recovered', async () => {
       const cell = render(
         getRenderCellValue({
-          ...requiredProperties,
           columnId: ALERT_STATUS,
           data: makeAlertsTableRow({ alertStatus: ALERT_STATUS_RECOVERED }),
         })
@@ -50,22 +47,3 @@ function makeAlertsTableRow({ alertStatus }: AlertsTableRow) {
     },
   ];
 }
-
-const requiredProperties: DeprecatedCellValueElementProps = {
-  rowIndex: 0,
-  colIndex: 0,
-  columnId: '',
-  setCellProps: jest.fn(),
-  isExpandable: false,
-  isExpanded: false,
-  isDetails: false,
-  data: [],
-  eventId: '',
-  header: {
-    id: '',
-    columnHeaderType: 'not-filtered',
-  },
-  isDraggable: false,
-  linkValues: [],
-  scopeId: '',
-};
diff --git a/x-pack/plugins/observability_solution/observability/public/components/alerts_table/common/render_cell_value.tsx b/x-pack/plugins/observability_solution/observability/public/components/alerts_table/common/render_cell_value.tsx
index 6f6eb54a333d1..23757f889e058 100644
--- a/x-pack/plugins/observability_solution/observability/public/components/alerts_table/common/render_cell_value.tsx
+++ b/x-pack/plugins/observability_solution/observability/public/components/alerts_table/common/render_cell_value.tsx
@@ -23,7 +23,7 @@ import {
   ALERT_RULE_EXECUTION_TIMESTAMP,
 } from '@kbn/rule-data-utils';
 import { isEmpty } from 'lodash';
-import type { TimelineNonEcsData } from '@kbn/timelines-plugin/common';
+import type { EventNonEcsData } from '../../../../common/typings';
 import type { ObservabilityRuleTypeRegistry } from '../../..';
 import { asDuration } from '../../../../common/utils/formatters';
 import { AlertSeverityBadge } from '../../alert_severity_badge';
@@ -36,7 +36,7 @@ export const getMappedNonEcsValue = ({
   data,
   fieldName,
 }: {
-  data: TimelineNonEcsData[];
+  data: EventNonEcsData[];
   fieldName: string;
 }): string[] | undefined => {
   const item = data.find((d) => d.field === fieldName);
@@ -64,23 +64,24 @@ const getRenderValue = (mappedNonEcsValue: any) => {
   return '--';
 };
 
+interface GetRenderCellValueParams {
+  columnId: string;
+  data?: EventNonEcsData[];
+  setFlyoutAlert?: (alertId: string) => void;
+  observabilityRuleTypeRegistry?: ObservabilityRuleTypeRegistry;
+}
+
 /**
  * This implementation of `EuiDataGrid`'s `renderCellValue`
  * accepts `EuiDataGridCellValueElementProps`, plus `data`
  * from the TGrid
  */
-
 export const getRenderCellValue = ({
   columnId,
   data,
   setFlyoutAlert,
   observabilityRuleTypeRegistry,
-}: {
-  columnId: string;
-  data?: Array<{ field: string; value: any }>;
-  setFlyoutAlert?: (alertId: string) => void;
-  observabilityRuleTypeRegistry?: ObservabilityRuleTypeRegistry;
-}) => {
+}: GetRenderCellValueParams) => {
   if (!data) return null;
   const mappedNonEcsValue = getMappedNonEcsValue({
     data,
diff --git a/x-pack/plugins/observability_solution/observability/public/components/alerts_table/slo/default_columns.tsx b/x-pack/plugins/observability_solution/observability/public/components/alerts_table/slo/default_columns.tsx
index ea67c7c158e83..3796667e2583f 100644
--- a/x-pack/plugins/observability_solution/observability/public/components/alerts_table/slo/default_columns.tsx
+++ b/x-pack/plugins/observability_solution/observability/public/components/alerts_table/slo/default_columns.tsx
@@ -10,20 +10,17 @@
  * We have types and code at different imports because we don't want to import the whole package in the resulting webpack bundle for the plugin.
  * This way plugins can do targeted imports to reduce the final code bundle
  */
+
+import type { EuiDataGridColumn } from '@elastic/eui';
 import { ALERT_DURATION, ALERT_REASON, ALERT_STATUS, ALERT_RULE_NAME } from '@kbn/rule-data-utils';
-import { EuiDataGridColumn } from '@elastic/eui';
-import type { ColumnHeaderOptions } from '@kbn/timelines-plugin/common';
 import { i18n } from '@kbn/i18n';
 
 /**
  * columns implements a subset of `EuiDataGrid`'s `EuiDataGridColumn` interface,
  * plus additional TGrid column properties
  */
-export const columns: Array<
-  Pick<EuiDataGridColumn, 'display' | 'displayAsText' | 'id' | 'initialWidth'> & ColumnHeaderOptions
-> = [
+export const columns: EuiDataGridColumn[] = [
   {
-    columnHeaderType: 'not-filtered',
     displayAsText: i18n.translate(
       'xpack.observability.slo.sloAlertsEmbeddable.alertsTGrid.statusColumnDescription',
       {
@@ -34,7 +31,6 @@ export const columns: Array<
     initialWidth: 110,
   },
   {
-    columnHeaderType: 'not-filtered',
     displayAsText: i18n.translate(
       'xpack.observability.slo.sloAlertsEmbeddable.alertsTGrid.durationColumnDescription',
       {
@@ -45,7 +41,6 @@ export const columns: Array<
     initialWidth: 116,
   },
   {
-    columnHeaderType: 'not-filtered',
     displayAsText: i18n.translate(
       'xpack.observability.slo.sloAlertsEmbeddable.alertsTGrid.sloColumnDescription',
       {
@@ -56,7 +51,6 @@ export const columns: Array<
     initialWidth: 110,
   },
   {
-    columnHeaderType: 'not-filtered',
     displayAsText: i18n.translate(
       'xpack.observability.slo.sloAlertsEmbeddable.alertsTGrid.reasonColumnDescription',
       {
@@ -64,6 +58,5 @@ export const columns: Array<
       }
     ),
     id: ALERT_REASON,
-    linkField: '*',
   },
 ];
diff --git a/x-pack/plugins/observability_solution/observability/public/components/custom_threshold/types.ts b/x-pack/plugins/observability_solution/observability/public/components/custom_threshold/types.ts
index 891661b6bc82a..2c04cdf8f0767 100644
--- a/x-pack/plugins/observability_solution/observability/public/components/custom_threshold/types.ts
+++ b/x-pack/plugins/observability_solution/observability/public/components/custom_threshold/types.ts
@@ -6,35 +6,36 @@
  */
 
 import * as rt from 'io-ts';
-import { CasesPublicStart } from '@kbn/cases-plugin/public';
-import { ChartsPluginStart } from '@kbn/charts-plugin/public';
-import { DataPublicPluginStart } from '@kbn/data-plugin/public';
-import { DataView, DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
-import { DiscoverStart } from '@kbn/discover-plugin/public';
-import { EmbeddableStart } from '@kbn/embeddable-plugin/public';
-import { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
-import { LensPublicStart } from '@kbn/lens-plugin/public';
-import { ObservabilitySharedPluginStart } from '@kbn/observability-shared-plugin/public';
-import { OsqueryPluginStart } from '@kbn/osquery-plugin/public';
+import type { CasesPublicStart } from '@kbn/cases-plugin/public';
+import type { ChartsPluginStart } from '@kbn/charts-plugin/public';
+import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
+import type { DataView, DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import type { DiscoverStart } from '@kbn/discover-plugin/public';
+import type { EmbeddableStart } from '@kbn/embeddable-plugin/public';
+import type { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
+import type { LensPublicStart } from '@kbn/lens-plugin/public';
+import type { ObservabilitySharedPluginStart } from '@kbn/observability-shared-plugin/public';
+import type { OsqueryPluginStart } from '@kbn/osquery-plugin/public';
 import { ALERT_GROUP, ALERT_RULE_PARAMETERS } from '@kbn/rule-data-utils';
-import { SharePluginStart } from '@kbn/share-plugin/public';
-import { SpacesPluginStart } from '@kbn/spaces-plugin/public';
-import {
+import type { SharePluginStart } from '@kbn/share-plugin/public';
+import type { SpacesPluginStart } from '@kbn/spaces-plugin/public';
+import type {
   RuleTypeParams,
   TriggersAndActionsUIPublicPluginStart,
 } from '@kbn/triggers-actions-ui-plugin/public';
-import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
-import { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
-import { UsageCollectionStart } from '@kbn/usage-collection-plugin/public';
+import type { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import type { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
+import type { UsageCollectionStart } from '@kbn/usage-collection-plugin/public';
+import type { Group } from '../../../common/typings';
 import {
   aggType,
-  CustomThresholdSearchSourceFields,
-  BaseMetricExpressionParams,
-  CustomMetricExpressionParams,
-  MetricExpressionParams,
-  ThresholdParams,
+  type CustomThresholdSearchSourceFields,
+  type BaseMetricExpressionParams,
+  type CustomMetricExpressionParams,
+  type MetricExpressionParams,
+  type ThresholdParams,
 } from '../../../common/custom_threshold_rule/types';
-import { ObservabilityPublicStart } from '../../plugin';
+import type { ObservabilityPublicStart } from '../../plugin';
 
 export type CustomThresholdPrefillOptions = Partial<
   Omit<ThresholdParams, 'criteria'> & { criteria: Array<Partial<MetricExpressionParams>> }
@@ -90,8 +91,9 @@ export interface CustomThresholdRuleTypeParams extends RuleTypeParams {
   searchConfiguration: CustomThresholdSearchSourceFields;
   groupBy?: string | string[];
 }
+
 export interface CustomThresholdAlertFields {
-  [ALERT_GROUP]?: Array<{ field: string; value: string }>;
+  [ALERT_GROUP]?: Group[];
   [ALERT_RULE_PARAMETERS]: CustomThresholdRuleTypeParams;
 }
 
diff --git a/x-pack/plugins/observability_solution/observability/public/pages/alerts/components/alert_actions.tsx b/x-pack/plugins/observability_solution/observability/public/pages/alerts/components/alert_actions.tsx
index f591347b17238..071b75ab89632 100644
--- a/x-pack/plugins/observability_solution/observability/public/pages/alerts/components/alert_actions.tsx
+++ b/x-pack/plugins/observability_solution/observability/public/pages/alerts/components/alert_actions.tsx
@@ -19,15 +19,15 @@ import { i18n } from '@kbn/i18n';
 import { CaseAttachmentsWithoutOwner } from '@kbn/cases-plugin/public';
 import { AttachmentType } from '@kbn/cases-plugin/common';
 import { EcsSecurityExtension as Ecs } from '@kbn/securitysolution-ecs';
-import { TimelineNonEcsData } from '@kbn/timelines-plugin/common';
 import type { AlertActionsProps } from '@kbn/triggers-actions-ui-plugin/public/types';
 import { useRouteMatch } from 'react-router-dom';
 import { SLO_ALERTS_TABLE_ID } from '@kbn/observability-shared-plugin/common';
+import type { EventNonEcsData } from '../../../../common/typings';
 import { RULE_DETAILS_PAGE_ID } from '../../rule_details/constants';
 import { paths, SLO_DETAIL_PATH } from '../../../../common/locators/paths';
 import { useKibana } from '../../../utils/kibana_react';
 import { parseAlert } from '../helpers/parse_alert';
-import { observabilityFeatureId, ObservabilityRuleTypeRegistry } from '../../..';
+import { observabilityFeatureId, type ObservabilityRuleTypeRegistry } from '../../..';
 import type { ConfigSchema } from '../../../plugin';
 import { ALERT_DETAILS_PAGE_ID } from '../../alert_details/alert_details';
 
@@ -58,7 +58,7 @@ export function AlertActions({
 
   const data = useMemo(
     () =>
-      Object.entries(alert ?? {}).reduce<TimelineNonEcsData[]>(
+      Object.entries(alert ?? {}).reduce<EventNonEcsData[]>(
         (acc, [field, value]) => [...acc, { field, value: value as string[] }],
         []
       ),
diff --git a/x-pack/plugins/observability_solution/observability/public/utils/test_helper.tsx b/x-pack/plugins/observability_solution/observability/public/utils/test_helper.tsx
index dca5d29851469..16184c5621594 100644
--- a/x-pack/plugins/observability_solution/observability/public/utils/test_helper.tsx
+++ b/x-pack/plugins/observability_solution/observability/public/utils/test_helper.tsx
@@ -14,7 +14,6 @@ import { coreMock } from '@kbn/core/public/mocks';
 import { __IntlProvider as IntlProvider } from '@kbn/i18n-react';
 import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { KibanaPageTemplate } from '@kbn/shared-ux-page-kibana-template';
-import translations from '@kbn/translations-plugin/translations/ja-JP.json';
 import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import { dataPluginMock } from '@kbn/data-plugin/public/mocks';
 
@@ -52,7 +51,7 @@ const queryClient = new QueryClient({
 
 export const render = (component: React.ReactNode, config: Subset<ConfigSchema> = {}) => {
   return testLibRender(
-    <IntlProvider locale="en-US" messages={translations.messages}>
+    <IntlProvider locale="en-US">
       <KibanaContextProvider
         services={{
           ...core,
diff --git a/x-pack/plugins/observability_solution/observability/tsconfig.json b/x-pack/plugins/observability_solution/observability/tsconfig.json
index cc8cef2a9716a..83c14047131b6 100644
--- a/x-pack/plugins/observability_solution/observability/tsconfig.json
+++ b/x-pack/plugins/observability_solution/observability/tsconfig.json
@@ -50,7 +50,6 @@
     "@kbn/grouping",
     "@kbn/data-views-plugin",
     "@kbn/core-http-browser",
-    "@kbn/timelines-plugin",
     "@kbn/visualization-ui-components",
     "@kbn/event-annotation-components",
     "@kbn/slo-schema",
@@ -101,7 +100,6 @@
     "@kbn/serverless",
     "@kbn/core-application-browser",
     "@kbn/core-theme-browser",
-    "@kbn/translations-plugin",
     "@kbn/config-schema",
     "@kbn/securitysolution-io-ts-utils",
     "@kbn/core-elasticsearch-server",
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/common/types.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/common/types.ts
index 51ae37b39d90f..210eb08b31e1a 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/common/types.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/common/types.ts
@@ -82,8 +82,8 @@ export type ConversationUpdateRequest = ConversationRequestBase & {
 export interface KnowledgeBaseEntry {
   '@timestamp': string;
   id: string;
+  title?: string;
   text: string;
-  doc_id: string;
   confidence: 'low' | 'medium' | 'high';
   is_correction: boolean;
   type?: 'user_instruction' | 'contextual';
@@ -96,12 +96,12 @@ export interface KnowledgeBaseEntry {
 }
 
 export interface Instruction {
-  doc_id: string;
+  id: string;
   text: string;
 }
 
 export interface AdHocInstruction {
-  doc_id?: string;
+  id?: string;
   text: string;
   instruction_type: 'user_instruction' | 'application_instruction';
 }
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/common/utils/short_id_table.test.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/common/utils/short_id_table.test.ts
index 784cf67530652..03d1cb177826e 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/common/utils/short_id_table.test.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/common/utils/short_id_table.test.ts
@@ -7,6 +7,16 @@
 import { ShortIdTable } from './short_id_table';
 
 describe('shortIdTable', () => {
+  it('generates a short id from a uuid', () => {
+    const table = new ShortIdTable();
+
+    const uuid = 'd877f65c-4036-42c4-b105-19e2f1a1c045';
+    const shortId = table.take(uuid);
+
+    expect(shortId.length).toBe(4);
+    expect(table.lookup(shortId)).toBe(uuid);
+  });
+
   it('generates at least 10k unique ids consistently', () => {
     const ids = new Set();
 
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/kibana.jsonc b/x-pack/plugins/observability_solution/observability_ai_assistant/kibana.jsonc
index c61ed31e60b10..e7a6a905a8bd2 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/kibana.jsonc
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/kibana.jsonc
@@ -4,8 +4,8 @@
   "owner": [
     "@elastic/obs-ai-assistant"
   ],
-  "group": "observability",
-  "visibility": "private",
+  "group": "platform",
+  "visibility": "shared",
   "plugin": {
     "id": "observabilityAIAssistant",
     "browser": true,
@@ -35,4 +35,4 @@
     ],
     "extraPublicDirs": []
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/analytics/recall_ranking.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/server/analytics/recall_ranking.ts
index 4c82f79fcba8d..4371310811edf 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/server/analytics/recall_ranking.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/server/analytics/recall_ranking.ts
@@ -52,9 +52,9 @@ const schema: RootSchema<RecallRanking> = {
   },
 };
 
-export const RecallRankingEventType = 'observability_ai_assistant_recall_ranking';
+export const recallRankingEventType = 'observability_ai_assistant_recall_ranking';
 
 export const recallRankingEvent: EventTypeOpts<RecallRanking> = {
-  eventType: RecallRankingEventType,
+  eventType: recallRankingEventType,
   schema,
 };
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/functions/summarize.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/server/functions/summarize.ts
index 8865861d81f45..1f4afdbdd56bb 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/server/functions/summarize.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/server/functions/summarize.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { KnowledgeBaseType } from '../../common/types';
+import { v4 } from 'uuid';
 import type { FunctionRegistrationParameters } from '.';
 import { KnowledgeBaseEntryRole } from '../../common';
 
@@ -14,6 +14,7 @@ export const SUMMARIZE_FUNCTION_NAME = 'summarize';
 export function registerSummarizationFunction({
   client,
   functions,
+  resources,
 }: FunctionRegistrationParameters) {
   functions.registerFunction(
     {
@@ -28,10 +29,10 @@ export function registerSummarizationFunction({
       parameters: {
         type: 'object',
         properties: {
-          id: {
+          title: {
             type: 'string',
             description:
-              'An id for the document. This should be a short human-readable keyword field with only alphabetic characters and underscores, that allow you to update it later.',
+              'A human readable title that can be used to identify the document later. This should be no longer than 255 characters',
           },
           text: {
             type: 'string',
@@ -54,7 +55,7 @@ export function registerSummarizationFunction({
           },
         },
         required: [
-          'id' as const,
+          'title' as const,
           'text' as const,
           'is_correction' as const,
           'confidence' as const,
@@ -62,21 +63,23 @@ export function registerSummarizationFunction({
         ],
       },
     },
-    (
-      { arguments: { id, text, is_correction: isCorrection, confidence, public: isPublic } },
+    async (
+      { arguments: { title, text, is_correction: isCorrection, confidence, public: isPublic } },
       signal
     ) => {
+      const id = v4();
+      resources.logger.debug(`Creating new knowledge base entry with id: ${id}`);
+
       return client
         .addKnowledgeBaseEntry({
           entry: {
-            doc_id: id,
-            role: KnowledgeBaseEntryRole.AssistantSummarization,
             id,
+            title,
             text,
-            is_correction: isCorrection,
-            type: KnowledgeBaseType.Contextual,
-            confidence,
             public: isPublic,
+            role: KnowledgeBaseEntryRole.AssistantSummarization,
+            confidence,
+            is_correction: isCorrection,
             labels: {},
           },
           // signal,
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/plugin.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/server/plugin.ts
index 81f4e24d4d21f..3bdff9eb17606 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/server/plugin.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/server/plugin.ts
@@ -32,7 +32,6 @@ import {
   ObservabilityAIAssistantPluginSetupDependencies,
   ObservabilityAIAssistantPluginStartDependencies,
 } from './types';
-import { addLensDocsToKb } from './service/knowledge_base_service/kb_docs/lens';
 import { registerFunctions } from './functions';
 import { recallRankingEvent } from './analytics/recall_ranking';
 import { initLangtrace } from './service/client/instrumentation/init_langtrace';
@@ -164,10 +163,6 @@ export class ObservabilityAIAssistantPlugin
 
     service.register(registerFunctions);
 
-    if (this.config.enableKnowledgeBase) {
-      addLensDocsToKb({ service, logger: this.logger.get('kb').get('lens') });
-    }
-
     registerServerRoutes({
       core,
       logger: this.logger,
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/routes/chat/route.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/server/routes/chat/route.ts
index 8bc88cca10b01..a6fe57cb58adc 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/server/routes/chat/route.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/server/routes/chat/route.ts
@@ -42,7 +42,7 @@ const chatCompleteBaseRt = t.type({
       ]),
       instructions: t.array(
         t.intersection([
-          t.partial({ doc_id: t.string }),
+          t.partial({ id: t.string }),
           t.type({
             text: t.string,
             instruction_type: t.union([
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/routes/functions/route.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/server/routes/functions/route.ts
index c402a0506736f..1571487765c09 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/server/routes/functions/route.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/server/routes/functions/route.ts
@@ -7,6 +7,7 @@
 import { notImplemented } from '@hapi/boom';
 import { nonEmptyStringRt, toBooleanRt } from '@kbn/io-ts-utils';
 import * as t from 'io-ts';
+import { v4 } from 'uuid';
 import { FunctionDefinition } from '../../../common/functions/types';
 import { KnowledgeBaseEntryRole } from '../../../common/types';
 import type { RecalledEntry } from '../../service/knowledge_base_service';
@@ -114,7 +115,8 @@ const functionRecallRoute = createObservabilityAIAssistantServerRoute({
       throw notImplemented();
     }
 
-    return client.recall({ queries, categories });
+    const entries = await client.recall({ queries, categories });
+    return { entries };
   },
 });
 
@@ -122,11 +124,10 @@ const functionSummariseRoute = createObservabilityAIAssistantServerRoute({
   endpoint: 'POST /internal/observability_ai_assistant/functions/summarize',
   params: t.type({
     body: t.type({
-      id: t.string,
+      title: t.string,
       text: nonEmptyStringRt,
       confidence: t.union([t.literal('low'), t.literal('medium'), t.literal('high')]),
       is_correction: toBooleanRt,
-      type: t.union([t.literal('user_instruction'), t.literal('contextual')]),
       public: toBooleanRt,
       labels: t.record(t.string, t.string),
     }),
@@ -142,10 +143,9 @@ const functionSummariseRoute = createObservabilityAIAssistantServerRoute({
     }
 
     const {
+      title,
       confidence,
-      id,
       is_correction: isCorrection,
-      type,
       text,
       public: isPublic,
       labels,
@@ -153,11 +153,10 @@ const functionSummariseRoute = createObservabilityAIAssistantServerRoute({
 
     return client.addKnowledgeBaseEntry({
       entry: {
+        title,
         confidence,
-        id,
-        doc_id: id,
+        id: v4(),
         is_correction: isCorrection,
-        type,
         text,
         public: isPublic,
         labels,
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/routes/knowledge_base/route.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/server/routes/knowledge_base/route.ts
index 1eb1650545781..0f1852c0e396c 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/server/routes/knowledge_base/route.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/server/routes/knowledge_base/route.ts
@@ -9,16 +9,12 @@ import type {
   MlDeploymentAllocationState,
   MlDeploymentState,
 } from '@elastic/elasticsearch/lib/api/types';
+import pLimit from 'p-limit';
 import { notImplemented } from '@hapi/boom';
 import { nonEmptyStringRt, toBooleanRt } from '@kbn/io-ts-utils';
 import * as t from 'io-ts';
 import { createObservabilityAIAssistantServerRoute } from '../create_observability_ai_assistant_server_route';
-import {
-  Instruction,
-  KnowledgeBaseEntry,
-  KnowledgeBaseEntryRole,
-  KnowledgeBaseType,
-} from '../../../common/types';
+import { Instruction, KnowledgeBaseEntry, KnowledgeBaseEntryRole } from '../../../common/types';
 
 const getKnowledgeBaseStatus = createObservabilityAIAssistantServerRoute({
   endpoint: 'GET /internal/observability_ai_assistant/kb/status',
@@ -108,18 +104,8 @@ const saveKnowledgeBaseUserInstruction = createObservabilityAIAssistantServerRou
     }
 
     const { id, text, public: isPublic } = resources.params.body;
-    return client.addKnowledgeBaseEntry({
-      entry: {
-        id,
-        doc_id: id,
-        text,
-        public: isPublic,
-        confidence: 'high',
-        is_correction: false,
-        type: KnowledgeBaseType.UserInstruction,
-        labels: {},
-        role: KnowledgeBaseEntryRole.UserEntry,
-      },
+    return client.addUserInstruction({
+      entry: { id, text, public: isPublic },
     });
   },
 });
@@ -153,26 +139,29 @@ const getKnowledgeBaseEntries = createObservabilityAIAssistantServerRoute({
   },
 });
 
+const knowledgeBaseEntryRt = t.intersection([
+  t.type({
+    id: t.string,
+    title: t.string,
+    text: nonEmptyStringRt,
+  }),
+  t.partial({
+    confidence: t.union([t.literal('low'), t.literal('medium'), t.literal('high')]),
+    is_correction: toBooleanRt,
+    public: toBooleanRt,
+    labels: t.record(t.string, t.string),
+    role: t.union([
+      t.literal(KnowledgeBaseEntryRole.AssistantSummarization),
+      t.literal(KnowledgeBaseEntryRole.UserEntry),
+      t.literal(KnowledgeBaseEntryRole.Elastic),
+    ]),
+  }),
+]);
+
 const saveKnowledgeBaseEntry = createObservabilityAIAssistantServerRoute({
   endpoint: 'POST /internal/observability_ai_assistant/kb/entries/save',
   params: t.type({
-    body: t.intersection([
-      t.type({
-        id: t.string,
-        text: nonEmptyStringRt,
-      }),
-      t.partial({
-        confidence: t.union([t.literal('low'), t.literal('medium'), t.literal('high')]),
-        is_correction: toBooleanRt,
-        public: toBooleanRt,
-        labels: t.record(t.string, t.string),
-        role: t.union([
-          t.literal('assistant_summarization'),
-          t.literal('user_entry'),
-          t.literal('elastic'),
-        ]),
-      }),
-    ]),
+    body: knowledgeBaseEntryRt,
   }),
   options: {
     tags: ['access:ai_assistant'],
@@ -184,27 +173,15 @@ const saveKnowledgeBaseEntry = createObservabilityAIAssistantServerRoute({
       throw notImplemented();
     }
 
-    const {
-      id,
-      text,
-      public: isPublic,
-      confidence,
-      is_correction: isCorrection,
-      labels,
-      role,
-    } = resources.params.body;
-
+    const entry = resources.params.body;
     return client.addKnowledgeBaseEntry({
       entry: {
-        id,
-        text,
-        doc_id: id,
-        confidence: confidence ?? 'high',
-        is_correction: isCorrection ?? false,
-        type: 'contextual',
-        public: isPublic ?? true,
-        labels: labels ?? {},
-        role: (role as KnowledgeBaseEntryRole) ?? KnowledgeBaseEntryRole.UserEntry,
+        confidence: 'high',
+        is_correction: false,
+        public: true,
+        labels: {},
+        role: KnowledgeBaseEntryRole.UserEntry,
+        ...entry,
       },
     });
   },
@@ -235,12 +212,7 @@ const importKnowledgeBaseEntries = createObservabilityAIAssistantServerRoute({
   endpoint: 'POST /internal/observability_ai_assistant/kb/entries/import',
   params: t.type({
     body: t.type({
-      entries: t.array(
-        t.type({
-          id: t.string,
-          text: nonEmptyStringRt,
-        })
-      ),
+      entries: t.array(knowledgeBaseEntryRt),
     }),
   }),
   options: {
@@ -253,18 +225,29 @@ const importKnowledgeBaseEntries = createObservabilityAIAssistantServerRoute({
       throw notImplemented();
     }
 
-    const entries = resources.params.body.entries.map((entry) => ({
-      doc_id: entry.id,
-      confidence: 'high' as KnowledgeBaseEntry['confidence'],
-      is_correction: false,
-      type: 'contextual' as const,
-      public: true,
-      labels: {},
-      role: KnowledgeBaseEntryRole.UserEntry,
-      ...entry,
-    }));
-
-    return await client.importKnowledgeBaseEntries({ entries });
+    const status = await client.getKnowledgeBaseStatus();
+    if (!status.ready) {
+      throw new Error('Knowledge base is not ready');
+    }
+
+    const limiter = pLimit(5);
+
+    const promises = resources.params.body.entries.map(async (entry) => {
+      return limiter(async () => {
+        return client.addKnowledgeBaseEntry({
+          entry: {
+            confidence: 'high',
+            is_correction: false,
+            public: true,
+            labels: {},
+            role: KnowledgeBaseEntryRole.UserEntry,
+            ...entry,
+          },
+        });
+      });
+    });
+
+    await Promise.all(promises);
   },
 });
 
@@ -273,8 +256,8 @@ export const knowledgeBaseRoutes = {
   ...getKnowledgeBaseStatus,
   ...getKnowledgeBaseEntries,
   ...saveKnowledgeBaseUserInstruction,
-  ...getKnowledgeBaseUserInstructions,
   ...importKnowledgeBaseEntries,
+  ...getKnowledgeBaseUserInstructions,
   ...saveKnowledgeBaseEntry,
   ...deleteKnowledgeBaseEntry,
 };
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/index.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/index.ts
index 162220ec7a7f1..048bbd2d362c2 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/index.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/index.ts
@@ -47,21 +47,19 @@ import {
 } from '../../../common/conversation_complete';
 import { CompatibleJSONSchema } from '../../../common/functions/types';
 import {
-  AdHocInstruction,
+  type AdHocInstruction,
   type Conversation,
   type ConversationCreateRequest,
   type ConversationUpdateRequest,
   type KnowledgeBaseEntry,
   type Message,
+  KnowledgeBaseType,
+  KnowledgeBaseEntryRole,
 } from '../../../common/types';
 import { withoutTokenCountEvents } from '../../../common/utils/without_token_count_events';
 import { CONTEXT_FUNCTION_NAME } from '../../functions/context';
 import type { ChatFunctionClient } from '../chat_function_client';
-import {
-  KnowledgeBaseEntryOperationType,
-  KnowledgeBaseService,
-  RecalledEntry,
-} from '../knowledge_base_service';
+import { KnowledgeBaseService, RecalledEntry } from '../knowledge_base_service';
 import { getAccessQuery } from '../util/get_access_query';
 import { getSystemMessageFromInstructions } from '../util/get_system_message_from_instructions';
 import { replaceSystemMessage } from '../util/replace_system_message';
@@ -709,7 +707,7 @@ export class ObservabilityAIAssistantClient {
   }: {
     queries: Array<{ text: string; boost?: number }>;
     categories?: string[];
-  }): Promise<{ entries: RecalledEntry[] }> => {
+  }): Promise<RecalledEntry[]> => {
     return (
       this.dependencies.knowledgeBaseService?.recall({
         namespace: this.dependencies.namespace,
@@ -718,7 +716,7 @@ export class ObservabilityAIAssistantClient {
         categories,
         esClient: this.dependencies.esClient,
         uiSettingsClient: this.dependencies.uiSettingsClient,
-      }) || { entries: [] }
+      }) || []
     );
   };
 
@@ -730,29 +728,55 @@ export class ObservabilityAIAssistantClient {
     return this.dependencies.knowledgeBaseService.setup();
   };
 
-  addKnowledgeBaseEntry = async ({
+  addUserInstruction = async ({
     entry,
   }: {
-    entry: Omit<KnowledgeBaseEntry, '@timestamp'>;
+    entry: Omit<
+      KnowledgeBaseEntry,
+      '@timestamp' | 'confidence' | 'is_correction' | 'type' | 'role'
+    >;
   }): Promise<void> => {
+    // for now we want to limit the number of user instructions to 1 per user
+    // if a user instruction already exists for the user, we get the id and update it
+    this.dependencies.logger.debug('Adding user instruction entry');
+    const existingId = await this.dependencies.knowledgeBaseService.getPersonalUserInstructionId({
+      isPublic: entry.public,
+      namespace: this.dependencies.namespace,
+      user: this.dependencies.user,
+    });
+
+    if (existingId) {
+      entry.id = existingId;
+      this.dependencies.logger.debug(`Updating user instruction with id "${existingId}"`);
+    }
+
     return this.dependencies.knowledgeBaseService.addEntry({
       namespace: this.dependencies.namespace,
       user: this.dependencies.user,
-      entry,
+      entry: {
+        ...entry,
+        confidence: 'high',
+        is_correction: false,
+        type: KnowledgeBaseType.UserInstruction,
+        labels: {},
+        role: KnowledgeBaseEntryRole.UserEntry,
+      },
     });
   };
 
-  importKnowledgeBaseEntries = async ({
-    entries,
+  addKnowledgeBaseEntry = async ({
+    entry,
   }: {
-    entries: Array<Omit<KnowledgeBaseEntry, '@timestamp'>>;
+    entry: Omit<KnowledgeBaseEntry, '@timestamp' | 'type'>;
   }): Promise<void> => {
-    const operations = entries.map((entry) => ({
-      type: KnowledgeBaseEntryOperationType.Index,
-      document: { ...entry, '@timestamp': new Date().toISOString() },
-    }));
-
-    await this.dependencies.knowledgeBaseService.addEntries({ operations });
+    return this.dependencies.knowledgeBaseService.addEntry({
+      namespace: this.dependencies.namespace,
+      user: this.dependencies.user,
+      entry: {
+        ...entry,
+        type: KnowledgeBaseType.Contextual,
+      },
+    });
   };
 
   getKnowledgeBaseEntries = async ({
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/index.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/index.ts
index d1aba4f232b0d..eb7eab19340ce 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/index.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/index.ts
@@ -13,18 +13,14 @@ import { getSpaceIdFromPath } from '@kbn/spaces-plugin/common';
 import type { TaskManagerSetupContract } from '@kbn/task-manager-plugin/server';
 import { once } from 'lodash';
 import type { AssistantScope } from '@kbn/ai-assistant-common';
-import {
-  KnowledgeBaseEntryRole,
-  ObservabilityAIAssistantScreenContextRequest,
-} from '../../common/types';
+import { ObservabilityAIAssistantScreenContextRequest } from '../../common/types';
 import type { ObservabilityAIAssistantPluginStartDependencies } from '../types';
 import { ChatFunctionClient } from './chat_function_client';
 import { ObservabilityAIAssistantClient } from './client';
 import { conversationComponentTemplate } from './conversation_component_template';
 import { kbComponentTemplate } from './kb_component_template';
-import { KnowledgeBaseEntryOperationType, KnowledgeBaseService } from './knowledge_base_service';
+import { KnowledgeBaseService } from './knowledge_base_service';
 import type { RegistrationCallback, RespondFunctionResources } from './types';
-import { splitKbText } from './util/split_kb_text';
 
 function getResourceName(resource: string) {
   return `.kibana-observability-ai-assistant-${resource}`;
@@ -52,24 +48,11 @@ export const resourceNames = {
   },
 };
 
-export const INDEX_QUEUED_DOCUMENTS_TASK_ID = 'observabilityAIAssistant:indexQueuedDocumentsTask';
-
-export const INDEX_QUEUED_DOCUMENTS_TASK_TYPE = INDEX_QUEUED_DOCUMENTS_TASK_ID + 'Type';
-
-type KnowledgeBaseEntryRequest = { id: string; labels?: Record<string, string> } & (
-  | {
-      text: string;
-    }
-  | {
-      texts: string[];
-    }
-);
-
 export class ObservabilityAIAssistantService {
   private readonly core: CoreSetup<ObservabilityAIAssistantPluginStartDependencies>;
   private readonly logger: Logger;
   private readonly getModelId: () => Promise<string>;
-  private kbService?: KnowledgeBaseService;
+  public kbService?: KnowledgeBaseService;
   private enableKnowledgeBase: boolean;
 
   private readonly registrations: RegistrationCallback[] = [];
@@ -93,26 +76,6 @@ export class ObservabilityAIAssistantService {
     this.enableKnowledgeBase = enableKnowledgeBase;
 
     this.allowInit();
-    if (enableKnowledgeBase) {
-      taskManager.registerTaskDefinitions({
-        [INDEX_QUEUED_DOCUMENTS_TASK_TYPE]: {
-          title: 'Index queued KB articles',
-          description:
-            'Indexes previously registered entries into the knowledge base when it is ready',
-          timeout: '30m',
-          maxAttempts: 2,
-          createTaskRunner: (context) => {
-            return {
-              run: async () => {
-                if (this.kbService) {
-                  await this.kbService.processQueue();
-                }
-              },
-            };
-          },
-        },
-      });
-    }
   }
 
   getKnowledgeBaseStatus() {
@@ -336,65 +299,6 @@ export class ObservabilityAIAssistantService {
     return fnClient;
   }
 
-  addToKnowledgeBaseQueue(entries: KnowledgeBaseEntryRequest[]): void {
-    if (this.enableKnowledgeBase) {
-      this.init()
-        .then(() => {
-          this.kbService!.queue(
-            entries.flatMap((entry) => {
-              const entryWithSystemProperties = {
-                ...entry,
-                '@timestamp': new Date().toISOString(),
-                doc_id: entry.id,
-                public: true,
-                confidence: 'high' as const,
-                type: 'contextual' as const,
-                is_correction: false,
-                labels: {
-                  ...entry.labels,
-                },
-                role: KnowledgeBaseEntryRole.Elastic,
-              };
-
-              const operations =
-                'texts' in entryWithSystemProperties
-                  ? splitKbText(entryWithSystemProperties)
-                  : [
-                      {
-                        type: KnowledgeBaseEntryOperationType.Index,
-                        document: entryWithSystemProperties,
-                      },
-                    ];
-
-              return operations;
-            })
-          );
-        })
-        .catch((error) => {
-          this.logger.error(
-            `Could not index ${entries.length} entries because of an initialisation error`
-          );
-          this.logger.error(error);
-        });
-    }
-  }
-
-  addCategoryToKnowledgeBase(categoryId: string, entries: KnowledgeBaseEntryRequest[]) {
-    if (this.enableKnowledgeBase) {
-      this.addToKnowledgeBaseQueue(
-        entries.map((entry) => {
-          return {
-            ...entry,
-            labels: {
-              ...entry.labels,
-              category: categoryId,
-            },
-          };
-        })
-      );
-    }
-  }
-
   register(cb: RegistrationCallback) {
     this.registrations.push(cb);
   }
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/kb_component_template.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/kb_component_template.ts
index a4c6dc25d2e57..b1b2d3293a234 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/kb_component_template.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/kb_component_template.ts
@@ -31,7 +31,16 @@ export const kbComponentTemplate: ClusterComponentTemplate['component_template']
     properties: {
       '@timestamp': date,
       id: keyword,
-      doc_id: { type: 'text', fielddata: true },
+      doc_id: { type: 'text', fielddata: true }, // deprecated but kept for backwards compatibility
+      title: {
+        type: 'text',
+        fields: {
+          keyword: {
+            type: 'keyword',
+            ignore_above: 256,
+          },
+        },
+      },
       user: {
         properties: {
           id: keyword,
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/knowledge_base_service/index.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/knowledge_base_service/index.ts
index 7306a0df7c572..92ce3a4a7e03b 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/knowledge_base_service/index.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/knowledge_base_service/index.ts
@@ -9,16 +9,11 @@ import { serverUnavailable, gatewayTimeout, badRequest } from '@hapi/boom';
 import type { ElasticsearchClient, IUiSettingsClient } from '@kbn/core/server';
 import type { Logger } from '@kbn/logging';
 import type { TaskManagerStartContract } from '@kbn/task-manager-plugin/server';
-import pLimit from 'p-limit';
 import pRetry from 'p-retry';
-import { map, orderBy } from 'lodash';
+import { orderBy } from 'lodash';
 import { encode } from 'gpt-tokenizer';
 import { MlTrainedModelDeploymentNodesStats } from '@elastic/elasticsearch/lib/api/types';
-import {
-  INDEX_QUEUED_DOCUMENTS_TASK_ID,
-  INDEX_QUEUED_DOCUMENTS_TASK_TYPE,
-  resourceNames,
-} from '..';
+import { resourceNames } from '..';
 import {
   Instruction,
   KnowledgeBaseEntry,
@@ -63,36 +58,11 @@ function throwKnowledgeBaseNotReady(body: any) {
   throw serverUnavailable(`Knowledge base is not ready yet`, body);
 }
 
-export enum KnowledgeBaseEntryOperationType {
-  Index = 'index',
-  Delete = 'delete',
-}
-
-interface KnowledgeBaseDeleteOperation {
-  type: KnowledgeBaseEntryOperationType.Delete;
-  doc_id?: string;
-  labels?: Record<string, string>;
-}
-
-interface KnowledgeBaseIndexOperation {
-  type: KnowledgeBaseEntryOperationType.Index;
-  document: KnowledgeBaseEntry;
-}
-
-export type KnowledgeBaseEntryOperation =
-  | KnowledgeBaseDeleteOperation
-  | KnowledgeBaseIndexOperation;
-
 export class KnowledgeBaseService {
-  private hasSetup: boolean = false;
-
-  private _queue: KnowledgeBaseEntryOperation[] = [];
-
-  constructor(private readonly dependencies: Dependencies) {
-    this.ensureTaskScheduled();
-  }
+  constructor(private readonly dependencies: Dependencies) {}
 
   setup = async () => {
+    this.dependencies.logger.debug('Setting up knowledge base');
     if (!this.dependencies.enabled) {
       return;
     }
@@ -192,7 +162,7 @@ export class KnowledgeBaseService {
       );
 
       if (isReady) {
-        return Promise.resolve();
+        return;
       }
 
       this.dependencies.logger.debug(`${elserModelId} model is not allocated yet`);
@@ -202,116 +172,10 @@ export class KnowledgeBaseService {
     }, retryOptions);
 
     this.dependencies.logger.info(`${elserModelId} model is ready`);
-    this.ensureTaskScheduled();
   };
 
-  private ensureTaskScheduled() {
-    if (!this.dependencies.enabled) {
-      return;
-    }
-    this.dependencies.taskManagerStart
-      .ensureScheduled({
-        taskType: INDEX_QUEUED_DOCUMENTS_TASK_TYPE,
-        id: INDEX_QUEUED_DOCUMENTS_TASK_ID,
-        state: {},
-        params: {},
-        schedule: {
-          interval: '1h',
-        },
-      })
-      .then(() => {
-        this.dependencies.logger.debug('Scheduled queue task');
-        return this.dependencies.taskManagerStart.runSoon(INDEX_QUEUED_DOCUMENTS_TASK_ID);
-      })
-      .then(() => {
-        this.dependencies.logger.debug('Queue task ran');
-      })
-      .catch((err) => {
-        this.dependencies.logger.error(`Failed to schedule queue task`);
-        this.dependencies.logger.error(err);
-      });
-  }
-
-  private async processOperation(operation: KnowledgeBaseEntryOperation) {
-    if (operation.type === KnowledgeBaseEntryOperationType.Delete) {
-      await this.dependencies.esClient.asInternalUser.deleteByQuery({
-        index: resourceNames.aliases.kb,
-        query: {
-          bool: {
-            filter: [
-              ...(operation.doc_id ? [{ term: { _id: operation.doc_id } }] : []),
-              ...(operation.labels
-                ? map(operation.labels, (value, key) => {
-                    return { term: { [key]: value } };
-                  })
-                : []),
-            ],
-          },
-        },
-      });
-      return;
-    }
-
-    await this.addEntry({
-      entry: operation.document,
-    });
-  }
-
-  async processQueue() {
-    if (!this._queue.length || !this.dependencies.enabled) {
-      return;
-    }
-
-    if (!(await this.status()).ready) {
-      this.dependencies.logger.debug(`Bailing on queue task: KB is not ready yet`);
-      return;
-    }
-
-    this.dependencies.logger.debug(`Processing queue`);
-
-    this.hasSetup = true;
-
-    this.dependencies.logger.info(`Processing ${this._queue.length} queue operations`);
-
-    const limiter = pLimit(5);
-
-    const operations = this._queue.concat();
-
-    await Promise.all(
-      operations.map((operation) =>
-        limiter(async () => {
-          this._queue.splice(operations.indexOf(operation), 1);
-          await this.processOperation(operation);
-        })
-      )
-    );
-
-    this.dependencies.logger.info('Processed all queued operations');
-  }
-
-  queue(operations: KnowledgeBaseEntryOperation[]): void {
-    if (!operations.length) {
-      return;
-    }
-
-    if (!this.hasSetup) {
-      this._queue.push(...operations);
-      return;
-    }
-
-    const limiter = pLimit(5);
-
-    const limitedFunctions = this._queue.map((operation) =>
-      limiter(() => this.processOperation(operation))
-    );
-
-    Promise.all(limitedFunctions).catch((err) => {
-      this.dependencies.logger.error(`Failed to process all queued operations`);
-      this.dependencies.logger.error(err);
-    });
-  }
-
   status = async () => {
+    this.dependencies.logger.debug('Checking model status');
     if (!this.dependencies.enabled) {
       return { ready: false, enabled: false };
     }
@@ -324,15 +188,24 @@ export class KnowledgeBaseService {
       const elserModelStats = modelStats.trained_model_stats[0];
       const deploymentState = elserModelStats.deployment_stats?.state;
       const allocationState = elserModelStats.deployment_stats?.allocation_status.state;
+      const ready = deploymentState === 'started' && allocationState === 'fully_allocated';
+
+      this.dependencies.logger.debug(
+        `Model deployment state: ${deploymentState}, allocation state: ${allocationState}, ready: ${ready}`
+      );
 
       return {
-        ready: deploymentState === 'started' && allocationState === 'fully_allocated',
+        ready,
         deployment_state: deploymentState,
         allocation_state: allocationState,
         model_name: elserModelId,
         enabled: true,
       };
     } catch (error) {
+      this.dependencies.logger.debug(
+        `Failed to get status for model "${elserModelId}" due to ${error.message}`
+      );
+
       return {
         error: error instanceof errors.ResponseError ? error.body.error : String(error),
         ready: false,
@@ -380,18 +253,21 @@ export class KnowledgeBaseService {
     };
 
     const response = await this.dependencies.esClient.asInternalUser.search<
-      Pick<KnowledgeBaseEntry, 'text' | 'is_correction' | 'labels'>
+      Pick<KnowledgeBaseEntry, 'text' | 'is_correction' | 'labels' | 'title'> & { doc_id?: string }
     >({
       index: [resourceNames.aliases.kb],
       query: esQuery,
       size: 20,
       _source: {
-        includes: ['text', 'is_correction', 'labels'],
+        includes: ['text', 'is_correction', 'labels', 'doc_id', 'title'],
       },
     });
 
     return response.hits.hits.map((hit) => ({
-      ...hit._source!,
+      text: hit._source?.text!,
+      is_correction: hit._source?.is_correction,
+      labels: hit._source?.labels,
+      title: hit._source?.title ?? hit._source?.doc_id, // use `doc_id` as fallback title for backwards compatibility
       score: hit._score!,
       id: hit._id!,
     }));
@@ -411,12 +287,11 @@ export class KnowledgeBaseService {
     namespace: string;
     esClient: { asCurrentUser: ElasticsearchClient; asInternalUser: ElasticsearchClient };
     uiSettingsClient: IUiSettingsClient;
-  }): Promise<{
-    entries: RecalledEntry[];
-  }> => {
+  }): Promise<RecalledEntry[]> => {
     if (!this.dependencies.enabled) {
-      return { entries: [] };
+      return [];
     }
+
     this.dependencies.logger.debug(
       () => `Recalling entries from KB for queries: "${JSON.stringify(queries)}"`
     );
@@ -480,9 +355,7 @@ export class KnowledgeBaseService {
       this.dependencies.logger.info(`Dropped ${droppedEntries} entries because of token limit`);
     }
 
-    return {
-      entries: returnedEntries,
-    };
+    return returnedEntries;
   };
 
   getUserInstructions = async (
@@ -508,11 +381,11 @@ export class KnowledgeBaseService {
           },
         },
         size: 500,
-        _source: ['doc_id', 'text', 'public'],
+        _source: ['id', 'text', 'public'],
       });
 
       return response.hits.hits.map((hit) => ({
-        doc_id: hit._source?.doc_id ?? '',
+        id: hit._id!,
         text: hit._source?.text ?? '',
         public: hit._source?.public,
       }));
@@ -536,13 +409,17 @@ export class KnowledgeBaseService {
       return { entries: [] };
     }
     try {
-      const response = await this.dependencies.esClient.asInternalUser.search<KnowledgeBaseEntry>({
+      const response = await this.dependencies.esClient.asInternalUser.search<
+        KnowledgeBaseEntry & { doc_id?: string }
+      >({
         index: resourceNames.aliases.kb,
         query: {
           bool: {
             filter: [
-              // filter title by query
-              ...(query ? [{ wildcard: { doc_id: { value: `${query}*` } } }] : []),
+              // filter by search query
+              ...(query
+                ? [{ query_string: { query: `${query}*`, fields: ['doc_id', 'title'] } }]
+                : []),
               {
                 // exclude user instructions
                 bool: { must_not: { term: { type: KnowledgeBaseType.UserInstruction } } },
@@ -550,16 +427,17 @@ export class KnowledgeBaseService {
             ],
           },
         },
-        sort: [
-          {
-            [String(sortBy)]: {
-              order: sortDirection,
-            },
-          },
-        ],
+        sort:
+          sortBy === 'title'
+            ? [
+                { ['title.keyword']: { order: sortDirection } },
+                { doc_id: { order: sortDirection } }, // sort by doc_id for backwards compatibility
+              ]
+            : [{ [String(sortBy)]: { order: sortDirection } }],
         size: 500,
         _source: {
           includes: [
+            'title',
             'doc_id',
             'text',
             'is_correction',
@@ -577,6 +455,7 @@ export class KnowledgeBaseService {
       return {
         entries: response.hits.hits.map((hit) => ({
           ...hit._source!,
+          title: hit._source!.title ?? hit._source!.doc_id, // use `doc_id` as fallback title for backwards compatibility
           role: hit._source!.role ?? KnowledgeBaseEntryRole.UserEntry,
           score: hit._score,
           id: hit._id!,
@@ -590,7 +469,7 @@ export class KnowledgeBaseService {
     }
   };
 
-  getExistingUserInstructionId = async ({
+  getPersonalUserInstructionId = async ({
     isPublic,
     user,
     namespace,
@@ -602,9 +481,7 @@ export class KnowledgeBaseService {
     if (!this.dependencies.enabled) {
       return null;
     }
-    const res = await this.dependencies.esClient.asInternalUser.search<
-      Pick<KnowledgeBaseEntry, 'doc_id'>
-    >({
+    const res = await this.dependencies.esClient.asInternalUser.search<KnowledgeBaseEntry>({
       index: resourceNames.aliases.kb,
       query: {
         bool: {
@@ -616,14 +493,47 @@ export class KnowledgeBaseService {
         },
       },
       size: 1,
-      _source: ['doc_id'],
+      _source: false,
     });
 
-    return res.hits.hits[0]?._source?.doc_id;
+    return res.hits.hits[0]?._id;
+  };
+
+  getUuidFromDocId = async ({
+    docId,
+    user,
+    namespace,
+  }: {
+    docId: string;
+    user?: { name: string; id?: string };
+    namespace?: string;
+  }) => {
+    const query = {
+      bool: {
+        filter: [
+          { term: { doc_id: docId } },
+
+          // exclude user instructions
+          { bool: { must_not: { term: { type: KnowledgeBaseType.UserInstruction } } } },
+
+          // restrict access to user's own entries
+          ...getAccessQuery({ user, namespace }),
+        ],
+      },
+    };
+
+    const response = await this.dependencies.esClient.asInternalUser.search<KnowledgeBaseEntry>({
+      size: 1,
+      index: resourceNames.aliases.kb,
+      query,
+      _source: false,
+    });
+
+    return response.hits.hits[0]?._id;
   };
 
   addEntry = async ({
-    entry: { id, ...document },
+    entry: { id, ...doc },
     user,
     namespace,
   }: {
@@ -634,19 +544,6 @@ export class KnowledgeBaseService {
     if (!this.dependencies.enabled) {
       return;
     }
-    // for now we want to limit the number of user instructions to 1 per user
-    if (document.type === KnowledgeBaseType.UserInstruction) {
-      const existingId = await this.getExistingUserInstructionId({
-        isPublic: document.public,
-        user,
-        namespace,
-      });
-
-      if (existingId) {
-        id = existingId;
-        document.doc_id = existingId;
-      }
-    }
 
     try {
       await this.dependencies.esClient.asInternalUser.index({
@@ -654,7 +551,7 @@ export class KnowledgeBaseService {
         id,
         document: {
           '@timestamp': new Date().toISOString(),
-          ...document,
+          ...doc,
           user,
           namespace,
         },
@@ -669,29 +566,6 @@ export class KnowledgeBaseService {
     }
   };
 
-  addEntries = async ({
-    operations,
-  }: {
-    operations: KnowledgeBaseEntryOperation[];
-  }): Promise<void> => {
-    if (!this.dependencies.enabled) {
-      return;
-    }
-    this.dependencies.logger.info(`Starting import of ${operations.length} entries`);
-
-    const limiter = pLimit(5);
-
-    await Promise.all(
-      operations.map((operation) =>
-        limiter(async () => {
-          await this.processOperation(operation);
-        })
-      )
-    );
-
-    this.dependencies.logger.info(`Completed import of ${operations.length} entries`);
-  };
-
   deleteEntry = async ({ id }: { id: string }): Promise<void> => {
     try {
       await this.dependencies.esClient.asInternalUser.delete({
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/knowledge_base_service/kb_docs/lens.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/knowledge_base_service/kb_docs/lens.ts
deleted file mode 100644
index 9baf75f6ff552..0000000000000
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/knowledge_base_service/kb_docs/lens.ts
+++ /dev/null
@@ -1,596 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import dedent from 'dedent';
-import type { Logger } from '@kbn/logging';
-import type { ObservabilityAIAssistantService } from '../..';
-
-export function addLensDocsToKb({
-  service,
-}: {
-  service: ObservabilityAIAssistantService;
-  logger: Logger;
-}) {
-  service.addCategoryToKnowledgeBase('lens', [
-    {
-      id: 'lens_formulas_how_it_works',
-      texts: [
-        `Lens formulas let you do math using a combination of Elasticsearch aggregations and
-      math functions. There are three main types of functions:
-      
-      * Elasticsearch metrics, like \`sum(bytes)\`
-      * Time series functions use Elasticsearch metrics as input, like \`cumulative_sum()\`
-      * Math functions like \`round()\`
-      
-      An example formula that uses all of these:
-      
-      \`\`\`
-      round(100 * moving_average(
-      average(cpu.load.pct),
-      window=10,
-      kql='datacenter.name: east*'
-      ))
-      \`\`\`
-      `,
-        `Elasticsearch functions take a field name, which can be in quotes. \`sum(bytes)\` is the same
-      as \`sum('bytes')\`.
-      
-      Some functions take named arguments, like \`moving_average(count(), window=5)\`.
-      
-      Elasticsearch metrics can be filtered using KQL or Lucene syntax. To add a filter, use the named
-      parameter \`kql='field: value'\` or \`lucene=''\`. Always use single quotes when writing KQL or Lucene
-      queries. If your search has a single quote in it, use a backslash to escape, like: \`kql='Women's'\'
-      
-      Math functions can take positional arguments, like pow(count(), 3) is the same as count() * count() * count()
-      
-      Use the symbols +, -, /, and * to perform basic math.`,
-      ],
-    },
-    {
-      id: 'lens_common_formulas',
-      texts: [
-        `The most common formulas are dividing two values to produce a percent. To display accurately, set
-      "value format" to "percent"`,
-        `### Filter ratio:
-
-      Use \`kql=''\` to filter one set of documents and compare it to other documents within the same grouping.
-      For example, to see how the error rate changes over time:
-
-      \`\`\`
-      count(kql='response.status_code > 400') / count()
-      \`\`\``,
-        `### Week over week:
-
-      Use \`shift='1w'\` to get the value of each grouping from
-      the previous week. Time shift should not be used with the *Top values* function.
-
-      \`\`\`
-      percentile(system.network.in.bytes, percentile=99) /
-      percentile(system.network.in.bytes, percentile=99, shift='1w')
-      \`\`\``,
-
-        `### Percent of total
-
-      Formulas can calculate \`overall_sum\` for all the groupings,
-      which lets you convert each grouping into a percent of total:
-
-      \`\`\`
-      sum(products.base_price) / overall_sum(sum(products.base_price))
-      \`\`\``,
-
-        `### Recent change
-
-      Use \`reducedTimeRange='30m'\` to add an additional filter on the
-      time range of a metric aligned with the end of the global time range.
-      This can be used to calculate how much a value changed recently.
-
-      \`\`\`
-      max(system.network.in.bytes, reducedTimeRange="30m")
-      - min(system.network.in.bytes, reducedTimeRange="30m")
-      \`\`\`     
-      `,
-      ],
-    },
-    {
-      id: 'lens_formulas_elasticsearch_functions',
-      texts: [
-        `## Elasticsearch functions
-
-      These functions will be executed on the raw documents for each row of the
-      resulting table, aggregating all documents matching the break down
-      dimensions into a single value.`,
-
-        `#### average(field: string)
-      Returns the average of a field. This function only works for number fields.
-
-      Example: Get the average of price: \`average(price)\`
-
-      Example: Get the average of price for orders from the UK: \`average(price, 
-      kql='location:UK')\``,
-
-        `#### count([field: string])
-      The total number of documents. When you provide a field, the total number of 
-      field values is counted. When you use the Count function for fields that have 
-      multiple values in a single document, all values are counted.
-
-      To calculate the total number of documents, use \`count().\`
-
-      To calculate the number of products in all orders, use \`count(products.id)\`.
-
-      To calculate the number of documents that match a specific filter, use 
-      \`count(kql='price > 500')\`.`,
-
-        `#### last_value(field: string)
-      Returns the value of a field from the last document, ordered by the default 
-      time field of the data view.
-
-      This function is usefull the retrieve the latest state of an entity.
-
-      Example: Get the current status of server A: \`last_value(server.status, 
-      kql='server.name="A"')\``,
-
-        `#### max(field: string)
-      Returns the max of a field. This function only works for number fields.
-
-      Example: Get the max of price: \`max(price)\`
-
-      Example: Get the max of price for orders from the UK: \`max(price, 
-      kql='location:UK')\``,
-
-        `#### median(field: string)
-      Returns the median of a field. This function only works for number fields.
-
-      Example: Get the median of price: \`median(price)\`
-
-      Example: Get the median of price for orders from the UK: \`median(price, 
-      kql='location:UK')\``,
-
-        `#### min(field: string)
-      Returns the min of a field. This function only works for number fields.
-
-      Example: Get the min of price: \`min(price)\`
-
-      Example: Get the min of price for orders from the UK: \`min(price, 
-      kql='location:UK')\``,
-
-        `#### percentile(field: string, [percentile]: number)
-      Returns the specified percentile of the values of a field. This is the value n 
-      percent of the values occuring in documents are smaller.
-
-      Example: Get the number of bytes larger than 95 % of values: 
-      \`percentile(bytes, percentile=95)\``,
-
-        `#### percentile_rank(field: string, [value]: number)
-      Returns the percentage of values which are below a certain value. For example, 
-      if a value is greater than or equal to 95% of the observed values it is said to 
-      be at the 95th percentile rank
-
-      Example: Get the percentage of values which are below of 100: 
-      \`percentile_rank(bytes, value=100)\``,
-
-        `#### standard_deviation(field: string)
-      Returns the amount of variation or dispersion of the field. The function works 
-      only for number fields.
-
-      Example: To get the standard deviation of price, use 
-      \`standard_deviation(price).\`
-
-      Example: To get the variance of price for orders from the UK, use 
-      \`square(standard_deviation(price, kql='location:UK'))\`.`,
-
-        `#### sum(field: string)
-      Returns the sum of a field. This function only works for number fields.
-
-      Example: Get the sum of price: sum(price)
-
-      Example: Get the sum of price for orders from the UK: \`sum(price, 
-      kql='location:UK')\``,
-
-        `#### unique_count(field: string)
-      Calculates the number of unique values of a specified field. Works for number, 
-      string, date and boolean values.
-
-      Example: Calculate the number of different products: 
-      \`unique_count(product.name)\`
-
-      Example: Calculate the number of different products from the "clothes" group: 
-      \`unique_count(product.name, kql='product.group=clothes')\`
-            
-      `,
-      ],
-    },
-    {
-      id: 'lens_formulas_column_functions',
-      texts: [
-        `## Column calculations
-      These functions are executed for each row, but are provided with the whole 
-      column as context. This is also known as a window function.`,
-
-        `#### counter_rate(metric: number)
-      Calculates the rate of an ever increasing counter. This function will only 
-      yield helpful results on counter metric fields which contain a measurement of 
-      some kind monotonically growing over time. If the value does get smaller, it 
-      will interpret this as a counter reset. To get most precise results, 
-      counter_rate should be calculated on the max of a field.
-      
-      This calculation will be done separately for separate series defined by filters 
-      or top values dimensions. It uses the current interval when used in Formula.
-      
-      Example: Visualize the rate of bytes received over time by a memcached server: 
-      counter_rate(max(memcached.stats.read.bytes))`,
-
-        `cumulative_sum(metric: number)
-      Calculates the cumulative sum of a metric over time, adding all previous values 
-      of a series to each value. To use this function, you need to configure a date 
-      histogram dimension as well.
-      
-      This calculation will be done separately for separate series defined by filters 
-      or top values dimensions.
-      
-      Example: Visualize the received bytes accumulated over time: 
-      cumulative_sum(sum(bytes))`,
-
-        `differences(metric: number)
-      Calculates the difference to the last value of a metric over time. To use this 
-      function, you need to configure a date histogram dimension as well. Differences 
-      requires the data to be sequential. If your data is empty when using 
-      differences, try increasing the date histogram interval.
-      
-      This calculation will be done separately for separate series defined by filters 
-      or top values dimensions.
-      
-      Example: Visualize the change in bytes received over time: 
-      differences(sum(bytes))`,
-
-        `moving_average(metric: number, [window]: number)
-      Calculates the moving average of a metric over time, averaging the last n-th 
-      values to calculate the current value. To use this function, you need to 
-      configure a date histogram dimension as well. The default window value is 5.
-      
-      This calculation will be done separately for separate series defined by filters 
-      or top values dimensions.
-      
-      Takes a named parameter window which specifies how many last values to include 
-      in the average calculation for the current value.
-      
-      Example: Smooth a line of measurements: moving_average(sum(bytes), window=5)`,
-
-        `normalize_by_unit(metric: number, unit: s|m|h|d|w|M|y)
-      This advanced function is useful for normalizing counts and sums to a specific 
-      time interval. It allows for integration with metrics that are stored already 
-      normalized to a specific time interval.
-      
-      This function can only be used if there's a date histogram function used in the 
-      current chart.
-      
-      Example: A ratio comparing an already normalized metric to another metric that 
-      needs to be normalized. 
-      normalize_by_unit(counter_rate(max(system.diskio.write.bytes)), unit='s') / 
-      last_value(apache.status.bytes_per_second)`,
-
-        `overall_average(metric: number)
-      Calculates the average of a metric for all data points of a series in the 
-      current chart. A series is defined by a dimension using a date histogram or 
-      interval function. Other dimensions breaking down the data like top values or 
-      filter are treated as separate series.
-      
-      If no date histograms or interval functions are used in the current chart, 
-      overall_average is calculating the average over all dimensions no matter the 
-      used function
-      
-      Example: Divergence from the mean: sum(bytes) - overall_average(sum(bytes))`,
-
-        `overall_max(metric: number)
-      Calculates the maximum of a metric for all data points of a series in the 
-      current chart. A series is defined by a dimension using a date histogram or 
-      interval function. Other dimensions breaking down the data like top values or 
-      filter are treated as separate series.
-      
-      If no date histograms or interval functions are used in the current chart, 
-      overall_max is calculating the maximum over all dimensions no matter the used 
-      function
-      
-      Example: Percentage of range (sum(bytes) - overall_min(sum(bytes))) / 
-      (overall_max(sum(bytes)) - overall_min(sum(bytes)))`,
-
-        `overall_min(metric: number)
-      Calculates the minimum of a metric for all data points of a series in the 
-      current chart. A series is defined by a dimension using a date histogram or 
-      interval function. Other dimensions breaking down the data like top values or 
-      filter are treated as separate series.
-      
-      If no date histograms or interval functions are used in the current chart, 
-      overall_min is calculating the minimum over all dimensions no matter the used 
-      function
-      
-      Example: Percentage of range (sum(bytes) - overall_min(sum(bytes)) / 
-      (overall_max(sum(bytes)) - overall_min(sum(bytes)))`,
-
-        `overall_sum(metric: number)
-      Calculates the sum of a metric of all data points of a series in the current 
-      chart. A series is defined by a dimension using a date histogram or interval 
-      function. Other dimensions breaking down the data like top values or filter are 
-      treated as separate series.
-      
-      If no date histograms or interval functions are used in the current chart, 
-      overall_sum is calculating the sum over all dimensions no matter the used 
-      function.
-      
-      Example: Percentage of total sum(bytes) / overall_sum(sum(bytes))`,
-      ],
-    },
-    {
-      id: 'lens_formulas_math_functions',
-      texts: [
-        `Math
-      These functions will be executed for reach row of the resulting table using single values from the same row calculated using other functions.`,
-
-        `abs([value]: number)
-      Calculates absolute value. A negative value is multiplied by -1, a positive value stays the same.
-      
-      Example: Calculate average distance to sea level abs(average(altitude))`,
-
-        `add([left]: number, [right]: number)
-      Adds up two numbers.
-      
-      Also works with + symbol.
-      
-      Example: Calculate the sum of two fields
-      
-      sum(price) + sum(tax)
-      
-      Example: Offset count by a static value
-      
-      add(count(), 5)`,
-
-        `cbrt([value]: number)
-      Cube root of value.
-      
-      Example: Calculate side length from volume
-      
-      cbrt(last_value(volume))
-      
-      ceil([value]: number)
-      Ceiling of value, rounds up.
-      
-      Example: Round up price to the next dollar
-      
-      ceil(sum(price))`,
-
-        `clamp([value]: number, [min]: number, [max]: number)
-      Limits the value from a minimum to maximum.
-      
-      Example: Make sure to catch outliers
-      
-      clamp(
-        average(bytes),
-        percentile(bytes, percentile=5),
-        percentile(bytes, percentile=95)
-      )`,
-        `cube([value]: number)
-      Calculates the cube of a number.
-      
-      Example: Calculate volume from side length
-      
-      cube(last_value(length))`,
-
-        `defaults([value]: number, [default]: number)
-      Returns a default numeric value when value is null.
-      
-      Example: Return -1 when a field has no data
-      
-      defaults(average(bytes), -1)`,
-
-        `divide([left]: number, [right]: number)
-      Divides the first number by the second number.
-      
-      Also works with / symbol
-      
-      Example: Calculate profit margin
-      
-      sum(profit) / sum(revenue)
-      
-      Example: divide(sum(bytes), 2)`,
-
-        `exp([value]: number)
-      Raises e to the nth power.
-      
-      Example: Calculate the natural exponential function
-      
-      exp(last_value(duration))`,
-
-        `fix([value]: number)
-      For positive values, takes the floor. For negative values, takes the ceiling.
-      
-      Example: Rounding towards zero
-      
-      fix(sum(profit))`,
-
-        `floor([value]: number)
-      Round down to nearest integer value
-      
-      Example: Round down a price
-      
-      floor(sum(price))`,
-
-        `log([value]: number, [base]?: number)
-      Logarithm with optional base. The natural base e is used as default.
-      
-      Example: Calculate number of bits required to store values
-      
-      log(sum(bytes))
-      log(sum(bytes), 2)`,
-        `mod([value]: number, [base]: number)
-      Remainder after dividing the function by a number
-      
-      Example: Calculate last three digits of a value
-      
-      mod(sum(price), 1000)`,
-
-        `multiply([left]: number, [right]: number)
-      Multiplies two numbers.
-      
-      Also works with * symbol.
-      
-      Example: Calculate price after current tax rate
-      
-      sum(bytes) * last_value(tax_rate)
-      
-      Example: Calculate price after constant tax rate
-      
-      multiply(sum(price), 1.2)`,
-
-        `pick_max([left]: number, [right]: number)
-      Finds the maximum value between two numbers.
-      
-      Example: Find the maximum between two fields averages
-      
-      pick_max(average(bytes), average(memory))`,
-
-        `pick_min([left]: number, [right]: number)
-      Finds the minimum value between two numbers.
-      
-      Example: Find the minimum between two fields averages
-      
-      pick_min(average(bytes), average(memory))`,
-
-        `pow([value]: number, [base]: number)
-      Raises the value to a certain power. The second argument is required
-      
-      Example: Calculate volume based on side length
-      
-      pow(last_value(length), 3)`,
-
-        `round([value]: number, [decimals]?: number)
-      Rounds to a specific number of decimal places, default of 0
-      
-      Examples: Round to the cent
-      
-      round(sum(bytes))
-      round(sum(bytes), 2)`,
-        `sqrt([value]: number)
-      Square root of a positive value only
-      
-      Example: Calculate side length based on area
-      
-      sqrt(last_value(area))`,
-
-        `square([value]: number)
-      Raise the value to the 2nd power
-      
-      Example: Calculate area based on side length
-      
-      square(last_value(length))`,
-
-        `subtract([left]: number, [right]: number)
-      Subtracts the first number from the second number.
-      
-      Also works with - symbol.
-      
-      Example: Calculate the range of a field
-      
-      subtract(max(bytes), min(bytes))`,
-      ],
-    },
-    {
-      id: 'lens_formulas_comparison_functions',
-      texts: [
-        `Comparison
-      These functions are used to perform value comparison.`,
-
-        `eq([left]: number, [right]: number)
-      Performs an equality comparison between two values.
-      
-      To be used as condition for ifelse comparison function.
-      
-      Also works with == symbol.
-      
-      Example: Returns true if the average of bytes is exactly the same amount of average memory
-      
-      average(bytes) == average(memory)
-      
-      Example: eq(sum(bytes), 1000000)`,
-
-        `gt([left]: number, [right]: number)
-      Performs a greater than comparison between two values.
-      
-      To be used as condition for ifelse comparison function.
-      
-      Also works with > symbol.
-      
-      Example: Returns true if the average of bytes is greater than the average amount of memory
-      
-      average(bytes) > average(memory)
-      
-      Example: gt(average(bytes), 1000)`,
-
-        `gte([left]: number, [right]: number)
-      Performs a greater than comparison between two values.
-      
-      To be used as condition for ifelse comparison function.
-      
-      Also works with >= symbol.
-      
-      Example: Returns true if the average of bytes is greater than or equal to the average amount of memory
-      
-      average(bytes) >= average(memory)
-      
-      Example: gte(average(bytes), 1000)`,
-
-        `ifelse([condition]: boolean, [left]: number, [right]: number)
-      Returns a value depending on whether the element of condition is true or false.
-      
-      Example: Average revenue per customer but in some cases customer id is not provided which counts as additional customer
-      
-      sum(total)/(unique_count(customer_id) + ifelse( count() > count(kql='customer_id:*'), 1, 0))`,
-
-        `lt([left]: number, [right]: number)
-      Performs a lower than comparison between two values.
-      
-      To be used as condition for ifelse comparison function.
-      
-      Also works with < symbol.
-      
-      Example: Returns true if the average of bytes is lower than the average amount of memory
-      
-      average(bytes) <= average(memory)
-      
-      Example: lt(average(bytes), 1000)`,
-
-        `lte([left]: number, [right]: number)
-      Performs a lower than or equal comparison between two values.
-      
-      To be used as condition for ifelse comparison function.
-      
-      Also works with <= symbol.
-      
-      Example: Returns true if the average of bytes is lower than or equal to the average amount of memory
-      
-      average(bytes) <= average(memory)
-      
-      Example: lte(average(bytes), 1000)`,
-      ],
-    },
-    {
-      id: 'lens_formulas_kibana_context',
-      text: dedent(`Kibana context
-
-      These functions are used to retrieve Kibana context variables, which are the 
-      date histogram \`interval\`, the current \`now\` and the selected \`time_range\`
-      and help you to compute date math operations.
-      
-      interval()
-      The specified minimum interval for the date histogram, in milliseconds (ms).
-      
-      now()
-      The current now moment used in Kibana expressed in milliseconds (ms).
-      
-      time_range()
-      The specified time range, in milliseconds (ms).`),
-    },
-  ]);
-}
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/types.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/types.ts
index 2df3f36163972..2e24cf25902e0 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/types.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/types.ts
@@ -17,7 +17,6 @@ import type {
 import type {
   Message,
   ObservabilityAIAssistantScreenContextRequest,
-  InstructionOrPlainText,
   AdHocInstruction,
 } from '../../common/types';
 import type { ObservabilityAIAssistantRouteHandlerResources } from '../routes/types';
@@ -67,13 +66,13 @@ export interface FunctionHandler {
   respond: RespondFunction<any, FunctionResponse>;
 }
 
-export type InstructionOrCallback = InstructionOrPlainText | RegisterInstructionCallback;
+export type InstructionOrCallback = string | RegisterInstructionCallback;
 
 export type RegisterInstructionCallback = ({
   availableFunctionNames,
 }: {
   availableFunctionNames: string[];
-}) => InstructionOrPlainText | InstructionOrPlainText[] | undefined;
+}) => string | string[] | undefined;
 
 export type RegisterInstruction = (...instruction: InstructionOrCallback[]) => void;
 
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/util/get_system_message_from_instructions.test.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/util/get_system_message_from_instructions.test.ts
index 8e4075bed7b9d..82f22e08d1fc7 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/util/get_system_message_from_instructions.test.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/util/get_system_message_from_instructions.test.ts
@@ -41,10 +41,10 @@ describe('getSystemMessageFromInstructions', () => {
     expect(
       getSystemMessageFromInstructions({
         applicationInstructions: ['first'],
-        userInstructions: [{ doc_id: 'second', text: 'second from kb' }],
+        userInstructions: [{ id: 'second', text: 'second from kb' }],
         adHocInstructions: [
           {
-            doc_id: 'second',
+            id: 'second',
             text: 'second from adhoc instruction',
             instruction_type: 'user_instruction',
           },
@@ -58,7 +58,7 @@ describe('getSystemMessageFromInstructions', () => {
     expect(
       getSystemMessageFromInstructions({
         applicationInstructions: ['first'],
-        userInstructions: [{ doc_id: 'second', text: 'second_kb' }],
+        userInstructions: [{ id: 'second', text: 'second_kb' }],
         adHocInstructions: [],
         availableFunctionNames: [],
       })
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/util/get_system_message_from_instructions.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/util/get_system_message_from_instructions.ts
index 570449673084b..7b59b4ce59219 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/util/get_system_message_from_instructions.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/util/get_system_message_from_instructions.ts
@@ -45,7 +45,7 @@ export function getSystemMessageFromInstructions({
 
   const adHocInstructionsWithId = adHocInstructions.map((adHocInstruction) => ({
     ...adHocInstruction,
-    doc_id: adHocInstruction?.doc_id ?? v4(),
+    id: adHocInstruction?.id ?? v4(),
   }));
 
   // split ad hoc instructions into user instructions and application instructions
@@ -55,15 +55,16 @@ export function getSystemMessageFromInstructions({
   );
 
   // all adhoc instructions and KB instructions.
-  // adhoc instructions will be prioritized over Knowledge Base instructions if the doc_id is the same
+  // adhoc instructions will be prioritized over Knowledge Base instructions if the id is the same
   const allUserInstructions = withTokenBudget(
-    uniqBy([...adHocUserInstructions, ...kbUserInstructions], (i) => i.doc_id),
+    uniqBy([...adHocUserInstructions, ...kbUserInstructions], (i) => i.id),
     1000
   );
 
   return [
     // application instructions
-    ...allApplicationInstructions.concat(adHocApplicationInstructions),
+    ...allApplicationInstructions,
+    ...adHocApplicationInstructions,
 
     // user instructions
     ...(allUserInstructions.length ? [USER_INSTRUCTIONS_HEADER, ...allUserInstructions] : []),
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/util/split_kb_text.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/util/split_kb_text.ts
deleted file mode 100644
index 9a2f047b60f9b..0000000000000
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/util/split_kb_text.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { merge } from 'lodash';
-import type { KnowledgeBaseEntry } from '../../../common/types';
-import {
-  type KnowledgeBaseEntryOperation,
-  KnowledgeBaseEntryOperationType,
-} from '../knowledge_base_service';
-
-export function splitKbText({
-  id,
-  texts,
-  ...rest
-}: Omit<KnowledgeBaseEntry, 'text'> & { texts: string[] }): KnowledgeBaseEntryOperation[] {
-  return [
-    {
-      type: KnowledgeBaseEntryOperationType.Delete,
-      doc_id: id,
-      labels: {},
-    },
-    ...texts.map((text, index) => ({
-      type: KnowledgeBaseEntryOperationType.Index,
-      document: merge({}, rest, {
-        id: [id, index].join('_'),
-        doc_id: id,
-        labels: {},
-        text,
-      }),
-    })),
-  ];
-}
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/utils/recall/recall_and_score.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/server/utils/recall/recall_and_score.ts
index 8885ff7e1d7a2..fefe324805e59 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/server/utils/recall/recall_and_score.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/server/utils/recall/recall_and_score.ts
@@ -7,13 +7,14 @@
 
 import type { Logger } from '@kbn/logging';
 import { AnalyticsServiceStart } from '@kbn/core/server';
+import { scoreSuggestions } from './score_suggestions';
 import type { Message } from '../../../common';
 import type { ObservabilityAIAssistantClient } from '../../service/client';
 import type { FunctionCallChatFunction } from '../../service/types';
-import { retrieveSuggestions } from './retrieve_suggestions';
-import { scoreSuggestions } from './score_suggestions';
-import type { RetrievedSuggestion } from './types';
-import { RecallRanking, RecallRankingEventType } from '../../analytics/recall_ranking';
+import { RecallRanking, recallRankingEventType } from '../../analytics/recall_ranking';
+import { RecalledEntry } from '../../service/knowledge_base_service';
+
+export type RecalledSuggestion = Pick<RecalledEntry, 'id' | 'text' | 'score'>;
 
 export async function recallAndScore({
   recall,
@@ -34,19 +35,18 @@ export async function recallAndScore({
   logger: Logger;
   signal: AbortSignal;
 }): Promise<{
-  relevantDocuments?: RetrievedSuggestion[];
+  relevantDocuments?: RecalledSuggestion[];
   scores?: Array<{ id: string; score: number }>;
-  suggestions: RetrievedSuggestion[];
+  suggestions: RecalledSuggestion[];
 }> {
   const queries = [
     { text: userPrompt, boost: 3 },
     { text: context, boost: 1 },
   ].filter((query) => query.text.trim());
 
-  const suggestions = await retrieveSuggestions({
-    recall,
-    queries,
-  });
+  const suggestions: RecalledSuggestion[] = (await recall({ queries })).map(
+    ({ id, text, score }) => ({ id, text, score })
+  );
 
   if (!suggestions.length) {
     return {
@@ -67,7 +67,7 @@ export async function recallAndScore({
       chat,
     });
 
-    analytics.reportEvent<RecallRanking>(RecallRankingEventType, {
+    analytics.reportEvent<RecallRanking>(recallRankingEventType, {
       prompt: queries.map((query) => query.text).join('\n\n'),
       scoredDocuments: suggestions.map((suggestion) => {
         const llmScore = scores.find((score) => score.id === suggestion.id);
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/utils/recall/retrieve_suggestions.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/server/utils/recall/retrieve_suggestions.ts
deleted file mode 100644
index 3c680229cd5d2..0000000000000
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/server/utils/recall/retrieve_suggestions.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { omit } from 'lodash';
-import { ObservabilityAIAssistantClient } from '../../service/client';
-import { RetrievedSuggestion } from './types';
-
-export async function retrieveSuggestions({
-  queries,
-  recall,
-}: {
-  queries: Array<{ text: string; boost?: number }>;
-  recall: ObservabilityAIAssistantClient['recall'];
-}): Promise<RetrievedSuggestion[]> {
-  const recallResponse = await recall({
-    queries,
-  });
-
-  return recallResponse.entries.map((entry) => omit(entry, 'labels', 'is_correction'));
-}
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/utils/recall/score_suggestions.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/server/utils/recall/score_suggestions.ts
index 009b91a7a8c2c..7d1a19463cceb 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/server/utils/recall/score_suggestions.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/server/utils/recall/score_suggestions.ts
@@ -5,15 +5,15 @@
  * 2.0.
  */
 import * as t from 'io-ts';
-import { omit } from 'lodash';
 import { Logger } from '@kbn/logging';
 import dedent from 'dedent';
 import { lastValueFrom } from 'rxjs';
 import { decodeOrThrow, jsonRt } from '@kbn/io-ts-utils';
+import { omit } from 'lodash';
 import { concatenateChatCompletionChunks, Message, MessageRole } from '../../../common';
 import type { FunctionCallChatFunction } from '../../service/types';
-import type { RetrievedSuggestion } from './types';
 import { parseSuggestionScores } from './parse_suggestion_scores';
+import { RecalledSuggestion } from './recall_and_score';
 import { ShortIdTable } from '../../../common/utils/short_id_table';
 
 const scoreFunctionRequestRt = t.type({
@@ -38,7 +38,7 @@ export async function scoreSuggestions({
   signal,
   logger,
 }: {
-  suggestions: RetrievedSuggestion[];
+  suggestions: RecalledSuggestion[];
   messages: Message[];
   userPrompt: string;
   context: string;
@@ -46,28 +46,21 @@ export async function scoreSuggestions({
   signal: AbortSignal;
   logger: Logger;
 }): Promise<{
-  relevantDocuments: RetrievedSuggestion[];
+  relevantDocuments: RecalledSuggestion[];
   scores: Array<{ id: string; score: number }>;
 }> {
   const shortIdTable = new ShortIdTable();
 
-  const suggestionsWithShortId = suggestions.map((suggestion) => ({
-    ...omit(suggestion, 'score', 'id'), // To not bias the LLM
-    originalId: suggestion.id,
-    shortId: shortIdTable.take(suggestion.id),
-  }));
-
   const newUserMessageContent =
-    dedent(`Given the following question, score the documents that are relevant to the question. on a scale from 0 to 7,
-    0 being completely irrelevant, and 7 being extremely relevant. Information is relevant to the question if it helps in
-    answering the question. Judge it according to the following criteria:
-
-    - The document is relevant to the question, and the rest of the conversation
-    - The document has information relevant to the question that is not mentioned,
-      or more detailed than what is available in the conversation
-    - The document has a high amount of information relevant to the question compared to other documents
-    - The document contains new information not mentioned before in the conversation
-
+    dedent(`Given the following prompt, score the documents that are relevant to the prompt on a scale from 0 to 7,
+    0 being completely irrelevant, and 7 being extremely relevant. Information is relevant to the prompt if it helps in
+    answering the prompt. Judge the document according to the following criteria:
+    
+    - The document is relevant to the prompt, and the rest of the conversation
+    - The document has information relevant to the prompt that is not mentioned, or more detailed than what is available in the conversation
+    - The document has a high amount of information relevant to the prompt compared to other documents
+    - The document contains new information not mentioned before in the conversation or provides a correction to previously stated information.
+    
     User prompt:
     ${userPrompt}
 
@@ -76,9 +69,9 @@ export async function scoreSuggestions({
 
     Documents:
     ${JSON.stringify(
-      suggestionsWithShortId.map((suggestion) => ({
-        id: suggestion.shortId,
-        content: suggestion.text,
+      suggestions.map((suggestion) => ({
+        ...omit(suggestion, 'score'), // Omit score to not bias the LLM
+        id: shortIdTable.take(suggestion.id), // Shorten id to save tokens
       })),
       null,
       2
@@ -127,15 +120,9 @@ export async function scoreSuggestions({
     scoreFunctionRequest.message.function_call.arguments
   );
 
-  const scores = parseSuggestionScores(scoresAsString).map(({ id, score }) => {
-    const originalSuggestion = suggestionsWithShortId.find(
-      (suggestion) => suggestion.shortId === id
-    );
-    return {
-      originalId: originalSuggestion?.originalId,
-      score,
-    };
-  });
+  const scores = parseSuggestionScores(scoresAsString)
+    // Restore original IDs
+    .map(({ id, score }) => ({ id: shortIdTable.lookup(id)!, score }));
 
   if (scores.length === 0) {
     // seemingly invalid or no scores, return all
@@ -144,12 +131,13 @@ export async function scoreSuggestions({
 
   const suggestionIds = suggestions.map((document) => document.id);
 
+  // get top 5 documents ids with scores > 4
   const relevantDocumentIds = scores
-    .filter((document) => suggestionIds.includes(document.originalId ?? '')) // Remove hallucinated documents
-    .filter((document) => document.score > 4)
+    .filter(({ score }) => score > 4)
     .sort((a, b) => b.score - a.score)
     .slice(0, 5)
-    .map((document) => document.originalId);
+    .filter(({ id }) => suggestionIds.includes(id ?? '')) // Remove hallucinated documents
+    .map(({ id }) => id);
 
   const relevantDocuments = suggestions.filter((suggestion) =>
     relevantDocumentIds.includes(suggestion.id)
@@ -159,6 +147,6 @@ export async function scoreSuggestions({
 
   return {
     relevantDocuments,
-    scores: scores.map((score) => ({ id: score.originalId!, score: score.score })),
+    scores: scores.map((score) => ({ id: score.id, score: score.score })),
   };
 }
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_management/kibana.jsonc b/x-pack/plugins/observability_solution/observability_ai_assistant_management/kibana.jsonc
index f42dc2d2074d8..6699252ed69ed 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant_management/kibana.jsonc
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant_management/kibana.jsonc
@@ -2,6 +2,8 @@
   "type": "plugin",
   "id": "@kbn/observability-ai-assistant-management-plugin",
   "owner": "@elastic/obs-ai-assistant",
+  "group": "observability",
+  "visibility": "private",
   "plugin": {
     "id": "observabilityAiAssistantManagement",
     "server": true,
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/helpers/categorize_entries.ts b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/helpers/categorize_entries.ts
index 8d32ea4664f9f..7ea25eab8c661 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/helpers/categorize_entries.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/helpers/categorize_entries.ts
@@ -9,21 +9,30 @@ import type { KnowledgeBaseEntry } from '@kbn/observability-ai-assistant-plugin/
 
 export interface KnowledgeBaseEntryCategory {
   '@timestamp': string;
-  categoryName: string;
+  categoryKey: string;
+  title: string;
   entries: KnowledgeBaseEntry[];
 }
 
-export function categorizeEntries({ entries }: { entries: KnowledgeBaseEntry[] }) {
+export function categorizeEntries({
+  entries,
+}: {
+  entries: KnowledgeBaseEntry[];
+}): KnowledgeBaseEntryCategory[] {
   return entries.reduce((acc, entry) => {
-    const categoryName = entry.labels?.category ?? entry.id;
-
-    const index = acc.findIndex((item) => item.categoryName === categoryName);
+    const categoryKey = entry.labels?.category ?? entry.id;
 
-    if (index > -1) {
-      acc[index].entries.push(entry);
+    const existingEntry = acc.find((item) => item.categoryKey === categoryKey);
+    if (existingEntry) {
+      existingEntry.entries.push(entry);
       return acc;
-    } else {
-      return acc.concat({ categoryName, entries: [entry], '@timestamp': entry['@timestamp'] });
     }
-  }, [] as Array<{ categoryName: string; entries: KnowledgeBaseEntry[]; '@timestamp': string }>);
+
+    return acc.concat({
+      categoryKey,
+      title: entry.labels?.category ?? entry.title ?? 'No title',
+      entries: [entry],
+      '@timestamp': entry['@timestamp'],
+    });
+  }, [] as Array<{ categoryKey: string; title: string; entries: KnowledgeBaseEntry[]; '@timestamp': string }>);
 }
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/helpers/test_helper.tsx b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/helpers/test_helper.tsx
index a12fb8e12d90f..e520cc4052b59 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/helpers/test_helper.tsx
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/helpers/test_helper.tsx
@@ -11,7 +11,6 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { render as testLibRender } from '@testing-library/react';
 import { coreMock } from '@kbn/core/public/mocks';
 import { __IntlProvider as IntlProvider } from '@kbn/i18n-react';
-import translations from '@kbn/translations-plugin/translations/ja-JP.json';
 import { observabilityAIAssistantPluginMock } from '@kbn/observability-ai-assistant-plugin/public/mock';
 import { RouterProvider } from '@kbn/typed-react-router-config';
 import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
@@ -79,7 +78,7 @@ export const render = (
 
   return testLibRender(
     // @ts-ignore
-    <IntlProvider locale="en-US" messages={translations.messages}>
+    <IntlProvider locale="en-US">
       <RedirectToHomeIfUnauthorized coreStart={mergedCoreStartMock}>
         <KibanaContextProvider services={{ ...mergedCoreStartMock, ...startDeps }}>
           <AppContextProvider value={appContextValue}>
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/hooks/use_create_knowledge_base_entry.ts b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/hooks/use_create_knowledge_base_entry.ts
index 459de7be2d528..4cc6c8e2b9bf1 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/hooks/use_create_knowledge_base_entry.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/hooks/use_create_knowledge_base_entry.ts
@@ -28,10 +28,9 @@ export function useCreateKnowledgeBaseEntry() {
     void,
     ServerError,
     {
-      entry: Omit<
-        KnowledgeBaseEntry,
-        '@timestamp' | 'confidence' | 'is_correction' | 'role' | 'doc_id'
-      >;
+      entry: Omit<KnowledgeBaseEntry, '@timestamp'> & {
+        title: string;
+      };
     }
   >(
     [REACT_QUERY_KEYS.CREATE_KB_ENTRIES],
@@ -41,10 +40,7 @@ export function useCreateKnowledgeBaseEntry() {
         {
           signal: null,
           params: {
-            body: {
-              ...entry,
-              role: 'user_entry',
-            },
+            body: entry,
           },
         }
       );
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/hooks/use_create_knowledge_base_user_instruction.ts b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/hooks/use_create_knowledge_base_user_instruction.ts
index b51e45a3bdd6b..8adf5a7d8cfd0 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/hooks/use_create_knowledge_base_user_instruction.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/hooks/use_create_knowledge_base_user_instruction.ts
@@ -32,7 +32,7 @@ export function useCreateKnowledgeBaseUserInstruction() {
           signal: null,
           params: {
             body: {
-              id: entry.doc_id,
+              id: entry.id,
               text: entry.text,
               public: entry.public,
             },
@@ -62,7 +62,7 @@ export function useCreateKnowledgeBaseUserInstruction() {
             'xpack.observabilityAiAssistantManagement.kb.addUserInstruction.errorNotification',
             {
               defaultMessage: 'Something went wrong while creating {name}',
-              values: { name: entry.doc_id },
+              values: { name: entry.id },
             }
           ),
         });
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/hooks/use_import_knowledge_base_entries.ts b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/hooks/use_import_knowledge_base_entries.ts
index 9ff0748793bc8..239e72d99109e 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/hooks/use_import_knowledge_base_entries.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/hooks/use_import_knowledge_base_entries.ts
@@ -30,7 +30,7 @@ export function useImportKnowledgeBaseEntries() {
         Omit<
           KnowledgeBaseEntry,
           '@timestamp' | 'confidence' | 'is_correction' | 'public' | 'labels'
-        >
+        > & { title: string }
       >;
     }
   >(
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/knowledge_base_bulk_import_flyout.tsx b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/knowledge_base_bulk_import_flyout.tsx
index ac7632243a2a0..23d5ad00af12a 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/knowledge_base_bulk_import_flyout.tsx
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/knowledge_base_bulk_import_flyout.tsx
@@ -47,15 +47,13 @@ export function KnowledgeBaseBulkImportFlyout({ onClose }: { onClose: () => void
   };
 
   const handleSubmitNewEntryClick = async () => {
-    let entries: Array<Omit<KnowledgeBaseEntry, '@timestamp'>> = [];
+    let entries: Array<Omit<KnowledgeBaseEntry, '@timestamp' | 'title'> & { title: string }> = [];
     const text = await files[0].text();
 
     const elements = text.split('\n').filter(Boolean);
 
     try {
-      entries = elements.map((el) => JSON.parse(el)) as Array<
-        Omit<KnowledgeBaseEntry, '@timestamp'>
-      >;
+      entries = elements.map((el) => JSON.parse(el));
     } catch (_) {
       toasts.addError(
         new Error(
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/knowledge_base_category_flyout.tsx b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/knowledge_base_category_flyout.tsx
index fab3b34809c19..8dcf76e4bc56e 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/knowledge_base_category_flyout.tsx
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/knowledge_base_category_flyout.tsx
@@ -104,13 +104,13 @@ export function KnowledgeBaseCategoryFlyout({
   ];
 
   const hasDescription =
-    CATEGORY_MAP[category.categoryName as unknown as keyof typeof CATEGORY_MAP]?.description;
+    CATEGORY_MAP[category.categoryKey as unknown as keyof typeof CATEGORY_MAP]?.description;
 
   return (
     <EuiFlyout onClose={onClose} data-test-subj="knowledgeBaseCategoryFlyout">
       <EuiFlyoutHeader hasBorder>
         <EuiTitle>
-          <h2>{capitalize(category.categoryName)}</h2>
+          <h2>{capitalize(category.categoryKey)}</h2>
         </EuiTitle>
       </EuiFlyoutHeader>
       <EuiFlyoutBody>
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/knowledge_base_edit_manual_entry_flyout.tsx b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/knowledge_base_edit_manual_entry_flyout.tsx
index d809b6cd96d6d..20c7a75a401a8 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/knowledge_base_edit_manual_entry_flyout.tsx
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/knowledge_base_edit_manual_entry_flyout.tsx
@@ -26,7 +26,9 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 import moment from 'moment';
-import type { KnowledgeBaseEntry } from '@kbn/observability-ai-assistant-plugin/common/types';
+import { KnowledgeBaseEntryRole } from '@kbn/observability-ai-assistant-plugin/public';
+import { type KnowledgeBaseEntry } from '@kbn/observability-ai-assistant-plugin/common';
+import { v4 } from 'uuid';
 import { useCreateKnowledgeBaseEntry } from '../../hooks/use_create_knowledge_base_entry';
 import { useDeleteKnowledgeBaseEntry } from '../../hooks/use_delete_knowledge_base_entry';
 import { useKibana } from '../../hooks/use_kibana';
@@ -45,20 +47,24 @@ export function KnowledgeBaseEditManualEntryFlyout({
   const { mutateAsync: deleteEntry, isLoading: isDeleting } = useDeleteKnowledgeBaseEntry();
 
   const [isPublic, setIsPublic] = useState(entry?.public ?? false);
-
-  const [newEntryId, setNewEntryId] = useState(entry?.id ?? '');
+  const [newEntryTitle, setNewEntryTitle] = useState(entry?.title ?? '');
   const [newEntryText, setNewEntryText] = useState(entry?.text ?? '');
 
-  const isEntryIdInvalid = newEntryId.trim() === '';
+  const isEntryTitleInvalid = newEntryTitle.trim() === '';
   const isEntryTextInvalid = newEntryText.trim() === '';
-  const isFormInvalid = isEntryIdInvalid || isEntryTextInvalid;
+  const isFormInvalid = isEntryTitleInvalid || isEntryTextInvalid;
 
   const handleSubmit = async () => {
     await createEntry({
       entry: {
-        id: newEntryId,
+        id: entry?.id ?? v4(),
+        title: newEntryTitle,
         text: newEntryText,
         public: isPublic,
+        role: KnowledgeBaseEntryRole.UserEntry,
+        confidence: 'high',
+        is_correction: false,
+        labels: {},
       },
     });
 
@@ -85,8 +91,8 @@ export function KnowledgeBaseEditManualEntryFlyout({
               : i18n.translate(
                   'xpack.observabilityAiAssistantManagement.knowledgeBaseNewEntryFlyout.h2.editEntryLabel',
                   {
-                    defaultMessage: 'Edit {id}',
-                    values: { id: entry.id },
+                    defaultMessage: 'Edit {title}',
+                    values: { title: entry?.title },
                   }
                 )}
           </h2>
@@ -94,23 +100,7 @@ export function KnowledgeBaseEditManualEntryFlyout({
       </EuiFlyoutHeader>
 
       <EuiFlyoutBody>
-        {!entry ? (
-          <EuiFormRow
-            fullWidth
-            label={i18n.translate(
-              'xpack.observabilityAiAssistantManagement.knowledgeBaseEditManualEntryFlyout.euiFormRow.idLabel',
-              { defaultMessage: 'Name' }
-            )}
-          >
-            <EuiFieldText
-              data-test-subj="knowledgeBaseEditManualEntryFlyoutIdInput"
-              fullWidth
-              value={newEntryId}
-              onChange={(e) => setNewEntryId(e.target.value)}
-              isInvalid={isEntryIdInvalid}
-            />
-          </EuiFormRow>
-        ) : (
+        {entry ? (
           <EuiFlexGroup>
             <EuiFlexItem>
               <EuiText color="subdued" size="s">
@@ -136,7 +126,26 @@ export function KnowledgeBaseEditManualEntryFlyout({
               </EuiButton>
             </EuiFlexItem>
           </EuiFlexGroup>
-        )}
+        ) : null}
+
+        <EuiSpacer size="m" />
+
+        <EuiFormRow
+          fullWidth
+          label={i18n.translate(
+            'xpack.observabilityAiAssistantManagement.knowledgeBaseEditManualEntryFlyout.euiFormRow.idLabel',
+            { defaultMessage: 'Name' }
+          )}
+        >
+          <EuiFieldText
+            data-test-subj="knowledgeBaseEditManualEntryFlyoutIdInput"
+            fullWidth
+            value={newEntryTitle}
+            onChange={(e) => setNewEntryTitle(e.target.value)}
+            isInvalid={isEntryTitleInvalid}
+          />
+        </EuiFormRow>
+
         <EuiSpacer size="m" />
 
         <EuiFlexGroup alignItems="center">
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/knowledge_base_edit_user_instruction_flyout.tsx b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/knowledge_base_edit_user_instruction_flyout.tsx
index e8152738e3807..1c05ca6d52b3f 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/knowledge_base_edit_user_instruction_flyout.tsx
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/knowledge_base_edit_user_instruction_flyout.tsx
@@ -30,19 +30,19 @@ export function KnowledgeBaseEditUserInstructionFlyout({ onClose }: { onClose: (
   const { userInstructions, isLoading: isFetching } = useGetUserInstructions();
   const { mutateAsync: createEntry, isLoading: isSaving } = useCreateKnowledgeBaseUserInstruction();
   const [newEntryText, setNewEntryText] = useState('');
-  const [newEntryDocId, setNewEntryDocId] = useState<string>();
+  const [newEntryId, setNewEntryId] = useState<string>();
   const isSubmitDisabled = newEntryText.trim() === '';
 
   useEffect(() => {
     const userInstruction = userInstructions?.find((entry) => !entry.public);
-    setNewEntryDocId(userInstruction?.doc_id);
     setNewEntryText(userInstruction?.text ?? '');
+    setNewEntryId(userInstruction?.id);
   }, [userInstructions]);
 
   const handleSubmit = async () => {
     await createEntry({
       entry: {
-        doc_id: newEntryDocId ?? uuidv4(),
+        id: newEntryId ?? uuidv4(),
         text: newEntryText,
         public: false, // limit user instructions to private (for now)
       },
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/knowledge_base_tab.test.tsx b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/knowledge_base_tab.test.tsx
index d8e2897c6878c..50d0cb8ba47c8 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/knowledge_base_tab.test.tsx
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/knowledge_base_tab.test.tsx
@@ -81,7 +81,18 @@ describe('KnowledgeBaseTab', () => {
 
       getByTestId('knowledgeBaseEditManualEntryFlyoutSaveButton').click();
 
-      expect(createMock).toHaveBeenCalledWith({ entry: { id: 'foo', public: false, text: 'bar' } });
+      expect(createMock).toHaveBeenCalledWith({
+        entry: {
+          id: expect.any(String),
+          title: 'foo',
+          public: false,
+          text: 'bar',
+          role: 'user_entry',
+          confidence: 'high',
+          is_correction: false,
+          labels: expect.any(Object),
+        },
+      });
     });
 
     it('should require an id', () => {
@@ -126,7 +137,7 @@ describe('KnowledgeBaseTab', () => {
         entries: [
           {
             id: 'test',
-            doc_id: 'test',
+            title: 'test',
             text: 'test',
             '@timestamp': 1638340456,
             labels: {},
@@ -134,7 +145,7 @@ describe('KnowledgeBaseTab', () => {
           },
           {
             id: 'test2',
-            doc_id: 'test2',
+            title: 'test2',
             text: 'test',
             '@timestamp': 1638340456,
             labels: {
@@ -144,7 +155,7 @@ describe('KnowledgeBaseTab', () => {
           },
           {
             id: 'test3',
-            doc_id: 'test3',
+            title: 'test3',
             text: 'test',
             '@timestamp': 1638340456,
             labels: {
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/knowledge_base_tab.tsx b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/knowledge_base_tab.tsx
index 6ba09101b6227..23fbf796290c8 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/knowledge_base_tab.tsx
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/routes/components/knowledge_base_tab.tsx
@@ -57,10 +57,10 @@ export function KnowledgeBaseTab() {
             data-test-subj="pluginsColumnsButton"
             onClick={() => setSelectedCategory(category)}
             aria-label={
-              category.categoryName === selectedCategory?.categoryName ? 'Collapse' : 'Expand'
+              category.categoryKey === selectedCategory?.categoryKey ? 'Collapse' : 'Expand'
             }
             iconType={
-              category.categoryName === selectedCategory?.categoryName ? 'minimize' : 'expand'
+              category.categoryKey === selectedCategory?.categoryKey ? 'minimize' : 'expand'
             }
           />
         );
@@ -85,7 +85,8 @@ export function KnowledgeBaseTab() {
       width: '40px',
     },
     {
-      field: 'categoryName',
+      'data-test-subj': 'knowledgeBaseTableTitleCell',
+      field: 'title',
       name: i18n.translate('xpack.observabilityAiAssistantManagement.kbTab.columns.name', {
         defaultMessage: 'Name',
       }),
@@ -107,6 +108,7 @@ export function KnowledgeBaseTab() {
       },
     },
     {
+      'data-test-subj': 'knowledgeBaseTableAuthorCell',
       name: i18n.translate('xpack.observabilityAiAssistantManagement.kbTab.columns.author', {
         defaultMessage: 'Author',
       }),
@@ -183,7 +185,7 @@ export function KnowledgeBaseTab() {
   const [isNewEntryPopoverOpen, setIsNewEntryPopoverOpen] = useState(false);
   const [isEditUserInstructionFlyoutOpen, setIsEditUserInstructionFlyoutOpen] = useState(false);
   const [query, setQuery] = useState('');
-  const [sortBy, setSortBy] = useState<'doc_id' | '@timestamp'>('doc_id');
+  const [sortBy, setSortBy] = useState<keyof KnowledgeBaseEntryCategory>('title');
   const [sortDirection, setSortDirection] = useState<'asc' | 'desc'>('asc');
 
   const {
@@ -193,17 +195,10 @@ export function KnowledgeBaseTab() {
   } = useGetKnowledgeBaseEntries({ query, sortBy, sortDirection });
   const categorizedEntries = categorizeEntries({ entries });
 
-  const handleChangeSort = ({
-    sort,
-  }: Criteria<KnowledgeBaseEntryCategory & KnowledgeBaseEntry>) => {
+  const handleChangeSort = ({ sort }: Criteria<KnowledgeBaseEntryCategory>) => {
     if (sort) {
       const { field, direction } = sort;
-      if (field === '@timestamp') {
-        setSortBy(field);
-      }
-      if (field === 'categoryName') {
-        setSortBy('doc_id');
-      }
+      setSortBy(field);
       setSortDirection(direction);
     }
   };
@@ -329,7 +324,7 @@ export function KnowledgeBaseTab() {
             loading={isLoading}
             sorting={{
               sort: {
-                field: sortBy === 'doc_id' ? 'categoryName' : sortBy,
+                field: sortBy,
                 direction: sortDirection,
               },
             }}
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_management/tsconfig.json b/x-pack/plugins/observability_solution/observability_ai_assistant_management/tsconfig.json
index 99bce73e1722f..f0ad230f6f1b3 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant_management/tsconfig.json
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant_management/tsconfig.json
@@ -19,7 +19,6 @@
     "@kbn/core-chrome-browser",
     "@kbn/observability-ai-assistant-plugin",
     "@kbn/serverless",
-    "@kbn/translations-plugin",
     "@kbn/enterprise-search-plugin",
     "@kbn/management-settings-components-field-row",
     "@kbn/observability-shared-plugin",
diff --git a/x-pack/plugins/observability_solution/observability_onboarding/public/assets/auto_detect.sh b/x-pack/plugins/observability_solution/observability_onboarding/public/assets/auto_detect.sh
index 3b45ed3baf626..06f6a90f82a45 100755
--- a/x-pack/plugins/observability_solution/observability_onboarding/public/assets/auto_detect.sh
+++ b/x-pack/plugins/observability_solution/observability_onboarding/public/assets/auto_detect.sh
@@ -325,15 +325,32 @@ apply_elastic_agent_config() {
 
 read_open_log_file_list() {
   local exclude_patterns=(
-    "^\/Users\/.+?\/Library\/Application Support"
-    "^\/Users\/.+?\/Library\/Group Containers"
-    "^\/Users\/.+?\/Library\/Containers"
-    "^\/Users\/.+?\/Library\/Caches"
-    "^\/private"
+    "^\/Users\/.+?\/Library\/Application Support\/"
+    "^\/Users\/.+?\/Library\/Group Containers\/"
+    "^\/Users\/.+?\/Library\/Containers\/"
+    "^\/Users\/.+?\/Library\/Caches\/"
+    "^\/private\/"
+
+    # Integrations only ingest a subset of application logs so there are scenarios where additional
+    # log files could be detected and displayed as a "custom log" alongside the detected integration
+    # they belong to. To avoid this UX issue we exclude all log files inside application directories
+    # from the custom log file detection
+    "^\/var\/log\/nginx\/"
+    "^\/var\/log\/apache2\/"
+    "^\/var\/log\/httpd\/"
+    "^\/var\/log\/mysql\/"
+    "^\/var\/log\/postgresql\/"
+    "^\/var\/log\/redis\/"
+    "^\/var\/log\/rabbitmq\/"
+    "^\/var\/log\/kafka\/"
+    "^\/var\/lib\/docker\/"
+    "^\/var\/log\/mongodb\/"
+    "^\/opt\/tomcat\/logs\/"
+    "^\/var\/log\/prometheus\/"
 
     # Exclude previous installation logs
-    "\/opt\/Elastic\/Agent\/"
-    "\/Library\/Elastic\/Agent\/"
+    "^\/opt\/Elastic\/Agent\/"
+    "^\/Library\/Elastic\/Agent\/"
   )
 
   # Excluding all patterns that correspond to known integrations
diff --git a/x-pack/plugins/observability_solution/observability_onboarding/public/assets/integrations.conf b/x-pack/plugins/observability_solution/observability_onboarding/public/assets/integrations.conf
index 0b197bef30f7d..48ad18035edc0 100644
--- a/x-pack/plugins/observability_solution/observability_onboarding/public/assets/integrations.conf
+++ b/x-pack/plugins/observability_solution/observability_onboarding/public/assets/integrations.conf
@@ -34,9 +34,9 @@ patterns=
 title=PostgreSQL
 patterns=
     /var/log/postgresql/postgresql-*-*.log*
+    /var/log/postgresql/postgresql-*-*.csv*
     /*/postgresql-logs/*.log
     /etc/postgresql/*/main/postgresql.conf
-    /var/log/postgresql/postgresql-*-*.csv*
 
 [redis]
 title=Redis
diff --git a/x-pack/plugins/observability_solution/slo/public/utils/test_helper.tsx b/x-pack/plugins/observability_solution/slo/public/utils/test_helper.tsx
index 1fe6ece726610..014644d973b74 100644
--- a/x-pack/plugins/observability_solution/slo/public/utils/test_helper.tsx
+++ b/x-pack/plugins/observability_solution/slo/public/utils/test_helper.tsx
@@ -13,7 +13,6 @@ import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { createObservabilityRuleTypeRegistryMock } from '@kbn/observability-plugin/public';
 import { KibanaPageTemplate } from '@kbn/shared-ux-page-kibana-template';
-import translations from '@kbn/translations-plugin/translations/ja-JP.json';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { render as testLibRender } from '@testing-library/react';
 import React from 'react';
@@ -43,7 +42,7 @@ const queryClient = new QueryClient({
 export const render = (component: React.ReactNode) => {
   return testLibRender(
     // @ts-ignore
-    <IntlProvider locale="en-US" messages={translations.messages}>
+    <IntlProvider locale="en-US">
       <KibanaContextProvider
         services={{
           ...core,
diff --git a/x-pack/plugins/observability_solution/slo/tsconfig.json b/x-pack/plugins/observability_solution/slo/tsconfig.json
index 9391cc9962b58..e10293188e644 100644
--- a/x-pack/plugins/observability_solution/slo/tsconfig.json
+++ b/x-pack/plugins/observability_solution/slo/tsconfig.json
@@ -17,7 +17,6 @@
     "@kbn/i18n-react",
     "@kbn/shared-ux-router",
     "@kbn/core",
-    "@kbn/translations-plugin",
     "@kbn/rule-data-utils",
     "@kbn/triggers-actions-ui-plugin",
     "@kbn/observability-plugin",
diff --git a/x-pack/plugins/observability_solution/synthetics/.buildkite/pipelines/flaky.js b/x-pack/plugins/observability_solution/synthetics/.buildkite/pipelines/flaky.js
index 7a1ee5c582d7d..ca024e9b42286 100644
--- a/x-pack/plugins/observability_solution/synthetics/.buildkite/pipelines/flaky.js
+++ b/x-pack/plugins/observability_solution/synthetics/.buildkite/pipelines/flaky.js
@@ -63,8 +63,8 @@ console.log(JSON.stringify(pipeline, null, 2));
 function getBuildJob() {
   return {
     command: '.buildkite/scripts/steps/build_kibana.sh',
-    label: 'Build Kibana Distribution and Plugins',
-    agents: { queue: 'c2-8' },
+    label: 'Build Kibana Distribution',
+    agents: { queue: 'n2-8' },
     key: BUILD_UUID,
     if: `build.env('${KIBANA_BUILD_ID}') == null || build.env('${KIBANA_BUILD_ID}') == ''`,
   };
diff --git a/x-pack/plugins/observability_solution/synthetics/common/runtime_types/monitor_management/synthetics_params.ts b/x-pack/plugins/observability_solution/synthetics/common/runtime_types/monitor_management/synthetics_params.ts
index 5393fed135b7d..4107bc1efbb2a 100644
--- a/x-pack/plugins/observability_solution/synthetics/common/runtime_types/monitor_management/synthetics_params.ts
+++ b/x-pack/plugins/observability_solution/synthetics/common/runtime_types/monitor_management/synthetics_params.ts
@@ -19,6 +19,8 @@ export const SyntheticsParamsReadonlyCodec = t.intersection([
   }),
 ]);
 
+export const SyntheticsParamsReadonlyCodecList = t.array(SyntheticsParamsReadonlyCodec);
+
 export type SyntheticsParamsReadonly = t.TypeOf<typeof SyntheticsParamsReadonlyCodec>;
 
 export const SyntheticsParamsCodec = t.intersection([
diff --git a/x-pack/plugins/observability_solution/synthetics/e2e/kibana.jsonc b/x-pack/plugins/observability_solution/synthetics/e2e/kibana.jsonc
index 178c7b2e8e84f..ab72e2d66425e 100644
--- a/x-pack/plugins/observability_solution/synthetics/e2e/kibana.jsonc
+++ b/x-pack/plugins/observability_solution/synthetics/e2e/kibana.jsonc
@@ -2,5 +2,7 @@
   "type": "test-helper",
   "id": "@kbn/synthetics-e2e",
   "owner": "@elastic/obs-ux-management-team",
+  "group": "observability",
+  "visibility": "private",
   "devOnly": true
 }
diff --git a/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/components/settings/global_params/delete_param.tsx b/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/components/settings/global_params/delete_param.tsx
index 814fb13a99ba9..2615a65ef289c 100644
--- a/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/components/settings/global_params/delete_param.tsx
+++ b/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/components/settings/global_params/delete_param.tsx
@@ -5,16 +5,17 @@
  * 2.0.
  */
 
-import React, { useEffect, useState } from 'react';
+import React, { useEffect } from 'react';
 import { EuiConfirmModal } from '@elastic/eui';
-import { FETCH_STATUS, useFetcher } from '@kbn/observability-shared-plugin/public';
-import { toMountPoint } from '@kbn/react-kibana-mount';
 import { i18n } from '@kbn/i18n';
 
-import { useDispatch } from 'react-redux';
-import { getGlobalParamAction, deleteGlobalParams } from '../../../state/global_params';
+import { useDispatch, useSelector } from 'react-redux';
+import {
+  getGlobalParamAction,
+  deleteGlobalParamsAction,
+  selectGlobalParamState,
+} from '../../../state/global_params';
 import { syncGlobalParamsAction } from '../../../state/settings';
-import { kibanaService } from '../../../../../utils/kibana_service';
 import { NO_LABEL, YES_LABEL } from '../../monitors_page/management/monitor_list_table/labels';
 import { ListParamItem } from './params_list';
 
@@ -25,19 +26,8 @@ export const DeleteParam = ({
   items: ListParamItem[];
   setIsDeleteModalVisible: React.Dispatch<React.SetStateAction<boolean>>;
 }) => {
-  const [isDeleting, setIsDeleting] = useState<boolean>(false);
-
   const dispatch = useDispatch();
-
-  const handleConfirmDelete = () => {
-    setIsDeleting(true);
-  };
-
-  const { status } = useFetcher(() => {
-    if (isDeleting) {
-      return deleteGlobalParams(items.map(({ id }) => id));
-    }
-  }, [items, isDeleting]);
+  const { isDeleting, listOfParams } = useSelector(selectGlobalParamState);
 
   const name = items
     .map(({ key }) => key)
@@ -45,51 +35,12 @@ export const DeleteParam = ({
     .slice(0, 50);
 
   useEffect(() => {
-    if (!isDeleting) {
-      return;
-    }
-    const { coreStart, toasts } = kibanaService;
-
-    if (status === FETCH_STATUS.FAILURE) {
-      toasts.addDanger(
-        {
-          title: toMountPoint(
-            <p data-test-subj="uptimeDeleteParamFailure">
-              {' '}
-              {i18n.translate('xpack.synthetics.paramManagement.paramDeleteFailuresMessage.name', {
-                defaultMessage: 'Param {name} failed to delete.',
-                values: { name },
-              })}
-            </p>,
-            coreStart
-          ),
-        },
-        { toastLifeTimeMs: 3000 }
-      );
-    } else if (status === FETCH_STATUS.SUCCESS) {
-      toasts.addSuccess(
-        {
-          title: toMountPoint(
-            <p data-test-subj="uptimeDeleteParamSuccess">
-              {i18n.translate('xpack.synthetics.paramManagement.paramDeleteSuccessMessage.name', {
-                defaultMessage: 'Param {name} deleted successfully.',
-                values: { name },
-              })}
-            </p>,
-            coreStart
-          ),
-        },
-        { toastLifeTimeMs: 3000 }
-      );
-      dispatch(syncGlobalParamsAction.get());
-    }
-    if (status === FETCH_STATUS.SUCCESS || status === FETCH_STATUS.FAILURE) {
-      setIsDeleting(false);
+    if (!isDeleting && (listOfParams ?? []).length === 0) {
       setIsDeleteModalVisible(false);
       dispatch(getGlobalParamAction.get());
       dispatch(syncGlobalParamsAction.get());
     }
-  }, [setIsDeleting, isDeleting, status, setIsDeleteModalVisible, name, dispatch]);
+  }, [isDeleting, setIsDeleteModalVisible, name, dispatch, listOfParams]);
 
   return (
     <EuiConfirmModal
@@ -98,7 +49,9 @@ export const DeleteParam = ({
         values: { name },
       })}
       onCancel={() => setIsDeleteModalVisible(false)}
-      onConfirm={handleConfirmDelete}
+      onConfirm={() => {
+        dispatch(deleteGlobalParamsAction.get(items.map(({ id }) => id)));
+      }}
       cancelButtonText={NO_LABEL}
       confirmButtonText={YES_LABEL}
       buttonColor="danger"
diff --git a/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/components/settings/global_params/params_list.tsx b/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/components/settings/global_params/params_list.tsx
index 2ff3ea547ae9f..b16dbcd686d91 100644
--- a/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/components/settings/global_params/params_list.tsx
+++ b/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/components/settings/global_params/params_list.tsx
@@ -83,7 +83,11 @@ export const ParamsList = () => {
       render: (val: string[]) => {
         const tags = val ?? [];
         if (tags.length === 0) {
-          return <EuiText>--</EuiText>;
+          return (
+            <EuiText>
+              {i18n.translate('xpack.synthetics.columns.TextLabel', { defaultMessage: '--' })}
+            </EuiText>
+          );
         }
         return (
           <EuiFlexGroup gutterSize="xs" wrap>
@@ -105,7 +109,11 @@ export const ParamsList = () => {
       render: (val: string[]) => {
         const namespaces = val ?? [];
         if (namespaces.length === 0) {
-          return <EuiText>--</EuiText>;
+          return (
+            <EuiText>
+              {i18n.translate('xpack.synthetics.columns.TextLabel', { defaultMessage: '--' })}
+            </EuiText>
+          );
         }
         return (
           <EuiFlexGroup gutterSize="xs" wrap>
@@ -184,6 +192,7 @@ export const ParamsList = () => {
         isEditingItem={isEditingItem}
         setIsEditingItem={setIsEditingItem}
         items={items}
+        key="add-param-flyout"
       />,
     ];
   };
diff --git a/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/state/global_params/actions.ts b/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/state/global_params/actions.ts
index b1388bc2674b9..0faef0079657a 100644
--- a/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/state/global_params/actions.ts
+++ b/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/state/global_params/actions.ts
@@ -23,3 +23,8 @@ export const editGlobalParamAction = createAsyncAction<
   },
   SyntheticsParams
 >('EDIT GLOBAL PARAM');
+
+export const deleteGlobalParamsAction = createAsyncAction<
+  string[],
+  Array<{ id: string; deleted: boolean }>
+>('DELETE GLOBAL PARAMS');
diff --git a/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/state/global_params/api.ts b/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/state/global_params/api.ts
index 33eb4622bf6c5..1badb74dff26f 100644
--- a/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/state/global_params/api.ts
+++ b/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/state/global_params/api.ts
@@ -13,6 +13,7 @@ import {
   SyntheticsParams,
   SyntheticsParamsCodec,
   SyntheticsParamsReadonlyCodec,
+  SyntheticsParamsReadonlyCodecList,
 } from '../../../../../common/runtime_types';
 import { apiService } from '../../../../utils/api_service/api_service';
 
@@ -20,14 +21,14 @@ export const getGlobalParams = async (): Promise<SyntheticsParams[]> => {
   return apiService.get<SyntheticsParams[]>(
     SYNTHETICS_API_URLS.PARAMS,
     { version: INITIAL_REST_VERSION },
-    SyntheticsParamsReadonlyCodec
+    SyntheticsParamsReadonlyCodecList
   );
 };
 
 export const addGlobalParam = async (
   paramRequest: SyntheticsParamRequest
 ): Promise<SyntheticsParams> =>
-  apiService.post(SYNTHETICS_API_URLS.PARAMS, paramRequest, SyntheticsParamsCodec, {
+  apiService.post(SYNTHETICS_API_URLS.PARAMS, paramRequest, SyntheticsParamsReadonlyCodec, {
     version: INITIAL_REST_VERSION,
   });
 
@@ -53,11 +54,13 @@ export const editGlobalParam = async ({
   );
 };
 
-export const deleteGlobalParams = async (ids: string[]): Promise<DeleteParamsResponse[]> =>
-  apiService.delete(
-    SYNTHETICS_API_URLS.PARAMS,
-    { version: INITIAL_REST_VERSION },
+export const deleteGlobalParams = async (ids: string[]): Promise<DeleteParamsResponse[]> => {
+  return await apiService.post(
+    SYNTHETICS_API_URLS.PARAMS + '/_bulk_delete',
     {
       ids,
-    }
+    },
+    null,
+    { version: INITIAL_REST_VERSION }
   );
+};
diff --git a/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/state/global_params/effects.ts b/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/state/global_params/effects.ts
index d5249fcfc4519..f5f0c6e4ee951 100644
--- a/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/state/global_params/effects.ts
+++ b/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/state/global_params/effects.ts
@@ -8,8 +8,13 @@
 import { takeLeading } from 'redux-saga/effects';
 import { i18n } from '@kbn/i18n';
 import { fetchEffectFactory } from '../utils/fetch_effect';
-import { addGlobalParam, editGlobalParam, getGlobalParams } from './api';
-import { addNewGlobalParamAction, editGlobalParamAction, getGlobalParamAction } from './actions';
+import { addGlobalParam, deleteGlobalParams, editGlobalParam, getGlobalParams } from './api';
+import {
+  addNewGlobalParamAction,
+  deleteGlobalParamsAction,
+  editGlobalParamAction,
+  getGlobalParamAction,
+} from './actions';
 
 export function* getGlobalParamEffect() {
   yield takeLeading(
@@ -69,3 +74,26 @@ const editSuccessMessage = i18n.translate('xpack.synthetics.settings.editParams.
 const editFailureMessage = i18n.translate('xpack.synthetics.settings.editParams.fail', {
   defaultMessage: 'Failed to edit global parameter.',
 });
+
+// deleteGlobalParams
+
+export function* deleteGlobalParamsEffect() {
+  yield takeLeading(
+    deleteGlobalParamsAction.get,
+    fetchEffectFactory(
+      deleteGlobalParams,
+      deleteGlobalParamsAction.success,
+      deleteGlobalParamsAction.fail,
+      deleteSuccessMessage,
+      deleteFailureMessage
+    )
+  );
+}
+
+const deleteSuccessMessage = i18n.translate('xpack.synthetics.settings.deleteParams.success', {
+  defaultMessage: 'Successfully deleted global parameters.',
+});
+
+const deleteFailureMessage = i18n.translate('xpack.synthetics.settings.deleteParams.fail', {
+  defaultMessage: 'Failed to delete global parameters.',
+});
diff --git a/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/state/global_params/index.ts b/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/state/global_params/index.ts
index 89b3a0b7e1904..a1e2e07ff955f 100644
--- a/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/state/global_params/index.ts
+++ b/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/state/global_params/index.ts
@@ -8,7 +8,12 @@
 import { createReducer } from '@reduxjs/toolkit';
 import { SyntheticsParams } from '../../../../../common/runtime_types';
 import { IHttpSerializedFetchError } from '..';
-import { addNewGlobalParamAction, editGlobalParamAction, getGlobalParamAction } from './actions';
+import {
+  addNewGlobalParamAction,
+  deleteGlobalParamsAction,
+  editGlobalParamAction,
+  getGlobalParamAction,
+} from './actions';
 
 export interface GlobalParamsState {
   isLoading?: boolean;
@@ -16,6 +21,7 @@ export interface GlobalParamsState {
   addError: IHttpSerializedFetchError | null;
   editError: IHttpSerializedFetchError | null;
   isSaving?: boolean;
+  isDeleting?: boolean;
   savedData?: SyntheticsParams;
 }
 
@@ -23,6 +29,7 @@ const initialState: GlobalParamsState = {
   isLoading: false,
   addError: null,
   isSaving: false,
+  isDeleting: false,
   editError: null,
   listOfParams: [],
 };
@@ -62,6 +69,16 @@ export const globalParamsReducer = createReducer(initialState, (builder) => {
     .addCase(editGlobalParamAction.fail, (state, action) => {
       state.isSaving = false;
       state.editError = action.payload;
+    })
+    .addCase(deleteGlobalParamsAction.get, (state) => {
+      state.isDeleting = true;
+    })
+    .addCase(deleteGlobalParamsAction.success, (state) => {
+      state.isDeleting = false;
+      state.listOfParams = [];
+    })
+    .addCase(deleteGlobalParamsAction.fail, (state) => {
+      state.isDeleting = false;
     });
 });
 
diff --git a/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/state/monitor_list/api.ts b/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/state/monitor_list/api.ts
index 344897dd0eb1d..bef569bf0da39 100644
--- a/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/state/monitor_list/api.ts
+++ b/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/state/monitor_list/api.ts
@@ -60,12 +60,13 @@ export const fetchDeleteMonitor = async ({
 }): Promise<void> => {
   const baseUrl = SYNTHETICS_API_URLS.SYNTHETICS_MONITORS;
 
-  return await apiService.delete(
-    baseUrl,
-    { version: INITIAL_REST_VERSION, spaceId },
+  return await apiService.post(
+    baseUrl + '/_bulk_delete',
     {
       ids: configIds,
-    }
+    },
+    undefined,
+    { version: INITIAL_REST_VERSION, spaceId }
   );
 };
 
diff --git a/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/state/root_effect.ts b/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/state/root_effect.ts
index 1a565fe772aa6..e38a1b5ad918f 100644
--- a/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/state/root_effect.ts
+++ b/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/state/root_effect.ts
@@ -7,7 +7,12 @@
 
 import { all, fork } from 'redux-saga/effects';
 import { getCertsListEffect } from './certs';
-import { addGlobalParamEffect, editGlobalParamEffect, getGlobalParamEffect } from './global_params';
+import {
+  addGlobalParamEffect,
+  deleteGlobalParamsEffect,
+  editGlobalParamEffect,
+  getGlobalParamEffect,
+} from './global_params';
 import { fetchManualTestRunsEffect } from './manual_test_runs/effects';
 import {
   enableDefaultAlertingEffect,
@@ -66,6 +71,7 @@ export const rootEffect = function* root(): Generator {
     fork(fetchManualTestRunsEffect),
     fork(addGlobalParamEffect),
     fork(editGlobalParamEffect),
+    fork(deleteGlobalParamsEffect),
     fork(getGlobalParamEffect),
     fork(getCertsListEffect),
     fork(getDefaultAlertingEffect),
diff --git a/x-pack/plugins/observability_solution/synthetics/server/routes/index.ts b/x-pack/plugins/observability_solution/synthetics/server/routes/index.ts
index 48e0de1c7fba4..f9d178befeb46 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/routes/index.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/routes/index.ts
@@ -5,6 +5,8 @@
  * 2.0.
  */
 
+import { deleteSyntheticsParamsBulkRoute } from './settings/params/delete_params_bulk';
+import { deleteSyntheticsMonitorBulkRoute } from './monitor_cruds/bulk_cruds/delete_monitor_bulk';
 import {
   createGetDynamicSettingsRoute,
   createPostDynamicSettingsRoute,
@@ -113,4 +115,6 @@ export const syntheticsAppPublicRestApiRoutes: SyntheticsRestApiRouteFactory[] =
   addSyntheticsMonitorRoute,
   editSyntheticsMonitorRoute,
   deleteSyntheticsMonitorRoute,
+  deleteSyntheticsMonitorBulkRoute,
+  deleteSyntheticsParamsBulkRoute,
 ];
diff --git a/x-pack/plugins/observability_solution/synthetics/server/routes/monitor_cruds/bulk_cruds/add_monitor_bulk.ts b/x-pack/plugins/observability_solution/synthetics/server/routes/monitor_cruds/bulk_cruds/add_monitor_bulk.ts
index 2ecbbf83d471c..03c7ede49ceba 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/routes/monitor_cruds/bulk_cruds/add_monitor_bulk.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/routes/monitor_cruds/bulk_cruds/add_monitor_bulk.ts
@@ -10,7 +10,6 @@ import { SavedObjectsBulkResponse } from '@kbn/core-saved-objects-api-server';
 import { v4 as uuidV4 } from 'uuid';
 import { NewPackagePolicy } from '@kbn/fleet-plugin/common';
 import { SavedObjectError } from '@kbn/core-saved-objects-common';
-import { deleteMonitorBulk } from './delete_monitor_bulk';
 import { SyntheticsServerSetup } from '../../../types';
 import { RouteContext } from '../../types';
 import { formatTelemetryEvent, sendTelemetryEvents } from '../../telemetry/monitor_upgrade_sender';
@@ -190,9 +189,10 @@ export const deleteMonitorIfCreated = async ({
       newMonitorId
     );
     if (encryptedMonitor) {
-      await deleteMonitorBulk({
+      const deleteMonitorAPI = new DeleteMonitorAPI(routeContext);
+
+      await deleteMonitorAPI.deleteMonitorBulk({
         monitors: [encryptedMonitor],
-        routeContext,
       });
     }
   } catch (e) {
diff --git a/x-pack/plugins/observability_solution/synthetics/server/routes/monitor_cruds/bulk_cruds/delete_monitor_bulk.ts b/x-pack/plugins/observability_solution/synthetics/server/routes/monitor_cruds/bulk_cruds/delete_monitor_bulk.ts
index 9a031b3e7111a..ba6426de740d3 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/routes/monitor_cruds/bulk_cruds/delete_monitor_bulk.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/routes/monitor_cruds/bulk_cruds/delete_monitor_bulk.ts
@@ -4,63 +4,40 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { SavedObject } from '@kbn/core-saved-objects-server';
-import {
-  formatTelemetryDeleteEvent,
-  sendTelemetryEvents,
-} from '../../telemetry/monitor_upgrade_sender';
-import {
-  ConfigKey,
-  MonitorFields,
-  SyntheticsMonitor,
-  EncryptedSyntheticsMonitorAttributes,
-  SyntheticsMonitorWithId,
-} from '../../../../common/runtime_types';
-import { syntheticsMonitorType } from '../../../../common/types/saved_objects';
-import { RouteContext } from '../../types';
 
-export const deleteMonitorBulk = async ({
-  monitors,
-  routeContext,
-}: {
-  monitors: Array<SavedObject<SyntheticsMonitor | EncryptedSyntheticsMonitorAttributes>>;
-  routeContext: RouteContext;
-}) => {
-  const { savedObjectsClient, server, spaceId, syntheticsMonitorClient } = routeContext;
-  const { logger, telemetry, stackVersion } = server;
+import { schema } from '@kbn/config-schema';
+import { DeleteMonitorAPI } from '../services/delete_monitor_api';
+import { SYNTHETICS_API_URLS } from '../../../../common/constants';
+import { SyntheticsRestApiRouteFactory } from '../../types';
 
-  try {
-    const deleteSyncPromise = syntheticsMonitorClient.deleteMonitors(
-      monitors.map((normalizedMonitor) => ({
-        ...normalizedMonitor.attributes,
-        id: normalizedMonitor.attributes[ConfigKey.MONITOR_QUERY_ID],
-      })) as SyntheticsMonitorWithId[],
-      savedObjectsClient,
-      spaceId
-    );
+export const deleteSyntheticsMonitorBulkRoute: SyntheticsRestApiRouteFactory<
+  Array<{ id: string; deleted: boolean }>,
+  Record<string, string>,
+  Record<string, string>,
+  { ids: string[] }
+> = () => ({
+  method: 'POST',
+  path: SYNTHETICS_API_URLS.SYNTHETICS_MONITORS + '/_bulk_delete',
+  validate: {},
+  validation: {
+    request: {
+      body: schema.object({
+        ids: schema.arrayOf(schema.string(), {
+          minSize: 1,
+        }),
+      }),
+    },
+  },
+  handler: async (routeContext): Promise<any> => {
+    const { request } = routeContext;
 
-    const deletePromises = savedObjectsClient.bulkDelete(
-      monitors.map((monitor) => ({ type: syntheticsMonitorType, id: monitor.id }))
-    );
+    const { ids: idsToDelete } = request.body || {};
+    const deleteMonitorAPI = new DeleteMonitorAPI(routeContext);
 
-    const [errors, result] = await Promise.all([deleteSyncPromise, deletePromises]);
-
-    monitors.forEach((monitor) => {
-      sendTelemetryEvents(
-        logger,
-        telemetry,
-        formatTelemetryDeleteEvent(
-          monitor,
-          stackVersion,
-          new Date().toISOString(),
-          Boolean((monitor.attributes as MonitorFields)[ConfigKey.SOURCE_INLINE]),
-          errors
-        )
-      );
+    const { errors, result } = await deleteMonitorAPI.execute({
+      monitorIds: idsToDelete,
     });
 
-    return { errors, result };
-  } catch (e) {
-    throw e;
-  }
-};
+    return { result, errors };
+  },
+});
diff --git a/x-pack/plugins/observability_solution/synthetics/server/routes/monitor_cruds/delete_monitor.ts b/x-pack/plugins/observability_solution/synthetics/server/routes/monitor_cruds/delete_monitor.ts
index f40f06f66b1ff..b989d16e4f194 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/routes/monitor_cruds/delete_monitor.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/routes/monitor_cruds/delete_monitor.ts
@@ -4,6 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import { i18n } from '@kbn/i18n';
 import { schema } from '@kbn/config-schema';
 import { DeleteMonitorAPI } from './services/delete_monitor_api';
 import { SyntheticsRestApiRouteFactory } from '../types';
@@ -41,30 +42,39 @@ export const deleteSyntheticsMonitorRoute: SyntheticsRestApiRouteFactory<
 
     if (ids && queryId) {
       return response.badRequest({
-        body: { message: 'id must be provided either via param or body.' },
+        body: {
+          message: i18n.translate('xpack.synthetics.deleteMonitor.errorMultipleIdsProvided', {
+            defaultMessage: 'id must be provided either via param or body.',
+          }),
+        },
       });
     }
 
     const idsToDelete = [...(ids ?? []), ...(queryId ? [queryId] : [])];
     if (idsToDelete.length === 0) {
       return response.badRequest({
-        body: { message: 'id must be provided via param or body.' },
+        body: {
+          message: i18n.translate('xpack.synthetics.deleteMonitor.errorMultipleIdsProvided', {
+            defaultMessage: 'id must be provided either via param or body.',
+          }),
+        },
       });
     }
 
     const deleteMonitorAPI = new DeleteMonitorAPI(routeContext);
-    try {
-      const { errors } = await deleteMonitorAPI.execute({
-        monitorIds: idsToDelete,
-      });
+    const { errors } = await deleteMonitorAPI.execute({
+      monitorIds: idsToDelete,
+    });
 
-      if (errors && errors.length > 0) {
-        return response.ok({
-          body: { message: 'error pushing monitor to the service', attributes: { errors } },
-        });
-      }
-    } catch (getErr) {
-      throw getErr;
+    if (errors && errors.length > 0) {
+      return response.ok({
+        body: {
+          message: i18n.translate('xpack.synthetics.deleteMonitor.errorPushingMonitorToService', {
+            defaultMessage: 'Error pushing monitor to the service',
+          }),
+          attributes: { errors },
+        },
+      });
     }
 
     return deleteMonitorAPI.result;
diff --git a/x-pack/plugins/observability_solution/synthetics/server/routes/monitor_cruds/delete_monitor_project.ts b/x-pack/plugins/observability_solution/synthetics/server/routes/monitor_cruds/delete_monitor_project.ts
index 7b36780937694..a56f66842a703 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/routes/monitor_cruds/delete_monitor_project.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/routes/monitor_cruds/delete_monitor_project.ts
@@ -6,12 +6,12 @@
  */
 import { schema } from '@kbn/config-schema';
 import { i18n } from '@kbn/i18n';
+import { DeleteMonitorAPI } from './services/delete_monitor_api';
 import { SyntheticsRestApiRouteFactory } from '../types';
 import { syntheticsMonitorType } from '../../../common/types/saved_objects';
 import { ConfigKey } from '../../../common/runtime_types';
 import { SYNTHETICS_API_URLS } from '../../../common/constants';
 import { getMonitors, getSavedObjectKqlFilter } from '../common';
-import { deleteMonitorBulk } from './bulk_cruds/delete_monitor_bulk';
 import { validateSpaceId } from './services/validate_space_id';
 
 export const deleteSyntheticsMonitorProjectRoute: SyntheticsRestApiRouteFactory = () => ({
@@ -58,9 +58,10 @@ export const deleteSyntheticsMonitorProjectRoute: SyntheticsRestApiRouteFactory
       { fields: [] }
     );
 
-    await deleteMonitorBulk({
+    const deleteMonitorAPI = new DeleteMonitorAPI(routeContext);
+
+    await deleteMonitorAPI.deleteMonitorBulk({
       monitors,
-      routeContext,
     });
 
     return {
diff --git a/x-pack/plugins/observability_solution/synthetics/server/routes/monitor_cruds/services/delete_monitor_api.ts b/x-pack/plugins/observability_solution/synthetics/server/routes/monitor_cruds/services/delete_monitor_api.ts
index bd162fc043592..4fc527f930832 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/routes/monitor_cruds/services/delete_monitor_api.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/routes/monitor_cruds/services/delete_monitor_api.ts
@@ -7,16 +7,22 @@
 
 import pMap from 'p-map';
 import { SavedObject, SavedObjectsErrorHelpers } from '@kbn/core-saved-objects-server';
-import { deleteMonitorBulk } from '../bulk_cruds/delete_monitor_bulk';
 import { validatePermissions } from '../edit_monitor';
 import {
+  ConfigKey,
   EncryptedSyntheticsMonitorAttributes,
+  MonitorFields,
   SyntheticsMonitor,
+  SyntheticsMonitorWithId,
   SyntheticsMonitorWithSecretsAttributes,
 } from '../../../../common/runtime_types';
 import { syntheticsMonitorType } from '../../../../common/types/saved_objects';
 import { normalizeSecrets } from '../../../synthetics_service/utils';
-import { sendErrorTelemetryEvents } from '../../telemetry/monitor_upgrade_sender';
+import {
+  formatTelemetryDeleteEvent,
+  sendErrorTelemetryEvents,
+  sendTelemetryEvents,
+} from '../../telemetry/monitor_upgrade_sender';
 import { RouteContext } from '../../types';
 
 export class DeleteMonitorAPI {
@@ -100,9 +106,8 @@ export class DeleteMonitorAPI {
     }
 
     try {
-      const { errors, result } = await deleteMonitorBulk({
+      const { errors, result } = await this.deleteMonitorBulk({
         monitors,
-        routeContext: this.routeContext,
       });
 
       result.statuses?.forEach((res) => {
@@ -112,11 +117,55 @@ export class DeleteMonitorAPI {
         });
       });
 
-      return { errors };
+      return { errors, result: this.result };
     } catch (e) {
       server.logger.error(`Unable to delete Synthetics monitor with error ${e.message}`);
       server.logger.error(e);
       throw e;
     }
   }
+
+  async deleteMonitorBulk({
+    monitors,
+  }: {
+    monitors: Array<SavedObject<SyntheticsMonitor | EncryptedSyntheticsMonitorAttributes>>;
+  }) {
+    const { savedObjectsClient, server, spaceId, syntheticsMonitorClient } = this.routeContext;
+    const { logger, telemetry, stackVersion } = server;
+
+    try {
+      const deleteSyncPromise = syntheticsMonitorClient.deleteMonitors(
+        monitors.map((normalizedMonitor) => ({
+          ...normalizedMonitor.attributes,
+          id: normalizedMonitor.attributes[ConfigKey.MONITOR_QUERY_ID],
+        })) as SyntheticsMonitorWithId[],
+        savedObjectsClient,
+        spaceId
+      );
+
+      const deletePromises = savedObjectsClient.bulkDelete(
+        monitors.map((monitor) => ({ type: syntheticsMonitorType, id: monitor.id }))
+      );
+
+      const [errors, result] = await Promise.all([deleteSyncPromise, deletePromises]);
+
+      monitors.forEach((monitor) => {
+        sendTelemetryEvents(
+          logger,
+          telemetry,
+          formatTelemetryDeleteEvent(
+            monitor,
+            stackVersion,
+            new Date().toISOString(),
+            Boolean((monitor.attributes as MonitorFields)[ConfigKey.SOURCE_INLINE]),
+            errors
+          )
+        );
+      });
+
+      return { errors, result };
+    } catch (e) {
+      throw e;
+    }
+  }
 }
diff --git a/x-pack/plugins/observability_solution/synthetics/server/routes/settings/params/delete_param.ts b/x-pack/plugins/observability_solution/synthetics/server/routes/settings/params/delete_param.ts
index 78d24d9452ae9..1a504b263861b 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/routes/settings/params/delete_param.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/routes/settings/params/delete_param.ts
@@ -6,6 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { i18n } from '@kbn/i18n';
 import { SyntheticsRestApiRouteFactory } from '../../types';
 import { syntheticsParamType } from '../../../../common/types/saved_objects';
 import { SYNTHETICS_API_URLS } from '../../../../common/constants';
@@ -13,25 +14,51 @@ import { DeleteParamsResponse } from '../../../../common/runtime_types';
 
 export const deleteSyntheticsParamsRoute: SyntheticsRestApiRouteFactory<
   DeleteParamsResponse[],
-  unknown,
+  { id?: string },
   unknown,
   { ids: string[] }
 > = () => ({
   method: 'DELETE',
-  path: SYNTHETICS_API_URLS.PARAMS,
+  path: SYNTHETICS_API_URLS.PARAMS + '/{id?}',
   validate: {},
   validation: {
     request: {
-      body: schema.object({
-        ids: schema.arrayOf(schema.string()),
+      body: schema.nullable(
+        schema.object({
+          ids: schema.arrayOf(schema.string(), {
+            minSize: 1,
+          }),
+        })
+      ),
+      params: schema.object({
+        id: schema.maybe(schema.string()),
       }),
     },
   },
-  handler: async ({ savedObjectsClient, request }) => {
-    const { ids } = request.body;
+  handler: async ({ savedObjectsClient, request, response }) => {
+    const { ids } = request.body ?? {};
+    const { id: paramId } = request.params ?? {};
+
+    if (ids && paramId) {
+      return response.badRequest({
+        body: i18n.translate('xpack.synthetics.deleteParam.errorMultipleIdsProvided', {
+          defaultMessage: `Both param id  and body parameters cannot be provided`,
+        }),
+      });
+    }
+
+    const idsToDelete = ids ?? [paramId];
+
+    if (idsToDelete.length === 0) {
+      return response.badRequest({
+        body: i18n.translate('xpack.synthetics.deleteParam.errorNoIdsProvided', {
+          defaultMessage: `No param ids provided`,
+        }),
+      });
+    }
 
     const result = await savedObjectsClient.bulkDelete(
-      ids.map((id) => ({ type: syntheticsParamType, id })),
+      idsToDelete.map((id) => ({ type: syntheticsParamType, id })),
       { force: true }
     );
     return result.statuses.map(({ id, success }) => ({ id, deleted: success }));
diff --git a/x-pack/plugins/observability_solution/synthetics/server/routes/settings/params/delete_params_bulk.ts b/x-pack/plugins/observability_solution/synthetics/server/routes/settings/params/delete_params_bulk.ts
new file mode 100644
index 0000000000000..2cafaf0a1af99
--- /dev/null
+++ b/x-pack/plugins/observability_solution/synthetics/server/routes/settings/params/delete_params_bulk.ts
@@ -0,0 +1,39 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { schema } from '@kbn/config-schema';
+import { SyntheticsRestApiRouteFactory } from '../../types';
+import { syntheticsParamType } from '../../../../common/types/saved_objects';
+import { SYNTHETICS_API_URLS } from '../../../../common/constants';
+import { DeleteParamsResponse } from '../../../../common/runtime_types';
+
+export const deleteSyntheticsParamsBulkRoute: SyntheticsRestApiRouteFactory<
+  DeleteParamsResponse[],
+  unknown,
+  unknown,
+  { ids: string[] }
+> = () => ({
+  method: 'POST',
+  path: SYNTHETICS_API_URLS.PARAMS + '/_bulk_delete',
+  validate: {},
+  validation: {
+    request: {
+      body: schema.object({
+        ids: schema.arrayOf(schema.string()),
+      }),
+    },
+  },
+  handler: async ({ savedObjectsClient, request }) => {
+    const { ids } = request.body;
+
+    const result = await savedObjectsClient.bulkDelete(
+      ids.map((id) => ({ type: syntheticsParamType, id })),
+      { force: true }
+    );
+    return result.statuses.map(({ id, success }) => ({ id, deleted: success }));
+  },
+});
diff --git a/x-pack/plugins/observability_solution/uptime/.buildkite/pipelines/flaky.js b/x-pack/plugins/observability_solution/uptime/.buildkite/pipelines/flaky.js
index 7a1ee5c582d7d..ca024e9b42286 100644
--- a/x-pack/plugins/observability_solution/uptime/.buildkite/pipelines/flaky.js
+++ b/x-pack/plugins/observability_solution/uptime/.buildkite/pipelines/flaky.js
@@ -63,8 +63,8 @@ console.log(JSON.stringify(pipeline, null, 2));
 function getBuildJob() {
   return {
     command: '.buildkite/scripts/steps/build_kibana.sh',
-    label: 'Build Kibana Distribution and Plugins',
-    agents: { queue: 'c2-8' },
+    label: 'Build Kibana Distribution',
+    agents: { queue: 'n2-8' },
     key: BUILD_UUID,
     if: `build.env('${KIBANA_BUILD_ID}') == null || build.env('${KIBANA_BUILD_ID}') == ''`,
   };
diff --git a/x-pack/plugins/observability_solution/ux/.buildkite/pipelines/flaky.js b/x-pack/plugins/observability_solution/ux/.buildkite/pipelines/flaky.js
index 6a01e8c52d002..b9a1782820aeb 100644
--- a/x-pack/plugins/observability_solution/ux/.buildkite/pipelines/flaky.js
+++ b/x-pack/plugins/observability_solution/ux/.buildkite/pipelines/flaky.js
@@ -64,8 +64,8 @@ console.log(JSON.stringify(pipeline, null, 2));
 function getBuildJob() {
   return {
     command: '.buildkite/scripts/steps/build_kibana.sh',
-    label: 'Build Kibana Distribution and Plugins',
-    agents: { queue: 'c2-8' },
+    label: 'Build Kibana Distribution',
+    agents: { queue: 'n2-8' },
     key: BUILD_UUID,
     if: `build.env('${KIBANA_BUILD_ID}') == null || build.env('${KIBANA_BUILD_ID}') == ''`,
   };
diff --git a/x-pack/plugins/osquery/cypress/e2e/all/ecs_mappings.cy.ts b/x-pack/plugins/osquery/cypress/e2e/all/ecs_mappings.cy.ts
index 4bafc3d173156..536935a4b3894 100644
--- a/x-pack/plugins/osquery/cypress/e2e/all/ecs_mappings.cy.ts
+++ b/x-pack/plugins/osquery/cypress/e2e/all/ecs_mappings.cy.ts
@@ -18,7 +18,8 @@ import {
   typeInOsqueryFieldInput,
 } from '../../tasks/live_query';
 
-describe('EcsMapping', { tags: ['@ess', '@serverless', '@skipInServerlessMKI'] }, () => {
+// FLAKY: https://github.com/elastic/kibana/issues/192128
+describe.skip('EcsMapping', { tags: ['@ess', '@serverless', '@skipInServerlessMKI'] }, () => {
   beforeEach(() => {
     initializeDataViews();
   });
diff --git a/x-pack/plugins/reporting/README.md b/x-pack/plugins/reporting/README.md
index f9d6fe4e3db40..7e4d1beefde19 100644
--- a/x-pack/plugins/reporting/README.md
+++ b/x-pack/plugins/reporting/README.md
@@ -4,8 +4,6 @@ An awesome Kibana reporting plugin
 
 ## csv_searchsource. 
 This is the endpoint used in the Discover UI. It must be replaced by csv_v2 at some point, when we have more capacity in reporting. https://github.com/elastic/kibana/issues/151190
-## csv_searchsource_immediate. 
-This is deprecated. This export type provides users with the means to download a CSV export of a saved search without creating a report. It is only available to users when `xpack.reporting.csv.enablePanelActionDownload` is set to `true` in kibana.yml. The default is `false`, which provides users with the means to generate a normal CSV report.
 ## csv_v2. 
 This new endpoint is designed to have a more automation-friendly signature. It will replace csv_searchsource in the UI at some point, when there is more capacity in reporting. It will need a little more work to have parity: it needs to be able to export "unsaved" searches.
 
diff --git a/x-pack/plugins/reporting/public/management/__test__/report_listing.test.helpers.tsx b/x-pack/plugins/reporting/public/management/__test__/report_listing.test.helpers.tsx
index 97c5fae9cc5aa..19337a6f46deb 100644
--- a/x-pack/plugins/reporting/public/management/__test__/report_listing.test.helpers.tsx
+++ b/x-pack/plugins/reporting/public/management/__test__/report_listing.test.helpers.tsx
@@ -55,7 +55,6 @@ export const mockConfig: ClientConfigType = {
       duration: '10m',
       size: 500,
     },
-    enablePanelActionDownload: false,
   },
   poll: {
     jobsRefresh: {
diff --git a/x-pack/plugins/reporting/server/config/index.ts b/x-pack/plugins/reporting/server/config/index.ts
index a44a51d7d9ae4..709d072a9035a 100644
--- a/x-pack/plugins/reporting/server/config/index.ts
+++ b/x-pack/plugins/reporting/server/config/index.ts
@@ -24,6 +24,7 @@ export const config: PluginConfigDescriptor<ReportingConfigType> = {
   },
   schema: ConfigSchema,
   deprecations: ({ unused }) => [
+    unused('csv.enablePanelActionDownload', { level: 'warning' }), // unused since 9.0
     unused('queue.indexInterval', { level: 'warning' }), // unused since 8.15
     unused('capture.browser.chromium.maxScreenshotDimension', { level: 'warning' }), // unused since 7.8
     unused('capture.browser.type', { level: 'warning' }),
diff --git a/x-pack/plugins/reporting/server/core.ts b/x-pack/plugins/reporting/server/core.ts
index 794cb5180ea09..283488dd5a973 100644
--- a/x-pack/plugins/reporting/server/core.ts
+++ b/x-pack/plugins/reporting/server/core.ts
@@ -29,11 +29,7 @@ import type { FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import type { FieldFormatsStart } from '@kbn/field-formats-plugin/server';
 import type { LicensingPluginStart } from '@kbn/licensing-plugin/server';
 import type { ReportingServerInfo } from '@kbn/reporting-common/types';
-import {
-  CsvSearchSourceExportType,
-  CsvSearchSourceImmediateExportType,
-  CsvV2ExportType,
-} from '@kbn/reporting-export-types-csv';
+import { CsvSearchSourceExportType, CsvV2ExportType } from '@kbn/reporting-export-types-csv';
 import { PdfExportType, PdfV1ExportType } from '@kbn/reporting-export-types-pdf';
 import { PngExportType } from '@kbn/reporting-export-types-png';
 import type { ReportingConfigType } from '@kbn/reporting-server';
@@ -383,22 +379,4 @@ export class ReportingCore {
     const ReportingEventLogger = reportingEventLoggerFactory(this.logger);
     return new ReportingEventLogger(report, task);
   }
-
-  /**
-   * @deprecated
-   * Requires `xpack.reporting.csv.enablePanelActionDownload` set to `true` (default is false)
-   */
-  public async getCsvSearchSourceImmediate() {
-    const startDeps = await this.getPluginStartDeps();
-
-    const csvImmediateExport = new CsvSearchSourceImmediateExportType(
-      this.core,
-      this.config,
-      this.logger,
-      this.context
-    );
-    csvImmediateExport.setup(this.getPluginSetupDeps());
-    csvImmediateExport.start({ ...startDeps });
-    return csvImmediateExport;
-  }
 }
diff --git a/x-pack/plugins/reporting/server/lib/event_logger/types.ts b/x-pack/plugins/reporting/server/lib/event_logger/types.ts
index 8a6725eb33a4d..4b792446ff4c7 100644
--- a/x-pack/plugins/reporting/server/lib/event_logger/types.ts
+++ b/x-pack/plugins/reporting/server/lib/event_logger/types.ts
@@ -20,7 +20,7 @@ export interface ReportingAction<A extends ActionType> extends LogMeta {
   kibana: {
     reporting: {
       actionType: A;
-      id?: string; // "immediate download" exports have no ID
+      id: string;
       jobType: string;
       byteSize?: number;
     } & TaskRunMetrics;
diff --git a/x-pack/plugins/reporting/server/routes/index.ts b/x-pack/plugins/reporting/server/routes/index.ts
index 750cd0d5cd6fb..3473f660f647f 100644
--- a/x-pack/plugins/reporting/server/routes/index.ts
+++ b/x-pack/plugins/reporting/server/routes/index.ts
@@ -9,7 +9,6 @@ import type { Logger } from '@kbn/core/server';
 import { ReportingCore } from '..';
 import { registerDeprecationsRoutes } from './internal/deprecations/deprecations';
 import { registerDiagnosticRoutes } from './internal/diagnostic';
-import { registerGenerateCsvFromSavedObjectImmediate } from './internal/generate/csv_searchsource_immediate';
 import { registerGenerationRoutesInternal } from './internal/generate/generate_from_jobparams';
 import { registerJobInfoRoutesInternal } from './internal/management/jobs';
 import { registerGenerationRoutesPublic } from './public/generate_from_jobparams';
@@ -22,10 +21,4 @@ export function registerRoutes(reporting: ReportingCore, logger: Logger) {
   registerJobInfoRoutesInternal(reporting);
   registerGenerationRoutesPublic(reporting, logger);
   registerJobInfoRoutesPublic(reporting);
-
-  // (deprecated) allow users to download CSV without generating a report
-  const config = reporting.getConfig();
-  if (config.csv.enablePanelActionDownload) {
-    registerGenerateCsvFromSavedObjectImmediate(reporting, logger);
-  }
 }
diff --git a/x-pack/plugins/reporting/server/routes/internal/generate/csv_searchsource_immediate.ts b/x-pack/plugins/reporting/server/routes/internal/generate/csv_searchsource_immediate.ts
deleted file mode 100644
index cc9ad946d84ef..0000000000000
--- a/x-pack/plugins/reporting/server/routes/internal/generate/csv_searchsource_immediate.ts
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import Boom from '@hapi/boom';
-import moment from 'moment';
-
-import { schema } from '@kbn/config-schema';
-import type { KibanaRequest, Logger } from '@kbn/core/server';
-import { INTERNAL_ROUTES } from '@kbn/reporting-common';
-import {
-  CSV_SEARCHSOURCE_IMMEDIATE_TYPE,
-  JobParamsDownloadCSV,
-} from '@kbn/reporting-export-types-csv-common';
-import type { ReportingCore } from '../../..';
-import { PassThroughStream } from '../../../lib';
-import { authorizedUserPreRouting, getCounters } from '../../common';
-
-const path = INTERNAL_ROUTES.DOWNLOAD_CSV;
-
-export type CsvFromSavedObjectRequest = KibanaRequest<unknown, unknown, JobParamsDownloadCSV>;
-
-/*
- * This function registers API Endpoints for immediate Reporting jobs. The API inputs are:
- * - saved object type and ID
- * - time range and time zone
- * - application state:
- *     - filters
- *     - query bar
- *     - local (transient) changes the user made to the saved object
- */
-export function registerGenerateCsvFromSavedObjectImmediate(
-  reporting: ReportingCore,
-  parentLogger: Logger
-) {
-  const setupDeps = reporting.getPluginSetupDeps();
-  const { router } = setupDeps;
-
-  const useKibanaAccessControl = reporting.getDeprecatedAllowedRoles() === false; // true if deprecated config is turned off
-  const kibanaAccessControlTags = useKibanaAccessControl ? ['access:downloadCsv'] : [];
-
-  // This API calls run the SearchSourceImmediate export type's runTaskFn directly
-  router.post(
-    {
-      path,
-      validate: {
-        body: schema.object({
-          columns: schema.maybe(schema.arrayOf(schema.string())),
-          searchSource: schema.object({}, { unknowns: 'allow' }),
-          browserTimezone: schema.string({
-            defaultValue: 'UTC',
-            validate: (value) =>
-              moment.tz.zone(value) ? undefined : `Invalid timezone "${typeof value}".`,
-          }),
-          title: schema.string(),
-          version: schema.maybe(schema.string()),
-        }),
-      },
-      options: { tags: kibanaAccessControlTags, access: 'internal' },
-    },
-    authorizedUserPreRouting(
-      reporting,
-      async (user, context, req: CsvFromSavedObjectRequest, res) => {
-        const counters = getCounters(req.route.method, path, reporting.getUsageCounter());
-
-        const logger = parentLogger.get(CSV_SEARCHSOURCE_IMMEDIATE_TYPE);
-        const csvSearchSourceImmediateExport = await reporting.getCsvSearchSourceImmediate();
-
-        const stream = new PassThroughStream();
-        const eventLog = reporting.getEventLogger({
-          jobtype: CSV_SEARCHSOURCE_IMMEDIATE_TYPE,
-          created_by: user && user.username,
-          payload: { browserTimezone: req.body.browserTimezone },
-        });
-        const logError = (error: Error) => {
-          logger.error(error);
-          eventLog.logError(error);
-        };
-
-        try {
-          eventLog.logExecutionStart();
-
-          const taskPromise = csvSearchSourceImmediateExport
-            .runTask(null, req.body, context, stream, req)
-            .then((output) => {
-              logger.info(`Job output size: ${stream.bytesWritten} bytes.`);
-
-              if (!stream.bytesWritten) {
-                logger.warn('CSV Job Execution created empty content result');
-              }
-
-              eventLog.logExecutionComplete({
-                ...(output.metrics ?? {}),
-                byteSize: stream.bytesWritten,
-              });
-            })
-            .finally(() => stream.end());
-
-          await Promise.race([stream.firstBytePromise, taskPromise]);
-
-          taskPromise.catch(logError);
-
-          counters.usageCounter();
-
-          return res.ok({
-            body: stream,
-            headers: {
-              'content-type': 'text/csv;charset=utf-8',
-              'accept-ranges': 'none',
-            },
-          });
-        } catch (error) {
-          logError(error);
-
-          if (error instanceof Boom.Boom) {
-            const statusCode = error.output.statusCode;
-            counters.errorCounter(undefined, statusCode);
-
-            return res.customError({
-              statusCode,
-              body: error.output.payload.message,
-            });
-          }
-
-          counters.errorCounter(undefined, 500);
-
-          return res.customError({
-            statusCode: 500,
-          });
-        }
-      }
-    )
-  );
-}
diff --git a/x-pack/plugins/screenshotting/kibana.jsonc b/x-pack/plugins/screenshotting/kibana.jsonc
index 770b8c8fb9b91..27004f3abe529 100644
--- a/x-pack/plugins/screenshotting/kibana.jsonc
+++ b/x-pack/plugins/screenshotting/kibana.jsonc
@@ -5,7 +5,7 @@
     "@elastic/kibana-reporting-services"
   ],
   "group": "platform",
-  "visibility": "private",
+  "visibility": "shared",
   "description": "Kibana Screenshotting Plugin",
   "plugin": {
     "id": "screenshotting",
@@ -23,4 +23,4 @@
       "cloud"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/x-pack/plugins/search_assistant/kibana.jsonc b/x-pack/plugins/search_assistant/kibana.jsonc
index 0f94105943037..d84d928b7a8b7 100644
--- a/x-pack/plugins/search_assistant/kibana.jsonc
+++ b/x-pack/plugins/search_assistant/kibana.jsonc
@@ -2,6 +2,8 @@
   "type": "plugin",
   "id": "@kbn/search-assistant",
   "owner": "@elastic/search-kibana",
+  "group": "search",
+  "visibility": "private",
   "description": "AI Assistant for Search",
   "plugin": {
     "id": "searchAssistant",
diff --git a/x-pack/plugins/search_connectors/common/constants.ts b/x-pack/plugins/search_connectors/common/constants.ts
deleted file mode 100644
index ce2ac89a40d33..0000000000000
--- a/x-pack/plugins/search_connectors/common/constants.ts
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { ConnectorClientSideDefinition } from './types';
-import { docLinks } from './doc_links';
-
-// needs to be a function because, docLinks are only populated with actual
-// documentation links in browser after SearchConnectorsPlugin starts
-export const getConnectorsDict = (): Record<string, ConnectorClientSideDefinition> => ({
-  azure_blob_storage: {
-    docsUrl: docLinks.connectorsAzureBlobStorage,
-    externalAuthDocsUrl: 'https://learn.microsoft.com/azure/storage/common/authorize-data-access',
-    externalDocsUrl: 'https://learn.microsoft.com/azure/storage/blobs/',
-    platinumOnly: true,
-  },
-  box: {
-    docsUrl: docLinks.connectorsBox,
-    externalAuthDocsUrl: '',
-    externalDocsUrl: '',
-    platinumOnly: true,
-  },
-  confluence: {
-    docsUrl: docLinks.connectorsConfluence,
-    externalAuthDocsUrl: '',
-    externalDocsUrl: '',
-    platinumOnly: true,
-  },
-  custom: {
-    docsUrl: docLinks.connectors,
-    externalAuthDocsUrl: '',
-    externalDocsUrl: '',
-  },
-  dropbox: {
-    docsUrl: docLinks.connectorsDropbox,
-    externalAuthDocsUrl: '',
-    externalDocsUrl: '',
-    platinumOnly: true,
-  },
-  github: {
-    docsUrl: docLinks.connectorsGithub,
-    externalAuthDocsUrl: '',
-    externalDocsUrl: '',
-    platinumOnly: true,
-  },
-  gmail: {
-    docsUrl: docLinks.connectorsGmail,
-    externalAuthDocsUrl: '',
-    externalDocsUrl: '',
-    platinumOnly: true,
-  },
-  google_cloud_storage: {
-    docsUrl: docLinks.connectorsGoogleCloudStorage,
-    externalAuthDocsUrl: 'https://cloud.google.com/storage/docs/authentication',
-    externalDocsUrl: 'https://cloud.google.com/storage/docs',
-    platinumOnly: true,
-  },
-  google_drive: {
-    docsUrl: docLinks.connectorsGoogleDrive,
-    externalAuthDocsUrl: 'https://cloud.google.com/iam/docs/service-account-overview',
-    externalDocsUrl: 'https://developers.google.com/drive',
-    platinumOnly: true,
-  },
-  jira: {
-    docsUrl: docLinks.connectorsJira,
-    externalAuthDocsUrl: '',
-    externalDocsUrl: '',
-    platinumOnly: true,
-  },
-  microsoft_teams: {
-    docsUrl: docLinks.connectorsTeams,
-    externalAuthDocsUrl: '',
-    externalDocsUrl: '',
-    platinumOnly: true,
-  },
-  mongodb: {
-    docsUrl: docLinks.connectorsMongoDB,
-    externalAuthDocsUrl: 'https://www.mongodb.com/docs/atlas/app-services/authentication/',
-    externalDocsUrl: 'https://www.mongodb.com/docs/',
-    platinumOnly: true,
-  },
-  mssql: {
-    docsUrl: docLinks.connectorsMicrosoftSQL,
-    externalAuthDocsUrl:
-      'https://learn.microsoft.com/sql/relational-databases/security/authentication-access/getting-started-with-database-engine-permissions',
-    externalDocsUrl: 'https://learn.microsoft.com/sql/',
-    platinumOnly: true,
-  },
-  mysql: {
-    docsUrl: docLinks.connectorsMySQL,
-    externalDocsUrl: 'https://dev.mysql.com/doc/',
-    platinumOnly: true,
-  },
-  network_drive: {
-    docsUrl: docLinks.connectorsNetworkDrive,
-    externalAuthDocsUrl: '',
-    externalDocsUrl: '',
-    platinumOnly: true,
-  },
-  notion: {
-    docsUrl: docLinks.connectorsNotion,
-    externalAuthDocsUrl: '',
-    externalDocsUrl: '',
-    platinumOnly: true,
-  },
-  onedrive: {
-    docsUrl: docLinks.connectorsOneDrive,
-    externalAuthDocsUrl: '',
-    externalDocsUrl: '',
-    platinumOnly: true,
-  },
-  oracle: {
-    docsUrl: docLinks.connectorsOracle,
-    externalAuthDocsUrl:
-      'https://docs.oracle.com/en/database/oracle/oracle-database/19/dbseg/index.html',
-    externalDocsUrl: 'https://docs.oracle.com/database/oracle/oracle-database/',
-    platinumOnly: true,
-  },
-  outlook: {
-    docsUrl: docLinks.connectorsOutlook,
-    externalAuthDocsUrl: '',
-    externalDocsUrl: '',
-    platinumOnly: true,
-  },
-  postgresql: {
-    docsUrl: docLinks.connectorsPostgreSQL,
-    externalAuthDocsUrl: 'https://www.postgresql.org/docs/15/auth-methods.html',
-    externalDocsUrl: 'https://www.postgresql.org/docs/',
-    platinumOnly: true,
-  },
-  redis: {
-    docsUrl: docLinks.connectorsRedis,
-    externalAuthDocsUrl: '',
-    externalDocsUrl: '',
-    platinumOnly: true,
-  },
-  s3: {
-    docsUrl: docLinks.connectorsS3,
-    externalAuthDocsUrl: 'https://docs.aws.amazon.com/s3/index.html',
-    externalDocsUrl: '',
-    platinumOnly: true,
-  },
-  salesforce: {
-    docsUrl: docLinks.connectorsSalesforce,
-    externalAuthDocsUrl: '',
-    externalDocsUrl: '',
-    platinumOnly: true,
-  },
-  servicenow: {
-    docsUrl: docLinks.connectorsServiceNow,
-    externalAuthDocsUrl: '',
-    externalDocsUrl: '',
-    platinumOnly: true,
-  },
-  sharepoint_online: {
-    docsUrl: docLinks.connectorsSharepointOnline,
-    externalAuthDocsUrl: '',
-    externalDocsUrl: '',
-    platinumOnly: true,
-  },
-  sharepoint_server: {
-    docsUrl: docLinks.connectorsSharepoint,
-    externalAuthDocsUrl: '',
-    externalDocsUrl: '',
-    platinumOnly: true,
-  },
-  slack: {
-    docsUrl: docLinks.connectorsSlack,
-    externalAuthDocsUrl: '',
-    externalDocsUrl: '',
-    platinumOnly: true,
-  },
-  zoom: {
-    docsUrl: docLinks.connectorsZoom,
-    externalAuthDocsUrl: '',
-    externalDocsUrl: '',
-    platinumOnly: true,
-  },
-});
diff --git a/x-pack/plugins/search_connectors/common/lib/connector_types.ts b/x-pack/plugins/search_connectors/common/lib/connector_types.ts
index 387b405b45774..32eff7d676a1d 100644
--- a/x-pack/plugins/search_connectors/common/lib/connector_types.ts
+++ b/x-pack/plugins/search_connectors/common/lib/connector_types.ts
@@ -6,10 +6,12 @@
  */
 
 import type { IStaticAssets } from '@kbn/core-http-browser';
-import { ConnectorServerSideDefinition, CONNECTOR_DEFINITIONS } from '../connectors';
-import { getConnectorsDict } from '../constants';
-
-import { ConnectorDefinition } from '../types';
+import {
+  CONNECTOR_DEFINITIONS,
+  ConnectorDefinition,
+  ConnectorServerSideDefinition,
+  getConnectorsDict,
+} from '@kbn/search-connectors';
 
 // used on server and in browser before plugin start when we don't have docLinks yet
 export function getConnectorTypes(staticAssets: IStaticAssets): ConnectorServerSideDefinition[] {
diff --git a/x-pack/plugins/search_connectors/common/types.ts b/x-pack/plugins/search_connectors/common/types.ts
deleted file mode 100644
index 9d5049895b963..0000000000000
--- a/x-pack/plugins/search_connectors/common/types.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { ConnectorServerSideDefinition } from './connectors';
-
-export interface ConnectorClientSideDefinition {
-  docsUrl?: string;
-  externalAuthDocsUrl?: string;
-  externalDocsUrl: string;
-  platinumOnly?: boolean;
-}
-
-export type ConnectorDefinition = ConnectorClientSideDefinition & ConnectorServerSideDefinition;
diff --git a/x-pack/plugins/search_connectors/public/index.ts b/x-pack/plugins/search_connectors/public/index.ts
index 77afb7b9f82d8..6a59a98b068f4 100644
--- a/x-pack/plugins/search_connectors/public/index.ts
+++ b/x-pack/plugins/search_connectors/public/index.ts
@@ -13,4 +13,3 @@ export function plugin() {
 }
 
 export type { SearchConnectorsPluginSetup, SearchConnectorsPluginStart } from './types';
-export type { ConnectorDefinition } from '../common/types';
diff --git a/x-pack/plugins/search_connectors/public/plugin.ts b/x-pack/plugins/search_connectors/public/plugin.ts
index 830d9d3e94c1e..cc86709121ab0 100644
--- a/x-pack/plugins/search_connectors/public/plugin.ts
+++ b/x-pack/plugins/search_connectors/public/plugin.ts
@@ -6,7 +6,7 @@
  */
 
 import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
-import { docLinks } from '../common/doc_links';
+import { docLinks } from '@kbn/search-connectors';
 import { getConnectorFullTypes, getConnectorTypes } from '../common/lib/connector_types';
 import {
   SearchConnectorsPluginSetup,
diff --git a/x-pack/plugins/search_connectors/public/types.ts b/x-pack/plugins/search_connectors/public/types.ts
index a86ca30170fce..ec77fb403af78 100644
--- a/x-pack/plugins/search_connectors/public/types.ts
+++ b/x-pack/plugins/search_connectors/public/types.ts
@@ -5,8 +5,7 @@
  * 2.0.
  */
 
-import { ConnectorServerSideDefinition } from '../common/connectors';
-import { ConnectorDefinition } from '../common/types';
+import { ConnectorDefinition, ConnectorServerSideDefinition } from '@kbn/search-connectors';
 
 /* eslint-disable @typescript-eslint/no-empty-interface */
 
diff --git a/x-pack/plugins/search_connectors/server/index.ts b/x-pack/plugins/search_connectors/server/index.ts
index 304eb460ca7d6..9a52237740d16 100644
--- a/x-pack/plugins/search_connectors/server/index.ts
+++ b/x-pack/plugins/search_connectors/server/index.ts
@@ -18,4 +18,3 @@ export function plugin(initializerContext: PluginInitializerContext) {
 }
 
 export type { SearchConnectorsPluginSetup, SearchConnectorsPluginStart } from './types';
-export type { CONNECTOR_DEFINITIONS, ConnectorServerSideDefinition } from '../common/connectors';
diff --git a/x-pack/plugins/search_connectors/server/plugin.ts b/x-pack/plugins/search_connectors/server/plugin.ts
index 56f78638da2d7..fe73afae20b9a 100644
--- a/x-pack/plugins/search_connectors/server/plugin.ts
+++ b/x-pack/plugins/search_connectors/server/plugin.ts
@@ -6,7 +6,7 @@
  */
 
 import type { PluginInitializerContext, Plugin, CoreSetup } from '@kbn/core/server';
-import { ConnectorServerSideDefinition } from '../common/connectors';
+import { ConnectorServerSideDefinition } from '@kbn/search-connectors';
 import { getConnectorTypes } from '../common/lib/connector_types';
 import type {
   SearchConnectorsPluginSetup as SearchConnectorsPluginSetup,
diff --git a/x-pack/plugins/search_connectors/server/types.ts b/x-pack/plugins/search_connectors/server/types.ts
index c08b562ec8a5f..36b5aa877fd1e 100644
--- a/x-pack/plugins/search_connectors/server/types.ts
+++ b/x-pack/plugins/search_connectors/server/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { ConnectorServerSideDefinition } from '../common/connectors';
+import { ConnectorServerSideDefinition } from '@kbn/search-connectors';
 
 /* eslint-disable @typescript-eslint/no-empty-interface */
 
diff --git a/x-pack/plugins/search_connectors/tsconfig.json b/x-pack/plugins/search_connectors/tsconfig.json
index 9da933a758aec..040c873fe0353 100644
--- a/x-pack/plugins/search_connectors/tsconfig.json
+++ b/x-pack/plugins/search_connectors/tsconfig.json
@@ -17,8 +17,7 @@
   "kbn_references": [
     "@kbn/core",
     "@kbn/config-schema",
-    "@kbn/doc-links",
     "@kbn/core-http-browser",
-    "@kbn/i18n",
+    "@kbn/search-connectors",
   ]
 }
diff --git a/x-pack/plugins/search_playground/common/models.ts b/x-pack/plugins/search_playground/common/models.ts
index ca27c29e20533..85bf5ddfb0970 100644
--- a/x-pack/plugins/search_playground/common/models.ts
+++ b/x-pack/plugins/search_playground/common/models.ts
@@ -8,12 +8,6 @@
 import { ModelProvider, LLMs } from './types';
 
 export const MODELS: ModelProvider[] = [
-  {
-    name: 'OpenAI GPT-3.5 Turbo',
-    model: 'gpt-3.5-turbo',
-    promptTokenLimit: 16385,
-    provider: LLMs.openai,
-  },
   {
     name: 'OpenAI GPT-4o',
     model: 'gpt-4o',
@@ -26,6 +20,12 @@ export const MODELS: ModelProvider[] = [
     promptTokenLimit: 128000,
     provider: LLMs.openai,
   },
+  {
+    name: 'OpenAI GPT-3.5 Turbo',
+    model: 'gpt-3.5-turbo',
+    promptTokenLimit: 16385,
+    provider: LLMs.openai,
+  },
   {
     name: 'Anthropic Claude 3 Haiku',
     model: 'anthropic.claude-3-haiku-20240307-v1:0',
@@ -40,13 +40,13 @@ export const MODELS: ModelProvider[] = [
   },
   {
     name: 'Google Gemini 1.5 Pro',
-    model: 'gemini-1.5-pro-001',
+    model: 'gemini-1.5-pro-002',
     promptTokenLimit: 2097152,
     provider: LLMs.gemini,
   },
   {
     name: 'Google Gemini 1.5 Flash',
-    model: 'gemini-1.5-flash-001',
+    model: 'gemini-1.5-flash-002',
     promptTokenLimit: 2097152,
     provider: LLMs.gemini,
   },
diff --git a/x-pack/plugins/search_playground/public/hooks/use_llms_models.test.ts b/x-pack/plugins/search_playground/public/hooks/use_llms_models.test.ts
index ebce3883a471b..c529a9d4b9aa6 100644
--- a/x-pack/plugins/search_playground/public/hooks/use_llms_models.test.ts
+++ b/x-pack/plugins/search_playground/public/hooks/use_llms_models.test.ts
@@ -41,11 +41,11 @@ describe('useLLMsModels Hook', () => {
         connectorType: LLMs.openai,
         disabled: false,
         icon: expect.any(Function),
-        id: 'connectorId1OpenAI GPT-3.5 Turbo ',
-        name: 'OpenAI GPT-3.5 Turbo ',
+        id: 'connectorId1OpenAI GPT-4o ',
+        name: 'OpenAI GPT-4o ',
         showConnectorName: false,
-        value: 'gpt-3.5-turbo',
-        promptTokenLimit: 16385,
+        value: 'gpt-4o',
+        promptTokenLimit: 128000,
       },
       {
         connectorId: 'connectorId1',
@@ -53,10 +53,10 @@ describe('useLLMsModels Hook', () => {
         connectorType: LLMs.openai,
         disabled: false,
         icon: expect.any(Function),
-        id: 'connectorId1OpenAI GPT-4o ',
-        name: 'OpenAI GPT-4o ',
+        id: 'connectorId1OpenAI GPT-4 Turbo ',
+        name: 'OpenAI GPT-4 Turbo ',
         showConnectorName: false,
-        value: 'gpt-4o',
+        value: 'gpt-4-turbo',
         promptTokenLimit: 128000,
       },
       {
@@ -65,11 +65,11 @@ describe('useLLMsModels Hook', () => {
         connectorType: LLMs.openai,
         disabled: false,
         icon: expect.any(Function),
-        id: 'connectorId1OpenAI GPT-4 Turbo ',
-        name: 'OpenAI GPT-4 Turbo ',
+        id: 'connectorId1OpenAI GPT-3.5 Turbo ',
+        name: 'OpenAI GPT-3.5 Turbo ',
         showConnectorName: false,
-        value: 'gpt-4-turbo',
-        promptTokenLimit: 128000,
+        value: 'gpt-3.5-turbo',
+        promptTokenLimit: 16385,
       },
       {
         connectorId: 'connectorId2',
diff --git a/x-pack/plugins/search_playground/public/hooks/use_source_indices_fields.test.tsx b/x-pack/plugins/search_playground/public/hooks/use_source_indices_fields.test.tsx
index b31512177d3cb..4adf3d18ea92b 100644
--- a/x-pack/plugins/search_playground/public/hooks/use_source_indices_fields.test.tsx
+++ b/x-pack/plugins/search_playground/public/hooks/use_source_indices_fields.test.tsx
@@ -6,144 +6,82 @@
  */
 
 import { renderHook, act } from '@testing-library/react-hooks';
-import { useKibana } from './use_kibana';
-import { PlaygroundProvider } from '../providers/playground_provider';
-import React from 'react';
-import * as ReactHookForm from 'react-hook-form';
-
-jest.mock('./use_kibana', () => ({
-  useKibana: jest.fn(),
-}));
-jest.mock('react-router-dom-v5-compat', () => ({
-  useSearchParams: jest.fn(() => [{ get: jest.fn() }]),
-}));
-
-let formHookSpy: jest.SpyInstance;
-
+import { useUsageTracker } from './use_usage_tracker';
+import { useController } from 'react-hook-form';
+import { useIndicesFields } from './use_indices_fields';
+import { AnalyticsEvents } from '../analytics/constants';
 import { useSourceIndicesFields } from './use_source_indices_field';
-import { IndicesQuerySourceFields } from '../types';
 
-// Failing: See https://github.com/elastic/kibana/issues/188840
-describe.skip('useSourceIndicesFields Hook', () => {
-  let postMock: jest.Mock;
-
-  beforeEach(() => {
-    // Playground Provider has the formProvider which
-    // persists the form state into local storage
-    // We need to clear the local storage before each test
-    localStorage.clear();
-  });
+jest.mock('./use_usage_tracker');
+jest.mock('react-hook-form');
+jest.mock('./use_indices_fields');
 
-  const wrapper = ({ children }: { children: React.ReactNode }) => (
-    <PlaygroundProvider>{children}</PlaygroundProvider>
-  );
+describe('useSourceIndicesFields', () => {
+  const mockUsageTracker = {
+    count: jest.fn(),
+  };
+  const mockOnChange = jest.fn();
+  const mockFields = ['field1', 'field2'];
+  const mockSelectedIndices = ['index1', 'index2'];
 
   beforeEach(() => {
-    formHookSpy = jest.spyOn(ReactHookForm, 'useForm');
-    const querySourceFields: IndicesQuerySourceFields = {
-      newIndex: {
-        elser_query_fields: [
-          {
-            field: 'field1',
-            model_id: 'model1',
-            indices: ['newIndex'],
-            sparse_vector: true,
-          },
-        ],
-        dense_vector_query_fields: [],
-        bm25_query_fields: [],
-        source_fields: ['field1'],
-        skipped_fields: 0,
-        semantic_fields: [],
-      },
-    };
-
-    postMock = jest.fn().mockResolvedValue(querySourceFields);
-    (useKibana as jest.Mock).mockImplementation(() => ({
-      services: {
-        http: {
-          post: postMock,
-          get: jest.fn(() => {
-            return [];
-          }),
-        },
-      },
-    }));
-  });
-
-  afterEach(() => {
     jest.clearAllMocks();
+    (useUsageTracker as jest.Mock).mockReturnValue(mockUsageTracker);
+    (useController as jest.Mock).mockReturnValue({
+      field: { value: mockSelectedIndices, onChange: mockOnChange },
+    });
+    (useIndicesFields as jest.Mock).mockReturnValue({
+      fields: mockFields,
+      isLoading: false,
+    });
   });
 
-  it('should handle addIndex correctly changing indices', async () => {
-    const { result, waitForNextUpdate } = renderHook(() => useSourceIndicesFields(), { wrapper });
-    const { getValues } = formHookSpy.mock.results[0].value;
+  it('should initialize correctly', () => {
+    const { result } = renderHook(() => useSourceIndicesFields());
+
+    expect(result.current.indices).toEqual(mockSelectedIndices);
+    expect(result.current.fields).toEqual(mockFields);
+    expect(result.current.isFieldsLoading).toBe(false);
+  });
 
+  it('should add an index', () => {
+    const { result } = renderHook(() => useSourceIndicesFields());
     act(() => {
-      expect(result.current.indices).toEqual([]);
-      expect(getValues()).toMatchInlineSnapshot(`
-        Object {
-          "doc_size": 3,
-          "elasticsearch_query": Object {
-            "retriever": Object {
-              "standard": Object {
-                "query": Object {
-                  "match_all": Object {},
-                },
-              },
-            },
-          },
-          "indices": Array [],
-          "prompt": "You are an assistant for question-answering tasks.",
-          "query_fields": Object {},
-          "source_fields": Object {},
-          "summarization_model": undefined,
-        }
-      `);
       result.current.addIndex('newIndex');
     });
 
-    await act(async () => {
-      await waitForNextUpdate();
-      expect(result.current.indices).toEqual(['newIndex']);
+    expect(mockOnChange).toHaveBeenCalledWith([...mockSelectedIndices, 'newIndex']);
+    expect(mockUsageTracker.count).toHaveBeenCalledWith(
+      AnalyticsEvents.sourceIndexUpdated,
+      mockSelectedIndices.length + 1
+    );
+  });
+
+  it('should remove an index', () => {
+    const { result } = renderHook(() => useSourceIndicesFields());
+    act(() => {
+      result.current.removeIndex('index1');
     });
 
-    expect(postMock).toHaveBeenCalled();
+    expect(mockOnChange).toHaveBeenCalledWith(['index2']);
+    expect(mockUsageTracker.count).toHaveBeenCalledWith(
+      AnalyticsEvents.sourceIndexUpdated,
+      mockSelectedIndices.length - 1
+    );
+  });
+
+  it('should set indices', () => {
+    const { result } = renderHook(() => useSourceIndicesFields());
+    const newIndices = ['index3', 'index4'];
 
-    await act(async () => {
-      expect(getValues()).toMatchInlineSnapshot(`
-        Object {
-          "doc_size": 3,
-          "elasticsearch_query": Object {
-            "retriever": Object {
-              "standard": Object {
-                "query": Object {
-                  "sparse_vector": Object {
-                    "field": "field1",
-                    "inference_id": "model1",
-                    "query": "{query}",
-                  },
-                },
-              },
-            },
-          },
-          "indices": Array [
-            "newIndex",
-          ],
-          "prompt": "You are an assistant for question-answering tasks.",
-          "query_fields": Object {
-            "newIndex": Array [
-              "field1",
-            ],
-          },
-          "source_fields": Object {
-            "newIndex": Array [
-              "field1",
-            ],
-          },
-          "summarization_model": undefined,
-        }
-      `);
+    act(() => {
+      result.current.setIndices(newIndices);
     });
+
+    expect(mockOnChange).toHaveBeenCalledWith(newIndices);
+    expect(mockUsageTracker.count).toHaveBeenCalledWith(
+      AnalyticsEvents.sourceIndexUpdated,
+      newIndices.length
+    );
   });
 });
diff --git a/x-pack/plugins/search_playground/server/lib/conversational_chain.test.ts b/x-pack/plugins/search_playground/server/lib/conversational_chain.test.ts
index 13959e4455c29..5a56598e7387b 100644
--- a/x-pack/plugins/search_playground/server/lib/conversational_chain.test.ts
+++ b/x-pack/plugins/search_playground/server/lib/conversational_chain.test.ts
@@ -9,9 +9,8 @@ import type { Client } from '@elastic/elasticsearch';
 import { BaseChatModel } from '@langchain/core/language_models/chat_models';
 import { ChatPromptTemplate } from '@langchain/core/prompts';
 import { FakeListChatModel, FakeStreamingLLM } from '@langchain/core/utils/testing';
-import { experimental_StreamData } from 'ai';
 import { createAssist as Assist } from '../utils/assist';
-import { ConversationalChain, clipContext } from './conversational_chain';
+import { ConversationalChain, contextLimitCheck } from './conversational_chain';
 import { ChatMessage, MessageRole } from '../types';
 
 describe('conversational chain', () => {
@@ -30,16 +29,20 @@ describe('conversational chain', () => {
   }: {
     responses: string[];
     chat: ChatMessage[];
-    expectedFinalAnswer: string;
-    expectedDocs: any;
-    expectedTokens: any;
-    expectedSearchRequest: any;
+    expectedFinalAnswer?: string;
+    expectedDocs?: any;
+    expectedTokens?: any;
+    expectedSearchRequest?: any;
     contentField?: Record<string, string>;
     isChatModel?: boolean;
     docs?: any;
     expectedHasClipped?: boolean;
     modelLimit?: number;
   }) => {
+    if (expectedHasClipped) {
+      expect.assertions(1);
+    }
+
     const searchMock = jest.fn().mockImplementation(() => {
       return {
         hits: {
@@ -101,44 +104,52 @@ describe('conversational chain', () => {
       questionRewritePrompt: 'rewrite question {question} using {context}"',
     });
 
-    const stream = await conversationalChain.stream(aiClient, chat);
+    try {
+      const stream = await conversationalChain.stream(aiClient, chat);
 
-    const streamToValue: string[] = await new Promise((resolve, reject) => {
-      const reader = stream.getReader();
-      const textDecoder = new TextDecoder();
-      const chunks: string[] = [];
+      const streamToValue: string[] = await new Promise((resolve, reject) => {
+        const reader = stream.getReader();
+        const textDecoder = new TextDecoder();
+        const chunks: string[] = [];
 
-      const read = () => {
-        reader.read().then(({ done, value }) => {
-          if (done) {
-            resolve(chunks);
-          } else {
-            chunks.push(textDecoder.decode(value));
-            read();
-          }
-        }, reject);
-      };
-      read();
-    });
+        const read = () => {
+          reader.read().then(({ done, value }) => {
+            if (done) {
+              resolve(chunks);
+            } else {
+              chunks.push(textDecoder.decode(value));
+              read();
+            }
+          }, reject);
+        };
+        read();
+      });
 
-    const textValue = streamToValue
-      .filter((v) => v[0] === '0')
-      .reduce((acc, v) => acc + v.replace(/0:"(.*)"\n/, '$1'), '');
-    expect(textValue).toEqual(expectedFinalAnswer);
+      const textValue = streamToValue
+        .filter((v) => v[0] === '0')
+        .reduce((acc, v) => acc + v.replace(/0:"(.*)"\n/, '$1'), '');
+      expect(textValue).toEqual(expectedFinalAnswer);
 
-    const annotations = streamToValue
-      .filter((v) => v[0] === '8')
-      .map((entry) => entry.replace(/8:(.*)\n/, '$1'), '')
-      .map((entry) => JSON.parse(entry))
-      .reduce((acc, v) => acc.concat(v), []);
+      const annotations = streamToValue
+        .filter((v) => v[0] === '8')
+        .map((entry) => entry.replace(/8:(.*)\n/, '$1'), '')
+        .map((entry) => JSON.parse(entry))
+        .reduce((acc, v) => acc.concat(v), []);
 
-    const docValues = annotations.filter((v: { type: string }) => v.type === 'retrieved_docs');
-    const tokens = annotations.filter((v: { type: string }) => v.type.endsWith('_token_count'));
-    const hasClipped = !!annotations.some((v: { type: string }) => v.type === 'context_clipped');
-    expect(docValues).toEqual(expectedDocs);
-    expect(tokens).toEqual(expectedTokens);
-    expect(hasClipped).toEqual(expectedHasClipped);
-    expect(searchMock.mock.calls[0]).toEqual(expectedSearchRequest);
+      const docValues = annotations.filter((v: { type: string }) => v.type === 'retrieved_docs');
+      const tokens = annotations.filter((v: { type: string }) => v.type.endsWith('_token_count'));
+      const hasClipped = !!annotations.some((v: { type: string }) => v.type === 'context_clipped');
+      expect(docValues).toEqual(expectedDocs);
+      expect(tokens).toEqual(expectedTokens);
+      expect(hasClipped).toEqual(expectedHasClipped);
+      expect(searchMock.mock.calls[0]).toEqual(expectedSearchRequest);
+    } catch (error) {
+      if (expectedHasClipped) {
+        expect(error).toMatchInlineSnapshot(`[ContextLimitError: Context exceeds the model limit]`);
+      } else {
+        throw error;
+      }
+    }
   };
 
   it('should be able to create a conversational chain', async () => {
@@ -470,102 +481,56 @@ describe('conversational chain', () => {
         },
       ],
       modelLimit: 100,
-      expectedFinalAnswer: 'the final answer',
-      expectedDocs: [
-        {
-          documents: [
-            {
-              metadata: { _id: '1', _index: 'index' },
-              pageContent: expect.any(String),
-            },
-            {
-              metadata: { _id: '1', _index: 'website' },
-              pageContent: expect.any(String),
-            },
-          ],
-          type: 'retrieved_docs',
-        },
-      ],
-      // Even with body_content of 1000, the token count should be below or equal to model limit of 100
-      expectedTokens: [
-        { type: 'context_token_count', count: 63 },
-        { type: 'prompt_token_count', count: 97 },
-      ],
       expectedHasClipped: true,
-      expectedSearchRequest: [
-        {
-          method: 'POST',
-          path: '/index,website/_search',
-          body: { query: { match: { field: 'rewrite "the" question' } }, size: 3 },
-        },
-      ],
       isChatModel: false,
     });
   }, 10000);
 
-  describe('clipContext', () => {
+  describe('contextLimitCheck', () => {
     const prompt = ChatPromptTemplate.fromTemplate(
       'you are a QA bot {question} {chat_history} {context}'
     );
 
+    afterEach(() => {
+      jest.clearAllMocks();
+    });
+
     it('should return the input as is if modelLimit is undefined', async () => {
       const input = {
         context: 'This is a test context.',
         question: 'This is a test question.',
         chat_history: 'This is a test chat history.',
       };
+      jest.spyOn(prompt, 'format');
+      const result = await contextLimitCheck(undefined, prompt)(input);
 
-      const data = new experimental_StreamData();
-      const appendMessageAnnotationSpy = jest.spyOn(data, 'appendMessageAnnotation');
-
-      const result = await clipContext(undefined, prompt, data)(input);
-      expect(result).toEqual(input);
-      expect(appendMessageAnnotationSpy).not.toHaveBeenCalled();
+      expect(result).toBe(input);
+      expect(prompt.format).not.toHaveBeenCalled();
     });
 
-    it('should not clip context if within modelLimit', async () => {
+    it('should return the input if within modelLimit', async () => {
       const input = {
         context: 'This is a test context.',
         question: 'This is a test question.',
         chat_history: 'This is a test chat history.',
       };
-      const data = new experimental_StreamData();
-      const appendMessageAnnotationSpy = jest.spyOn(data, 'appendMessageAnnotation');
-      const result = await clipContext(10000, prompt, data)(input);
+      jest.spyOn(prompt, 'format');
+      const result = await contextLimitCheck(10000, prompt)(input);
       expect(result).toEqual(input);
-      expect(appendMessageAnnotationSpy).not.toHaveBeenCalled();
+      expect(prompt.format).toHaveBeenCalledWith(input);
     });
 
     it('should clip context if exceeds modelLimit', async () => {
+      expect.assertions(1);
       const input = {
         context: 'This is a test context.\nThis is another line.\nAnd another one.',
         question: 'This is a test question.',
         chat_history: 'This is a test chat history.',
       };
-      const data = new experimental_StreamData();
-      const appendMessageAnnotationSpy = jest.spyOn(data, 'appendMessageAnnotation');
-      const result = await clipContext(33, prompt, data)(input);
-      expect(result.context).toBe('This is a test context.\nThis is another line.');
-      expect(appendMessageAnnotationSpy).toHaveBeenCalledWith({
-        type: 'context_clipped',
-        count: 4,
-      });
-    });
 
-    it('exit when context becomes empty', async () => {
-      const input = {
-        context: 'This is a test context.\nThis is another line.\nAnd another one.',
-        question: 'This is a test question.',
-        chat_history: 'This is a test chat history.',
-      };
-      const data = new experimental_StreamData();
-      const appendMessageAnnotationSpy = jest.spyOn(data, 'appendMessageAnnotation');
-      const result = await clipContext(1, prompt, data)(input);
-      expect(result.context).toBe('');
-      expect(appendMessageAnnotationSpy).toHaveBeenCalledWith({
-        type: 'context_clipped',
-        count: 15,
-      });
+      await expect(contextLimitCheck(33, prompt)(input)).rejects.toMatchInlineSnapshot(
+        `[ContextLimitError: Context exceeds the model limit]`
+      );
     });
   });
 });
diff --git a/x-pack/plugins/search_playground/server/lib/conversational_chain.ts b/x-pack/plugins/search_playground/server/lib/conversational_chain.ts
index 922f672bda5c6..dcd1f4189bc75 100644
--- a/x-pack/plugins/search_playground/server/lib/conversational_chain.ts
+++ b/x-pack/plugins/search_playground/server/lib/conversational_chain.ts
@@ -25,6 +25,7 @@ import { renderTemplate } from '../utils/render_template';
 import { AssistClient } from '../utils/assist';
 import { getCitations } from '../utils/get_citations';
 import { getTokenEstimate, getTokenEstimateFromMessages } from './token_tracking';
+import { ContextLimitError } from './errors';
 
 interface RAGOptions {
   index: string;
@@ -88,37 +89,26 @@ position: ${i + 1}
   return serializedDocs.join('\n');
 };
 
-export function clipContext(
+export function contextLimitCheck(
   modelLimit: number | undefined,
-  prompt: ChatPromptTemplate,
-  data: experimental_StreamData
+  prompt: ChatPromptTemplate
 ): (input: ContextInputs) => Promise<ContextInputs> {
   return async (input) => {
     if (!modelLimit) return input;
-    let context = input.context;
-    const clippedContext = [];
 
-    while (
-      getTokenEstimate(await prompt.format({ ...input, context })) > modelLimit &&
-      context.length > 0
-    ) {
-      // remove the last paragraph
-      const lines = context.split('\n');
-      clippedContext.push(lines.pop());
-      context = lines.join('\n');
-    }
+    const stringPrompt = await prompt.format(input);
+    const approxPromptTokens = getTokenEstimate(stringPrompt);
+    const aboveContextLimit = approxPromptTokens > modelLimit;
 
-    if (clippedContext.length > 0) {
-      data.appendMessageAnnotation({
-        type: 'context_clipped',
-        count: getTokenEstimate(clippedContext.join('\n')),
-      });
+    if (aboveContextLimit) {
+      throw new ContextLimitError(
+        'Context exceeds the model limit',
+        modelLimit,
+        approxPromptTokens
+      );
     }
 
-    return {
-      ...input,
-      context,
-    };
+    return input;
   };
 }
 
@@ -205,7 +195,7 @@ class ConversationalChainFn {
         });
         return inputs;
       }),
-      RunnableLambda.from(clipContext(this.options?.rag?.inputTokensLimit, prompt, data)),
+      RunnableLambda.from(contextLimitCheck(this.options?.rag?.inputTokensLimit, prompt)),
       RunnableLambda.from(registerContextTokenCounts(data)),
       prompt,
       this.options.model.withConfig({ metadata: { type: 'question_answer_qa' } }),
diff --git a/x-pack/plugins/search_playground/server/lib/errors.ts b/x-pack/plugins/search_playground/server/lib/errors.ts
new file mode 100644
index 0000000000000..38441b607a64a
--- /dev/null
+++ b/x-pack/plugins/search_playground/server/lib/errors.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export class ContextLimitError extends Error {
+  public modelLimit: number;
+  public currentTokens: number;
+
+  constructor(message: string, modelLimit: number, currentTokens: number) {
+    super(message);
+    this.name = 'ContextLimitError';
+    this.modelLimit = modelLimit;
+    this.currentTokens = currentTokens;
+  }
+}
diff --git a/x-pack/plugins/search_playground/server/routes.test.ts b/x-pack/plugins/search_playground/server/routes.test.ts
index 018b1420a46cf..fca1adab5862b 100644
--- a/x-pack/plugins/search_playground/server/routes.test.ts
+++ b/x-pack/plugins/search_playground/server/routes.test.ts
@@ -12,6 +12,7 @@ import { MockRouter } from '../__mocks__/router.mock';
 import { ConversationalChain } from './lib/conversational_chain';
 import { getChatParams } from './lib/get_chat_params';
 import { createRetriever, defineRoutes } from './routes';
+import { ContextLimitError } from './lib/errors';
 
 jest.mock('./lib/get_chat_params', () => ({
   getChatParams: jest.fn(),
@@ -100,5 +101,29 @@ describe('Search Playground routes', () => {
         },
       });
     });
+
+    it('responds with context error message if there is ContextLimitError', async () => {
+      (getChatParams as jest.Mock).mockResolvedValue({ model: 'open-ai' });
+      (ConversationalChain as jest.Mock).mockImplementation(() => {
+        return {
+          stream: jest
+            .fn()
+            .mockRejectedValue(
+              new ContextLimitError('Context exceeds the model limit', 16385, 24000)
+            ),
+        };
+      });
+
+      await mockRouter.callRoute({
+        body: mockRequestBody,
+      });
+
+      expect(mockRouter.response.badRequest).toHaveBeenCalledWith({
+        body: {
+          message:
+            'Your request uses 24000 input tokens. This exceeds the model token limit of 16385 tokens. Please try using a different model thats capable of accepting larger prompts or reducing the prompt by decreasing the size of the context documents. If you are unsure, please see our documentation.',
+        },
+      });
+    });
   });
 });
diff --git a/x-pack/plugins/search_playground/server/routes.ts b/x-pack/plugins/search_playground/server/routes.ts
index c26a342aace49..3cdebe11c02c2 100644
--- a/x-pack/plugins/search_playground/server/routes.ts
+++ b/x-pack/plugins/search_playground/server/routes.ts
@@ -8,6 +8,7 @@
 import { schema } from '@kbn/config-schema';
 import type { Logger } from '@kbn/logging';
 import { IRouter, StartServicesAccessor } from '@kbn/core/server';
+import { i18n } from '@kbn/i18n';
 import { sendMessageEvent, SendMessageEventData } from './analytics/events';
 import { fetchFields } from './lib/fetch_query_source_fields';
 import { AssistClientOptionsWithClient, createAssist as Assist } from './utils/assist';
@@ -23,6 +24,7 @@ import { getChatParams } from './lib/get_chat_params';
 import { fetchIndices } from './lib/fetch_indices';
 import { isNotNullish } from '../common/is_not_nullish';
 import { MODELS } from '../common/models';
+import { ContextLimitError } from './lib/errors';
 
 export function createRetriever(esQuery: string) {
   return (question: string) => {
@@ -157,6 +159,21 @@ export function defineRoutes({
           isCloud: cloud?.isCloudEnabled ?? false,
         });
       } catch (e) {
+        if (e instanceof ContextLimitError) {
+          return response.badRequest({
+            body: {
+              message: i18n.translate(
+                'xpack.searchPlayground.serverErrors.exceedsModelTokenLimit',
+                {
+                  defaultMessage:
+                    'Your request uses {approxPromptTokens} input tokens. This exceeds the model token limit of {modelLimit} tokens. Please try using a different model thats capable of accepting larger prompts or reducing the prompt by decreasing the size of the context documents. If you are unsure, please see our documentation.',
+                  values: { modelLimit: e.modelLimit, approxPromptTokens: e.currentTokens },
+                }
+              ),
+            },
+          });
+        }
+
         logger.error('Failed to create the chat stream', e);
 
         if (typeof e === 'object') {
diff --git a/x-pack/plugins/security/server/authorization/authorization_service.test.ts b/x-pack/plugins/security/server/authorization/authorization_service.test.ts
index 275a6d2643f24..de3646166d8f9 100644
--- a/x-pack/plugins/security/server/authorization/authorization_service.test.ts
+++ b/x-pack/plugins/security/server/authorization/authorization_service.test.ts
@@ -145,12 +145,9 @@ describe('#start', () => {
       customBranding: mockCoreSetup.customBranding,
     });
 
-    const featuresStart = featuresPluginMock.createStart();
-    featuresStart.getKibanaFeatures.mockReturnValue([]);
-
     authorizationService.start({
       clusterClient: mockClusterClient,
-      features: featuresStart,
+      features: featuresPluginMock.createStart(),
       online$: statusSubject.asObservable(),
     });
 
@@ -217,12 +214,9 @@ it('#stop unsubscribes from license and ES updates.', async () => {
     customBranding: mockCoreSetup.customBranding,
   });
 
-  const featuresStart = featuresPluginMock.createStart();
-  featuresStart.getKibanaFeatures.mockReturnValue([]);
-
   authorizationService.start({
     clusterClient: mockClusterClient,
-    features: featuresStart,
+    features: featuresPluginMock.createStart(),
     online$: statusSubject.asObservable(),
   });
 
diff --git a/x-pack/plugins/security/server/plugin.test.ts b/x-pack/plugins/security/server/plugin.test.ts
index 37c6e22a07fab..4b9479f51a0f3 100644
--- a/x-pack/plugins/security/server/plugin.test.ts
+++ b/x-pack/plugins/security/server/plugin.test.ts
@@ -64,10 +64,8 @@ describe('Security Plugin', () => {
 
     mockCoreStart = coreMock.createStart();
 
-    const mockFeaturesStart = featuresPluginMock.createStart();
-    mockFeaturesStart.getKibanaFeatures.mockReturnValue([]);
     mockStartDependencies = {
-      features: mockFeaturesStart,
+      features: featuresPluginMock.createStart(),
       licensing: licensingMock.createStart(),
       taskManager: taskManagerMock.createStart(),
     };
diff --git a/x-pack/plugins/security_solution/common/api/quickstart_client.gen.ts b/x-pack/plugins/security_solution/common/api/quickstart_client.gen.ts
index e4f4faaa7a2d5..8ad3dfbf451c7 100644
--- a/x-pack/plugins/security_solution/common/api/quickstart_client.gen.ts
+++ b/x-pack/plugins/security_solution/common/api/quickstart_client.gen.ts
@@ -365,7 +365,16 @@ import type {
 import type {
   CreateRuleMigrationRequestBodyInput,
   CreateRuleMigrationResponse,
+  GetAllStatsRuleMigrationResponse,
+  GetRuleMigrationRequestParamsInput,
   GetRuleMigrationResponse,
+  GetRuleMigrationStatsRequestParamsInput,
+  GetRuleMigrationStatsResponse,
+  StartRuleMigrationRequestParamsInput,
+  StartRuleMigrationRequestBodyInput,
+  StartRuleMigrationResponse,
+  StopRuleMigrationRequestParamsInput,
+  StopRuleMigrationResponse,
 } from '../siem_migrations/model/api/rules/rules_migration.gen';
 
 export interface ClientOptions {
@@ -1238,6 +1247,21 @@ finalize it.
       })
       .catch(catchAxiosErrorFormatAndThrow);
   }
+  /**
+   * Retrieves the rule migrations stats for all migrations stored in the system
+   */
+  async getAllStatsRuleMigration() {
+    this.log.info(`${new Date().toISOString()} Calling API GetAllStatsRuleMigration`);
+    return this.kbnClient
+      .request<GetAllStatsRuleMigrationResponse>({
+        path: '/internal/siem_migrations/rules/stats',
+        headers: {
+          [ELASTIC_HTTP_VERSION_HEADER]: '1',
+        },
+        method: 'GET',
+      })
+      .catch(catchAxiosErrorFormatAndThrow);
+  }
   /**
    * Get the asset criticality record for a specific entity.
    */
@@ -1431,13 +1455,28 @@ finalize it.
       .catch(catchAxiosErrorFormatAndThrow);
   }
   /**
-   * Retrieves the rule migrations stored in the system
+   * Retrieves the rule documents stored in the system given the rule migration id
    */
-  async getRuleMigration() {
+  async getRuleMigration(props: GetRuleMigrationProps) {
     this.log.info(`${new Date().toISOString()} Calling API GetRuleMigration`);
     return this.kbnClient
       .request<GetRuleMigrationResponse>({
-        path: '/internal/siem_migrations/rules',
+        path: replaceParams('/internal/siem_migrations/rules/{migration_id}', props.params),
+        headers: {
+          [ELASTIC_HTTP_VERSION_HEADER]: '1',
+        },
+        method: 'GET',
+      })
+      .catch(catchAxiosErrorFormatAndThrow);
+  }
+  /**
+   * Retrieves the stats of a SIEM rules migration using the migration id provided
+   */
+  async getRuleMigrationStats(props: GetRuleMigrationStatsProps) {
+    this.log.info(`${new Date().toISOString()} Calling API GetRuleMigrationStats`);
+    return this.kbnClient
+      .request<GetRuleMigrationStatsResponse>({
+        path: replaceParams('/internal/siem_migrations/rules/{migration_id}/stats', props.params),
         headers: {
           [ELASTIC_HTTP_VERSION_HEADER]: '1',
         },
@@ -1973,6 +2012,22 @@ detection engine rules.
       })
       .catch(catchAxiosErrorFormatAndThrow);
   }
+  /**
+   * Starts a SIEM rules migration using the migration id provided
+   */
+  async startRuleMigration(props: StartRuleMigrationProps) {
+    this.log.info(`${new Date().toISOString()} Calling API StartRuleMigration`);
+    return this.kbnClient
+      .request<StartRuleMigrationResponse>({
+        path: replaceParams('/internal/siem_migrations/rules/{migration_id}/start', props.params),
+        headers: {
+          [ELASTIC_HTTP_VERSION_HEADER]: '1',
+        },
+        method: 'PUT',
+        body: props.body,
+      })
+      .catch(catchAxiosErrorFormatAndThrow);
+  }
   async stopEntityEngine(props: StopEntityEngineProps) {
     this.log.info(`${new Date().toISOString()} Calling API StopEntityEngine`);
     return this.kbnClient
@@ -1985,6 +2040,21 @@ detection engine rules.
       })
       .catch(catchAxiosErrorFormatAndThrow);
   }
+  /**
+   * Stops a running SIEM rules migration using the migration id provided
+   */
+  async stopRuleMigration(props: StopRuleMigrationProps) {
+    this.log.info(`${new Date().toISOString()} Calling API StopRuleMigration`);
+    return this.kbnClient
+      .request<StopRuleMigrationResponse>({
+        path: replaceParams('/internal/siem_migrations/rules/{migration_id}/stop', props.params),
+        headers: {
+          [ELASTIC_HTTP_VERSION_HEADER]: '1',
+        },
+        method: 'PUT',
+      })
+      .catch(catchAxiosErrorFormatAndThrow);
+  }
   /**
    * Suggests user profiles.
    */
@@ -2221,6 +2291,12 @@ export interface GetRuleExecutionResultsProps {
   query: GetRuleExecutionResultsRequestQueryInput;
   params: GetRuleExecutionResultsRequestParamsInput;
 }
+export interface GetRuleMigrationProps {
+  params: GetRuleMigrationRequestParamsInput;
+}
+export interface GetRuleMigrationStatsProps {
+  params: GetRuleMigrationStatsRequestParamsInput;
+}
 export interface GetTimelineProps {
   query: GetTimelineRequestQueryInput;
 }
@@ -2297,9 +2373,16 @@ export interface SetAlertTagsProps {
 export interface StartEntityEngineProps {
   params: StartEntityEngineRequestParamsInput;
 }
+export interface StartRuleMigrationProps {
+  params: StartRuleMigrationRequestParamsInput;
+  body: StartRuleMigrationRequestBodyInput;
+}
 export interface StopEntityEngineProps {
   params: StopEntityEngineRequestParamsInput;
 }
+export interface StopRuleMigrationProps {
+  params: StopRuleMigrationRequestParamsInput;
+}
 export interface SuggestUserProfilesProps {
   query: SuggestUserProfilesRequestQueryInput;
 }
diff --git a/x-pack/plugins/security_solution/common/siem_migrations/constants.ts b/x-pack/plugins/security_solution/common/siem_migrations/constants.ts
index 96ca75679f112..f2efc646a8101 100644
--- a/x-pack/plugins/security_solution/common/siem_migrations/constants.ts
+++ b/x-pack/plugins/security_solution/common/siem_migrations/constants.ts
@@ -8,9 +8,24 @@
 export const SIEM_MIGRATIONS_PATH = '/internal/siem_migrations' as const;
 export const SIEM_RULE_MIGRATIONS_PATH = `${SIEM_MIGRATIONS_PATH}/rules` as const;
 
-export enum SiemMigrationsStatus {
+export const SIEM_RULE_MIGRATIONS_ALL_STATS_PATH = `${SIEM_RULE_MIGRATIONS_PATH}/stats` as const;
+export const SIEM_RULE_MIGRATIONS_GET_PATH = `${SIEM_RULE_MIGRATIONS_PATH}/{migration_id}` as const;
+export const SIEM_RULE_MIGRATIONS_START_PATH =
+  `${SIEM_RULE_MIGRATIONS_PATH}/{migration_id}/start` as const;
+export const SIEM_RULE_MIGRATIONS_STATS_PATH =
+  `${SIEM_RULE_MIGRATIONS_PATH}/{migration_id}/stats` as const;
+export const SIEM_RULE_MIGRATIONS_STOP_PATH =
+  `${SIEM_RULE_MIGRATIONS_PATH}/{migration_id}/stop` as const;
+
+export enum SiemMigrationStatus {
   PENDING = 'pending',
   PROCESSING = 'processing',
-  FINISHED = 'finished',
-  ERROR = 'error',
+  COMPLETED = 'completed',
+  FAILED = 'failed',
+}
+
+export enum SiemMigrationRuleTranslationResult {
+  FULL = 'full',
+  PARTIAL = 'partial',
+  UNTRANSLATABLE = 'untranslatable',
 }
diff --git a/x-pack/plugins/security_solution/common/siem_migrations/model/api/rules/rules_migration.gen.ts b/x-pack/plugins/security_solution/common/siem_migrations/model/api/rules/rules_migration.gen.ts
index fa8a1cc8a6778..120505ec43cb7 100644
--- a/x-pack/plugins/security_solution/common/siem_migrations/model/api/rules/rules_migration.gen.ts
+++ b/x-pack/plugins/security_solution/common/siem_migrations/model/api/rules/rules_migration.gen.ts
@@ -16,7 +16,13 @@
 
 import { z } from '@kbn/zod';
 
-import { OriginalRule, RuleMigration } from '../../rule_migration.gen';
+import {
+  OriginalRule,
+  RuleMigrationAllTaskStats,
+  RuleMigration,
+  RuleMigrationTaskStats,
+} from '../../rule_migration.gen';
+import { ConnectorId, LangSmithOptions } from '../common.gen';
 
 export type CreateRuleMigrationRequestBody = z.infer<typeof CreateRuleMigrationRequestBody>;
 export const CreateRuleMigrationRequestBody = z.array(OriginalRule);
@@ -30,5 +36,60 @@ export const CreateRuleMigrationResponse = z.object({
   migration_id: z.string(),
 });
 
+export type GetAllStatsRuleMigrationResponse = z.infer<typeof GetAllStatsRuleMigrationResponse>;
+export const GetAllStatsRuleMigrationResponse = RuleMigrationAllTaskStats;
+
+export type GetRuleMigrationRequestParams = z.infer<typeof GetRuleMigrationRequestParams>;
+export const GetRuleMigrationRequestParams = z.object({
+  migration_id: z.string(),
+});
+export type GetRuleMigrationRequestParamsInput = z.input<typeof GetRuleMigrationRequestParams>;
+
 export type GetRuleMigrationResponse = z.infer<typeof GetRuleMigrationResponse>;
 export const GetRuleMigrationResponse = z.array(RuleMigration);
+
+export type GetRuleMigrationStatsRequestParams = z.infer<typeof GetRuleMigrationStatsRequestParams>;
+export const GetRuleMigrationStatsRequestParams = z.object({
+  migration_id: z.string(),
+});
+export type GetRuleMigrationStatsRequestParamsInput = z.input<
+  typeof GetRuleMigrationStatsRequestParams
+>;
+
+export type GetRuleMigrationStatsResponse = z.infer<typeof GetRuleMigrationStatsResponse>;
+export const GetRuleMigrationStatsResponse = RuleMigrationTaskStats;
+
+export type StartRuleMigrationRequestParams = z.infer<typeof StartRuleMigrationRequestParams>;
+export const StartRuleMigrationRequestParams = z.object({
+  migration_id: z.string(),
+});
+export type StartRuleMigrationRequestParamsInput = z.input<typeof StartRuleMigrationRequestParams>;
+
+export type StartRuleMigrationRequestBody = z.infer<typeof StartRuleMigrationRequestBody>;
+export const StartRuleMigrationRequestBody = z.object({
+  connector_id: ConnectorId,
+  langsmith_options: LangSmithOptions.optional(),
+});
+export type StartRuleMigrationRequestBodyInput = z.input<typeof StartRuleMigrationRequestBody>;
+
+export type StartRuleMigrationResponse = z.infer<typeof StartRuleMigrationResponse>;
+export const StartRuleMigrationResponse = z.object({
+  /**
+   * Indicates the migration has been started. `false` means the migration does not need to be started.
+   */
+  started: z.boolean(),
+});
+
+export type StopRuleMigrationRequestParams = z.infer<typeof StopRuleMigrationRequestParams>;
+export const StopRuleMigrationRequestParams = z.object({
+  migration_id: z.string(),
+});
+export type StopRuleMigrationRequestParamsInput = z.input<typeof StopRuleMigrationRequestParams>;
+
+export type StopRuleMigrationResponse = z.infer<typeof StopRuleMigrationResponse>;
+export const StopRuleMigrationResponse = z.object({
+  /**
+   * Indicates the migration has been stopped.
+   */
+  stopped: z.boolean(),
+});
diff --git a/x-pack/plugins/security_solution/common/siem_migrations/model/api/rules/rules_migration.schema.yaml b/x-pack/plugins/security_solution/common/siem_migrations/model/api/rules/rules_migration.schema.yaml
index 40596ba7e712d..7b06c3d6a22ac 100644
--- a/x-pack/plugins/security_solution/common/siem_migrations/model/api/rules/rules_migration.schema.yaml
+++ b/x-pack/plugins/security_solution/common/siem_migrations/model/api/rules/rules_migration.schema.yaml
@@ -10,8 +10,7 @@ paths:
       x-codegen-enabled: true
       description: Creates a new SIEM rules migration using the original vendor rules provided
       tags:
-        - SIEM Migrations
-        - Rule Migrations
+        - SIEM Rule Migrations
       requestBody:
         required: true
         content:
@@ -33,20 +32,146 @@ paths:
                   migration_id:
                     type: string
                     description: The migration id created.
+
+  /internal/siem_migrations/rules/stats:
     get:
-      summary: Retrieves rule migrations
-      operationId: GetRuleMigration
+      summary: Retrieves the stats for all rule migrations
+      operationId: GetAllStatsRuleMigration
       x-codegen-enabled: true
-      description: Retrieves the rule migrations stored in the system
+      description: Retrieves the rule migrations stats for all migrations stored in the system
       tags:
-        - SIEM Migrations
-        - Rule Migrations
+        - SIEM Rule Migrations
       responses:
         200:
           description: Indicates rule migrations have been retrieved correctly.
+          content:
+            application/json:
+              schema:
+                $ref: '../../rule_migration.schema.yaml#/components/schemas/RuleMigrationAllTaskStats'
+
+  /internal/siem_migrations/rules/{migration_id}:
+    get:
+      summary: Retrieves all the rules of a migration
+      operationId: GetRuleMigration
+      x-codegen-enabled: true
+      description: Retrieves the rule documents stored in the system given the rule migration id
+      tags:
+        - SIEM Rule Migrations
+      parameters:
+        - name: migration_id
+          in: path
+          required: true
+          schema:
+            type: string
+            description: The migration id to start
+      responses:
+        200:
+          description: Indicates rule migration have been retrieved correctly.
           content:
             application/json:
               schema:
                 type: array
                 items:
                   $ref: '../../rule_migration.schema.yaml#/components/schemas/RuleMigration'
+        204:
+          description: Indicates the migration id was not found.
+
+  /internal/siem_migrations/rules/{migration_id}/start:
+    put:
+      summary: Starts a rule migration
+      operationId: StartRuleMigration
+      x-codegen-enabled: true
+      description: Starts a SIEM rules migration using the migration id provided
+      tags:
+        - SIEM Rule Migrations
+      parameters:
+        - name: migration_id
+          in: path
+          required: true
+          schema:
+            type: string
+            description: The migration id to start
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              required:
+                - connector_id
+              properties:
+                connector_id:
+                  $ref: '../common.schema.yaml#/components/schemas/ConnectorId'
+                langsmith_options:
+                  $ref: '../common.schema.yaml#/components/schemas/LangSmithOptions'
+      responses:
+        200:
+          description: Indicates the migration start request has been processed successfully.
+          content:
+            application/json:
+              schema:
+                type: object
+                required:
+                  - started
+                properties:
+                  started:
+                    type: boolean
+                    description: Indicates the migration has been started. `false` means the migration does not need to be started.
+        204:
+          description: Indicates the migration id was not found.
+
+  /internal/siem_migrations/rules/{migration_id}/stats:
+    get:
+      summary: Gets a rule migration task stats
+      operationId: GetRuleMigrationStats
+      x-codegen-enabled: true
+      description: Retrieves the stats of a SIEM rules migration using the migration id provided
+      tags:
+        - SIEM Rule Migrations
+      parameters:
+        - name: migration_id
+          in: path
+          required: true
+          schema:
+            type: string
+            description: The migration id to start
+      responses:
+        200:
+          description: Indicates the migration stats has been retrieved correctly.
+          content:
+            application/json:
+              schema:
+                $ref: '../../rule_migration.schema.yaml#/components/schemas/RuleMigrationTaskStats'
+        204:
+          description: Indicates the migration id was not found.
+
+  /internal/siem_migrations/rules/{migration_id}/stop:
+    put:
+      summary: Stops an existing rule migration
+      operationId: StopRuleMigration
+      x-codegen-enabled: true
+      description: Stops a running SIEM rules migration using the migration id provided
+      tags:
+        - SIEM Rule Migrations
+      parameters:
+        - name: migration_id
+          in: path
+          required: true
+          schema:
+            type: string
+            description: The migration id to stop
+      responses:
+        200:
+          description: Indicates migration task stop has been processed successfully.
+          content:
+            application/json:
+              schema:
+                type: object
+                required:
+                  - stopped
+                properties:
+                  stopped:
+                    type: boolean
+                    description: Indicates the migration has been stopped.
+        204:
+          description: Indicates the migration id was not found running.
diff --git a/x-pack/plugins/security_solution/common/siem_migrations/model/rule_migration.gen.ts b/x-pack/plugins/security_solution/common/siem_migrations/model/rule_migration.gen.ts
index 0e07ef2f208da..fe00c4b4df1c6 100644
--- a/x-pack/plugins/security_solution/common/siem_migrations/model/rule_migration.gen.ts
+++ b/x-pack/plugins/security_solution/common/siem_migrations/model/rule_migration.gen.ts
@@ -71,11 +71,11 @@ export const ElasticRule = z.object({
   /**
    * The translated elastic query.
    */
-  query: z.string(),
+  query: z.string().optional(),
   /**
    * The translated elastic query language.
    */
-  query_language: z.literal('esql').default('esql'),
+  query_language: z.literal('esql').optional(),
   /**
    * The Elastic prebuilt rule id matched.
    */
@@ -99,16 +99,20 @@ export const RuleMigration = z.object({
    * The migration id.
    */
   migration_id: z.string(),
+  /**
+   * The username of the user who created the migration.
+   */
+  created_by: z.string(),
   original_rule: OriginalRule,
   elastic_rule: ElasticRule.optional(),
   /**
-   * The translation state.
+   * The rule translation result.
    */
-  translation_state: z.enum(['complete', 'partial', 'untranslatable']).optional(),
+  translation_result: z.enum(['full', 'partial', 'untranslatable']).optional(),
   /**
-   * The status of the rule migration.
+   * The status of the rule migration process.
    */
-  status: z.enum(['pending', 'processing', 'finished', 'error']).default('pending'),
+  status: z.enum(['pending', 'processing', 'completed', 'failed']).default('pending'),
   /**
    * The comments for the migration including a summary from the LLM in markdown.
    */
@@ -122,3 +126,55 @@ export const RuleMigration = z.object({
    */
   updated_by: z.string().optional(),
 });
+
+/**
+ * The rule migration task stats object.
+ */
+export type RuleMigrationTaskStats = z.infer<typeof RuleMigrationTaskStats>;
+export const RuleMigrationTaskStats = z.object({
+  /**
+   * Indicates if the migration task status.
+   */
+  status: z.enum(['ready', 'running', 'stopped', 'finished']),
+  /**
+   * The rules migration stats.
+   */
+  rules: z.object({
+    /**
+     * The total number of rules to migrate.
+     */
+    total: z.number().int(),
+    /**
+     * The number of rules that are pending migration.
+     */
+    pending: z.number().int(),
+    /**
+     * The number of rules that are being migrated.
+     */
+    processing: z.number().int(),
+    /**
+     * The number of rules that have been migrated successfully.
+     */
+    completed: z.number().int(),
+    /**
+     * The number of rules that have failed migration.
+     */
+    failed: z.number().int(),
+  }),
+  /**
+   * The moment of the last update.
+   */
+  last_updated_at: z.string().optional(),
+});
+
+export type RuleMigrationAllTaskStats = z.infer<typeof RuleMigrationAllTaskStats>;
+export const RuleMigrationAllTaskStats = z.array(
+  RuleMigrationTaskStats.merge(
+    z.object({
+      /**
+       * The migration id
+       */
+      migration_id: z.string(),
+    })
+  )
+);
diff --git a/x-pack/plugins/security_solution/common/siem_migrations/model/rule_migration.schema.yaml b/x-pack/plugins/security_solution/common/siem_migrations/model/rule_migration.schema.yaml
index 9ec825389a52b..c9841856a6914 100644
--- a/x-pack/plugins/security_solution/common/siem_migrations/model/rule_migration.schema.yaml
+++ b/x-pack/plugins/security_solution/common/siem_migrations/model/rule_migration.schema.yaml
@@ -48,8 +48,6 @@ components:
       description: The migrated elastic rule.
       required:
         - title
-        - query
-        - query_language
       properties:
         title:
           type: string
@@ -68,7 +66,6 @@ components:
           description: The translated elastic query language.
           enum:
             - esql
-          default: esql
         prebuilt_rule_id:
           type: string
           description: The Elastic prebuilt rule id matched.
@@ -84,32 +81,36 @@ components:
         - migration_id
         - original_rule
         - status
+        - created_by
       properties:
-        "@timestamp":
+        '@timestamp':
           type: string
           description: The moment of creation
         migration_id:
           type: string
           description: The migration id.
+        created_by:
+          type: string
+          description: The username of the user who created the migration.
         original_rule:
           $ref: '#/components/schemas/OriginalRule'
         elastic_rule:
           $ref: '#/components/schemas/ElasticRule'
-        translation_state:
+        translation_result:
           type: string
-          description: The translation state.
-          enum:
-            - complete
+          description: The rule translation result.
+          enum: # should match SiemMigrationRuleTranslationResult enum at ../constants.ts
+            - full
             - partial
             - untranslatable
         status:
           type: string
-          description: The status of the rule migration.
+          description: The status of the rule migration process.
           enum: # should match SiemMigrationsStatus enum at ../constants.ts
             - pending
             - processing
-            - finished
-            - error
+            - completed
+            - failed
           default: pending
         comments:
           type: array
@@ -122,3 +123,60 @@ components:
         updated_by:
           type: string
           description: The user who last updated the migration
+
+    RuleMigrationTaskStats:
+      type: object
+      description: The rule migration task stats object.
+      required:
+        - status
+        - rules
+      properties:
+        status:
+          type: string
+          description: Indicates if the migration task status.
+          enum:
+            - ready
+            - running
+            - stopped
+            - finished
+        rules:
+          type: object
+          description: The rules migration stats.
+          required:
+            - total
+            - pending
+            - processing
+            - completed
+            - failed
+          properties:
+            total:
+              type: integer
+              description: The total number of rules to migrate.
+            pending:
+              type: integer
+              description: The number of rules that are pending migration.
+            processing:
+              type: integer
+              description: The number of rules that are being migrated.
+            completed:
+              type: integer
+              description: The number of rules that have been migrated successfully.
+            failed:
+              type: integer
+              description: The number of rules that have failed migration.
+        last_updated_at:
+          type: string
+          description: The moment of the last update.
+
+    RuleMigrationAllTaskStats:
+      type: array
+      items:
+        allOf:
+          - $ref: '#/components/schemas/RuleMigrationTaskStats'
+          - type: object
+            required:
+              - migration_id
+            properties:
+              migration_id:
+                type: string
+                description: The migration id
diff --git a/x-pack/plugins/security_solution/kibana.jsonc b/x-pack/plugins/security_solution/kibana.jsonc
index d6f3e5f6580e3..0e713bc095888 100644
--- a/x-pack/plugins/security_solution/kibana.jsonc
+++ b/x-pack/plugins/security_solution/kibana.jsonc
@@ -58,7 +58,8 @@
       "savedSearch",
       "unifiedDocViewer",
       "charts",
-      "entityManager"
+      "entityManager",
+      "inference"
     ],
     "optionalPlugins": [
       "encryptedSavedObjects",
diff --git a/x-pack/plugins/security_solution/public/cases/pages/index.tsx b/x-pack/plugins/security_solution/public/cases/pages/index.tsx
index c873e48e4975f..82c069e1ed77c 100644
--- a/x-pack/plugins/security_solution/public/cases/pages/index.tsx
+++ b/x-pack/plugins/security_solution/public/cases/pages/index.tsx
@@ -12,15 +12,13 @@ import { CaseMetricsFeature } from '@kbn/cases-plugin/common';
 import { useExpandableFlyoutApi } from '@kbn/expandable-flyout';
 import { CaseDetailsRefreshContext } from '../../common/components/endpoint';
 import { DocumentDetailsRightPanelKey } from '../../flyout/document_details/shared/constants/panel_keys';
+import { RulePanelKey } from '../../flyout/rule_details/right';
 import { useTourContext } from '../../common/components/guided_onboarding_tour';
 import {
   AlertsCasesTourSteps,
   SecurityStepId,
 } from '../../common/components/guided_onboarding_tour/tour_config';
 import { TimelineId } from '../../../common/types/timeline';
-
-import { getRuleDetailsUrl, useFormatUrl } from '../../common/components/link_to';
-
 import { useKibana, useNavigation } from '../../common/lib/kibana';
 import { APP_ID, CASES_PATH, SecurityPageName } from '../../../common/constants';
 import { timelineActions } from '../../timelines/store';
@@ -38,17 +36,8 @@ const CaseContainerComponent: React.FC = () => {
   const { getAppUrl, navigateTo } = useNavigation();
   const userCasesPermissions = cases.helpers.canUseCases([APP_ID]);
   const dispatch = useDispatch();
-  const { formatUrl: detectionsFormatUrl, search: detectionsUrlSearch } = useFormatUrl(
-    SecurityPageName.rules
-  );
   const { openFlyout } = useExpandableFlyoutApi();
 
-  const getDetectionsRuleDetailsHref = useCallback(
-    (ruleId: string | null | undefined) =>
-      detectionsFormatUrl(getRuleDetailsUrl(ruleId ?? '', detectionsUrlSearch)),
-    [detectionsFormatUrl, detectionsUrlSearch]
-  );
-
   const interactionsUpsellingMessage = useUpsellingMessage('investigation_guide_interactions');
 
   const showAlertDetails = useCallback(
@@ -71,6 +60,15 @@ const CaseContainerComponent: React.FC = () => {
     [openFlyout, telemetry]
   );
 
+  const onRuleDetailsClick = useCallback(
+    (ruleId: string | null | undefined) => {
+      if (ruleId) {
+        openFlyout({ right: { id: RulePanelKey, params: { ruleId } } });
+      }
+    },
+    [openFlyout]
+  );
+
   const { onLoad: onAlertsTableLoaded } = useFetchNotes();
 
   const endpointDetailsHref = (endpointId: string) =>
@@ -138,16 +136,7 @@ const CaseContainerComponent: React.FC = () => {
             },
           },
           ruleDetailsNavigation: {
-            href: getDetectionsRuleDetailsHref,
-            onClick: async (ruleId: string | null | undefined, e) => {
-              if (e) {
-                e.preventDefault();
-              }
-              return navigateTo({
-                deepLinkId: SecurityPageName.rules,
-                path: getRuleDetailsUrl(ruleId ?? ''),
-              });
-            },
+            onClick: onRuleDetailsClick,
           },
           showAlertDetails,
           timelineIntegration: {
diff --git a/x-pack/plugins/security_solution/public/detection_engine/rule_management/components/rule_details/customized_prebuilt_rule_badge.tsx b/x-pack/plugins/security_solution/public/detection_engine/rule_management/components/rule_details/customized_prebuilt_rule_badge.tsx
index 56a559a91794a..e4b00196f4768 100644
--- a/x-pack/plugins/security_solution/public/detection_engine/rule_management/components/rule_details/customized_prebuilt_rule_badge.tsx
+++ b/x-pack/plugins/security_solution/public/detection_engine/rule_management/components/rule_details/customized_prebuilt_rule_badge.tsx
@@ -10,7 +10,7 @@ import { EuiBadge } from '@elastic/eui';
 import * as i18n from './translations';
 import { isCustomizedPrebuiltRule } from '../../../../../common/api/detection_engine';
 import type { RuleResponse } from '../../../../../common/api/detection_engine';
-import { useIsExperimentalFeatureEnabled } from '../../../../common/hooks/use_experimental_features';
+import { useIsPrebuiltRulesCustomizationEnabled } from '../../hooks/use_is_prebuilt_rules_customization_enabled';
 
 interface CustomizedPrebuiltRuleBadgeProps {
   rule: RuleResponse | null;
@@ -19,9 +19,7 @@ interface CustomizedPrebuiltRuleBadgeProps {
 export const CustomizedPrebuiltRuleBadge: React.FC<CustomizedPrebuiltRuleBadgeProps> = ({
   rule,
 }) => {
-  const isPrebuiltRulesCustomizationEnabled = useIsExperimentalFeatureEnabled(
-    'prebuiltRulesCustomizationEnabled'
-  );
+  const isPrebuiltRulesCustomizationEnabled = useIsPrebuiltRulesCustomizationEnabled();
 
   if (!isPrebuiltRulesCustomizationEnabled) {
     return null;
@@ -31,5 +29,5 @@ export const CustomizedPrebuiltRuleBadge: React.FC<CustomizedPrebuiltRuleBadgePr
     return null;
   }
 
-  return <EuiBadge color="hollow">{i18n.CUSTOMIZED_PREBUILT_RULE_LABEL}</EuiBadge>;
+  return <EuiBadge color="hollow">{i18n.MODIFIED_PREBUILT_RULE_LABEL}</EuiBadge>;
 };
diff --git a/x-pack/plugins/security_solution/public/detection_engine/rule_management/components/rule_details/translations.ts b/x-pack/plugins/security_solution/public/detection_engine/rule_management/components/rule_details/translations.ts
index 89c22a285e327..e7f36e2011f3c 100644
--- a/x-pack/plugins/security_solution/public/detection_engine/rule_management/components/rule_details/translations.ts
+++ b/x-pack/plugins/security_solution/public/detection_engine/rule_management/components/rule_details/translations.ts
@@ -350,10 +350,10 @@ export const MAX_SIGNALS_FIELD_LABEL = i18n.translate(
   }
 );
 
-export const CUSTOMIZED_PREBUILT_RULE_LABEL = i18n.translate(
+export const MODIFIED_PREBUILT_RULE_LABEL = i18n.translate(
   'xpack.securitySolution.detectionEngine.ruleDetails.customizedPrebuiltRuleLabel',
   {
-    defaultMessage: 'Customized Elastic rule',
+    defaultMessage: 'Modified Elastic rule',
   }
 );
 
diff --git a/x-pack/plugins/security_solution/public/detection_engine/rule_management/hooks/use_default_index_pattern.tsx b/x-pack/plugins/security_solution/public/detection_engine/rule_management/hooks/use_default_index_pattern.tsx
index b5ca86c6f1f57..5450cf9950d59 100644
--- a/x-pack/plugins/security_solution/public/detection_engine/rule_management/hooks/use_default_index_pattern.tsx
+++ b/x-pack/plugins/security_solution/public/detection_engine/rule_management/hooks/use_default_index_pattern.tsx
@@ -7,7 +7,7 @@
 
 import { useKibana } from '../../../common/lib/kibana/kibana_react';
 import { DEFAULT_INDEX_KEY, DEFAULT_INDEX_PATTERN } from '../../../../common/constants';
-import { useIsExperimentalFeatureEnabled } from '../../../common/hooks/use_experimental_features';
+import { useIsPrebuiltRulesCustomizationEnabled } from './use_is_prebuilt_rules_customization_enabled';
 
 /**
  * Gets the default index pattern for cases when rule has neither index patterns or data view.
@@ -15,9 +15,7 @@ import { useIsExperimentalFeatureEnabled } from '../../../common/hooks/use_exper
  */
 export function useDefaultIndexPattern(): string[] {
   const { services } = useKibana();
-  const isPrebuiltRulesCustomizationEnabled = useIsExperimentalFeatureEnabled(
-    'prebuiltRulesCustomizationEnabled'
-  );
+  const isPrebuiltRulesCustomizationEnabled = useIsPrebuiltRulesCustomizationEnabled();
 
   return isPrebuiltRulesCustomizationEnabled
     ? services.settings.client.get(DEFAULT_INDEX_KEY, DEFAULT_INDEX_PATTERN)
diff --git a/x-pack/plugins/security_solution/public/detection_engine/rule_management/hooks/use_is_prebuilt_rules_customization_enabled.tsx b/x-pack/plugins/security_solution/public/detection_engine/rule_management/hooks/use_is_prebuilt_rules_customization_enabled.tsx
new file mode 100644
index 0000000000000..d25925860c175
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/detection_engine/rule_management/hooks/use_is_prebuilt_rules_customization_enabled.tsx
@@ -0,0 +1,12 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { useIsExperimentalFeatureEnabled } from '../../../common/hooks/use_experimental_features';
+
+export const useIsPrebuiltRulesCustomizationEnabled = () => {
+  return useIsExperimentalFeatureEnabled('prebuiltRulesCustomizationEnabled');
+};
diff --git a/x-pack/plugins/security_solution/public/detection_engine/rule_management/logic/types.ts b/x-pack/plugins/security_solution/public/detection_engine/rule_management/logic/types.ts
index e12442c97aa4c..59ac52d592bcd 100644
--- a/x-pack/plugins/security_solution/public/detection_engine/rule_management/logic/types.ts
+++ b/x-pack/plugins/security_solution/public/detection_engine/rule_management/logic/types.ts
@@ -99,6 +99,7 @@ export interface FilterOptions {
   excludeRuleTypes?: Type[];
   enabled?: boolean; // undefined is to display all the rules
   ruleExecutionStatus?: RuleExecutionStatus; // undefined means "all"
+  ruleSource?: RuleCustomizationEnum[]; // undefined is to display all the rules
 }
 
 export interface FetchRulesResponse {
@@ -202,3 +203,8 @@ export interface FindRulesReferencedByExceptionsProps {
   lists: FindRulesReferencedByExceptionsListProp[];
   signal?: AbortSignal;
 }
+
+export enum RuleCustomizationEnum {
+  customized = 'CUSTOMIZED',
+  not_customized = 'NOT_CUSTOMIZED',
+}
diff --git a/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/rules_table/upgrade_prebuilt_rules_table/upgrade_prebuilt_rules_table_context.tsx b/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/rules_table/upgrade_prebuilt_rules_table/upgrade_prebuilt_rules_table_context.tsx
index aad1e053e15b6..6ec9ffdd02e67 100644
--- a/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/rules_table/upgrade_prebuilt_rules_table/upgrade_prebuilt_rules_table_context.tsx
+++ b/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/rules_table/upgrade_prebuilt_rules_table/upgrade_prebuilt_rules_table_context.tsx
@@ -8,8 +8,8 @@
 import type { Dispatch, SetStateAction } from 'react';
 import React, { createContext, useCallback, useContext, useMemo, useState } from 'react';
 import { EuiButton, EuiToolTip } from '@elastic/eui';
+import { useIsPrebuiltRulesCustomizationEnabled } from '../../../../rule_management/hooks/use_is_prebuilt_rules_customization_enabled';
 import type { RulesUpgradeState } from '../../../../rule_management/model/prebuilt_rule_upgrade';
-import { useIsExperimentalFeatureEnabled } from '../../../../../common/hooks/use_experimental_features';
 import { RuleUpgradeConflictsResolverTab } from '../../../../rule_management/components/rule_details/three_way_diff/rule_upgrade_conflicts_resolver_tab';
 import { PerFieldRuleDiffTab } from '../../../../rule_management/components/rule_details/per_field_rule_diff_tab';
 import { useIsUpgradingSecurityPackages } from '../../../../rule_management/logic/use_upgrade_security_packages';
@@ -111,13 +111,12 @@ interface UpgradePrebuiltRulesTableContextProviderProps {
 export const UpgradePrebuiltRulesTableContextProvider = ({
   children,
 }: UpgradePrebuiltRulesTableContextProviderProps) => {
-  const isPrebuiltRulesCustomizationEnabled = useIsExperimentalFeatureEnabled(
-    'prebuiltRulesCustomizationEnabled'
-  );
+  const isPrebuiltRulesCustomizationEnabled = useIsPrebuiltRulesCustomizationEnabled();
   const [loadingRules, setLoadingRules] = useState<RuleSignatureId[]>([]);
   const [filterOptions, setFilterOptions] = useState<UpgradePrebuiltRulesTableFilterOptions>({
     filter: '',
     tags: [],
+    ruleSource: [],
   });
 
   const isUpgradingSecurityPackages = useIsUpgradingSecurityPackages();
diff --git a/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/rules_table/upgrade_prebuilt_rules_table/upgrade_prebuilt_rules_table_filters.tsx b/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/rules_table/upgrade_prebuilt_rules_table/upgrade_prebuilt_rules_table_filters.tsx
index 215a810bf3aa2..900d81d0b0037 100644
--- a/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/rules_table/upgrade_prebuilt_rules_table/upgrade_prebuilt_rules_table_filters.tsx
+++ b/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/rules_table/upgrade_prebuilt_rules_table/upgrade_prebuilt_rules_table_filters.tsx
@@ -9,10 +9,13 @@ import { EuiFilterGroup, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { isEqual } from 'lodash/fp';
 import React, { useCallback } from 'react';
 import styled from 'styled-components';
+import { useIsPrebuiltRulesCustomizationEnabled } from '../../../../rule_management/hooks/use_is_prebuilt_rules_customization_enabled';
+import type { RuleCustomizationEnum } from '../../../../rule_management/logic';
 import * as i18n from './translations';
 import { TagsFilterPopover } from '../rules_table_filters/tags_filter_popover';
 import { RuleSearchField } from '../rules_table_filters/rule_search_field';
 import { useUpgradePrebuiltRulesTableContext } from './upgrade_prebuilt_rules_table_context';
+import { RuleCustomizationFilterPopover } from './upgrade_rule_customization_filter_popover';
 
 const FilterWrapper = styled(EuiFlexGroup)`
   margin-bottom: ${({ theme }) => theme.eui.euiSizeM};
@@ -28,7 +31,9 @@ const UpgradePrebuiltRulesTableFiltersComponent = () => {
     actions: { setFilterOptions },
   } = useUpgradePrebuiltRulesTableContext();
 
-  const { tags: selectedTags } = filterOptions;
+  const isPrebuiltRulesCustomizationEnabled = useIsPrebuiltRulesCustomizationEnabled();
+
+  const { tags: selectedTags, ruleSource: selectedRuleSource = [] } = filterOptions;
 
   const handleOnSearch = useCallback(
     (filterString: string) => {
@@ -52,22 +57,45 @@ const UpgradePrebuiltRulesTableFiltersComponent = () => {
     [selectedTags, setFilterOptions]
   );
 
+  const handleSelectedRuleSource = useCallback(
+    (newRuleSource: RuleCustomizationEnum[]) => {
+      if (!isEqual(newRuleSource, selectedRuleSource)) {
+        setFilterOptions((filters) => ({
+          ...filters,
+          ruleSource: newRuleSource,
+        }));
+      }
+    },
+    [selectedRuleSource, setFilterOptions]
+  );
+
   return (
-    <FilterWrapper gutterSize="m" justifyContent="flexEnd" wrap>
+    <FilterWrapper gutterSize="s" justifyContent="flexEnd" wrap>
       <RuleSearchField
         initialValue={filterOptions.filter}
         onSearch={handleOnSearch}
         placeholder={i18n.SEARCH_PLACEHOLDER}
       />
       <EuiFlexItem grow={false}>
-        <EuiFilterGroup>
-          <TagsFilterPopover
-            onSelectedTagsChanged={handleSelectedTags}
-            selectedTags={selectedTags}
-            tags={tags}
-            data-test-subj="upgradeRulesTagPopover"
-          />
-        </EuiFilterGroup>
+        <EuiFlexGroup gutterSize="s">
+          {isPrebuiltRulesCustomizationEnabled && (
+            <EuiFilterGroup>
+              <RuleCustomizationFilterPopover
+                onSelectedRuleSourceChanged={handleSelectedRuleSource}
+                selectedRuleSource={selectedRuleSource}
+                data-test-subj="upgradeRulesRuleCustomizationPopover"
+              />
+            </EuiFilterGroup>
+          )}
+          <EuiFilterGroup>
+            <TagsFilterPopover
+              onSelectedTagsChanged={handleSelectedTags}
+              selectedTags={selectedTags}
+              tags={tags}
+              data-test-subj="upgradeRulesTagPopover"
+            />
+          </EuiFilterGroup>
+        </EuiFlexGroup>
       </EuiFlexItem>
     </FilterWrapper>
   );
diff --git a/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/rules_table/upgrade_prebuilt_rules_table/upgrade_rule_customization_filter_popover.tsx b/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/rules_table/upgrade_prebuilt_rules_table/upgrade_rule_customization_filter_popover.tsx
new file mode 100644
index 0000000000000..234943e333272
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/rules_table/upgrade_prebuilt_rules_table/upgrade_rule_customization_filter_popover.tsx
@@ -0,0 +1,92 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { useState, useMemo } from 'react';
+import type { EuiSelectableOption } from '@elastic/eui';
+import { EuiFilterButton, EuiPopover, EuiSelectable } from '@elastic/eui';
+import { RuleCustomizationEnum } from '../../../../rule_management/logic';
+import * as i18n from '../../../../../detections/pages/detection_engine/rules/translations';
+import { toggleSelectedGroup } from '../../../../../common/components/ml_popover/jobs_table/filters/toggle_selected_group';
+
+interface RuleCustomizationFilterPopoverProps {
+  selectedRuleSource: RuleCustomizationEnum[];
+  onSelectedRuleSourceChanged: (newRuleSource: RuleCustomizationEnum[]) => void;
+}
+
+const RULE_CUSTOMIZATION_POPOVER_WIDTH = 200;
+
+const RuleCustomizationFilterPopoverComponent = ({
+  selectedRuleSource,
+  onSelectedRuleSourceChanged,
+}: RuleCustomizationFilterPopoverProps) => {
+  const [isRuleCustomizationPopoverOpen, setIsRuleCustomizationPopoverOpen] = useState(false);
+
+  const selectableOptions: EuiSelectableOption[] = useMemo(
+    () => [
+      {
+        label: i18n.MODIFIED_LABEL,
+        key: RuleCustomizationEnum.customized,
+        checked: selectedRuleSource.includes(RuleCustomizationEnum.customized) ? 'on' : undefined,
+      },
+      {
+        label: i18n.UNMODIFIED_LABEL,
+        key: RuleCustomizationEnum.not_customized,
+        checked: selectedRuleSource.includes(RuleCustomizationEnum.not_customized)
+          ? 'on'
+          : undefined,
+      },
+    ],
+    [selectedRuleSource]
+  );
+
+  const handleSelectableOptionsChange = (
+    newOptions: EuiSelectableOption[],
+    _: unknown,
+    changedOption: EuiSelectableOption
+  ) => {
+    toggleSelectedGroup(
+      changedOption.key ?? '',
+      selectedRuleSource,
+      onSelectedRuleSourceChanged as (args: string[]) => void
+    );
+  };
+
+  const triggerButton = (
+    <EuiFilterButton
+      grow
+      iconType="arrowDown"
+      onClick={() => setIsRuleCustomizationPopoverOpen(!isRuleCustomizationPopoverOpen)}
+      numFilters={selectableOptions.length}
+      isSelected={isRuleCustomizationPopoverOpen}
+      hasActiveFilters={selectedRuleSource.length > 0}
+      numActiveFilters={selectedRuleSource.length}
+      data-test-subj="rule-customization-filter-popover-button"
+    >
+      {i18n.RULE_SOURCE}
+    </EuiFilterButton>
+  );
+
+  return (
+    <EuiPopover
+      ownFocus
+      button={triggerButton}
+      isOpen={isRuleCustomizationPopoverOpen}
+      closePopover={() => setIsRuleCustomizationPopoverOpen(!isRuleCustomizationPopoverOpen)}
+      panelPaddingSize="none"
+      repositionOnScroll
+      panelProps={{
+        'data-test-subj': 'rule-customization-filter-popover',
+      }}
+    >
+      <EuiSelectable options={selectableOptions} onChange={handleSelectableOptionsChange}>
+        {(list) => <div style={{ width: RULE_CUSTOMIZATION_POPOVER_WIDTH }}>{list}</div>}
+      </EuiSelectable>
+    </EuiPopover>
+  );
+};
+
+export const RuleCustomizationFilterPopover = React.memo(RuleCustomizationFilterPopoverComponent);
diff --git a/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/rules_table/upgrade_prebuilt_rules_table/use_filter_prebuilt_rules_to_upgrade.ts b/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/rules_table/upgrade_prebuilt_rules_table/use_filter_prebuilt_rules_to_upgrade.ts
index 342a1e6e8768e..b5a0e123d7510 100644
--- a/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/rules_table/upgrade_prebuilt_rules_table/use_filter_prebuilt_rules_to_upgrade.ts
+++ b/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/rules_table/upgrade_prebuilt_rules_table/use_filter_prebuilt_rules_to_upgrade.ts
@@ -7,9 +7,12 @@
 
 import { useMemo } from 'react';
 import type { RuleUpgradeInfoForReview } from '../../../../../../common/api/detection_engine/prebuilt_rules';
-import type { FilterOptions } from '../../../../rule_management/logic/types';
+import { RuleCustomizationEnum, type FilterOptions } from '../../../../rule_management/logic/types';
 
-export type UpgradePrebuiltRulesTableFilterOptions = Pick<FilterOptions, 'filter' | 'tags'>;
+export type UpgradePrebuiltRulesTableFilterOptions = Pick<
+  FilterOptions,
+  'filter' | 'tags' | 'ruleSource'
+>;
 
 export const useFilterPrebuiltRulesToUpgrade = ({
   rules,
@@ -19,7 +22,7 @@ export const useFilterPrebuiltRulesToUpgrade = ({
   filterOptions: UpgradePrebuiltRulesTableFilterOptions;
 }) => {
   const filteredRules = useMemo(() => {
-    const { filter, tags } = filterOptions;
+    const { filter, tags, ruleSource } = filterOptions;
     return rules.filter((ruleInfo) => {
       if (filter && !ruleInfo.current_rule.name.toLowerCase().includes(filter.toLowerCase())) {
         return false;
@@ -29,6 +32,25 @@ export const useFilterPrebuiltRulesToUpgrade = ({
         return tags.every((tag) => ruleInfo.current_rule.tags.includes(tag));
       }
 
+      if (ruleSource && ruleSource.length > 0) {
+        if (
+          ruleSource.includes(RuleCustomizationEnum.customized) &&
+          ruleSource.includes(RuleCustomizationEnum.not_customized)
+        ) {
+          return true;
+        } else if (
+          ruleSource.includes(RuleCustomizationEnum.customized) &&
+          ruleInfo.current_rule.rule_source.type === 'external'
+        ) {
+          return ruleInfo.current_rule.rule_source.is_customized;
+        } else if (
+          ruleSource.includes(RuleCustomizationEnum.not_customized) &&
+          ruleInfo.current_rule.rule_source.type === 'external'
+        ) {
+          return ruleInfo.current_rule.rule_source.is_customized === false;
+        }
+      }
+
       return true;
     });
   }, [filterOptions, rules]);
diff --git a/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/rules_table/upgrade_prebuilt_rules_table/use_prebuilt_rules_upgrade_state.ts b/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/rules_table/upgrade_prebuilt_rules_table/use_prebuilt_rules_upgrade_state.ts
index 29c5b2b201fe6..8c97a4ef52e2b 100644
--- a/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/rules_table/upgrade_prebuilt_rules_table/use_prebuilt_rules_upgrade_state.ts
+++ b/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/rules_table/upgrade_prebuilt_rules_table/use_prebuilt_rules_upgrade_state.ts
@@ -6,7 +6,7 @@
  */
 
 import { useCallback, useMemo, useState } from 'react';
-import { useIsExperimentalFeatureEnabled } from '../../../../../common/hooks/use_experimental_features';
+import { useIsPrebuiltRulesCustomizationEnabled } from '../../../../rule_management/hooks/use_is_prebuilt_rules_customization_enabled';
 import type {
   RulesUpgradeState,
   FieldsUpgradeState,
@@ -33,9 +33,7 @@ interface UseRulesUpgradeStateResult {
 export function usePrebuiltRulesUpgradeState(
   ruleUpgradeInfos: RuleUpgradeInfoForReview[]
 ): UseRulesUpgradeStateResult {
-  const isPrebuiltRulesCustomizationEnabled = useIsExperimentalFeatureEnabled(
-    'prebuiltRulesCustomizationEnabled'
-  );
+  const isPrebuiltRulesCustomizationEnabled = useIsPrebuiltRulesCustomizationEnabled();
   const [rulesResolvedConflicts, setRulesResolvedConflicts] = useState<RulesResolvedConflicts>({});
 
   const setRuleFieldResolvedValue = useCallback(
diff --git a/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/rules_table/upgrade_prebuilt_rules_table/use_upgrade_prebuilt_rules_table_columns.tsx b/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/rules_table/upgrade_prebuilt_rules_table/use_upgrade_prebuilt_rules_table_columns.tsx
index 09009c98c2858..579f571f80e79 100644
--- a/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/rules_table/upgrade_prebuilt_rules_table/use_upgrade_prebuilt_rules_table_columns.tsx
+++ b/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/rules_table/upgrade_prebuilt_rules_table/use_upgrade_prebuilt_rules_table_columns.tsx
@@ -6,7 +6,14 @@
  */
 
 import type { EuiBasicTableColumn } from '@elastic/eui';
-import { EuiBadge, EuiButtonEmpty, EuiLink, EuiLoadingSpinner, EuiText } from '@elastic/eui';
+import {
+  EuiBadge,
+  EuiButtonEmpty,
+  EuiLink,
+  EuiLoadingSpinner,
+  EuiText,
+  EuiToolTip,
+} from '@elastic/eui';
 import React, { useMemo } from 'react';
 import type { RuleUpgradeState } from '../../../../rule_management/model/prebuilt_rule_upgrade/rule_upgrade_state';
 import { RulesTableEmptyColumnName } from '../rules_table_empty_column_name';
@@ -104,6 +111,35 @@ const INTEGRATIONS_COLUMN: TableColumn = {
   truncateText: true,
 };
 
+const MODIFIED_COLUMN: TableColumn = {
+  field: 'current_rule.rule_source',
+  name: <RulesTableEmptyColumnName name={i18n.COLUMN_MODIFIED} />,
+  align: 'center',
+  render: (ruleSource: Rule['rule_source']) => {
+    if (
+      ruleSource == null ||
+      ruleSource.type === 'internal' ||
+      (ruleSource.type === 'external' && ruleSource.is_customized === false)
+    ) {
+      return null;
+    }
+
+    return (
+      <EuiToolTip content={i18n.MODIFIED_TOOLTIP}>
+        <EuiBadge
+          color="hollow"
+          data-test-subj="upgradeRulesTableModifiedColumnBadge"
+          aria-label={i18n.MODIFIED_LABEL}
+        >
+          {i18n.MODIFIED_LABEL}
+        </EuiBadge>
+      </EuiToolTip>
+    );
+  },
+  width: '90px',
+  truncateText: true,
+};
+
 const createUpgradeButtonColumn = (
   upgradeRules: UpgradePrebuiltRulesTableActions['upgradeRules'],
   loadingRules: RuleSignatureId[],
@@ -154,9 +190,15 @@ export const useUpgradePrebuiltRulesTableColumns = (): TableColumn[] => {
   } = useUpgradePrebuiltRulesTableContext();
   const isDisabled = isRefetching || isUpgradingSecurityPackages;
 
+  // TODO: move this change to the `INTEGRATIONS_COLUMN` when `prebuiltRulesCustomizationEnabled` feature flag is removed
+  if (isPrebuiltRulesCustomizationEnabled) {
+    INTEGRATIONS_COLUMN.width = '70px';
+  }
+
   return useMemo(
     () => [
       RULE_NAME_COLUMN,
+      ...(isPrebuiltRulesCustomizationEnabled ? [MODIFIED_COLUMN] : []),
       ...(showRelatedIntegrations ? [INTEGRATIONS_COLUMN] : []),
       TAGS_COLUMN,
       {
diff --git a/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/rules_table/use_columns.tsx b/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/rules_table/use_columns.tsx
index c38fec638e478..ae24b2bb482d3 100644
--- a/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/rules_table/use_columns.tsx
+++ b/x-pack/plugins/security_solution/public/detection_engine/rule_management_ui/components/rules_table/use_columns.tsx
@@ -46,6 +46,7 @@ import { useRulesTableActions } from './use_rules_table_actions';
 import { MlRuleWarningPopover } from '../ml_rule_warning_popover/ml_rule_warning_popover';
 import { getMachineLearningJobId } from '../../../../detections/pages/detection_engine/rules/helpers';
 import type { TimeRange } from '../../../rule_gaps/types';
+import { useIsPrebuiltRulesCustomizationEnabled } from '../../../rule_management/hooks/use_is_prebuilt_rules_customization_enabled';
 
 export type TableColumn = EuiBasicTableColumn<Rule> | EuiTableActionsColumnType<Rule>;
 
@@ -233,6 +234,35 @@ const INTEGRATIONS_COLUMN: TableColumn = {
   truncateText: true,
 };
 
+const MODIFIED_COLUMN: TableColumn = {
+  field: 'rule_source',
+  name: <RulesTableEmptyColumnName name={i18n.COLUMN_MODIFIED} />,
+  align: 'center',
+  render: (ruleSource: Rule['rule_source']) => {
+    if (
+      ruleSource == null ||
+      ruleSource.type === 'internal' ||
+      (ruleSource.type === 'external' && ruleSource.is_customized === false)
+    ) {
+      return null;
+    }
+
+    return (
+      <EuiToolTip content={i18n.MODIFIED_TOOLTIP}>
+        <EuiBadge
+          color="hollow"
+          data-test-subj="rulesTableModifiedColumnBadge"
+          aria-label={i18n.MODIFIED_LABEL}
+        >
+          {i18n.MODIFIED_LABEL}
+        </EuiBadge>
+      </EuiToolTip>
+    );
+  },
+  width: '90px',
+  truncateText: true,
+};
+
 const useActionsColumn = ({
   showExceptionsDuplicateConfirmation,
   showManualRuleRunConfirmation,
@@ -265,6 +295,7 @@ export const useRulesColumns = ({
   });
   const ruleNameColumn = useRuleNameColumn();
   const [showRelatedIntegrations] = useUiSetting$<boolean>(SHOW_RELATED_INTEGRATIONS_SETTING);
+  const isPrebuiltRulesCustomizationEnabled = useIsPrebuiltRulesCustomizationEnabled();
   const enabledColumn = useEnabledColumn({
     hasCRUDPermissions,
     isLoadingJobs,
@@ -279,9 +310,15 @@ export const useRulesColumns = ({
   });
   const snoozeColumn = useRuleSnoozeColumn();
 
+  // TODO: move this change to the `INTEGRATIONS_COLUMN` when `prebuiltRulesCustomizationEnabled` feature flag is removed
+  if (isPrebuiltRulesCustomizationEnabled) {
+    INTEGRATIONS_COLUMN.width = '70px';
+  }
+
   return useMemo(
     () => [
       ruleNameColumn,
+      ...(isPrebuiltRulesCustomizationEnabled ? [MODIFIED_COLUMN] : []),
       ...(showRelatedIntegrations ? [INTEGRATIONS_COLUMN] : []),
       TAGS_COLUMN,
       {
@@ -352,13 +389,14 @@ export const useRulesColumns = ({
       ...(hasCRUDPermissions ? [actionsColumn] : []),
     ],
     [
-      actionsColumn,
-      enabledColumn,
+      ruleNameColumn,
+      isPrebuiltRulesCustomizationEnabled,
+      showRelatedIntegrations,
       executionStatusColumn,
       snoozeColumn,
+      enabledColumn,
       hasCRUDPermissions,
-      ruleNameColumn,
-      showRelatedIntegrations,
+      actionsColumn,
     ]
   );
 };
@@ -380,6 +418,7 @@ export const useMonitoringColumns = ({
   });
   const ruleNameColumn = useRuleNameColumn();
   const [showRelatedIntegrations] = useUiSetting$<boolean>(SHOW_RELATED_INTEGRATIONS_SETTING);
+  const isPrebuiltRulesCustomizationEnabled = useIsPrebuiltRulesCustomizationEnabled();
   const enabledColumn = useEnabledColumn({
     hasCRUDPermissions,
     isLoadingJobs,
@@ -393,12 +432,18 @@ export const useMonitoringColumns = ({
     mlJobs,
   });
 
+  // TODO: move this change to the `INTEGRATIONS_COLUMN` when `prebuiltRulesCustomizationEnabled` feature flag is removed
+  if (isPrebuiltRulesCustomizationEnabled) {
+    INTEGRATIONS_COLUMN.width = '70px';
+  }
+
   return useMemo(
     () => [
       {
         ...ruleNameColumn,
         width: '28%',
       },
+      ...(isPrebuiltRulesCustomizationEnabled ? [MODIFIED_COLUMN] : []),
       ...(showRelatedIntegrations ? [INTEGRATIONS_COLUMN] : []),
       TAGS_COLUMN,
       {
@@ -503,6 +548,7 @@ export const useMonitoringColumns = ({
       enabledColumn,
       executionStatusColumn,
       hasCRUDPermissions,
+      isPrebuiltRulesCustomizationEnabled,
       ruleNameColumn,
       showRelatedIntegrations,
     ]
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/related_integrations/integrations_popover/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/related_integrations/integrations_popover/index.tsx
index 2d2875d5a8734..49b6c1d1e4e99 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/related_integrations/integrations_popover/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/related_integrations/integrations_popover/index.tsx
@@ -16,6 +16,7 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 
+import { useIsPrebuiltRulesCustomizationEnabled } from '../../../../../detection_engine/rule_management/hooks/use_is_prebuilt_rules_customization_enabled';
 import type { RelatedIntegrationArray } from '../../../../../../common/api/detection_engine/model/rule_schema';
 import { IntegrationDescription } from '../integrations_description';
 import { useRelatedIntegrations } from '../use_related_integrations';
@@ -54,6 +55,7 @@ const IntegrationListItem = styled('li')`
 const IntegrationsPopoverComponent = ({ relatedIntegrations }: IntegrationsPopoverProps) => {
   const [isPopoverOpen, setPopoverOpen] = useState(false);
   const { integrations, isLoaded } = useRelatedIntegrations(relatedIntegrations);
+  const isPrebuiltRulesCustomizationEnabled = useIsPrebuiltRulesCustomizationEnabled();
 
   const enabledIntegrations = useMemo(() => {
     return integrations.filter(
@@ -65,10 +67,13 @@ const IntegrationsPopoverComponent = ({ relatedIntegrations }: IntegrationsPopov
   const numIntegrationsEnabled = enabledIntegrations.length;
 
   const badgeTitle = useMemo(() => {
+    if (isPrebuiltRulesCustomizationEnabled) {
+      return isLoaded ? `${numIntegrationsEnabled}/${numIntegrations}` : `${numIntegrations}`;
+    }
     return isLoaded
       ? `${numIntegrationsEnabled}/${numIntegrations} ${i18n.INTEGRATIONS_BADGE}`
       : `${numIntegrations} ${i18n.INTEGRATIONS_BADGE}`;
-  }, [isLoaded, numIntegrations, numIntegrationsEnabled]);
+  }, [isLoaded, isPrebuiltRulesCustomizationEnabled, numIntegrations, numIntegrationsEnabled]);
 
   return (
     <IntegrationsPopoverWrapper
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/translations.ts b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/translations.ts
index b573edd84343f..b6a3bbdc0ad90 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/translations.ts
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/translations.ts
@@ -697,6 +697,13 @@ export const COLUMN_INTEGRATIONS = i18n.translate(
   }
 );
 
+export const COLUMN_MODIFIED = i18n.translate(
+  'xpack.securitySolution.detectionEngine.rules.allRules.columns.modifiedTitle',
+  {
+    defaultMessage: 'MODIFIED',
+  }
+);
+
 export const COLUMN_ENABLE = i18n.translate(
   'xpack.securitySolution.detectionEngine.rules.allRules.columns.enabledTitle',
   {
@@ -823,6 +830,34 @@ export const NO_TAGS_AVAILABLE = i18n.translate(
   }
 );
 
+export const RULE_SOURCE = i18n.translate(
+  'xpack.securitySolution.detectionEngine.rules.allRules.filters.ruleSourceLabel',
+  {
+    defaultMessage: 'Modifications',
+  }
+);
+
+export const MODIFIED_LABEL = i18n.translate(
+  'xpack.securitySolution.detectionEngine.upgradeRules.modifiedLabel',
+  {
+    defaultMessage: 'Modified',
+  }
+);
+
+export const UNMODIFIED_LABEL = i18n.translate(
+  'xpack.securitySolution.detectionEngine.upgradeRules.unmodifiedLabel',
+  {
+    defaultMessage: 'Unmodified',
+  }
+);
+
+export const MODIFIED_TOOLTIP = i18n.translate(
+  'xpack.securitySolution.detectionEngine.upgradeRules.modifiedTooltipDescription',
+  {
+    defaultMessage: 'This Elastic rule has been modified.',
+  }
+);
+
 export const RULE_EXECTION_STATUS_FILTER = i18n.translate(
   'xpack.securitySolution.detectionEngine.rules.allRules.filters.ruleExecutionStatusFilter',
   {
diff --git a/x-pack/plugins/security_solution/public/entity_analytics/components/entity_store/components/enablement_modal.tsx b/x-pack/plugins/security_solution/public/entity_analytics/components/entity_store/components/enablement_modal.tsx
index 974bdddc831e5..6c2528620eb4c 100644
--- a/x-pack/plugins/security_solution/public/entity_analytics/components/entity_store/components/enablement_modal.tsx
+++ b/x-pack/plugins/security_solution/public/entity_analytics/components/entity_store/components/enablement_modal.tsx
@@ -72,20 +72,13 @@ export const EntityStoreEnablementModal: React.FC<EntityStoreEnablementModalProp
         <EuiModalHeaderTitle>
           <FormattedMessage
             id="xpack.securitySolution.entityAnalytics.enablements.modal.title"
-            defaultMessage="Additional charges may apply"
+            defaultMessage="Entity Analytics Enablement"
           />
         </EuiModalHeaderTitle>
       </EuiModalHeader>
 
       <EuiModalBody>
         <EuiFlexGroup direction="column">
-          <EuiText>
-            <FormattedMessage
-              id="xpack.securitySolution.entityAnalytics.enablements.modal.description"
-              defaultMessage="Please be aware that activating these features may incur additional charges depending on your subscription plan. Review your plan details carefully to avoid unexpected costs before proceeding."
-            />
-          </EuiText>
-          <EuiHorizontalRule margin="none" />
           <EuiFlexItem>
             <EuiSwitch
               label={
diff --git a/x-pack/plugins/security_solution/public/flyout/document_details/left/components/host_details.tsx b/x-pack/plugins/security_solution/public/flyout/document_details/left/components/host_details.tsx
index f5a1e112afa80..c315e991d9f06 100644
--- a/x-pack/plugins/security_solution/public/flyout/document_details/left/components/host_details.tsx
+++ b/x-pack/plugins/security_solution/public/flyout/document_details/left/components/host_details.tsx
@@ -359,11 +359,13 @@ export const HostDetails: React.FC<HostDetailsProps> = ({ hostName, timestamp, s
             name={hostName}
             direction="column"
             data-test-subj={HOST_DETAILS_MISCONFIGURATIONS_TEST_ID}
+            telemetrySuffix={'host-details'}
           />
           <VulnerabilitiesInsight
             hostName={hostName}
             direction="column"
             data-test-subj={HOST_DETAILS_VULNERABILITIES_TEST_ID}
+            telemetrySuffix={'host-details'}
           />
         </EuiFlexGrid>
         <EuiSpacer size="l" />
diff --git a/x-pack/plugins/security_solution/public/flyout/document_details/left/components/user_details.tsx b/x-pack/plugins/security_solution/public/flyout/document_details/left/components/user_details.tsx
index ed406d3b8c679..2f98c641b5954 100644
--- a/x-pack/plugins/security_solution/public/flyout/document_details/left/components/user_details.tsx
+++ b/x-pack/plugins/security_solution/public/flyout/document_details/left/components/user_details.tsx
@@ -359,6 +359,7 @@ export const UserDetails: React.FC<UserDetailsProps> = ({ userName, timestamp, s
             name={userName}
             direction="column"
             data-test-subj={USER_DETAILS_MISCONFIGURATIONS_TEST_ID}
+            telemetrySuffix={'user-details'}
           />
         </EuiFlexGrid>
         <EuiSpacer size="l" />
diff --git a/x-pack/plugins/security_solution/public/flyout/document_details/right/components/host_entity_overview.tsx b/x-pack/plugins/security_solution/public/flyout/document_details/right/components/host_entity_overview.tsx
index 90405286b004c..9b60eefbb5f61 100644
--- a/x-pack/plugins/security_solution/public/flyout/document_details/right/components/host_entity_overview.tsx
+++ b/x-pack/plugins/security_solution/public/flyout/document_details/right/components/host_entity_overview.tsx
@@ -285,10 +285,12 @@ export const HostEntityOverview: React.FC<HostEntityOverviewProps> = ({ hostName
         fieldName={'host.name'}
         name={hostName}
         data-test-subj={ENTITIES_HOST_OVERVIEW_MISCONFIGURATIONS_TEST_ID}
+        telemetrySuffix={'host-entity-overview'}
       />
       <VulnerabilitiesInsight
         hostName={hostName}
         data-test-subj={ENTITIES_HOST_OVERVIEW_VULNERABILITIES_TEST_ID}
+        telemetrySuffix={'host-entity-overview'}
       />
     </EuiFlexGroup>
   );
diff --git a/x-pack/plugins/security_solution/public/flyout/document_details/right/components/notes.test.tsx b/x-pack/plugins/security_solution/public/flyout/document_details/right/components/notes.test.tsx
index f70cd2aae3e8d..023b0202ecb63 100644
--- a/x-pack/plugins/security_solution/public/flyout/document_details/right/components/notes.test.tsx
+++ b/x-pack/plugins/security_solution/public/flyout/document_details/right/components/notes.test.tsx
@@ -23,6 +23,7 @@ import type { Note } from '../../../../../common/api/timeline';
 import { useExpandableFlyoutApi } from '@kbn/expandable-flyout';
 import { DocumentDetailsLeftPanelKey } from '../../shared/constants/panel_keys';
 import { LeftPanelNotesTab } from '../../left';
+import { getEmptyValue } from '../../../../common/components/empty_value';
 
 jest.mock('@kbn/expandable-flyout');
 
@@ -43,6 +44,10 @@ jest.mock('react-redux', () => {
 });
 
 describe('<Notes />', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
   it('should render loading spinner', () => {
     (useExpandableFlyoutApi as jest.Mock).mockReturnValue({ openLeftPanel: jest.fn() });
 
@@ -99,6 +104,34 @@ describe('<Notes />', () => {
     });
   });
 
+  it('should disabled the Add note button if in preview mode', () => {
+    const contextValue = {
+      ...mockContextValue,
+      isPreviewMode: true,
+    };
+
+    const mockOpenLeftPanel = jest.fn();
+    (useExpandableFlyoutApi as jest.Mock).mockReturnValue({ openLeftPanel: mockOpenLeftPanel });
+
+    const { getByTestId } = render(
+      <TestProviders>
+        <DocumentDetailsContext.Provider value={contextValue}>
+          <Notes />
+        </DocumentDetailsContext.Provider>
+      </TestProviders>
+    );
+
+    expect(mockDispatch).not.toHaveBeenCalled();
+
+    const button = getByTestId(NOTES_ADD_NOTE_BUTTON_TEST_ID);
+    expect(button).toBeInTheDocument();
+    expect(button).toBeDisabled();
+
+    button.click();
+
+    expect(mockOpenLeftPanel).not.toHaveBeenCalled();
+  });
+
   it('should render number of notes and plus button', () => {
     const mockOpenLeftPanel = jest.fn();
     (useExpandableFlyoutApi as jest.Mock).mockReturnValue({ openLeftPanel: mockOpenLeftPanel });
@@ -135,6 +168,38 @@ describe('<Notes />', () => {
     });
   });
 
+  it('should disable the plus button if in preview mode', () => {
+    const mockOpenLeftPanel = jest.fn();
+    (useExpandableFlyoutApi as jest.Mock).mockReturnValue({ openLeftPanel: mockOpenLeftPanel });
+
+    const contextValue = {
+      ...mockContextValue,
+      eventId: '1',
+      isPreviewMode: true,
+    };
+
+    const { getByTestId } = render(
+      <TestProviders>
+        <DocumentDetailsContext.Provider value={contextValue}>
+          <Notes />
+        </DocumentDetailsContext.Provider>
+      </TestProviders>
+    );
+
+    expect(getByTestId(NOTES_COUNT_TEST_ID)).toBeInTheDocument();
+    expect(getByTestId(NOTES_COUNT_TEST_ID)).toHaveTextContent('1');
+
+    expect(mockDispatch).not.toHaveBeenCalled();
+
+    const button = getByTestId(NOTES_ADD_NOTE_ICON_BUTTON_TEST_ID);
+
+    expect(button).toBeInTheDocument();
+    button.click();
+    expect(button).toBeDisabled();
+
+    expect(mockOpenLeftPanel).not.toHaveBeenCalled();
+  });
+
   it('should render number of notes in scientific notation for big numbers', () => {
     const createMockNote = (noteId: string): Note => ({
       eventId: '1', // should be a valid id based on mockTimelineData
@@ -180,6 +245,30 @@ describe('<Notes />', () => {
     expect(getByTestId(NOTES_COUNT_TEST_ID)).toHaveTextContent('1k');
   });
 
+  it('should show a - when in rule creation workflow', () => {
+    const contextValue = {
+      ...mockContextValue,
+      isPreview: true,
+    };
+
+    (useExpandableFlyoutApi as jest.Mock).mockReturnValue({ openLeftPanel: jest.fn() });
+
+    const { getByText, queryByTestId } = render(
+      <TestProviders>
+        <DocumentDetailsContext.Provider value={contextValue}>
+          <Notes />
+        </DocumentDetailsContext.Provider>
+      </TestProviders>
+    );
+
+    expect(mockDispatch).not.toHaveBeenCalled();
+
+    expect(queryByTestId(NOTES_ADD_NOTE_ICON_BUTTON_TEST_ID)).not.toBeInTheDocument();
+    expect(queryByTestId(NOTES_ADD_NOTE_BUTTON_TEST_ID)).not.toBeInTheDocument();
+    expect(queryByTestId(NOTES_COUNT_TEST_ID)).not.toBeInTheDocument();
+    expect(getByText(getEmptyValue())).toBeInTheDocument();
+  });
+
   it('should render toast error', () => {
     const store = createMockStore({
       ...mockGlobalState,
diff --git a/x-pack/plugins/security_solution/public/flyout/document_details/right/components/notes.tsx b/x-pack/plugins/security_solution/public/flyout/document_details/right/components/notes.tsx
index a981a16117a68..b0e2008c04103 100644
--- a/x-pack/plugins/security_solution/public/flyout/document_details/right/components/notes.tsx
+++ b/x-pack/plugins/security_solution/public/flyout/document_details/right/components/notes.tsx
@@ -19,6 +19,7 @@ import {
 } from '@elastic/eui';
 import { css } from '@emotion/react';
 import { useExpandableFlyoutApi } from '@kbn/expandable-flyout';
+import { getEmptyTagValue } from '../../../../common/components/empty_value';
 import { DocumentDetailsLeftPanelKey } from '../../shared/constants/panel_keys';
 import { FormattedCount } from '../../../../common/components/formatted_number';
 import { useDocumentDetailsContext } from '../../shared/context';
@@ -61,7 +62,7 @@ export const ADD_NOTE_BUTTON = i18n.translate(
 export const Notes = memo(() => {
   const { euiTheme } = useEuiTheme();
   const dispatch = useDispatch();
-  const { eventId, indexName, scopeId } = useDocumentDetailsContext();
+  const { eventId, indexName, scopeId, isPreview, isPreviewMode } = useDocumentDetailsContext();
   const { addError: addErrorToast } = useAppToasts();
 
   const { openLeftPanel } = useExpandableFlyoutApi();
@@ -80,8 +81,11 @@ export const Notes = memo(() => {
   );
 
   useEffect(() => {
-    dispatch(fetchNotesByDocumentIds({ documentIds: [eventId] }));
-  }, [dispatch, eventId]);
+    // only fetch notes if we are not in a preview panel, or not in a rule preview workflow
+    if (!isPreviewMode && !isPreview) {
+      dispatch(fetchNotesByDocumentIds({ documentIds: [eventId] }));
+    }
+  }, [dispatch, eventId, isPreview, isPreviewMode]);
 
   const fetchStatus = useSelector((state: State) => selectFetchNotesByDocumentIdsStatus(state));
   const fetchError = useSelector((state: State) => selectFetchNotesByDocumentIdsError(state));
@@ -107,37 +111,45 @@ export const Notes = memo(() => {
       }
       data-test-subj={NOTES_TITLE_TEST_ID}
     >
-      {fetchStatus === ReqStatus.Loading ? (
-        <EuiLoadingSpinner data-test-subj={NOTES_LOADING_TEST_ID} size="m" />
+      {isPreview ? (
+        getEmptyTagValue()
       ) : (
         <>
-          {notes.length === 0 ? (
-            <EuiButtonEmpty
-              iconType="plusInCircle"
-              onClick={openExpandedFlyoutNotesTab}
-              size="s"
-              aria-label={ADD_NOTE_BUTTON}
-              data-test-subj={NOTES_ADD_NOTE_BUTTON_TEST_ID}
-            >
-              {ADD_NOTE_BUTTON}
-            </EuiButtonEmpty>
+          {fetchStatus === ReqStatus.Loading ? (
+            <EuiLoadingSpinner data-test-subj={NOTES_LOADING_TEST_ID} size="m" />
           ) : (
-            <EuiFlexGroup responsive={false} alignItems="center" gutterSize="none">
-              <EuiFlexItem data-test-subj={NOTES_COUNT_TEST_ID}>
-                <FormattedCount count={notes.length} />
-              </EuiFlexItem>
-              <EuiFlexItem>
-                <EuiButtonIcon
-                  onClick={openExpandedFlyoutNotesTab}
+            <>
+              {notes.length === 0 ? (
+                <EuiButtonEmpty
                   iconType="plusInCircle"
-                  css={css`
-                    margin-left: ${euiTheme.size.xs};
-                  `}
+                  onClick={openExpandedFlyoutNotesTab}
+                  size="s"
+                  disabled={isPreviewMode || isPreview}
                   aria-label={ADD_NOTE_BUTTON}
-                  data-test-subj={NOTES_ADD_NOTE_ICON_BUTTON_TEST_ID}
-                />
-              </EuiFlexItem>
-            </EuiFlexGroup>
+                  data-test-subj={NOTES_ADD_NOTE_BUTTON_TEST_ID}
+                >
+                  {ADD_NOTE_BUTTON}
+                </EuiButtonEmpty>
+              ) : (
+                <EuiFlexGroup responsive={false} alignItems="center" gutterSize="none">
+                  <EuiFlexItem data-test-subj={NOTES_COUNT_TEST_ID}>
+                    <FormattedCount count={notes.length} />
+                  </EuiFlexItem>
+                  <EuiFlexItem>
+                    <EuiButtonIcon
+                      onClick={openExpandedFlyoutNotesTab}
+                      iconType="plusInCircle"
+                      disabled={isPreviewMode || isPreview}
+                      css={css`
+                        margin-left: ${euiTheme.size.xs};
+                      `}
+                      aria-label={ADD_NOTE_BUTTON}
+                      data-test-subj={NOTES_ADD_NOTE_ICON_BUTTON_TEST_ID}
+                    />
+                  </EuiFlexItem>
+                </EuiFlexGroup>
+              )}
+            </>
           )}
         </>
       )}
diff --git a/x-pack/plugins/security_solution/public/flyout/document_details/right/components/user_entity_overview.tsx b/x-pack/plugins/security_solution/public/flyout/document_details/right/components/user_entity_overview.tsx
index 0019228d656cd..1008f6139cd67 100644
--- a/x-pack/plugins/security_solution/public/flyout/document_details/right/components/user_entity_overview.tsx
+++ b/x-pack/plugins/security_solution/public/flyout/document_details/right/components/user_entity_overview.tsx
@@ -283,6 +283,7 @@ export const UserEntityOverview: React.FC<UserEntityOverviewProps> = ({ userName
         fieldName={'user.name'}
         name={userName}
         data-test-subj={ENTITIES_USER_OVERVIEW_MISCONFIGURATIONS_TEST_ID}
+        telemetrySuffix={'user-entity-overview'}
       />
     </EuiFlexGroup>
   );
diff --git a/x-pack/plugins/security_solution/public/flyout/document_details/shared/components/misconfiguration_insight.tsx b/x-pack/plugins/security_solution/public/flyout/document_details/shared/components/misconfiguration_insight.tsx
index 961fa1d5f3a45..e7ebb371fb020 100644
--- a/x-pack/plugins/security_solution/public/flyout/document_details/shared/components/misconfiguration_insight.tsx
+++ b/x-pack/plugins/security_solution/public/flyout/document_details/shared/components/misconfiguration_insight.tsx
@@ -5,12 +5,17 @@
  * 2.0.
  */
 
-import React, { useMemo } from 'react';
+import React, { useEffect, useMemo } from 'react';
 import { EuiFlexItem, type EuiFlexGroupProps, useEuiTheme } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { css } from '@emotion/css';
 import { useMisconfigurationPreview } from '@kbn/cloud-security-posture/src/hooks/use_misconfiguration_preview';
 import { buildEntityFlyoutPreviewQuery } from '@kbn/cloud-security-posture-common';
+import {
+  MISCONFIGURATION_INSIGHT,
+  uiMetricService,
+} from '@kbn/cloud-security-posture-common/utils/ui_metrics';
+import { METRIC_TYPE } from '@kbn/analytics';
 import { InsightDistributionBar } from './insight_distribution_bar';
 import { getFindingsStats } from '../../../../cloud_security_posture/components/misconfiguration/misconfiguration_preview';
 import { FormattedCount } from '../../../../common/components/formatted_number';
@@ -34,6 +39,10 @@ interface MisconfigurationsInsightProps {
    * The data-test-subj to use for the component
    */
   ['data-test-subj']?: string;
+  /**
+   * used to track the instance of this component, prefer kebab-case
+   */
+  telemetrySuffix?: string;
 }
 
 /*
@@ -44,6 +53,7 @@ export const MisconfigurationsInsight: React.FC<MisconfigurationsInsightProps> =
   fieldName,
   direction,
   'data-test-subj': dataTestSubj,
+  telemetrySuffix,
 }) => {
   const { scopeId, isPreview } = useDocumentDetailsContext();
   const { euiTheme } = useEuiTheme();
@@ -54,6 +64,14 @@ export const MisconfigurationsInsight: React.FC<MisconfigurationsInsightProps> =
     pageSize: 1,
   });
 
+  useEffect(() => {
+    uiMetricService.trackUiMetric(
+      METRIC_TYPE.COUNT,
+      `${MISCONFIGURATION_INSIGHT}-${telemetrySuffix}`
+    );
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
   const passedFindings = data?.count.passed || 0;
   const failedFindings = data?.count.failed || 0;
   const totalFindings = useMemo(
diff --git a/x-pack/plugins/security_solution/public/flyout/document_details/shared/components/vulnerabilities_insight.tsx b/x-pack/plugins/security_solution/public/flyout/document_details/shared/components/vulnerabilities_insight.tsx
index c675c0a0e079b..1dab4660194b9 100644
--- a/x-pack/plugins/security_solution/public/flyout/document_details/shared/components/vulnerabilities_insight.tsx
+++ b/x-pack/plugins/security_solution/public/flyout/document_details/shared/components/vulnerabilities_insight.tsx
@@ -5,13 +5,18 @@
  * 2.0.
  */
 
-import React, { useMemo } from 'react';
+import React, { useEffect, useMemo } from 'react';
 import { EuiFlexItem, type EuiFlexGroupProps, useEuiTheme } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { css } from '@emotion/css';
 import { useVulnerabilitiesPreview } from '@kbn/cloud-security-posture/src/hooks/use_vulnerabilities_preview';
 import { buildEntityFlyoutPreviewQuery } from '@kbn/cloud-security-posture-common';
 import { getVulnerabilityStats, hasVulnerabilitiesData } from '@kbn/cloud-security-posture';
+import {
+  uiMetricService,
+  VULNERABILITIES_INSIGHT,
+} from '@kbn/cloud-security-posture-common/utils/ui_metrics';
+import { METRIC_TYPE } from '@kbn/analytics';
 import { InsightDistributionBar } from './insight_distribution_bar';
 import { FormattedCount } from '../../../../common/components/formatted_number';
 import { PreviewLink } from '../../../shared/components/preview_link';
@@ -30,6 +35,10 @@ interface VulnerabilitiesInsightProps {
    * The data-test-subj to use for the component
    */
   ['data-test-subj']?: string;
+  /**
+   * used to track the instance of this component, prefer kebab-case
+   */
+  telemetrySuffix?: string;
 }
 
 /*
@@ -39,6 +48,7 @@ export const VulnerabilitiesInsight: React.FC<VulnerabilitiesInsightProps> = ({
   hostName,
   direction,
   'data-test-subj': dataTestSubj,
+  telemetrySuffix,
 }) => {
   const { scopeId, isPreview } = useDocumentDetailsContext();
   const { euiTheme } = useEuiTheme();
@@ -49,6 +59,14 @@ export const VulnerabilitiesInsight: React.FC<VulnerabilitiesInsightProps> = ({
     pageSize: 1,
   });
 
+  useEffect(() => {
+    uiMetricService.trackUiMetric(
+      METRIC_TYPE.COUNT,
+      `${VULNERABILITIES_INSIGHT}-${telemetrySuffix}`
+    );
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
   const { CRITICAL = 0, HIGH = 0, MEDIUM = 0, LOW = 0, NONE = 0 } = data?.count || {};
   const totalVulnerabilities = useMemo(
     () => CRITICAL + HIGH + MEDIUM + LOW + NONE,
diff --git a/x-pack/plugins/security_solution/public/management/cypress/e2e/response_actions/response_console/scan.cy.ts b/x-pack/plugins/security_solution/public/management/cypress/e2e/response_actions/response_console/scan.cy.ts
index 04630647ed35f..543961ef9900b 100644
--- a/x-pack/plugins/security_solution/public/management/cypress/e2e/response_actions/response_console/scan.cy.ts
+++ b/x-pack/plugins/security_solution/public/management/cypress/e2e/response_actions/response_console/scan.cy.ts
@@ -41,7 +41,8 @@ describe(
       login();
     });
 
-    describe('Scan operation:', () => {
+    // FLAKY: https://github.com/elastic/kibana/issues/187932
+    describe.skip('Scan operation:', () => {
       const homeFilePath = Cypress.env('IS_CI') ? '/home/vagrant' : '/home';
 
       const fileContent = 'This is a test file for the scan command.';
diff --git a/x-pack/plugins/security_solution/public/management/mocks/fleet_mocks.ts b/x-pack/plugins/security_solution/public/management/mocks/fleet_mocks.ts
index 43be2f7d7f157..17b436eae89b5 100644
--- a/x-pack/plugins/security_solution/public/management/mocks/fleet_mocks.ts
+++ b/x-pack/plugins/security_solution/public/management/mocks/fleet_mocks.ts
@@ -154,7 +154,7 @@ export const fleetGetPackageHttpMock = httpHandlerMockFactory<FleetGetPackageHtt
   {
     id: 'endpointPackage',
     method: 'get',
-    path: EPM_API_ROUTES.INFO_PATTERN_DEPRECATED,
+    path: EPM_API_ROUTES.INFO_WITHOUT_VERSION_PATTERN,
     handler() {
       const generator = new EndpointDocGenerator('seed');
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/perform_rule_upgrade/create_upgradeable_rules_payload.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/perform_rule_upgrade/create_upgradeable_rules_payload.ts
index 97e587646e524..b25320e1131ef 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/perform_rule_upgrade/create_upgradeable_rules_payload.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/perform_rule_upgrade/create_upgradeable_rules_payload.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 import { pickBy } from 'lodash';
+import { withSecuritySpanSync } from '../../../../../utils/with_security_span';
 import type { PromisePoolError } from '../../../../../utils/promise_pool';
 import {
   PickVersionValuesEnum,
@@ -36,77 +37,82 @@ export const createModifiedPrebuiltRuleAssets = ({
   upgradeableRules,
   requestBody,
 }: CreateModifiedPrebuiltRuleAssetsProps) => {
-  const { pick_version: globalPickVersion = PickVersionValuesEnum.MERGED, mode } = requestBody;
-
-  const { modifiedPrebuiltRuleAssets, processingErrors } = upgradeableRules.reduce<ProcessedRules>(
-    (processedRules, upgradeableRule) => {
-      const targetRuleType = upgradeableRule.target.type;
-      const ruleId = upgradeableRule.target.rule_id;
-      const fieldNames = FIELD_NAMES_BY_RULE_TYPE_MAP.get(targetRuleType);
-
-      try {
-        if (fieldNames === undefined) {
-          throw new Error(`Unexpected rule type: ${targetRuleType}`);
-        }
-
-        const { current, target } = upgradeableRule;
-        if (current.type !== target.type) {
-          assertPickVersionIsTarget({ ruleId, requestBody });
-        }
-
-        const calculatedRuleDiff = calculateRuleFieldsDiff({
-          base_version: upgradeableRule.base
-            ? convertRuleToDiffable(convertPrebuiltRuleAssetToRuleResponse(upgradeableRule.base))
-            : MissingVersion,
-          current_version: convertRuleToDiffable(upgradeableRule.current),
-          target_version: convertRuleToDiffable(
-            convertPrebuiltRuleAssetToRuleResponse(upgradeableRule.target)
-          ),
-        }) as AllFieldsDiff;
-
-        if (mode === 'ALL_RULES' && globalPickVersion === 'MERGED') {
-          const fieldsWithConflicts = Object.keys(getFieldsDiffConflicts(calculatedRuleDiff));
-          if (fieldsWithConflicts.length > 0) {
-            // If the mode is ALL_RULES, no fields can be overriden to any other pick_version
-            // than "MERGED", so throw an error for the fields that have conflicts.
-            throw new Error(
-              `Merge conflicts found in rule '${ruleId}' for fields: ${fieldsWithConflicts.join(
-                ', '
-              )}. Please resolve the conflict manually or choose another value for 'pick_version'`
-            );
+  return withSecuritySpanSync(createModifiedPrebuiltRuleAssets.name, () => {
+    const { pick_version: globalPickVersion = PickVersionValuesEnum.MERGED, mode } = requestBody;
+
+    const { modifiedPrebuiltRuleAssets, processingErrors } =
+      upgradeableRules.reduce<ProcessedRules>(
+        (processedRules, upgradeableRule) => {
+          const targetRuleType = upgradeableRule.target.type;
+          const ruleId = upgradeableRule.target.rule_id;
+          const fieldNames = FIELD_NAMES_BY_RULE_TYPE_MAP.get(targetRuleType);
+
+          try {
+            if (fieldNames === undefined) {
+              throw new Error(`Unexpected rule type: ${targetRuleType}`);
+            }
+
+            const { current, target } = upgradeableRule;
+            if (current.type !== target.type) {
+              assertPickVersionIsTarget({ ruleId, requestBody });
+            }
+
+            const calculatedRuleDiff = calculateRuleFieldsDiff({
+              base_version: upgradeableRule.base
+                ? convertRuleToDiffable(
+                    convertPrebuiltRuleAssetToRuleResponse(upgradeableRule.base)
+                  )
+                : MissingVersion,
+              current_version: convertRuleToDiffable(upgradeableRule.current),
+              target_version: convertRuleToDiffable(
+                convertPrebuiltRuleAssetToRuleResponse(upgradeableRule.target)
+              ),
+            }) as AllFieldsDiff;
+
+            if (mode === 'ALL_RULES' && globalPickVersion === 'MERGED') {
+              const fieldsWithConflicts = Object.keys(getFieldsDiffConflicts(calculatedRuleDiff));
+              if (fieldsWithConflicts.length > 0) {
+                // If the mode is ALL_RULES, no fields can be overriden to any other pick_version
+                // than "MERGED", so throw an error for the fields that have conflicts.
+                throw new Error(
+                  `Merge conflicts found in rule '${ruleId}' for fields: ${fieldsWithConflicts.join(
+                    ', '
+                  )}. Please resolve the conflict manually or choose another value for 'pick_version'`
+                );
+              }
+            }
+
+            const modifiedPrebuiltRuleAsset = createModifiedPrebuiltRuleAsset({
+              upgradeableRule,
+              fieldNames,
+              requestBody,
+              globalPickVersion,
+              calculatedRuleDiff,
+            });
+
+            processedRules.modifiedPrebuiltRuleAssets.push(modifiedPrebuiltRuleAsset);
+
+            return processedRules;
+          } catch (err) {
+            processedRules.processingErrors.push({
+              error: err,
+              item: { rule_id: ruleId },
+            });
+
+            return processedRules;
           }
+        },
+        {
+          modifiedPrebuiltRuleAssets: [],
+          processingErrors: [],
         }
+      );
 
-        const modifiedPrebuiltRuleAsset = createModifiedPrebuiltRuleAsset({
-          upgradeableRule,
-          fieldNames,
-          requestBody,
-          globalPickVersion,
-          calculatedRuleDiff,
-        });
-
-        processedRules.modifiedPrebuiltRuleAssets.push(modifiedPrebuiltRuleAsset);
-
-        return processedRules;
-      } catch (err) {
-        processedRules.processingErrors.push({
-          error: err,
-          item: { rule_id: ruleId },
-        });
-
-        return processedRules;
-      }
-    },
-    {
-      modifiedPrebuiltRuleAssets: [],
-      processingErrors: [],
-    }
-  );
-
-  return {
-    modifiedPrebuiltRuleAssets,
-    processingErrors,
-  };
+    return {
+      modifiedPrebuiltRuleAssets,
+      processingErrors,
+    };
+  });
 };
 
 interface CreateModifiedPrebuiltRuleAssetParams {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/perform_rule_upgrade/get_upgradeable_rules.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/perform_rule_upgrade/get_upgradeable_rules.ts
index acfdb674c309a..750561b9858a9 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/perform_rule_upgrade/get_upgradeable_rules.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/perform_rule_upgrade/get_upgradeable_rules.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-
+import { withSecuritySpanSync } from '../../../../../utils/with_security_span';
 import type {
   RuleResponse,
   RuleUpgradeSpecifier,
@@ -26,58 +26,60 @@ export const getUpgradeableRules = ({
   versionSpecifiers?: RuleUpgradeSpecifier[];
   mode: Mode;
 }) => {
-  const upgradeableRules = new Map(
-    rawUpgradeableRules.map((_rule) => [_rule.current.rule_id, _rule])
-  );
-  const fetchErrors: Array<PromisePoolError<{ rule_id: string }, Error>> = [];
-  const skippedRules: SkippedRuleUpgrade[] = [];
+  return withSecuritySpanSync(getUpgradeableRules.name, () => {
+    const upgradeableRules = new Map(
+      rawUpgradeableRules.map((_rule) => [_rule.current.rule_id, _rule])
+    );
+    const fetchErrors: Array<PromisePoolError<{ rule_id: string }, Error>> = [];
+    const skippedRules: SkippedRuleUpgrade[] = [];
 
-  if (mode === ModeEnum.SPECIFIC_RULES) {
-    const installedRuleIds = new Set(currentRules.map((rule) => rule.rule_id));
-    const upgradeableRuleIds = new Set(rawUpgradeableRules.map(({ current }) => current.rule_id));
-    versionSpecifiers?.forEach((rule) => {
-      // Check that the requested rule was found
-      if (!installedRuleIds.has(rule.rule_id)) {
-        fetchErrors.push({
-          error: new Error(
-            `Rule with rule_id "${rule.rule_id}" and version "${rule.version}" not found`
-          ),
-          item: rule,
-        });
-        return;
-      }
+    if (mode === ModeEnum.SPECIFIC_RULES) {
+      const installedRuleIds = new Set(currentRules.map((rule) => rule.rule_id));
+      const upgradeableRuleIds = new Set(rawUpgradeableRules.map(({ current }) => current.rule_id));
+      versionSpecifiers?.forEach((rule) => {
+        // Check that the requested rule was found
+        if (!installedRuleIds.has(rule.rule_id)) {
+          fetchErrors.push({
+            error: new Error(
+              `Rule with rule_id "${rule.rule_id}" and version "${rule.version}" not found`
+            ),
+            item: rule,
+          });
+          return;
+        }
 
-      // Check that the requested rule is upgradeable
-      if (!upgradeableRuleIds.has(rule.rule_id)) {
-        skippedRules.push({
-          rule_id: rule.rule_id,
-          reason: SkipRuleUpgradeReasonEnum.RULE_UP_TO_DATE,
-        });
-        return;
-      }
+        // Check that the requested rule is upgradeable
+        if (!upgradeableRuleIds.has(rule.rule_id)) {
+          skippedRules.push({
+            rule_id: rule.rule_id,
+            reason: SkipRuleUpgradeReasonEnum.RULE_UP_TO_DATE,
+          });
+          return;
+        }
 
-      // Check that rule revisions match (no update slipped in since the user reviewed the list)
-      const currentRevision = currentRules.find(
-        (currentRule) => currentRule.rule_id === rule.rule_id
-      )?.revision;
-      if (rule.revision !== currentRevision) {
-        fetchErrors.push({
-          error: new Error(
-            `Revision mismatch for rule_id ${rule.rule_id}: expected ${currentRevision}, got ${rule.revision}`
-          ),
-          item: rule,
-        });
-        // Remove the rule from the list of upgradeable rules
-        if (upgradeableRules.has(rule.rule_id)) {
-          upgradeableRules.delete(rule.rule_id);
+        // Check that rule revisions match (no update slipped in since the user reviewed the list)
+        const currentRevision = currentRules.find(
+          (currentRule) => currentRule.rule_id === rule.rule_id
+        )?.revision;
+        if (rule.revision !== currentRevision) {
+          fetchErrors.push({
+            error: new Error(
+              `Revision mismatch for rule_id ${rule.rule_id}: expected ${currentRevision}, got ${rule.revision}`
+            ),
+            item: rule,
+          });
+          // Remove the rule from the list of upgradeable rules
+          if (upgradeableRules.has(rule.rule_id)) {
+            upgradeableRules.delete(rule.rule_id);
+          }
         }
-      }
-    });
-  }
+      });
+    }
 
-  return {
-    upgradeableRules: Array.from(upgradeableRules.values()),
-    fetchErrors,
-    skippedRules,
-  };
+    return {
+      upgradeableRules: Array.from(upgradeableRules.values()),
+      fetchErrors,
+      skippedRules,
+    };
+  });
 };
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_context.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_context.ts
index 5e47428cd1749..cba989890438e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_context.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/__mocks__/request_context.ts
@@ -79,7 +79,8 @@ export const createMockClients = () => {
     internalFleetServices: {
       packages: packageServiceMock.createClient(),
     },
-    siemMigrationsClient: siemMigrationsServiceMock.createClient(),
+    siemRuleMigrationsClient: siemMigrationsServiceMock.createRulesClient(),
+    getInferenceClient: jest.fn(),
   };
 };
 
@@ -166,7 +167,8 @@ const createSecuritySolutionRequestContextMock = (
     getAuditLogger: jest.fn(() => mockAuditLogger),
     getDataViewsService: jest.fn(),
     getEntityStoreDataClient: jest.fn(() => clients.entityStoreDataClient),
-    getSiemMigrationsClient: jest.fn(() => clients.siemMigrationsClient),
+    getSiemRuleMigrationsClient: jest.fn(() => clients.siemRuleMigrationsClient),
+    getInferenceClient: jest.fn(() => clients.getInferenceClient()),
   };
 };
 
diff --git a/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/bulk_upload.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/bulk_upload.ts
index 93251bcf92652..e0de56da88c8d 100644
--- a/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/bulk_upload.ts
+++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/bulk_upload.ts
@@ -33,8 +33,10 @@ export const assetCriticalityPublicBulkUploadRoute = (
     .post({
       access: 'public',
       path: ASSET_CRITICALITY_PUBLIC_BULK_UPLOAD_URL,
-      options: {
-        tags: ['access:securitySolution', `access:${APP_ID}-entity-analytics`],
+      security: {
+        authz: {
+          requiredPrivileges: ['securitySolution', `${APP_ID}-entity-analytics`],
+        },
       },
     })
     .addVersion(
diff --git a/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/delete.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/delete.ts
index 6c2437081500d..de3f8cda4f5ba 100644
--- a/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/delete.ts
+++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/delete.ts
@@ -28,8 +28,10 @@ export const assetCriticalityPublicDeleteRoute = (
     .delete({
       access: 'public',
       path: ASSET_CRITICALITY_PUBLIC_URL,
-      options: {
-        tags: ['access:securitySolution', `access:${APP_ID}-entity-analytics`],
+      security: {
+        authz: {
+          requiredPrivileges: ['securitySolution', `${APP_ID}-entity-analytics`],
+        },
       },
     })
     .addVersion(
diff --git a/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/get.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/get.ts
index 048df61757a56..2cea50a2bbe20 100644
--- a/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/get.ts
+++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/get.ts
@@ -30,8 +30,10 @@ export const assetCriticalityPublicGetRoute = (
     .get({
       access: 'public',
       path: ASSET_CRITICALITY_PUBLIC_URL,
-      options: {
-        tags: ['access:securitySolution', `access:${APP_ID}-entity-analytics`],
+      security: {
+        authz: {
+          requiredPrivileges: ['securitySolution', `${APP_ID}-entity-analytics`],
+        },
       },
     })
     .addVersion(
diff --git a/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/list.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/list.ts
index a6316646bc612..7cfc763e8b97c 100644
--- a/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/list.ts
+++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/list.ts
@@ -28,8 +28,10 @@ export const assetCriticalityPublicListRoute = (
     .get({
       access: 'public',
       path: ASSET_CRITICALITY_PUBLIC_LIST_URL,
-      options: {
-        tags: ['access:securitySolution', `access:${APP_ID}-entity-analytics`],
+      security: {
+        authz: {
+          requiredPrivileges: ['securitySolution', `${APP_ID}-entity-analytics`],
+        },
       },
     })
     .addVersion(
diff --git a/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/privileges.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/privileges.ts
index 8c40335423973..59cdc983770ca 100644
--- a/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/privileges.ts
+++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/privileges.ts
@@ -28,8 +28,10 @@ export const assetCriticalityInternalPrivilegesRoute = (
     .get({
       access: 'internal',
       path: ASSET_CRITICALITY_INTERNAL_PRIVILEGES_URL,
-      options: {
-        tags: ['access:securitySolution', `access:${APP_ID}-entity-analytics`],
+      security: {
+        authz: {
+          requiredPrivileges: ['securitySolution', `${APP_ID}-entity-analytics`],
+        },
       },
     })
     .addVersion(
diff --git a/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/status.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/status.ts
index fc1cc92bbe1cf..6443981b327d9 100644
--- a/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/status.ts
+++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/status.ts
@@ -26,8 +26,10 @@ export const assetCriticalityInternalStatusRoute = (
     .get({
       access: 'internal',
       path: ASSET_CRITICALITY_INTERNAL_STATUS_URL,
-      options: {
-        tags: ['access:securitySolution', `access:${APP_ID}-entity-analytics`],
+      security: {
+        authz: {
+          requiredPrivileges: ['securitySolution', `${APP_ID}-entity-analytics`],
+        },
       },
     })
     .addVersion(
diff --git a/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/upload_csv.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/upload_csv.ts
index 8c1d94176111c..dccf24d161054 100644
--- a/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/upload_csv.ts
+++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/upload_csv.ts
@@ -35,8 +35,12 @@ export const assetCriticalityPublicCSVUploadRoute = (
     .post({
       access: 'public',
       path: ASSET_CRITICALITY_PUBLIC_CSV_UPLOAD_URL,
+      security: {
+        authz: {
+          requiredPrivileges: ['securitySolution', `${APP_ID}-entity-analytics`],
+        },
+      },
       options: {
-        tags: ['access:securitySolution', `access:${APP_ID}-entity-analytics`],
         body: {
           output: 'stream',
           accepts: 'multipart/form-data',
diff --git a/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/upsert.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/upsert.ts
index 488a75c0196ab..8614a2b8e9ad1 100644
--- a/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/upsert.ts
+++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/upsert.ts
@@ -31,8 +31,10 @@ export const assetCriticalityPublicUpsertRoute = (
     .post({
       access: 'public',
       path: ASSET_CRITICALITY_PUBLIC_URL,
-      options: {
-        tags: ['access:securitySolution', `access:${APP_ID}-entity-analytics`],
+      security: {
+        authz: {
+          requiredPrivileges: ['securitySolution', `${APP_ID}-entity-analytics`],
+        },
       },
     })
     .addVersion(
diff --git a/x-pack/plugins/security_solution/server/lib/entity_analytics/entity_store/routes/apply_dataview_indices.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/entity_store/routes/apply_dataview_indices.ts
index 72cd02f273cad..115afdb6b0b3b 100644
--- a/x-pack/plugins/security_solution/server/lib/entity_analytics/entity_store/routes/apply_dataview_indices.ts
+++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/entity_store/routes/apply_dataview_indices.ts
@@ -20,8 +20,10 @@ export const applyDataViewIndicesEntityEngineRoute = (
     .post({
       access: 'public',
       path: '/api/entity_store/engines/apply_dataview_indices',
-      options: {
-        tags: ['access:securitySolution', `access:${APP_ID}-entity-analytics`],
+      security: {
+        authz: {
+          requiredPrivileges: ['securitySolution', `${APP_ID}-entity-analytics`],
+        },
       },
     })
     .addVersion(
diff --git a/x-pack/plugins/security_solution/server/lib/entity_analytics/entity_store/routes/delete.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/entity_store/routes/delete.ts
index e11c9d3fa7b9d..9e221093d9582 100644
--- a/x-pack/plugins/security_solution/server/lib/entity_analytics/entity_store/routes/delete.ts
+++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/entity_store/routes/delete.ts
@@ -28,8 +28,10 @@ export const deleteEntityEngineRoute = (
     .delete({
       access: 'public',
       path: '/api/entity_store/engines/{entityType}',
-      options: {
-        tags: ['access:securitySolution', `access:${APP_ID}-entity-analytics`],
+      security: {
+        authz: {
+          requiredPrivileges: ['securitySolution', `${APP_ID}-entity-analytics`],
+        },
       },
     })
     .addVersion(
diff --git a/x-pack/plugins/security_solution/server/lib/entity_analytics/entity_store/routes/entities/list.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/entity_store/routes/entities/list.ts
index 3eefcb7de5752..9f195bb33c8d9 100644
--- a/x-pack/plugins/security_solution/server/lib/entity_analytics/entity_store/routes/entities/list.ts
+++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/entity_store/routes/entities/list.ts
@@ -32,8 +32,10 @@ export const listEntitiesRoute = (router: EntityAnalyticsRoutesDeps['router'], l
     .get({
       access: 'public',
       path: LIST_ENTITIES_URL,
-      options: {
-        tags: ['access:securitySolution', `access:${APP_ID}-entity-analytics`],
+      security: {
+        authz: {
+          requiredPrivileges: ['securitySolution', `${APP_ID}-entity-analytics`],
+        },
       },
     })
     .addVersion(
diff --git a/x-pack/plugins/security_solution/server/lib/entity_analytics/entity_store/routes/get.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/entity_store/routes/get.ts
index 23f013598b476..3ae59d6d748cb 100644
--- a/x-pack/plugins/security_solution/server/lib/entity_analytics/entity_store/routes/get.ts
+++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/entity_store/routes/get.ts
@@ -23,8 +23,10 @@ export const getEntityEngineRoute = (
     .get({
       access: 'public',
       path: '/api/entity_store/engines/{entityType}',
-      options: {
-        tags: ['access:securitySolution', `access:${APP_ID}-entity-analytics`],
+      security: {
+        authz: {
+          requiredPrivileges: ['securitySolution', `${APP_ID}-entity-analytics`],
+        },
       },
     })
     .addVersion(
diff --git a/x-pack/plugins/security_solution/server/lib/entity_analytics/entity_store/routes/init.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/entity_store/routes/init.ts
index 3535be022179b..c6ae2f23366a0 100644
--- a/x-pack/plugins/security_solution/server/lib/entity_analytics/entity_store/routes/init.ts
+++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/entity_store/routes/init.ts
@@ -28,8 +28,10 @@ export const initEntityEngineRoute = (
     .post({
       access: 'public',
       path: '/api/entity_store/engines/{entityType}/init',
-      options: {
-        tags: ['access:securitySolution', `access:${APP_ID}-entity-analytics`],
+      security: {
+        authz: {
+          requiredPrivileges: ['securitySolution', `${APP_ID}-entity-analytics`],
+        },
       },
     })
     .addVersion(
diff --git a/x-pack/plugins/security_solution/server/lib/entity_analytics/entity_store/routes/list.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/entity_store/routes/list.ts
index 7cec67bcdf5cd..372331cea7087 100644
--- a/x-pack/plugins/security_solution/server/lib/entity_analytics/entity_store/routes/list.ts
+++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/entity_store/routes/list.ts
@@ -22,8 +22,10 @@ export const listEntityEnginesRoute = (
     .get({
       access: 'public',
       path: '/api/entity_store/engines',
-      options: {
-        tags: ['access:securitySolution', `access:${APP_ID}-entity-analytics`],
+      security: {
+        authz: {
+          requiredPrivileges: ['securitySolution', `${APP_ID}-entity-analytics`],
+        },
       },
     })
     .addVersion(
diff --git a/x-pack/plugins/security_solution/server/lib/entity_analytics/entity_store/routes/start.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/entity_store/routes/start.ts
index 1872de211cb8f..2985553e874c1 100644
--- a/x-pack/plugins/security_solution/server/lib/entity_analytics/entity_store/routes/start.ts
+++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/entity_store/routes/start.ts
@@ -24,8 +24,10 @@ export const startEntityEngineRoute = (
     .post({
       access: 'public',
       path: '/api/entity_store/engines/{entityType}/start',
-      options: {
-        tags: ['access:securitySolution', `access:${APP_ID}-entity-analytics`],
+      security: {
+        authz: {
+          requiredPrivileges: ['securitySolution', `${APP_ID}-entity-analytics`],
+        },
       },
     })
     .addVersion(
diff --git a/x-pack/plugins/security_solution/server/lib/entity_analytics/entity_store/routes/stats.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/entity_store/routes/stats.ts
index 9ca3cd906f016..24785fbd5c015 100644
--- a/x-pack/plugins/security_solution/server/lib/entity_analytics/entity_store/routes/stats.ts
+++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/entity_store/routes/stats.ts
@@ -23,8 +23,10 @@ export const getEntityEngineStatsRoute = (
     .post({
       access: 'public',
       path: '/api/entity_store/engines/{entityType}/stats',
-      options: {
-        tags: ['access:securitySolution', `access:${APP_ID}-entity-analytics`],
+      security: {
+        authz: {
+          requiredPrivileges: ['securitySolution', `${APP_ID}-entity-analytics`],
+        },
       },
     })
     .addVersion(
diff --git a/x-pack/plugins/security_solution/server/lib/entity_analytics/entity_store/routes/stop.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/entity_store/routes/stop.ts
index 3ec84e13aa1db..0ba0b008a731c 100644
--- a/x-pack/plugins/security_solution/server/lib/entity_analytics/entity_store/routes/stop.ts
+++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/entity_store/routes/stop.ts
@@ -24,8 +24,10 @@ export const stopEntityEngineRoute = (
     .post({
       access: 'public',
       path: '/api/entity_store/engines/{entityType}/stop',
-      options: {
-        tags: ['access:securitySolution', `access:${APP_ID}-entity-analytics`],
+      security: {
+        authz: {
+          requiredPrivileges: ['securitySolution', `${APP_ID}-entity-analytics`],
+        },
       },
     })
     .addVersion(
diff --git a/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/delete.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/delete.ts
index 1776ddcca69b1..473627c9c7b09 100644
--- a/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/delete.ts
+++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/delete.ts
@@ -23,8 +23,10 @@ export const riskEngineCleanupRoute = (
     .delete({
       access: 'public',
       path: RISK_ENGINE_CLEANUP_URL,
-      options: {
-        tags: ['access:securitySolution', `access:${APP_ID}-entity-analytics`],
+      security: {
+        authz: {
+          requiredPrivileges: ['securitySolution', `${APP_ID}-entity-analytics`],
+        },
       },
     })
     .addVersion(
diff --git a/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/disable.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/disable.ts
index 59b4b4f77537e..fafa887d6fbb4 100644
--- a/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/disable.ts
+++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/disable.ts
@@ -24,8 +24,10 @@ export const riskEngineDisableRoute = (
     .post({
       access: 'internal',
       path: RISK_ENGINE_DISABLE_URL,
-      options: {
-        tags: ['access:securitySolution', `access:${APP_ID}-entity-analytics`],
+      security: {
+        authz: {
+          requiredPrivileges: ['securitySolution', `${APP_ID}-entity-analytics`],
+        },
       },
     })
     .addVersion(
diff --git a/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/enable.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/enable.ts
index 24b3c3816440d..ce86ac8f99bd6 100644
--- a/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/enable.ts
+++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/enable.ts
@@ -24,8 +24,10 @@ export const riskEngineEnableRoute = (
     .post({
       access: 'internal',
       path: RISK_ENGINE_ENABLE_URL,
-      options: {
-        tags: ['access:securitySolution', `access:${APP_ID}-entity-analytics`],
+      security: {
+        authz: {
+          requiredPrivileges: ['securitySolution', `${APP_ID}-entity-analytics`],
+        },
       },
     })
     .addVersion(
diff --git a/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/init.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/init.ts
index 4657d21cbcbe0..67edb78b740c5 100644
--- a/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/init.ts
+++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/init.ts
@@ -26,8 +26,10 @@ export const riskEngineInitRoute = (
     .post({
       access: 'internal',
       path: RISK_ENGINE_INIT_URL,
-      options: {
-        tags: ['access:securitySolution', `access:${APP_ID}-entity-analytics`],
+      security: {
+        authz: {
+          requiredPrivileges: ['securitySolution', `${APP_ID}-entity-analytics`],
+        },
       },
     })
     .addVersion(
diff --git a/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/privileges.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/privileges.ts
index f14e06fa72868..307da6980da50 100644
--- a/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/privileges.ts
+++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/privileges.ts
@@ -24,8 +24,10 @@ export const riskEnginePrivilegesRoute = (
     .get({
       access: 'internal',
       path: RISK_ENGINE_PRIVILEGES_URL,
-      options: {
-        tags: ['access:securitySolution', `access:${APP_ID}-entity-analytics`],
+      security: {
+        authz: {
+          requiredPrivileges: ['securitySolution', `${APP_ID}-entity-analytics`],
+        },
       },
     })
     .addVersion(
diff --git a/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/schedule_now.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/schedule_now.ts
index 91f32954f6102..99ec60b281293 100644
--- a/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/schedule_now.ts
+++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/schedule_now.ts
@@ -27,8 +27,10 @@ export const riskEngineScheduleNowRoute = (
     .post({
       access: 'public',
       path: RISK_ENGINE_SCHEDULE_NOW_URL,
-      options: {
-        tags: ['access:securitySolution', `access:${APP_ID}-entity-analytics`],
+      security: {
+        authz: {
+          requiredPrivileges: ['securitySolution', `${APP_ID}-entity-analytics`],
+        },
       },
     })
     .addVersion(
diff --git a/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/settings.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/settings.ts
index e300f012b86cf..8073f1222302f 100644
--- a/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/settings.ts
+++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/settings.ts
@@ -19,8 +19,10 @@ export const riskEngineSettingsRoute = (router: EntityAnalyticsRoutesDeps['route
     .get({
       access: 'internal',
       path: RISK_ENGINE_SETTINGS_URL,
-      options: {
-        tags: ['access:securitySolution', `access:${APP_ID}-entity-analytics`],
+      security: {
+        authz: {
+          requiredPrivileges: ['securitySolution', `${APP_ID}-entity-analytics`],
+        },
       },
     })
     .addVersion(
diff --git a/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/status.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/status.ts
index 9b69ddec6b005..5ece4cbf48e43 100644
--- a/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/status.ts
+++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/status.ts
@@ -20,8 +20,10 @@ export const riskEngineStatusRoute = (
     .get({
       access: 'internal',
       path: RISK_ENGINE_STATUS_URL,
-      options: {
-        tags: ['access:securitySolution', `access:${APP_ID}-entity-analytics`],
+      security: {
+        authz: {
+          requiredPrivileges: ['securitySolution', `${APP_ID}-entity-analytics`],
+        },
       },
     })
     .addVersion(
diff --git a/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_score/routes/entity_calculation.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_score/routes/entity_calculation.ts
index 4b1cf773a572b..8fe611721d323 100644
--- a/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_score/routes/entity_calculation.ts
+++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_score/routes/entity_calculation.ts
@@ -166,8 +166,10 @@ export const deprecatedRiskScoreEntityCalculationRoute = (
     .post({
       path: '/api/risk_scores/calculation/entity',
       access: 'internal',
-      options: {
-        tags: ['access:securitySolution', `access:${APP_ID}-entity-analytics`],
+      security: {
+        authz: {
+          requiredPrivileges: ['securitySolution', `${APP_ID}-entity-analytics`],
+        },
       },
     })
     .addVersion(
@@ -192,8 +194,10 @@ export const riskScoreEntityCalculationRoute = (
     .post({
       path: RISK_SCORE_ENTITY_CALCULATION_URL,
       access: 'internal',
-      options: {
-        tags: ['access:securitySolution', `access:${APP_ID}-entity-analytics`],
+      security: {
+        authz: {
+          requiredPrivileges: ['securitySolution', `${APP_ID}-entity-analytics`],
+        },
       },
     })
     .addVersion(
diff --git a/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_score/routes/preview.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_score/routes/preview.ts
index e2a1e664c5e76..5ab6791a300c3 100644
--- a/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_score/routes/preview.ts
+++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/risk_score/routes/preview.ts
@@ -30,8 +30,10 @@ export const riskScorePreviewRoute = (
     .post({
       access: 'internal',
       path: RISK_SCORE_PREVIEW_URL,
-      options: {
-        tags: ['access:securitySolution', `access:${APP_ID}-entity-analytics`],
+      security: {
+        authz: {
+          requiredPrivileges: ['securitySolution', `${APP_ID}-entity-analytics`],
+        },
       },
     })
     .addVersion(
diff --git a/x-pack/plugins/security_solution/server/lib/risk_score/index_status/index.ts b/x-pack/plugins/security_solution/server/lib/risk_score/index_status/index.ts
index 79eef256f8e93..c53039367dfbe 100644
--- a/x-pack/plugins/security_solution/server/lib/risk_score/index_status/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/risk_score/index_status/index.ts
@@ -18,8 +18,10 @@ export const getRiskScoreIndexStatusRoute = (router: SecuritySolutionPluginRoute
     .get({
       access: 'internal',
       path: RISK_SCORE_INDEX_STATUS_API_URL,
-      options: {
-        tags: ['access:securitySolution', `access:${APP_ID}-entity-analytics`],
+      security: {
+        authz: {
+          requiredPrivileges: ['securitySolution', `${APP_ID}-entity-analytics`],
+        },
       },
     })
     .addVersion(
diff --git a/x-pack/plugins/security_solution/server/lib/risk_score/indices/create_index_route.ts b/x-pack/plugins/security_solution/server/lib/risk_score/indices/create_index_route.ts
index ef4aacf251ff4..d029d098b03bf 100644
--- a/x-pack/plugins/security_solution/server/lib/risk_score/indices/create_index_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/risk_score/indices/create_index_route.ts
@@ -19,8 +19,10 @@ export const createEsIndexRoute = (router: SecuritySolutionPluginRouter, logger:
     .put({
       access: 'internal',
       path: RISK_SCORE_CREATE_INDEX,
-      options: {
-        tags: ['access:securitySolution'],
+      security: {
+        authz: {
+          requiredPrivileges: ['securitySolution'],
+        },
       },
     })
     .addVersion(
diff --git a/x-pack/plugins/security_solution/server/lib/risk_score/indices/delete_indices_route.ts b/x-pack/plugins/security_solution/server/lib/risk_score/indices/delete_indices_route.ts
index 407e9e0a8f3e0..4e7f8ed0975f1 100644
--- a/x-pack/plugins/security_solution/server/lib/risk_score/indices/delete_indices_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/risk_score/indices/delete_indices_route.ts
@@ -17,8 +17,10 @@ export const deleteEsIndicesRoute = (router: SecuritySolutionPluginRouter) => {
     .post({
       access: 'internal',
       path: RISK_SCORE_DELETE_INDICES,
-      options: {
-        tags: ['access:securitySolution'],
+      security: {
+        authz: {
+          requiredPrivileges: ['securitySolution'],
+        },
       },
     })
     .addVersion(
diff --git a/x-pack/plugins/security_solution/server/lib/risk_score/onboarding/routes/install_risk_scores.ts b/x-pack/plugins/security_solution/server/lib/risk_score/onboarding/routes/install_risk_scores.ts
index de6675985fc00..342ae7a0c577b 100644
--- a/x-pack/plugins/security_solution/server/lib/risk_score/onboarding/routes/install_risk_scores.ts
+++ b/x-pack/plugins/security_solution/server/lib/risk_score/onboarding/routes/install_risk_scores.ts
@@ -21,8 +21,10 @@ export const installRiskScoresRoute = (router: SecuritySolutionPluginRouter, log
     .post({
       access: 'internal',
       path: INTERNAL_RISK_SCORE_URL,
-      options: {
-        tags: ['access:securitySolution', `access:${APP_ID}-entity-analytics`],
+      security: {
+        authz: {
+          requiredPrivileges: ['securitySolution', `${APP_ID}-entity-analytics`],
+        },
       },
     })
     .addVersion(
diff --git a/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_dev_tool_content/routes/read_prebuilt_dev_tool_content_route.ts b/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_dev_tool_content/routes/read_prebuilt_dev_tool_content_route.ts
index 77553eca21d5c..81a7694ba79e9 100644
--- a/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_dev_tool_content/routes/read_prebuilt_dev_tool_content_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_dev_tool_content/routes/read_prebuilt_dev_tool_content_route.ts
@@ -53,8 +53,10 @@ export const readPrebuiltDevToolContentRoute = (router: SecuritySolutionPluginRo
     .get({
       access: 'internal',
       path: DEV_TOOL_PREBUILT_CONTENT,
-      options: {
-        tags: ['access:securitySolution'],
+      security: {
+        authz: {
+          requiredPrivileges: ['securitySolution'],
+        },
       },
     })
     .addVersion(
diff --git a/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/routes/create_prebuilt_saved_objects.ts b/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/routes/create_prebuilt_saved_objects.ts
index a17669af734fe..2ccccc4bab787 100644
--- a/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/routes/create_prebuilt_saved_objects.ts
+++ b/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/routes/create_prebuilt_saved_objects.ts
@@ -24,8 +24,10 @@ export const createPrebuiltSavedObjectsRoute = (
     .post({
       access: 'internal',
       path: PREBUILT_SAVED_OBJECTS_BULK_CREATE,
-      options: {
-        tags: ['access:securitySolution'],
+      security: {
+        authz: {
+          requiredPrivileges: ['securitySolution'],
+        },
       },
     })
     .addVersion(
diff --git a/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/routes/delete_prebuilt_saved_objects.ts b/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/routes/delete_prebuilt_saved_objects.ts
index bd7ae03191ea5..7e772e710cc93 100644
--- a/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/routes/delete_prebuilt_saved_objects.ts
+++ b/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/routes/delete_prebuilt_saved_objects.ts
@@ -21,8 +21,10 @@ export const deletePrebuiltSavedObjectsRoute = (router: SecuritySolutionPluginRo
     .post({
       access: 'internal',
       path: PREBUILT_SAVED_OBJECTS_BULK_DELETE,
-      options: {
-        tags: ['access:securitySolution'],
+      security: {
+        authz: {
+          requiredPrivileges: ['securitySolution'],
+        },
       },
     })
     .addVersion(
diff --git a/x-pack/plugins/security_solution/server/lib/risk_score/stored_scripts/create_script_route.ts b/x-pack/plugins/security_solution/server/lib/risk_score/stored_scripts/create_script_route.ts
index 573d1d30bcd28..85cd1fb9d1928 100644
--- a/x-pack/plugins/security_solution/server/lib/risk_score/stored_scripts/create_script_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/risk_score/stored_scripts/create_script_route.ts
@@ -18,8 +18,10 @@ export const createStoredScriptRoute = (router: SecuritySolutionPluginRouter, lo
     .put({
       access: 'internal',
       path: RISK_SCORE_CREATE_STORED_SCRIPT,
-      options: {
-        tags: ['access:securitySolution'],
+      security: {
+        authz: {
+          requiredPrivileges: ['securitySolution'],
+        },
       },
     })
     .addVersion(
diff --git a/x-pack/plugins/security_solution/server/lib/risk_score/stored_scripts/delete_script_route.ts b/x-pack/plugins/security_solution/server/lib/risk_score/stored_scripts/delete_script_route.ts
index 0d7ef94be2635..91bf387d55bd0 100644
--- a/x-pack/plugins/security_solution/server/lib/risk_score/stored_scripts/delete_script_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/risk_score/stored_scripts/delete_script_route.ts
@@ -17,8 +17,10 @@ export const deleteStoredScriptRoute = (router: SecuritySolutionPluginRouter) =>
     .delete({
       access: 'internal',
       path: RISK_SCORE_DELETE_STORED_SCRIPT,
-      options: {
-        tags: ['access:securitySolution'],
+      security: {
+        authz: {
+          requiredPrivileges: ['securitySolution'],
+        },
       },
     })
     .addVersion(
diff --git a/x-pack/plugins/security_solution/server/lib/siem_migrations/__mocks__/mocks.ts b/x-pack/plugins/security_solution/server/lib/siem_migrations/__mocks__/mocks.ts
index fcf119e19ece5..af961d48db5b1 100644
--- a/x-pack/plugins/security_solution/server/lib/siem_migrations/__mocks__/mocks.ts
+++ b/x-pack/plugins/security_solution/server/lib/siem_migrations/__mocks__/mocks.ts
@@ -7,18 +7,16 @@
 
 import { createRuleMigrationClient } from '../rules/__mocks__/mocks';
 
-const createClient = () => ({ rules: createRuleMigrationClient() });
-
 export const mockSetup = jest.fn().mockResolvedValue(undefined);
-export const mockCreateClient = jest.fn().mockReturnValue(createClient());
+export const mockCreateClient = jest.fn().mockReturnValue(createRuleMigrationClient());
 export const mockStop = jest.fn();
 
 export const siemMigrationsServiceMock = {
   create: () =>
     jest.fn().mockImplementation(() => ({
       setup: mockSetup,
-      createClient: mockCreateClient,
+      createRulesClient: mockCreateClient,
       stop: mockStop,
     })),
-  createClient: () => createClient(),
+  createRulesClient: () => createRuleMigrationClient(),
 };
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/utils/recall/types.ts b/x-pack/plugins/security_solution/server/lib/siem_migrations/__mocks__/siem_migrations_service.ts
similarity index 61%
rename from x-pack/plugins/observability_solution/observability_ai_assistant/server/utils/recall/types.ts
rename to x-pack/plugins/security_solution/server/lib/siem_migrations/__mocks__/siem_migrations_service.ts
index 3774df64c1ee1..659929d47570f 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/server/utils/recall/types.ts
+++ b/x-pack/plugins/security_solution/server/lib/siem_migrations/__mocks__/siem_migrations_service.ts
@@ -5,6 +5,5 @@
  * 2.0.
  */
 
-import type { RecalledEntry } from '../../service/knowledge_base_service';
-
-export type RetrievedSuggestion = Omit<RecalledEntry, 'labels' | 'is_correction'>;
+import { siemMigrationsServiceMock } from './mocks';
+export const SiemMigrationsService = siemMigrationsServiceMock.create();
diff --git a/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/__mocks__/mocks.ts b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/__mocks__/mocks.ts
index 8233151f513e4..8811a54195e2b 100644
--- a/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/__mocks__/mocks.ts
+++ b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/__mocks__/mocks.ts
@@ -5,17 +5,56 @@
  * 2.0.
  */
 
-import type { SiemRuleMigrationsClient } from '../types';
-
-export const createRuleMigrationClient = (): SiemRuleMigrationsClient => ({
+export const createRuleMigrationDataClient = jest.fn().mockImplementation(() => ({
   create: jest.fn().mockResolvedValue({ success: true }),
-  search: jest.fn().mockResolvedValue([]),
+  getRules: jest.fn().mockResolvedValue([]),
+  takePending: jest.fn().mockResolvedValue([]),
+  saveFinished: jest.fn().mockResolvedValue({ success: true }),
+  saveError: jest.fn().mockResolvedValue({ success: true }),
+  releaseProcessing: jest.fn().mockResolvedValue({ success: true }),
+  releaseProcessable: jest.fn().mockResolvedValue({ success: true }),
+  getStats: jest.fn().mockResolvedValue({
+    status: 'done',
+    rules: {
+      total: 1,
+      finished: 1,
+      processing: 0,
+      pending: 0,
+      failed: 0,
+    },
+  }),
+  getAllStats: jest.fn().mockResolvedValue([]),
+}));
+
+export const createRuleMigrationTaskClient = () => ({
+  start: jest.fn().mockResolvedValue({ started: true }),
+  stop: jest.fn().mockResolvedValue({ stopped: true }),
+  getStats: jest.fn().mockResolvedValue({
+    status: 'done',
+    rules: {
+      total: 1,
+      finished: 1,
+      processing: 0,
+      pending: 0,
+      failed: 0,
+    },
+  }),
+  getAllStats: jest.fn().mockResolvedValue([]),
 });
 
+export const createRuleMigrationClient = () => ({
+  data: createRuleMigrationDataClient(),
+  task: createRuleMigrationTaskClient(),
+});
+
+export const MockSiemRuleMigrationsClient = jest.fn().mockImplementation(createRuleMigrationClient);
+
 export const mockSetup = jest.fn();
-export const mockGetClient = jest.fn().mockReturnValue(createRuleMigrationClient());
+export const mockCreateClient = jest.fn().mockReturnValue(createRuleMigrationClient());
+export const mockStop = jest.fn();
 
 export const MockSiemRuleMigrationsService = jest.fn().mockImplementation(() => ({
   setup: mockSetup,
-  getClient: mockGetClient,
+  createClient: mockCreateClient,
+  stop: mockStop,
 }));
diff --git a/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/__mocks__/siem_rule_migrations_client.ts b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/__mocks__/siem_rule_migrations_client.ts
new file mode 100644
index 0000000000000..98032605ed233
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/__mocks__/siem_rule_migrations_client.ts
@@ -0,0 +1,9 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { MockSiemRuleMigrationsClient } from './mocks';
+export const SiemRuleMigrationsClient = MockSiemRuleMigrationsClient;
diff --git a/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/api/create.ts b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/api/create.ts
index e2cf97dd094a9..e2505ca83beed 100644
--- a/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/api/create.ts
+++ b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/api/create.ts
@@ -8,14 +8,11 @@
 import type { IKibanaResponse, Logger } from '@kbn/core/server';
 import { buildRouteValidationWithZod } from '@kbn/zod-helpers';
 import { v4 as uuidV4 } from 'uuid';
-import type { RuleMigration } from '../../../../../common/siem_migrations/model/rule_migration.gen';
 import type { CreateRuleMigrationResponse } from '../../../../../common/siem_migrations/model/api/rules/rules_migration.gen';
 import { CreateRuleMigrationRequestBody } from '../../../../../common/siem_migrations/model/api/rules/rules_migration.gen';
-import {
-  SIEM_RULE_MIGRATIONS_PATH,
-  SiemMigrationsStatus,
-} from '../../../../../common/siem_migrations/constants';
+import { SIEM_RULE_MIGRATIONS_PATH } from '../../../../../common/siem_migrations/constants';
 import type { SecuritySolutionPluginRouter } from '../../../../types';
+import type { CreateRuleMigrationInput } from '../data_stream/rule_migrations_data_client';
 
 export const registerSiemRuleMigrationsCreateRoute = (
   router: SecuritySolutionPluginRouter,
@@ -25,7 +22,7 @@ export const registerSiemRuleMigrationsCreateRoute = (
     .post({
       path: SIEM_RULE_MIGRATIONS_PATH,
       access: 'internal',
-      options: { tags: ['access:securitySolution'] },
+      security: { authz: { requiredPrivileges: ['securitySolution'] } },
     })
     .addVersion(
       {
@@ -37,27 +34,22 @@ export const registerSiemRuleMigrationsCreateRoute = (
       async (context, req, res): Promise<IKibanaResponse<CreateRuleMigrationResponse>> => {
         const originalRules = req.body;
         try {
-          const ctx = await context.resolve(['core', 'actions', 'securitySolution']);
-
-          const siemMigrationClient = ctx.securitySolution.getSiemMigrationsClient();
+          const ctx = await context.resolve(['securitySolution']);
+          const ruleMigrationsClient = ctx.securitySolution.getSiemRuleMigrationsClient();
 
           const migrationId = uuidV4();
-          const timestamp = new Date().toISOString();
 
-          const ruleMigrations = originalRules.map<RuleMigration>((originalRule) => ({
-            '@timestamp': timestamp,
+          const ruleMigrations = originalRules.map<CreateRuleMigrationInput>((originalRule) => ({
             migration_id: migrationId,
             original_rule: originalRule,
-            status: SiemMigrationsStatus.PENDING,
           }));
-          await siemMigrationClient.rules.create(ruleMigrations);
+
+          await ruleMigrationsClient.data.create(ruleMigrations);
 
           return res.ok({ body: { migration_id: migrationId } });
         } catch (err) {
           logger.error(err);
-          return res.badRequest({
-            body: err.message,
-          });
+          return res.badRequest({ body: err.message });
         }
       }
     );
diff --git a/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/api/get.ts b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/api/get.ts
new file mode 100644
index 0000000000000..0efb6706918f5
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/api/get.ts
@@ -0,0 +1,47 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { IKibanaResponse, Logger } from '@kbn/core/server';
+import { buildRouteValidationWithZod } from '@kbn/zod-helpers';
+import type { GetRuleMigrationResponse } from '../../../../../common/siem_migrations/model/api/rules/rules_migration.gen';
+import { GetRuleMigrationRequestParams } from '../../../../../common/siem_migrations/model/api/rules/rules_migration.gen';
+import { SIEM_RULE_MIGRATIONS_GET_PATH } from '../../../../../common/siem_migrations/constants';
+import type { SecuritySolutionPluginRouter } from '../../../../types';
+
+export const registerSiemRuleMigrationsGetRoute = (
+  router: SecuritySolutionPluginRouter,
+  logger: Logger
+) => {
+  router.versioned
+    .get({
+      path: SIEM_RULE_MIGRATIONS_GET_PATH,
+      access: 'internal',
+      security: { authz: { requiredPrivileges: ['securitySolution'] } },
+    })
+    .addVersion(
+      {
+        version: '1',
+        validate: {
+          request: { params: buildRouteValidationWithZod(GetRuleMigrationRequestParams) },
+        },
+      },
+      async (context, req, res): Promise<IKibanaResponse<GetRuleMigrationResponse>> => {
+        const migrationId = req.params.migration_id;
+        try {
+          const ctx = await context.resolve(['securitySolution']);
+          const ruleMigrationsClient = ctx.securitySolution.getSiemRuleMigrationsClient();
+
+          const migrationRules = await ruleMigrationsClient.data.getRules(migrationId);
+
+          return res.ok({ body: migrationRules });
+        } catch (err) {
+          logger.error(err);
+          return res.badRequest({ body: err.message });
+        }
+      }
+    );
+};
diff --git a/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/api/index.ts b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/api/index.ts
index 0de49eb7df92b..f37eb2108a8a4 100644
--- a/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/api/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/api/index.ts
@@ -8,10 +8,20 @@
 import type { Logger } from '@kbn/core/server';
 import type { SecuritySolutionPluginRouter } from '../../../../types';
 import { registerSiemRuleMigrationsCreateRoute } from './create';
+import { registerSiemRuleMigrationsGetRoute } from './get';
+import { registerSiemRuleMigrationsStartRoute } from './start';
+import { registerSiemRuleMigrationsStatsRoute } from './stats';
+import { registerSiemRuleMigrationsStopRoute } from './stop';
+import { registerSiemRuleMigrationsStatsAllRoute } from './stats_all';
 
 export const registerSiemRuleMigrationsRoutes = (
   router: SecuritySolutionPluginRouter,
   logger: Logger
 ) => {
   registerSiemRuleMigrationsCreateRoute(router, logger);
+  registerSiemRuleMigrationsStatsAllRoute(router, logger);
+  registerSiemRuleMigrationsGetRoute(router, logger);
+  registerSiemRuleMigrationsStartRoute(router, logger);
+  registerSiemRuleMigrationsStatsRoute(router, logger);
+  registerSiemRuleMigrationsStopRoute(router, logger);
 };
diff --git a/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/api/start.ts b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/api/start.ts
new file mode 100644
index 0000000000000..f97a4f2ce2398
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/api/start.ts
@@ -0,0 +1,91 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { IKibanaResponse, Logger } from '@kbn/core/server';
+import { buildRouteValidationWithZod } from '@kbn/zod-helpers';
+import { APMTracer } from '@kbn/langchain/server/tracers/apm';
+import { getLangSmithTracer } from '@kbn/langchain/server/tracers/langsmith';
+import type { StartRuleMigrationResponse } from '../../../../../common/siem_migrations/model/api/rules/rules_migration.gen';
+import {
+  StartRuleMigrationRequestBody,
+  StartRuleMigrationRequestParams,
+} from '../../../../../common/siem_migrations/model/api/rules/rules_migration.gen';
+import { SIEM_RULE_MIGRATIONS_START_PATH } from '../../../../../common/siem_migrations/constants';
+import type { SecuritySolutionPluginRouter } from '../../../../types';
+
+export const registerSiemRuleMigrationsStartRoute = (
+  router: SecuritySolutionPluginRouter,
+  logger: Logger
+) => {
+  router.versioned
+    .put({
+      path: SIEM_RULE_MIGRATIONS_START_PATH,
+      access: 'internal',
+      security: { authz: { requiredPrivileges: ['securitySolution'] } },
+    })
+    .addVersion(
+      {
+        version: '1',
+        validate: {
+          request: {
+            params: buildRouteValidationWithZod(StartRuleMigrationRequestParams),
+            body: buildRouteValidationWithZod(StartRuleMigrationRequestBody),
+          },
+        },
+      },
+      async (context, req, res): Promise<IKibanaResponse<StartRuleMigrationResponse>> => {
+        const migrationId = req.params.migration_id;
+        const { langsmith_options: langsmithOptions, connector_id: connectorId } = req.body;
+
+        try {
+          const ctx = await context.resolve([
+            'core',
+            'actions',
+            'alerting',
+            'securitySolution',
+            'licensing',
+          ]);
+          if (!ctx.licensing.license.hasAtLeast('enterprise')) {
+            return res.forbidden({
+              body: 'You must have a trial or enterprise license to use this feature',
+            });
+          }
+
+          const ruleMigrationsClient = ctx.securitySolution.getSiemRuleMigrationsClient();
+          const inferenceClient = ctx.securitySolution.getInferenceClient();
+          const actionsClient = ctx.actions.getActionsClient();
+          const soClient = ctx.core.savedObjects.client;
+          const rulesClient = ctx.alerting.getRulesClient();
+
+          const invocationConfig = {
+            callbacks: [
+              new APMTracer({ projectName: langsmithOptions?.project_name ?? 'default' }, logger),
+              ...getLangSmithTracer({ ...langsmithOptions, logger }),
+            ],
+          };
+
+          const { exists, started } = await ruleMigrationsClient.task.start({
+            migrationId,
+            connectorId,
+            invocationConfig,
+            inferenceClient,
+            actionsClient,
+            soClient,
+            rulesClient,
+          });
+
+          if (!exists) {
+            return res.noContent();
+          }
+          return res.ok({ body: { started } });
+        } catch (err) {
+          logger.error(err);
+          return res.badRequest({ body: err.message });
+        }
+      }
+    );
+};
diff --git a/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/api/stats.ts b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/api/stats.ts
new file mode 100644
index 0000000000000..8316e01fc6a9b
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/api/stats.ts
@@ -0,0 +1,47 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { IKibanaResponse, Logger } from '@kbn/core/server';
+import { buildRouteValidationWithZod } from '@kbn/zod-helpers';
+import type { GetRuleMigrationStatsResponse } from '../../../../../common/siem_migrations/model/api/rules/rules_migration.gen';
+import { GetRuleMigrationStatsRequestParams } from '../../../../../common/siem_migrations/model/api/rules/rules_migration.gen';
+import { SIEM_RULE_MIGRATIONS_STATS_PATH } from '../../../../../common/siem_migrations/constants';
+import type { SecuritySolutionPluginRouter } from '../../../../types';
+
+export const registerSiemRuleMigrationsStatsRoute = (
+  router: SecuritySolutionPluginRouter,
+  logger: Logger
+) => {
+  router.versioned
+    .get({
+      path: SIEM_RULE_MIGRATIONS_STATS_PATH,
+      access: 'internal',
+      security: { authz: { requiredPrivileges: ['securitySolution'] } },
+    })
+    .addVersion(
+      {
+        version: '1',
+        validate: {
+          request: { params: buildRouteValidationWithZod(GetRuleMigrationStatsRequestParams) },
+        },
+      },
+      async (context, req, res): Promise<IKibanaResponse<GetRuleMigrationStatsResponse>> => {
+        const migrationId = req.params.migration_id;
+        try {
+          const ctx = await context.resolve(['securitySolution']);
+          const ruleMigrationsClient = ctx.securitySolution.getSiemRuleMigrationsClient();
+
+          const stats = await ruleMigrationsClient.task.getStats(migrationId);
+
+          return res.ok({ body: stats });
+        } catch (err) {
+          logger.error(err);
+          return res.badRequest({ body: err.message });
+        }
+      }
+    );
+};
diff --git a/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/api/stats_all.ts b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/api/stats_all.ts
new file mode 100644
index 0000000000000..dd2f2f503e19d
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/api/stats_all.ts
@@ -0,0 +1,39 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { IKibanaResponse, Logger } from '@kbn/core/server';
+import type { GetAllStatsRuleMigrationResponse } from '../../../../../common/siem_migrations/model/api/rules/rules_migration.gen';
+import { SIEM_RULE_MIGRATIONS_ALL_STATS_PATH } from '../../../../../common/siem_migrations/constants';
+import type { SecuritySolutionPluginRouter } from '../../../../types';
+
+export const registerSiemRuleMigrationsStatsAllRoute = (
+  router: SecuritySolutionPluginRouter,
+  logger: Logger
+) => {
+  router.versioned
+    .get({
+      path: SIEM_RULE_MIGRATIONS_ALL_STATS_PATH,
+      access: 'internal',
+      security: { authz: { requiredPrivileges: ['securitySolution'] } },
+    })
+    .addVersion(
+      { version: '1', validate: {} },
+      async (context, req, res): Promise<IKibanaResponse<GetAllStatsRuleMigrationResponse>> => {
+        try {
+          const ctx = await context.resolve(['securitySolution']);
+          const ruleMigrationsClient = ctx.securitySolution.getSiemRuleMigrationsClient();
+
+          const allStats = await ruleMigrationsClient.task.getAllStats();
+
+          return res.ok({ body: allStats });
+        } catch (err) {
+          logger.error(err);
+          return res.badRequest({ body: err.message });
+        }
+      }
+    );
+};
diff --git a/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/api/stop.ts b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/api/stop.ts
new file mode 100644
index 0000000000000..4767106910186
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/api/stop.ts
@@ -0,0 +1,50 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { IKibanaResponse, Logger } from '@kbn/core/server';
+import { buildRouteValidationWithZod } from '@kbn/zod-helpers';
+import type { StopRuleMigrationResponse } from '../../../../../common/siem_migrations/model/api/rules/rules_migration.gen';
+import { StopRuleMigrationRequestParams } from '../../../../../common/siem_migrations/model/api/rules/rules_migration.gen';
+import { SIEM_RULE_MIGRATIONS_STOP_PATH } from '../../../../../common/siem_migrations/constants';
+import type { SecuritySolutionPluginRouter } from '../../../../types';
+
+export const registerSiemRuleMigrationsStopRoute = (
+  router: SecuritySolutionPluginRouter,
+  logger: Logger
+) => {
+  router.versioned
+    .put({
+      path: SIEM_RULE_MIGRATIONS_STOP_PATH,
+      access: 'internal',
+      security: { authz: { requiredPrivileges: ['securitySolution'] } },
+    })
+    .addVersion(
+      {
+        version: '1',
+        validate: {
+          request: { params: buildRouteValidationWithZod(StopRuleMigrationRequestParams) },
+        },
+      },
+      async (context, req, res): Promise<IKibanaResponse<StopRuleMigrationResponse>> => {
+        const migrationId = req.params.migration_id;
+        try {
+          const ctx = await context.resolve(['securitySolution']);
+          const ruleMigrationsClient = ctx.securitySolution.getSiemRuleMigrationsClient();
+
+          const { exists, stopped } = await ruleMigrationsClient.task.stop(migrationId);
+
+          if (!exists) {
+            return res.noContent();
+          }
+          return res.ok({ body: { stopped } });
+        } catch (err) {
+          logger.error(err);
+          return res.badRequest({ body: err.message });
+        }
+      }
+    );
+};
diff --git a/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/data_stream/__mocks__/mocks.ts b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/data_stream/__mocks__/mocks.ts
index 103c0f9b0c952..1d9a181d2de5b 100644
--- a/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/data_stream/__mocks__/mocks.ts
+++ b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/data_stream/__mocks__/mocks.ts
@@ -7,9 +7,9 @@
 
 export const mockIndexName = 'mocked_data_stream_name';
 export const mockInstall = jest.fn().mockResolvedValue(undefined);
-export const mockInstallSpace = jest.fn().mockResolvedValue(mockIndexName);
+export const mockCreateClient = jest.fn().mockReturnValue({});
 
 export const MockRuleMigrationsDataStream = jest.fn().mockImplementation(() => ({
   install: mockInstall,
-  installSpace: mockInstallSpace,
+  createClient: mockCreateClient,
 }));
diff --git a/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/data_stream/rule_migrations_data_client.ts b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/data_stream/rule_migrations_data_client.ts
new file mode 100644
index 0000000000000..83808901a0bd1
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/data_stream/rule_migrations_data_client.ts
@@ -0,0 +1,275 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { AuthenticatedUser, ElasticsearchClient, Logger } from '@kbn/core/server';
+import assert from 'assert';
+import type {
+  AggregationsFilterAggregate,
+  AggregationsMaxAggregate,
+  AggregationsStringTermsAggregate,
+  AggregationsStringTermsBucket,
+  QueryDslQueryContainer,
+  SearchHit,
+  SearchResponse,
+} from '@elastic/elasticsearch/lib/api/types';
+import type { StoredRuleMigration } from '../types';
+import { SiemMigrationStatus } from '../../../../../common/siem_migrations/constants';
+import type {
+  RuleMigration,
+  RuleMigrationTaskStats,
+} from '../../../../../common/siem_migrations/model/rule_migration.gen';
+
+export type CreateRuleMigrationInput = Omit<RuleMigration, '@timestamp' | 'status' | 'created_by'>;
+export type RuleMigrationDataStats = Omit<RuleMigrationTaskStats, 'status'>;
+export type RuleMigrationAllDataStats = Array<RuleMigrationDataStats & { migration_id: string }>;
+
+export class RuleMigrationsDataClient {
+  constructor(
+    private dataStreamNamePromise: Promise<string>,
+    private currentUser: AuthenticatedUser,
+    private esClient: ElasticsearchClient,
+    private logger: Logger
+  ) {}
+
+  /** Indexes an array of rule migrations to be processed */
+  async create(ruleMigrations: CreateRuleMigrationInput[]): Promise<void> {
+    const index = await this.dataStreamNamePromise;
+    await this.esClient
+      .bulk({
+        refresh: 'wait_for',
+        operations: ruleMigrations.flatMap((ruleMigration) => [
+          { create: { _index: index } },
+          {
+            ...ruleMigration,
+            '@timestamp': new Date().toISOString(),
+            status: SiemMigrationStatus.PENDING,
+            created_by: this.currentUser.username,
+          },
+        ]),
+      })
+      .catch((error) => {
+        this.logger.error(`Error creating rule migrations: ${error.message}`);
+        throw error;
+      });
+  }
+
+  /** Retrieves an array of rule documents of a specific migrations */
+  async getRules(migrationId: string): Promise<StoredRuleMigration[]> {
+    const index = await this.dataStreamNamePromise;
+    const query = this.getFilterQuery(migrationId);
+
+    const storedRuleMigrations = await this.esClient
+      .search<RuleMigration>({ index, query, sort: '_doc' })
+      .catch((error) => {
+        this.logger.error(`Error searching getting rule migrations: ${error.message}`);
+        throw error;
+      })
+      .then((response) => this.processHits(response.hits.hits));
+    return storedRuleMigrations;
+  }
+
+  /**
+   * Retrieves `pending` rule migrations with the provided id and updates their status to `processing`.
+   * This operation is not atomic at migration level:
+   * - Multiple tasks can process different migrations simultaneously.
+   * - Multiple tasks should not process the same migration simultaneously.
+   */
+  async takePending(migrationId: string, size: number): Promise<StoredRuleMigration[]> {
+    const index = await this.dataStreamNamePromise;
+    const query = this.getFilterQuery(migrationId, SiemMigrationStatus.PENDING);
+
+    const storedRuleMigrations = await this.esClient
+      .search<RuleMigration>({ index, query, sort: '_doc', size })
+      .catch((error) => {
+        this.logger.error(`Error searching for rule migrations: ${error.message}`);
+        throw error;
+      })
+      .then((response) =>
+        this.processHits(response.hits.hits, { status: SiemMigrationStatus.PROCESSING })
+      );
+
+    await this.esClient
+      .bulk({
+        refresh: 'wait_for',
+        operations: storedRuleMigrations.flatMap(({ _id, _index, status }) => [
+          { update: { _id, _index } },
+          {
+            doc: {
+              status,
+              updated_by: this.currentUser.username,
+              updated_at: new Date().toISOString(),
+            },
+          },
+        ]),
+      })
+      .catch((error) => {
+        this.logger.error(
+          `Error updating for rule migrations status to processing: ${error.message}`
+        );
+        throw error;
+      });
+
+    return storedRuleMigrations;
+  }
+
+  /** Updates one rule migration with the provided data and sets the status to `completed` */
+  async saveFinished({ _id, _index, ...ruleMigration }: StoredRuleMigration): Promise<void> {
+    const doc = {
+      ...ruleMigration,
+      status: SiemMigrationStatus.COMPLETED,
+      updated_by: this.currentUser.username,
+      updated_at: new Date().toISOString(),
+    };
+    await this.esClient
+      .update({ index: _index, id: _id, doc, refresh: 'wait_for' })
+      .catch((error) => {
+        this.logger.error(`Error updating rule migration status to completed: ${error.message}`);
+        throw error;
+      });
+  }
+
+  /** Updates one rule migration with the provided data and sets the status to `failed` */
+  async saveError({ _id, _index, ...ruleMigration }: StoredRuleMigration): Promise<void> {
+    const doc = {
+      ...ruleMigration,
+      status: SiemMigrationStatus.FAILED,
+      updated_by: this.currentUser.username,
+      updated_at: new Date().toISOString(),
+    };
+    await this.esClient
+      .update({ index: _index, id: _id, doc, refresh: 'wait_for' })
+      .catch((error) => {
+        this.logger.error(`Error updating rule migration status to completed: ${error.message}`);
+        throw error;
+      });
+  }
+
+  /** Updates all the rule migration with the provided id with status `processing` back to `pending` */
+  async releaseProcessing(migrationId: string): Promise<void> {
+    const index = await this.dataStreamNamePromise;
+    const query = this.getFilterQuery(migrationId, SiemMigrationStatus.PROCESSING);
+    const script = { source: `ctx._source['status'] = '${SiemMigrationStatus.PENDING}'` };
+    await this.esClient.updateByQuery({ index, query, script, refresh: false }).catch((error) => {
+      this.logger.error(`Error releasing rule migrations status to pending: ${error.message}`);
+      throw error;
+    });
+  }
+
+  /** Updates all the rule migration with the provided id with status `processing` or `failed` back to `pending` */
+  async releaseProcessable(migrationId: string): Promise<void> {
+    const index = await this.dataStreamNamePromise;
+    const query = this.getFilterQuery(migrationId, [
+      SiemMigrationStatus.PROCESSING,
+      SiemMigrationStatus.FAILED,
+    ]);
+    const script = { source: `ctx._source['status'] = '${SiemMigrationStatus.PENDING}'` };
+    await this.esClient.updateByQuery({ index, query, script, refresh: true }).catch((error) => {
+      this.logger.error(`Error releasing rule migrations status to pending: ${error.message}`);
+      throw error;
+    });
+  }
+
+  /** Retrieves the stats for the rule migrations with the provided id */
+  async getStats(migrationId: string): Promise<RuleMigrationDataStats> {
+    const index = await this.dataStreamNamePromise;
+    const query = this.getFilterQuery(migrationId);
+    const aggregations = {
+      pending: { filter: { term: { status: SiemMigrationStatus.PENDING } } },
+      processing: { filter: { term: { status: SiemMigrationStatus.PROCESSING } } },
+      completed: { filter: { term: { status: SiemMigrationStatus.COMPLETED } } },
+      failed: { filter: { term: { status: SiemMigrationStatus.FAILED } } },
+      lastUpdatedAt: { max: { field: 'updated_at' } },
+    };
+    const result = await this.esClient
+      .search({ index, query, aggregations, _source: false })
+      .catch((error) => {
+        this.logger.error(`Error getting rule migrations stats: ${error.message}`);
+        throw error;
+      });
+
+    const { pending, processing, completed, lastUpdatedAt, failed } = result.aggregations ?? {};
+    return {
+      rules: {
+        total: this.getTotalHits(result),
+        pending: (pending as AggregationsFilterAggregate)?.doc_count ?? 0,
+        processing: (processing as AggregationsFilterAggregate)?.doc_count ?? 0,
+        completed: (completed as AggregationsFilterAggregate)?.doc_count ?? 0,
+        failed: (failed as AggregationsFilterAggregate)?.doc_count ?? 0,
+      },
+      last_updated_at: (lastUpdatedAt as AggregationsMaxAggregate)?.value_as_string,
+    };
+  }
+
+  /** Retrieves the stats for all the rule migrations aggregated by migration id */
+  async getAllStats(): Promise<RuleMigrationAllDataStats> {
+    const index = await this.dataStreamNamePromise;
+    const aggregations = {
+      migrationIds: {
+        terms: { field: 'migration_id' },
+        aggregations: {
+          pending: { filter: { term: { status: SiemMigrationStatus.PENDING } } },
+          processing: { filter: { term: { status: SiemMigrationStatus.PROCESSING } } },
+          completed: { filter: { term: { status: SiemMigrationStatus.COMPLETED } } },
+          failed: { filter: { term: { status: SiemMigrationStatus.FAILED } } },
+          lastUpdatedAt: { max: { field: 'updated_at' } },
+        },
+      },
+    };
+    const result = await this.esClient
+      .search({ index, aggregations, _source: false })
+      .catch((error) => {
+        this.logger.error(`Error getting all rule migrations stats: ${error.message}`);
+        throw error;
+      });
+
+    const migrationsAgg = result.aggregations?.migrationIds as AggregationsStringTermsAggregate;
+    const buckets = (migrationsAgg?.buckets as AggregationsStringTermsBucket[]) ?? [];
+    return buckets.map((bucket) => ({
+      migration_id: bucket.key,
+      rules: {
+        total: bucket.doc_count,
+        pending: bucket.pending?.doc_count ?? 0,
+        processing: bucket.processing?.doc_count ?? 0,
+        completed: bucket.completed?.doc_count ?? 0,
+        failed: bucket.failed?.doc_count ?? 0,
+      },
+      last_updated_at: bucket.lastUpdatedAt?.value_as_string,
+    }));
+  }
+
+  private getFilterQuery(
+    migrationId: string,
+    status?: SiemMigrationStatus | SiemMigrationStatus[]
+  ): QueryDslQueryContainer {
+    const filter: QueryDslQueryContainer[] = [{ term: { migration_id: migrationId } }];
+    if (status) {
+      if (Array.isArray(status)) {
+        filter.push({ terms: { status } });
+      } else {
+        filter.push({ term: { status } });
+      }
+    }
+    return { bool: { filter } };
+  }
+
+  private processHits(
+    hits: Array<SearchHit<RuleMigration>>,
+    override: Partial<RuleMigration> = {}
+  ): StoredRuleMigration[] {
+    return hits.map(({ _id, _index, _source }) => {
+      assert(_id, 'RuleMigration document should have _id');
+      assert(_source, 'RuleMigration document should have _source');
+      return { ..._source, ...override, _id, _index };
+    });
+  }
+
+  private getTotalHits(response: SearchResponse) {
+    return typeof response.hits.total === 'number'
+      ? response.hits.total
+      : response.hits.total?.value ?? 0;
+  }
+}
diff --git a/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/data_stream/rule_migrations_data_stream.test.ts b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/data_stream/rule_migrations_data_stream.test.ts
index 56510da48f1bb..467d26a380945 100644
--- a/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/data_stream/rule_migrations_data_stream.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/data_stream/rule_migrations_data_stream.test.ts
@@ -11,9 +11,19 @@ import type { InstallParams } from '@kbn/data-stream-adapter';
 import { DataStreamSpacesAdapter } from '@kbn/data-stream-adapter';
 import { elasticsearchServiceMock } from '@kbn/core-elasticsearch-server-mocks';
 import { loggerMock } from '@kbn/logging-mocks';
+import { loggingSystemMock } from '@kbn/core-logging-server-mocks';
+import { securityServiceMock } from '@kbn/core-security-server-mocks';
 
 jest.mock('@kbn/data-stream-adapter');
 
+// This mock is required to have a way to await the data stream name promise
+const mockDataStreamNamePromise = jest.fn();
+jest.mock('./rule_migrations_data_client', () => ({
+  RuleMigrationsDataClient: jest.fn((dataStreamNamePromise: Promise<string>) => {
+    mockDataStreamNamePromise.mockReturnValue(dataStreamNamePromise);
+  }),
+}));
+
 const MockedDataStreamSpacesAdapter = DataStreamSpacesAdapter as unknown as jest.MockedClass<
   typeof DataStreamSpacesAdapter
 >;
@@ -21,18 +31,21 @@ const MockedDataStreamSpacesAdapter = DataStreamSpacesAdapter as unknown as jest
 const esClient = elasticsearchServiceMock.createStart().client.asInternalUser;
 
 describe('SiemRuleMigrationsDataStream', () => {
+  const kibanaVersion = '8.16.0';
+  const logger = loggingSystemMock.createLogger();
+
   beforeEach(() => {
     jest.clearAllMocks();
   });
 
   describe('constructor', () => {
     it('should create DataStreamSpacesAdapter', () => {
-      new RuleMigrationsDataStream({ kibanaVersion: '8.13.0' });
+      new RuleMigrationsDataStream(logger, kibanaVersion);
       expect(MockedDataStreamSpacesAdapter).toHaveBeenCalledTimes(1);
     });
 
     it('should create component templates', () => {
-      new RuleMigrationsDataStream({ kibanaVersion: '8.13.0' });
+      new RuleMigrationsDataStream(logger, kibanaVersion);
       const [dataStreamSpacesAdapter] = MockedDataStreamSpacesAdapter.mock.instances;
       expect(dataStreamSpacesAdapter.setComponentTemplate).toHaveBeenCalledWith(
         expect.objectContaining({ name: '.kibana.siem-rule-migrations' })
@@ -40,7 +53,7 @@ describe('SiemRuleMigrationsDataStream', () => {
     });
 
     it('should create index templates', () => {
-      new RuleMigrationsDataStream({ kibanaVersion: '8.13.0' });
+      new RuleMigrationsDataStream(logger, kibanaVersion);
       const [dataStreamSpacesAdapter] = MockedDataStreamSpacesAdapter.mock.instances;
       expect(dataStreamSpacesAdapter.setIndexTemplate).toHaveBeenCalledWith(
         expect.objectContaining({ name: '.kibana.siem-rule-migrations' })
@@ -50,22 +63,20 @@ describe('SiemRuleMigrationsDataStream', () => {
 
   describe('install', () => {
     it('should install data stream', async () => {
-      const dataStream = new RuleMigrationsDataStream({ kibanaVersion: '8.13.0' });
-      const params: InstallParams = {
+      const dataStream = new RuleMigrationsDataStream(logger, kibanaVersion);
+      const params: Omit<InstallParams, 'logger'> = {
         esClient,
-        logger: loggerMock.create(),
         pluginStop$: new Subject(),
       };
       await dataStream.install(params);
       const [dataStreamSpacesAdapter] = MockedDataStreamSpacesAdapter.mock.instances;
-      expect(dataStreamSpacesAdapter.install).toHaveBeenCalledWith(params);
+      expect(dataStreamSpacesAdapter.install).toHaveBeenCalledWith(expect.objectContaining(params));
     });
 
     it('should log error', async () => {
-      const dataStream = new RuleMigrationsDataStream({ kibanaVersion: '8.13.0' });
-      const params: InstallParams = {
+      const dataStream = new RuleMigrationsDataStream(logger, kibanaVersion);
+      const params: Omit<InstallParams, 'logger'> = {
         esClient,
-        logger: loggerMock.create(),
         pluginStop$: new Subject(),
       };
       const [dataStreamSpacesAdapter] = MockedDataStreamSpacesAdapter.mock.instances;
@@ -73,13 +84,16 @@ describe('SiemRuleMigrationsDataStream', () => {
       (dataStreamSpacesAdapter.install as jest.Mock).mockRejectedValueOnce(error);
 
       await dataStream.install(params);
-      expect(params.logger.error).toHaveBeenCalledWith(expect.any(String), error);
+      expect(logger.error).toHaveBeenCalledWith(expect.any(String), error);
     });
   });
 
-  describe('installSpace', () => {
+  describe('createClient', () => {
+    const currentUser = securityServiceMock.createMockAuthenticatedUser();
+    const createClientParams = { spaceId: 'space1', currentUser, esClient };
+
     it('should install space data stream', async () => {
-      const dataStream = new RuleMigrationsDataStream({ kibanaVersion: '8.13.0' });
+      const dataStream = new RuleMigrationsDataStream(logger, kibanaVersion);
       const params: InstallParams = {
         esClient,
         logger: loggerMock.create(),
@@ -89,19 +103,23 @@ describe('SiemRuleMigrationsDataStream', () => {
       (dataStreamSpacesAdapter.install as jest.Mock).mockResolvedValueOnce(undefined);
 
       await dataStream.install(params);
-      await dataStream.installSpace('space1');
+      dataStream.createClient(createClientParams);
+      await mockDataStreamNamePromise();
 
       expect(dataStreamSpacesAdapter.getInstalledSpaceName).toHaveBeenCalledWith('space1');
       expect(dataStreamSpacesAdapter.installSpace).toHaveBeenCalledWith('space1');
     });
 
     it('should not install space data stream if install not executed', async () => {
-      const dataStream = new RuleMigrationsDataStream({ kibanaVersion: '8.13.0' });
-      await expect(dataStream.installSpace('space1')).rejects.toThrowError();
+      const dataStream = new RuleMigrationsDataStream(logger, kibanaVersion);
+      await expect(async () => {
+        dataStream.createClient(createClientParams);
+        await mockDataStreamNamePromise();
+      }).rejects.toThrowError();
     });
 
     it('should throw error if main install had error', async () => {
-      const dataStream = new RuleMigrationsDataStream({ kibanaVersion: '8.13.0' });
+      const dataStream = new RuleMigrationsDataStream(logger, kibanaVersion);
       const params: InstallParams = {
         esClient,
         logger: loggerMock.create(),
@@ -112,7 +130,10 @@ describe('SiemRuleMigrationsDataStream', () => {
       (dataStreamSpacesAdapter.install as jest.Mock).mockRejectedValueOnce(error);
       await dataStream.install(params);
 
-      await expect(dataStream.installSpace('space1')).rejects.toThrowError(error);
+      await expect(async () => {
+        dataStream.createClient(createClientParams);
+        await mockDataStreamNamePromise();
+      }).rejects.toThrowError(error);
     });
   });
 });
diff --git a/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/data_stream/rule_migrations_data_stream.ts b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/data_stream/rule_migrations_data_stream.ts
index 83eb471e0cee3..a5855cefb1324 100644
--- a/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/data_stream/rule_migrations_data_stream.ts
+++ b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/data_stream/rule_migrations_data_stream.ts
@@ -6,51 +6,69 @@
  */
 
 import { DataStreamSpacesAdapter, type InstallParams } from '@kbn/data-stream-adapter';
+import type { AuthenticatedUser, ElasticsearchClient, Logger } from '@kbn/core/server';
 import { ruleMigrationsFieldMap } from './rule_migrations_field_map';
+import { RuleMigrationsDataClient } from './rule_migrations_data_client';
 
 const TOTAL_FIELDS_LIMIT = 2500;
 
 const DATA_STREAM_NAME = '.kibana.siem-rule-migrations';
-const ECS_COMPONENT_TEMPLATE_NAME = 'ecs';
+
+interface RuleMigrationsDataStreamCreateClientParams {
+  spaceId: string;
+  currentUser: AuthenticatedUser;
+  esClient: ElasticsearchClient;
+}
 
 export class RuleMigrationsDataStream {
-  private readonly dataStream: DataStreamSpacesAdapter;
+  private readonly dataStreamAdapter: DataStreamSpacesAdapter;
   private installPromise?: Promise<void>;
 
-  constructor({ kibanaVersion }: { kibanaVersion: string }) {
-    this.dataStream = new DataStreamSpacesAdapter(DATA_STREAM_NAME, {
+  constructor(private logger: Logger, kibanaVersion: string) {
+    this.dataStreamAdapter = new DataStreamSpacesAdapter(DATA_STREAM_NAME, {
       kibanaVersion,
       totalFieldsLimit: TOTAL_FIELDS_LIMIT,
     });
-    this.dataStream.setComponentTemplate({
+    this.dataStreamAdapter.setComponentTemplate({
       name: DATA_STREAM_NAME,
       fieldMap: ruleMigrationsFieldMap,
     });
 
-    this.dataStream.setIndexTemplate({
+    this.dataStreamAdapter.setIndexTemplate({
       name: DATA_STREAM_NAME,
-      componentTemplateRefs: [DATA_STREAM_NAME, ECS_COMPONENT_TEMPLATE_NAME],
+      componentTemplateRefs: [DATA_STREAM_NAME],
     });
   }
 
-  async install(params: InstallParams) {
+  async install(params: Omit<InstallParams, 'logger'>) {
     try {
-      this.installPromise = this.dataStream.install(params);
+      this.installPromise = this.dataStreamAdapter.install({ ...params, logger: this.logger });
       await this.installPromise;
     } catch (err) {
-      params.logger.error(`Error installing siem rule migrations data stream. ${err.message}`, err);
+      this.logger.error(`Error installing siem rule migrations data stream. ${err.message}`, err);
     }
   }
 
-  async installSpace(spaceId: string): Promise<string> {
+  createClient({
+    spaceId,
+    currentUser,
+    esClient,
+  }: RuleMigrationsDataStreamCreateClientParams): RuleMigrationsDataClient {
+    const dataStreamNamePromise = this.installSpace(spaceId);
+    return new RuleMigrationsDataClient(dataStreamNamePromise, currentUser, esClient, this.logger);
+  }
+
+  // Installs the data stream for the specific space. it will only install if it hasn't been installed yet.
+  // The adapter stores the data stream name promise, it will return it directly when the data stream is known to be installed.
+  private async installSpace(spaceId: string): Promise<string> {
     if (!this.installPromise) {
       throw new Error('Siem rule migrations data stream not installed');
     }
     // wait for install to complete, may reject if install failed, routes should handle this
     await this.installPromise;
-    let dataStreamName = await this.dataStream.getInstalledSpaceName(spaceId);
+    let dataStreamName = await this.dataStreamAdapter.getInstalledSpaceName(spaceId);
     if (!dataStreamName) {
-      dataStreamName = await this.dataStream.installSpace(spaceId);
+      dataStreamName = await this.dataStreamAdapter.installSpace(spaceId);
     }
     return dataStreamName;
   }
diff --git a/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/data_stream/rule_migrations_field_map.ts b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/data_stream/rule_migrations_field_map.ts
index ba9a706957bcb..a65cd45b832e9 100644
--- a/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/data_stream/rule_migrations_field_map.ts
+++ b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/data_stream/rule_migrations_field_map.ts
@@ -11,6 +11,7 @@ import type { RuleMigration } from '../../../../../common/siem_migrations/model/
 export const ruleMigrationsFieldMap: FieldMap<SchemaFieldMapKeys<RuleMigration>> = {
   '@timestamp': { type: 'date', required: false },
   migration_id: { type: 'keyword', required: true },
+  created_by: { type: 'keyword', required: true },
   status: { type: 'keyword', required: true },
   original_rule: { type: 'nested', required: true },
   'original_rule.vendor': { type: 'keyword', required: true },
@@ -28,7 +29,7 @@ export const ruleMigrationsFieldMap: FieldMap<SchemaFieldMapKeys<RuleMigration>>
   'elastic_rule.severity': { type: 'keyword', required: false },
   'elastic_rule.prebuilt_rule_id': { type: 'keyword', required: false },
   'elastic_rule.id': { type: 'keyword', required: false },
-  translation_state: { type: 'keyword', required: false },
+  translation_result: { type: 'keyword', required: false },
   comments: { type: 'text', array: true, required: false },
   updated_at: { type: 'date', required: false },
   updated_by: { type: 'keyword', required: false },
diff --git a/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/siem_rule_migrations_service.test.ts b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/siem_rule_migrations_service.test.ts
index 390d302264cea..5c611d85e0464 100644
--- a/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/siem_rule_migrations_service.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/siem_rule_migrations_service.test.ts
@@ -8,25 +8,28 @@ import {
   loggingSystemMock,
   elasticsearchServiceMock,
   httpServerMock,
+  securityServiceMock,
 } from '@kbn/core/server/mocks';
 import { SiemRuleMigrationsService } from './siem_rule_migrations_service';
 import { Subject } from 'rxjs';
-import type { RuleMigration } from '../../../../common/siem_migrations/model/rule_migration.gen';
 import {
   MockRuleMigrationsDataStream,
   mockInstall,
-  mockInstallSpace,
-  mockIndexName,
+  mockCreateClient,
 } from './data_stream/__mocks__/mocks';
-import type { KibanaRequest } from '@kbn/core/server';
+import type { SiemRuleMigrationsCreateClientParams } from './types';
 
 jest.mock('./data_stream/rule_migrations_data_stream');
+jest.mock('./task/rule_migrations_task_runner', () => ({
+  RuleMigrationsTaskRunner: jest.fn(),
+}));
 
 describe('SiemRuleMigrationsService', () => {
   let ruleMigrationsService: SiemRuleMigrationsService;
   const kibanaVersion = '8.16.0';
 
   const esClusterClient = elasticsearchServiceMock.createClusterClient();
+  const currentUser = securityServiceMock.createMockAuthenticatedUser();
   const logger = loggingSystemMock.createLogger();
   const pluginStop$ = new Subject<void>();
 
@@ -36,7 +39,7 @@ describe('SiemRuleMigrationsService', () => {
   });
 
   it('should instantiate the rule migrations data stream adapter', () => {
-    expect(MockRuleMigrationsDataStream).toHaveBeenCalledWith({ kibanaVersion });
+    expect(MockRuleMigrationsDataStream).toHaveBeenCalledWith(logger, kibanaVersion);
   });
 
   describe('when setup is called', () => {
@@ -45,22 +48,26 @@ describe('SiemRuleMigrationsService', () => {
 
       expect(mockInstall).toHaveBeenCalledWith({
         esClient: esClusterClient.asInternalUser,
-        logger,
         pluginStop$,
       });
     });
   });
 
-  describe('when getClient is called', () => {
-    let request: KibanaRequest;
+  describe('when createClient is called', () => {
+    let createClientParams: SiemRuleMigrationsCreateClientParams;
+
     beforeEach(() => {
-      request = httpServerMock.createKibanaRequest();
+      createClientParams = {
+        spaceId: 'default',
+        currentUser,
+        request: httpServerMock.createKibanaRequest(),
+      };
     });
 
     describe('without setup', () => {
       it('should throw an error', () => {
         expect(() => {
-          ruleMigrationsService.getClient({ spaceId: 'default', request });
+          ruleMigrationsService.createClient(createClientParams);
         }).toThrowError('ES client not available, please call setup first');
       });
     });
@@ -71,44 +78,19 @@ describe('SiemRuleMigrationsService', () => {
       });
 
       it('should call installSpace', () => {
-        ruleMigrationsService.getClient({ spaceId: 'default', request });
-
-        expect(mockInstallSpace).toHaveBeenCalledWith('default');
-      });
-
-      it('should return a client with create and search methods after setup', () => {
-        const client = ruleMigrationsService.getClient({ spaceId: 'default', request });
-
-        expect(client).toHaveProperty('create');
-        expect(client).toHaveProperty('search');
+        ruleMigrationsService.createClient(createClientParams);
+        expect(mockCreateClient).toHaveBeenCalledWith({
+          spaceId: createClientParams.spaceId,
+          currentUser: createClientParams.currentUser,
+          esClient: esClusterClient.asScoped().asCurrentUser,
+        });
       });
 
-      it('should call ES bulk create API with the correct parameters with create is called', async () => {
-        const client = ruleMigrationsService.getClient({ spaceId: 'default', request });
-
-        const ruleMigrations = [{ migration_id: 'dummy_migration_id' } as RuleMigration];
-        await client.create(ruleMigrations);
-
-        expect(esClusterClient.asScoped().asCurrentUser.bulk).toHaveBeenCalledWith(
-          expect.objectContaining({
-            body: [{ create: { _index: mockIndexName } }, { migration_id: 'dummy_migration_id' }],
-            refresh: 'wait_for',
-          })
-        );
-      });
-
-      it('should call ES search API with the correct parameters with search is called', async () => {
-        const client = ruleMigrationsService.getClient({ spaceId: 'default', request });
-
-        const term = { migration_id: 'dummy_migration_id' };
-        await client.search(term);
+      it('should return data and task clients', () => {
+        const client = ruleMigrationsService.createClient(createClientParams);
 
-        expect(esClusterClient.asScoped().asCurrentUser.search).toHaveBeenCalledWith(
-          expect.objectContaining({
-            index: mockIndexName,
-            body: { query: { term } },
-          })
-        );
+        expect(client).toHaveProperty('data');
+        expect(client).toHaveProperty('task');
       });
     });
   });
diff --git a/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/siem_rule_migrations_service.ts b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/siem_rule_migrations_service.ts
index 5b20f957cb6fa..1bf9dcf11fd95 100644
--- a/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/siem_rule_migrations_service.ts
+++ b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/siem_rule_migrations_service.ts
@@ -5,52 +5,67 @@
  * 2.0.
  */
 
+import assert from 'assert';
 import type { IClusterClient, Logger } from '@kbn/core/server';
 import { RuleMigrationsDataStream } from './data_stream/rule_migrations_data_stream';
 import type {
-  SiemRuleMigrationsClient,
   SiemRulesMigrationsSetupParams,
-  SiemRuleMigrationsGetClientParams,
+  SiemRuleMigrationsCreateClientParams,
+  SiemRuleMigrationsClient,
 } from './types';
+import { RuleMigrationsTaskRunner } from './task/rule_migrations_task_runner';
 
 export class SiemRuleMigrationsService {
-  private dataStreamAdapter: RuleMigrationsDataStream;
+  private rulesDataStream: RuleMigrationsDataStream;
   private esClusterClient?: IClusterClient;
+  private taskRunner: RuleMigrationsTaskRunner;
 
   constructor(private logger: Logger, kibanaVersion: string) {
-    this.dataStreamAdapter = new RuleMigrationsDataStream({ kibanaVersion });
+    this.rulesDataStream = new RuleMigrationsDataStream(this.logger, kibanaVersion);
+    this.taskRunner = new RuleMigrationsTaskRunner(this.logger);
   }
 
   setup({ esClusterClient, ...params }: SiemRulesMigrationsSetupParams) {
     this.esClusterClient = esClusterClient;
     const esClient = esClusterClient.asInternalUser;
-    this.dataStreamAdapter.install({ ...params, esClient, logger: this.logger }).catch((err) => {
+
+    this.rulesDataStream.install({ ...params, esClient }).catch((err) => {
       this.logger.error(`Error installing data stream for rule migrations: ${err.message}`);
       throw err;
     });
   }
 
-  getClient({ spaceId, request }: SiemRuleMigrationsGetClientParams): SiemRuleMigrationsClient {
-    if (!this.esClusterClient) {
-      throw new Error('ES client not available, please call setup first');
-    }
-    // Installs the data stream for the specific space. it will only install if it hasn't been installed yet.
-    // The adapter stores the data stream name promise, it will return it directly when the data stream is known to be installed.
-    const dataStreamNamePromise = this.dataStreamAdapter.installSpace(spaceId);
+  createClient({
+    spaceId,
+    currentUser,
+    request,
+  }: SiemRuleMigrationsCreateClientParams): SiemRuleMigrationsClient {
+    assert(currentUser, 'Current user must be authenticated');
+    assert(this.esClusterClient, 'ES client not available, please call setup first');
 
     const esClient = this.esClusterClient.asScoped(request).asCurrentUser;
+    const dataClient = this.rulesDataStream.createClient({ spaceId, currentUser, esClient });
+
     return {
-      create: async (ruleMigrations) => {
-        const _index = await dataStreamNamePromise;
-        return esClient.bulk({
-          refresh: 'wait_for',
-          body: ruleMigrations.flatMap((ruleMigration) => [{ create: { _index } }, ruleMigration]),
-        });
-      },
-      search: async (term) => {
-        const index = await dataStreamNamePromise;
-        return esClient.search({ index, body: { query: { term } } });
+      data: dataClient,
+      task: {
+        start: (params) => {
+          return this.taskRunner.start({ ...params, currentUser, dataClient });
+        },
+        stop: (migrationId) => {
+          return this.taskRunner.stop({ migrationId, dataClient });
+        },
+        getStats: async (migrationId) => {
+          return this.taskRunner.getStats({ migrationId, dataClient });
+        },
+        getAllStats: async () => {
+          return this.taskRunner.getAllStats({ dataClient });
+        },
       },
     };
   }
+
+  stop() {
+    this.taskRunner.stopAll();
+  }
 }
diff --git a/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/agent/graph.ts b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/agent/graph.ts
new file mode 100644
index 0000000000000..a44197d82850f
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/agent/graph.ts
@@ -0,0 +1,43 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { END, START, StateGraph } from '@langchain/langgraph';
+import { migrateRuleState } from './state';
+import type { MigrateRuleGraphParams, MigrateRuleState } from './types';
+import { getTranslateQueryNode } from './nodes/translate_query';
+import { getMatchPrebuiltRuleNode } from './nodes/match_prebuilt_rule';
+
+export function getRuleMigrationAgent({
+  model,
+  inferenceClient,
+  prebuiltRulesMap,
+  connectorId,
+  logger,
+}: MigrateRuleGraphParams) {
+  const matchPrebuiltRuleNode = getMatchPrebuiltRuleNode({ model, prebuiltRulesMap, logger });
+  const translationNode = getTranslateQueryNode({ inferenceClient, connectorId, logger });
+
+  const translateRuleGraph = new StateGraph(migrateRuleState)
+    // Nodes
+    .addNode('matchPrebuiltRule', matchPrebuiltRuleNode)
+    .addNode('translation', translationNode)
+    // Edges
+    .addEdge(START, 'matchPrebuiltRule')
+    .addConditionalEdges('matchPrebuiltRule', matchedPrebuiltRuleConditional)
+    .addEdge('translation', END);
+
+  const graph = translateRuleGraph.compile();
+  graph.name = 'Rule Migration Graph'; // Customizes the name displayed in LangSmith
+  return graph;
+}
+
+const matchedPrebuiltRuleConditional = (state: MigrateRuleState) => {
+  if (state.elastic_rule?.prebuilt_rule_id) {
+    return END;
+  }
+  return 'translation';
+};
diff --git a/x-pack/test/alerting_api_integration/observability/custom_threshold_rule/constants.ts b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/agent/index.ts
similarity index 76%
rename from x-pack/test/alerting_api_integration/observability/custom_threshold_rule/constants.ts
rename to x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/agent/index.ts
index 5cf1e0b4d6614..febf5fc85f5a0 100644
--- a/x-pack/test/alerting_api_integration/observability/custom_threshold_rule/constants.ts
+++ b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/agent/index.ts
@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export const ISO_DATE_REGEX = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/;
+export { getRuleMigrationAgent } from './graph';
diff --git a/x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/constants.ts b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/agent/nodes/match_prebuilt_rule/index.ts
similarity index 76%
rename from x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/constants.ts
rename to x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/agent/nodes/match_prebuilt_rule/index.ts
index 5cf1e0b4d6614..2d8b81d00eafb 100644
--- a/x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/constants.ts
+++ b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/agent/nodes/match_prebuilt_rule/index.ts
@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export const ISO_DATE_REGEX = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/;
+export { getMatchPrebuiltRuleNode } from './match_prebuilt_rule';
diff --git a/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/agent/nodes/match_prebuilt_rule/match_prebuilt_rule.ts b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/agent/nodes/match_prebuilt_rule/match_prebuilt_rule.ts
new file mode 100644
index 0000000000000..4a0404acf653d
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/agent/nodes/match_prebuilt_rule/match_prebuilt_rule.ts
@@ -0,0 +1,59 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { Logger } from '@kbn/core/server';
+import { StringOutputParser } from '@langchain/core/output_parsers';
+import type { ChatModel } from '../../../util/actions_client_chat';
+import type { GraphNode } from '../../types';
+import { filterPrebuiltRules, type PrebuiltRulesMapByName } from '../../../util/prebuilt_rules';
+import { MATCH_PREBUILT_RULE_PROMPT } from './prompts';
+
+interface GetMatchPrebuiltRuleNodeParams {
+  model: ChatModel;
+  prebuiltRulesMap: PrebuiltRulesMapByName;
+  logger: Logger;
+}
+
+export const getMatchPrebuiltRuleNode =
+  ({ model, prebuiltRulesMap }: GetMatchPrebuiltRuleNodeParams): GraphNode =>
+  async (state) => {
+    const mitreAttackIds = state.original_rule.mitre_attack_ids;
+    if (!mitreAttackIds?.length) {
+      return {};
+    }
+    const filteredPrebuiltRulesMap = filterPrebuiltRules(prebuiltRulesMap, mitreAttackIds);
+    if (filteredPrebuiltRulesMap.size === 0) {
+      return {};
+    }
+
+    const outputParser = new StringOutputParser();
+    const matchPrebuiltRule = MATCH_PREBUILT_RULE_PROMPT.pipe(model).pipe(outputParser);
+
+    const elasticSecurityRules = Array(filteredPrebuiltRulesMap.keys()).join('\n');
+    const response = await matchPrebuiltRule.invoke({
+      elasticSecurityRules,
+      ruleTitle: state.original_rule.title,
+    });
+    const cleanResponse = response.trim();
+    if (cleanResponse === 'no_match') {
+      return {};
+    }
+
+    const result = filteredPrebuiltRulesMap.get(cleanResponse);
+    if (result != null) {
+      return {
+        elastic_rule: {
+          title: result.rule.name,
+          description: result.rule.description,
+          prebuilt_rule_id: result.rule.rule_id,
+          id: result.installedRuleId,
+        },
+      };
+    }
+
+    return {};
+  };
diff --git a/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/agent/nodes/match_prebuilt_rule/prompts.ts b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/agent/nodes/match_prebuilt_rule/prompts.ts
new file mode 100644
index 0000000000000..434636d0519b1
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/agent/nodes/match_prebuilt_rule/prompts.ts
@@ -0,0 +1,35 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { ChatPromptTemplate } from '@langchain/core/prompts';
+export const MATCH_PREBUILT_RULE_PROMPT = ChatPromptTemplate.fromMessages([
+  [
+    'system',
+    `You are an expert assistant in Cybersecurity, your task is to help migrating a SIEM detection rule, from Splunk Security to Elastic Security.
+You will be provided with a Splunk Detection Rule name by the user, your goal is to try find an Elastic Detection Rule that covers the same threat, if any.
+The list of Elastic Detection Rules suggested is provided in the context below.
+
+Guidelines:
+If there is no Elastic rule in the list that covers the same threat, answer only with the string: no_match
+If there is one Elastic rule in the list that covers the same threat, answer only with its name without any further explanation.
+If there are multiple rules in the list that cover the same threat, answer with the most specific of them, for example: "Linux User Account Creation" is more specific than "User Account Creation".
+
+<ELASTIC_DETECTION_RULE_NAMES>
+{elasticSecurityRules}
+</ELASTIC_DETECTION_RULE_NAMES>
+`,
+  ],
+  [
+    'human',
+    `The Splunk Detection Rule is:
+<<SPLUNK_RULE_TITLE>>
+{ruleTitle}
+<<SPLUNK_RULE_TITLE>>
+`,
+  ],
+  ['ai', 'Please find the answer below:'],
+]);
diff --git a/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/agent/nodes/translate_query/esql_knowledge_base_caller.ts b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/agent/nodes/translate_query/esql_knowledge_base_caller.ts
new file mode 100644
index 0000000000000..2277f2fae41a9
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/agent/nodes/translate_query/esql_knowledge_base_caller.ts
@@ -0,0 +1,36 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { Logger } from '@kbn/core/server';
+import { naturalLanguageToEsql, type InferenceClient } from '@kbn/inference-plugin/server';
+import { lastValueFrom } from 'rxjs';
+
+export type EsqlKnowledgeBaseCaller = (input: string) => Promise<string>;
+
+type GetEsqlTranslatorToolParams = (params: {
+  inferenceClient: InferenceClient;
+  connectorId: string;
+  logger: Logger;
+}) => EsqlKnowledgeBaseCaller;
+
+export const getEsqlKnowledgeBase: GetEsqlTranslatorToolParams =
+  ({ inferenceClient: client, connectorId, logger }) =>
+  async (input: string) => {
+    const { content } = await lastValueFrom(
+      naturalLanguageToEsql({
+        client,
+        connectorId,
+        input,
+        logger: {
+          debug: (source) => {
+            logger.debug(typeof source === 'function' ? source() : source);
+          },
+        },
+      })
+    );
+    return content;
+  };
diff --git a/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/agent/nodes/translate_query/index.ts b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/agent/nodes/translate_query/index.ts
new file mode 100644
index 0000000000000..7d247f755e9da
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/agent/nodes/translate_query/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+export { getTranslateQueryNode } from './translate_query';
diff --git a/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/agent/nodes/translate_query/prompt.ts b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/agent/nodes/translate_query/prompt.ts
new file mode 100644
index 0000000000000..0b97faf7dc96f
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/agent/nodes/translate_query/prompt.ts
@@ -0,0 +1,39 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { MigrateRuleState } from '../../types';
+
+export const getEsqlTranslationPrompt = (
+  state: MigrateRuleState
+): string => `You are a helpful cybersecurity (SIEM) expert agent. Your task is to migrate "detection rules" from Splunk to Elastic Security.
+Below you will find Splunk rule information: the title, description and the SPL (Search Processing Language) query.
+Your goal is to translate the SPL query into an equivalent Elastic Security Query Language (ES|QL) query.
+
+Guidelines:
+- Start the translation process by analyzing the SPL query and identifying the key components.
+- Always use logs* index pattern for the ES|QL translated query.
+- If, in the SPL query, you find a lookup list or macro that, based only on its name, you can not translate with confidence to ES|QL, mention it in the summary and
+add a placeholder in the query with the format [macro:<macro_name>(parameters)] or [lookup:<lookup_name>] including the [] keys, example: [macro:my_macro(first_param,second_param)] or [lookup:my_lookup].
+
+The output will be parsed and should contain:
+- First, the ES|QL query inside an \`\`\`esql code block.
+- At the end, the summary of the translation process followed in markdown, starting with "## Migration Summary".
+
+This is the Splunk rule information:
+
+<<SPLUNK_RULE_TITLE>>
+${state.original_rule.title}
+<</SPLUNK_RULE_TITLE>>
+
+<<SPLUNK_RULE_DESCRIPTION>>
+${state.original_rule.description}
+<</SPLUNK_RULE_DESCRIPTION>>
+
+<<SPLUNK_RULE_QUERY_SLP>>
+${state.original_rule.query}
+<</SPLUNK_RULE_QUERY_SLP>>
+`;
diff --git a/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/agent/nodes/translate_query/translate_query.ts b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/agent/nodes/translate_query/translate_query.ts
new file mode 100644
index 0000000000000..00e1e60c7b5f3
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/agent/nodes/translate_query/translate_query.ts
@@ -0,0 +1,56 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { Logger } from '@kbn/core/server';
+import type { InferenceClient } from '@kbn/inference-plugin/server';
+import type { GraphNode } from '../../types';
+import { getEsqlKnowledgeBase } from './esql_knowledge_base_caller';
+import { getEsqlTranslationPrompt } from './prompt';
+import { SiemMigrationRuleTranslationResult } from '../../../../../../../../common/siem_migrations/constants';
+
+interface GetTranslateQueryNodeParams {
+  inferenceClient: InferenceClient;
+  connectorId: string;
+  logger: Logger;
+}
+
+export const getTranslateQueryNode = ({
+  inferenceClient,
+  connectorId,
+  logger,
+}: GetTranslateQueryNodeParams): GraphNode => {
+  const esqlKnowledgeBaseCaller = getEsqlKnowledgeBase({ inferenceClient, connectorId, logger });
+  return async (state) => {
+    const input = getEsqlTranslationPrompt(state);
+    const response = await esqlKnowledgeBaseCaller(input);
+
+    const esqlQuery = response.match(/```esql\n([\s\S]*?)\n```/)?.[1] ?? '';
+    const summary = response.match(/## Migration Summary[\s\S]*$/)?.[0] ?? '';
+
+    const translationResult = getTranslationResult(esqlQuery);
+
+    return {
+      response,
+      comments: [summary],
+      translation_result: translationResult,
+      elastic_rule: {
+        title: state.original_rule.title,
+        description: state.original_rule.description,
+        severity: 'low',
+        query: esqlQuery,
+        query_language: 'esql',
+      },
+    };
+  };
+};
+
+const getTranslationResult = (esqlQuery: string): SiemMigrationRuleTranslationResult => {
+  if (esqlQuery.match(/\[(macro|lookup):[\s\S]*\]/)) {
+    return SiemMigrationRuleTranslationResult.PARTIAL;
+  }
+  return SiemMigrationRuleTranslationResult.FULL;
+};
diff --git a/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/agent/state.ts b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/agent/state.ts
new file mode 100644
index 0000000000000..c1e510bdc052d
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/agent/state.ts
@@ -0,0 +1,32 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { BaseMessage } from '@langchain/core/messages';
+import { Annotation, messagesStateReducer } from '@langchain/langgraph';
+import type {
+  ElasticRule,
+  OriginalRule,
+  RuleMigration,
+} from '../../../../../../common/siem_migrations/model/rule_migration.gen';
+import type { SiemMigrationRuleTranslationResult } from '../../../../../../common/siem_migrations/constants';
+
+export const migrateRuleState = Annotation.Root({
+  messages: Annotation<BaseMessage[]>({
+    reducer: messagesStateReducer,
+    default: () => [],
+  }),
+  original_rule: Annotation<OriginalRule>(),
+  elastic_rule: Annotation<ElasticRule>({
+    reducer: (state, action) => ({ ...state, ...action }),
+  }),
+  translation_result: Annotation<SiemMigrationRuleTranslationResult>(),
+  comments: Annotation<RuleMigration['comments']>({
+    reducer: (current, value) => (value ? (current ?? []).concat(value) : current),
+    default: () => [],
+  }),
+  response: Annotation<string>(),
+});
diff --git a/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/agent/types.ts b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/agent/types.ts
new file mode 100644
index 0000000000000..643d200e4b0bf
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/agent/types.ts
@@ -0,0 +1,23 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { Logger } from '@kbn/core/server';
+import type { InferenceClient } from '@kbn/inference-plugin/server';
+import type { migrateRuleState } from './state';
+import type { ChatModel } from '../util/actions_client_chat';
+import type { PrebuiltRulesMapByName } from '../util/prebuilt_rules';
+
+export type MigrateRuleState = typeof migrateRuleState.State;
+export type GraphNode = (state: MigrateRuleState) => Promise<Partial<MigrateRuleState>>;
+
+export interface MigrateRuleGraphParams {
+  inferenceClient: InferenceClient;
+  model: ChatModel;
+  connectorId: string;
+  prebuiltRulesMap: PrebuiltRulesMapByName;
+  logger: Logger;
+}
diff --git a/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/rule_migrations_task_runner.ts b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/rule_migrations_task_runner.ts
new file mode 100644
index 0000000000000..6ae7294fb5257
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/rule_migrations_task_runner.ts
@@ -0,0 +1,285 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license 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 '@kbn/core/server';
+import { AbortError, abortSignalToPromise } from '@kbn/kibana-utils-plugin/server';
+import type { RunnableConfig } from '@langchain/core/runnables';
+import type {
+  RuleMigrationAllTaskStats,
+  RuleMigrationTaskStats,
+} from '../../../../../common/siem_migrations/model/rule_migration.gen';
+import type { RuleMigrationDataStats } from '../data_stream/rule_migrations_data_client';
+import type {
+  RuleMigrationTaskStartParams,
+  RuleMigrationTaskStartResult,
+  RuleMigrationTaskStatsParams,
+  RuleMigrationTaskStopParams,
+  RuleMigrationTaskStopResult,
+  RuleMigrationTaskPrepareParams,
+  RuleMigrationTaskRunParams,
+  MigrationAgent,
+  RuleMigrationAllTaskStatsParams,
+} from './types';
+import { getRuleMigrationAgent } from './agent';
+import type { MigrateRuleState } from './agent/types';
+import { retrievePrebuiltRulesMap } from './util/prebuilt_rules';
+import { ActionsClientChat } from './util/actions_client_chat';
+
+interface TaskLogger {
+  info: (msg: string) => void;
+  debug: (msg: string) => void;
+  error: (msg: string, error: Error) => void;
+}
+const getTaskLogger = (logger: Logger): TaskLogger => {
+  const prefix = '[ruleMigrationsTask]: ';
+  return {
+    info: (msg) => logger.info(`${prefix}${msg}`),
+    debug: (msg) => logger.debug(`${prefix}${msg}`),
+    error: (msg, error) => logger.error(`${prefix}${msg}: ${error.message}`),
+  };
+};
+
+const ITERATION_BATCH_SIZE = 50 as const;
+const ITERATION_SLEEP_SECONDS = 10 as const;
+
+export class RuleMigrationsTaskRunner {
+  private migrationsRunning: Map<string, { user: string; abortController: AbortController }>;
+  private taskLogger: TaskLogger;
+
+  constructor(private logger: Logger) {
+    this.migrationsRunning = new Map();
+    this.taskLogger = getTaskLogger(logger);
+  }
+
+  /** Starts a rule migration task */
+  async start(params: RuleMigrationTaskStartParams): Promise<RuleMigrationTaskStartResult> {
+    const { migrationId, dataClient } = params;
+    if (this.migrationsRunning.has(migrationId)) {
+      return { exists: true, started: false };
+    }
+    // Just in case some previous execution was interrupted without releasing
+    await dataClient.releaseProcessable(migrationId);
+
+    const { rules } = await dataClient.getStats(migrationId);
+    if (rules.total === 0) {
+      return { exists: false, started: false };
+    }
+    if (rules.pending === 0) {
+      return { exists: true, started: false };
+    }
+
+    const abortController = new AbortController();
+
+    // Await the preparation to make sure the agent is created properly so the task can run
+    const agent = await this.prepare({ ...params, abortController });
+
+    // not awaiting the `run` promise to execute the task in the background
+    this.run({ ...params, agent, abortController }).catch((err) => {
+      // All errors in the `run` method are already catch, this should never happen, but just in case
+      this.taskLogger.error(`Unexpected error running the migration ID:${migrationId}`, err);
+    });
+
+    return { exists: true, started: true };
+  }
+
+  private async prepare({
+    connectorId,
+    inferenceClient,
+    actionsClient,
+    rulesClient,
+    soClient,
+    abortController,
+  }: RuleMigrationTaskPrepareParams): Promise<MigrationAgent> {
+    const prebuiltRulesMap = await retrievePrebuiltRulesMap({ soClient, rulesClient });
+
+    const actionsClientChat = new ActionsClientChat(connectorId, actionsClient, this.logger);
+    const model = await actionsClientChat.createModel({
+      signal: abortController.signal,
+      temperature: 0.05,
+    });
+
+    const agent = getRuleMigrationAgent({
+      connectorId,
+      model,
+      inferenceClient,
+      prebuiltRulesMap,
+      logger: this.logger,
+    });
+    return agent;
+  }
+
+  private async run({
+    migrationId,
+    agent,
+    dataClient,
+    currentUser,
+    invocationConfig,
+    abortController,
+  }: RuleMigrationTaskRunParams): Promise<void> {
+    if (this.migrationsRunning.has(migrationId)) {
+      // This should never happen, but just in case
+      throw new Error(`Task already running for migration ID:${migrationId} `);
+    }
+    this.taskLogger.info(`Starting migration ID:${migrationId}`);
+
+    this.migrationsRunning.set(migrationId, { user: currentUser.username, abortController });
+    const config: RunnableConfig = {
+      ...invocationConfig,
+      // signal: abortController.signal, // not working properly https://github.com/langchain-ai/langgraphjs/issues/319
+    };
+
+    const abortPromise = abortSignalToPromise(abortController.signal);
+
+    try {
+      const sleep = async (seconds: number) => {
+        this.taskLogger.debug(`Sleeping ${seconds}s for migration ID:${migrationId}`);
+        await Promise.race([
+          new Promise((resolve) => setTimeout(resolve, seconds * 1000)),
+          abortPromise.promise,
+        ]);
+      };
+
+      let isDone: boolean = false;
+      do {
+        const ruleMigrations = await dataClient.takePending(migrationId, ITERATION_BATCH_SIZE);
+        this.taskLogger.debug(
+          `Processing ${ruleMigrations.length} rules for migration ID:${migrationId}`
+        );
+
+        await Promise.all(
+          ruleMigrations.map(async (ruleMigration) => {
+            this.taskLogger.debug(
+              `Starting migration of rule "${ruleMigration.original_rule.title}"`
+            );
+            try {
+              const start = Date.now();
+
+              const ruleMigrationResult: MigrateRuleState = await Promise.race([
+                agent.invoke({ original_rule: ruleMigration.original_rule }, config),
+                abortPromise.promise, // workaround for the issue with the langGraph signal
+              ]);
+
+              const duration = (Date.now() - start) / 1000;
+              this.taskLogger.debug(
+                `Migration of rule "${ruleMigration.original_rule.title}" finished in ${duration}s`
+              );
+
+              await dataClient.saveFinished({
+                ...ruleMigration,
+                elastic_rule: ruleMigrationResult.elastic_rule,
+                translation_result: ruleMigrationResult.translation_result,
+                comments: ruleMigrationResult.comments,
+              });
+            } catch (error) {
+              if (error instanceof AbortError) {
+                throw error;
+              }
+              this.taskLogger.error(
+                `Error migrating rule "${ruleMigration.original_rule.title}"`,
+                error
+              );
+              await dataClient.saveError({
+                ...ruleMigration,
+                comments: [`Error migrating rule: ${error.message}`],
+              });
+            }
+          })
+        );
+
+        this.taskLogger.debug(`Batch processed successfully for migration ID:${migrationId}`);
+
+        const { rules } = await dataClient.getStats(migrationId);
+        isDone = rules.pending === 0;
+        if (!isDone) {
+          await sleep(ITERATION_SLEEP_SECONDS);
+        }
+      } while (!isDone);
+
+      this.taskLogger.info(`Finished migration ID:${migrationId}`);
+    } catch (error) {
+      await dataClient.releaseProcessing(migrationId);
+
+      if (error instanceof AbortError) {
+        this.taskLogger.info(`Abort signal received, stopping migration ID:${migrationId}`);
+        return;
+      } else {
+        this.taskLogger.error(`Error processing migration ID:${migrationId}`, error);
+      }
+    } finally {
+      this.migrationsRunning.delete(migrationId);
+      abortPromise.cleanup();
+    }
+  }
+
+  /** Returns the stats of a migration */
+  async getStats({
+    migrationId,
+    dataClient,
+  }: RuleMigrationTaskStatsParams): Promise<RuleMigrationTaskStats> {
+    const dataStats = await dataClient.getStats(migrationId);
+    const status = this.getTaskStatus(migrationId, dataStats.rules);
+    return { status, ...dataStats };
+  }
+
+  /** Returns the stats of all migrations */
+  async getAllStats({
+    dataClient,
+  }: RuleMigrationAllTaskStatsParams): Promise<RuleMigrationAllTaskStats> {
+    const allDataStats = await dataClient.getAllStats();
+    return allDataStats.map((dataStats) => {
+      const status = this.getTaskStatus(dataStats.migration_id, dataStats.rules);
+      return { status, ...dataStats };
+    });
+  }
+
+  private getTaskStatus(
+    migrationId: string,
+    dataStats: RuleMigrationDataStats['rules']
+  ): RuleMigrationTaskStats['status'] {
+    if (this.migrationsRunning.has(migrationId)) {
+      return 'running';
+    }
+    if (dataStats.pending === dataStats.total) {
+      return 'ready';
+    }
+    if (dataStats.completed + dataStats.failed === dataStats.total) {
+      return 'finished';
+    }
+    return 'stopped';
+  }
+
+  /** Stops one running migration */
+  async stop({
+    migrationId,
+    dataClient,
+  }: RuleMigrationTaskStopParams): Promise<RuleMigrationTaskStopResult> {
+    try {
+      const migrationRunning = this.migrationsRunning.get(migrationId);
+      if (migrationRunning) {
+        migrationRunning.abortController.abort();
+        return { exists: true, stopped: true };
+      }
+
+      const { rules } = await dataClient.getStats(migrationId);
+      if (rules.total > 0) {
+        return { exists: true, stopped: false };
+      }
+      return { exists: false, stopped: false };
+    } catch (err) {
+      this.taskLogger.error(`Error stopping migration ID:${migrationId}`, err);
+      return { exists: true, stopped: false };
+    }
+  }
+
+  /** Stops all running migrations */
+  stopAll() {
+    this.migrationsRunning.forEach((migrationRunning) => {
+      migrationRunning.abortController.abort();
+    });
+    this.migrationsRunning.clear();
+  }
+}
diff --git a/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/types.ts b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/types.ts
new file mode 100644
index 0000000000000..e26a5b7216f48
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/types.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 { AuthenticatedUser, SavedObjectsClientContract } from '@kbn/core/server';
+import type { RunnableConfig } from '@langchain/core/runnables';
+import type { InferenceClient } from '@kbn/inference-plugin/server';
+import type { ActionsClient } from '@kbn/actions-plugin/server';
+import type { RulesClient } from '@kbn/alerting-plugin/server';
+import type { RuleMigrationsDataClient } from '../data_stream/rule_migrations_data_client';
+import type { getRuleMigrationAgent } from './agent';
+
+export type MigrationAgent = ReturnType<typeof getRuleMigrationAgent>;
+
+export interface RuleMigrationTaskStartParams {
+  migrationId: string;
+  currentUser: AuthenticatedUser;
+  connectorId: string;
+  invocationConfig: RunnableConfig;
+  inferenceClient: InferenceClient;
+  actionsClient: ActionsClient;
+  rulesClient: RulesClient;
+  soClient: SavedObjectsClientContract;
+  dataClient: RuleMigrationsDataClient;
+}
+
+export interface RuleMigrationTaskPrepareParams {
+  connectorId: string;
+  inferenceClient: InferenceClient;
+  actionsClient: ActionsClient;
+  rulesClient: RulesClient;
+  soClient: SavedObjectsClientContract;
+  abortController: AbortController;
+}
+
+export interface RuleMigrationTaskRunParams {
+  migrationId: string;
+  currentUser: AuthenticatedUser;
+  invocationConfig: RunnableConfig;
+  agent: MigrationAgent;
+  dataClient: RuleMigrationsDataClient;
+  abortController: AbortController;
+}
+
+export interface RuleMigrationTaskStopParams {
+  migrationId: string;
+  dataClient: RuleMigrationsDataClient;
+}
+
+export interface RuleMigrationTaskStatsParams {
+  migrationId: string;
+  dataClient: RuleMigrationsDataClient;
+}
+
+export interface RuleMigrationAllTaskStatsParams {
+  dataClient: RuleMigrationsDataClient;
+}
+
+export interface RuleMigrationTaskStartResult {
+  started: boolean;
+  exists: boolean;
+}
+
+export interface RuleMigrationTaskStopResult {
+  stopped: boolean;
+  exists: boolean;
+}
diff --git a/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/util/actions_client_chat.ts b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/util/actions_client_chat.ts
new file mode 100644
index 0000000000000..204978c901df6
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/util/actions_client_chat.ts
@@ -0,0 +1,93 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ActionsClientSimpleChatModel } from '@kbn/langchain/server';
+import {
+  ActionsClientBedrockChatModel,
+  ActionsClientChatOpenAI,
+  ActionsClientChatVertexAI,
+} from '@kbn/langchain/server';
+import type { Logger } from '@kbn/core/server';
+import type { ActionsClient } from '@kbn/actions-plugin/server';
+import type { ActionsClientChatOpenAIParams } from '@kbn/langchain/server/language_models/chat_openai';
+import type { CustomChatModelInput as ActionsClientBedrockChatModelParams } from '@kbn/langchain/server/language_models/bedrock_chat';
+import type { CustomChatModelInput as ActionsClientChatVertexAIParams } from '@kbn/langchain/server/language_models/gemini_chat';
+import type { CustomChatModelInput as ActionsClientSimpleChatModelParams } from '@kbn/langchain/server/language_models/simple_chat_model';
+
+export type ChatModel =
+  | ActionsClientSimpleChatModel
+  | ActionsClientChatOpenAI
+  | ActionsClientBedrockChatModel
+  | ActionsClientChatVertexAI;
+
+export type ActionsClientChatModelClass =
+  | typeof ActionsClientSimpleChatModel
+  | typeof ActionsClientChatOpenAI
+  | typeof ActionsClientBedrockChatModel
+  | typeof ActionsClientChatVertexAI;
+
+export type ChatModelParams = Partial<ActionsClientSimpleChatModelParams> &
+  Partial<ActionsClientChatOpenAIParams> &
+  Partial<ActionsClientBedrockChatModelParams> &
+  Partial<ActionsClientChatVertexAIParams> & {
+    /** Enables the streaming mode of the response, disabled by default */
+    streaming?: boolean;
+  };
+
+const llmTypeDictionary: Record<string, string> = {
+  [`.gen-ai`]: `openai`,
+  [`.bedrock`]: `bedrock`,
+  [`.gemini`]: `gemini`,
+};
+
+export class ActionsClientChat {
+  constructor(
+    private readonly connectorId: string,
+    private readonly actionsClient: ActionsClient,
+    private readonly logger: Logger
+  ) {}
+
+  public async createModel(params?: ChatModelParams): Promise<ChatModel> {
+    const connector = await this.actionsClient.get({ id: this.connectorId });
+    if (!connector) {
+      throw new Error(`Connector not found: ${this.connectorId}`);
+    }
+
+    const llmType = this.getLLMType(connector.actionTypeId);
+    const ChatModelClass = this.getLLMClass(llmType);
+
+    const model = new ChatModelClass({
+      actionsClient: this.actionsClient,
+      connectorId: this.connectorId,
+      logger: this.logger,
+      llmType,
+      model: connector.config?.defaultModel,
+      ...params,
+      streaming: params?.streaming ?? false, // disabling streaming by default, for some reason is enabled when omitted
+    });
+    return model;
+  }
+
+  private getLLMType(actionTypeId: string): string | undefined {
+    if (llmTypeDictionary[actionTypeId]) {
+      return llmTypeDictionary[actionTypeId];
+    }
+    throw new Error(`Unknown LLM type for action type ID: ${actionTypeId}`);
+  }
+
+  private getLLMClass(llmType?: string): ActionsClientChatModelClass {
+    switch (llmType) {
+      case 'bedrock':
+        return ActionsClientBedrockChatModel;
+      case 'gemini':
+        return ActionsClientChatVertexAI;
+      case 'openai':
+      default:
+        return ActionsClientChatOpenAI;
+    }
+  }
+}
diff --git a/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/util/prebuilt_rules.test.ts b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/util/prebuilt_rules.test.ts
new file mode 100644
index 0000000000000..55256d0ad0fdd
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/util/prebuilt_rules.test.ts
@@ -0,0 +1,105 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { savedObjectsClientMock } from '@kbn/core-saved-objects-api-server-mocks';
+import type { PrebuiltRulesMapByName } from './prebuilt_rules';
+import { filterPrebuiltRules, retrievePrebuiltRulesMap } from './prebuilt_rules';
+import { rulesClientMock } from '@kbn/alerting-plugin/server/mocks';
+
+jest.mock(
+  '../../../../detection_engine/prebuilt_rules/logic/rule_objects/prebuilt_rule_objects_client',
+  () => ({ createPrebuiltRuleObjectsClient: jest.fn() })
+);
+jest.mock(
+  '../../../../detection_engine/prebuilt_rules/logic/rule_assets/prebuilt_rule_assets_client',
+  () => ({ createPrebuiltRuleAssetsClient: jest.fn() })
+);
+
+const mitreAttackIds = 'T1234';
+const rule1 = {
+  name: 'rule one',
+  id: 'rule1',
+  threat: [
+    {
+      framework: 'MITRE ATT&CK',
+      technique: [{ id: mitreAttackIds, name: 'tactic one' }],
+    },
+  ],
+};
+const rule2 = {
+  name: 'rule two',
+  id: 'rule2',
+};
+
+const defaultRuleVersionsTriad = new Map<string, unknown>([
+  ['rule1', { target: rule1 }],
+  ['rule2', { target: rule2, current: rule2 }],
+]);
+const mockFetchRuleVersionsTriad = jest.fn().mockResolvedValue(defaultRuleVersionsTriad);
+jest.mock(
+  '../../../../detection_engine/prebuilt_rules/logic/rule_versions/fetch_rule_versions_triad',
+  () => ({
+    fetchRuleVersionsTriad: () => mockFetchRuleVersionsTriad(),
+  })
+);
+
+const defaultParams = {
+  soClient: savedObjectsClientMock.create(),
+  rulesClient: rulesClientMock.create(),
+};
+
+describe('retrievePrebuiltRulesMap', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('when prebuilt rule is installed', () => {
+    it('should return isInstalled flag', async () => {
+      const prebuiltRulesMap = await retrievePrebuiltRulesMap(defaultParams);
+      expect(prebuiltRulesMap.size).toBe(2);
+      expect(prebuiltRulesMap.get('rule one')).toEqual(
+        expect.objectContaining({ installedRuleId: undefined })
+      );
+      expect(prebuiltRulesMap.get('rule two')).toEqual(
+        expect.objectContaining({ installedRuleId: rule2.id })
+      );
+    });
+  });
+});
+
+describe('filterPrebuiltRules', () => {
+  let prebuiltRulesMap: PrebuiltRulesMapByName;
+
+  beforeEach(async () => {
+    prebuiltRulesMap = await retrievePrebuiltRulesMap(defaultParams);
+    jest.clearAllMocks();
+  });
+
+  describe('when splunk rule contains empty mitreAttackIds', () => {
+    it('should return empty rules map', async () => {
+      const filteredPrebuiltRules = filterPrebuiltRules(prebuiltRulesMap, []);
+      expect(filteredPrebuiltRules.size).toBe(0);
+    });
+  });
+
+  describe('when splunk rule does not match mitreAttackIds', () => {
+    it('should return empty rules map', async () => {
+      const filteredPrebuiltRules = filterPrebuiltRules(prebuiltRulesMap, [`${mitreAttackIds}_2`]);
+      expect(filteredPrebuiltRules.size).toBe(0);
+    });
+  });
+
+  describe('when splunk rule contains matching mitreAttackIds', () => {
+    it('should return the filtered rules map', async () => {
+      const filteredPrebuiltRules = filterPrebuiltRules(prebuiltRulesMap, [mitreAttackIds]);
+      expect(filteredPrebuiltRules.size).toBe(1);
+      expect(filteredPrebuiltRules.get('rule one')).toEqual(
+        expect.objectContaining({ rule: rule1 })
+      );
+    });
+  });
+});
diff --git a/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/util/prebuilt_rules.ts b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/util/prebuilt_rules.ts
new file mode 100644
index 0000000000000..ade6632aaa5b5
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/task/util/prebuilt_rules.ts
@@ -0,0 +1,77 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { RulesClient } from '@kbn/alerting-plugin/server';
+import type { SavedObjectsClientContract } from '@kbn/core-saved-objects-api-server';
+import type { PrebuiltRuleAsset } from '../../../../detection_engine/prebuilt_rules';
+import { fetchRuleVersionsTriad } from '../../../../detection_engine/prebuilt_rules/logic/rule_versions/fetch_rule_versions_triad';
+import { createPrebuiltRuleObjectsClient } from '../../../../detection_engine/prebuilt_rules/logic/rule_objects/prebuilt_rule_objects_client';
+import { createPrebuiltRuleAssetsClient } from '../../../../detection_engine/prebuilt_rules/logic/rule_assets/prebuilt_rule_assets_client';
+
+export interface PrebuiltRuleMapped {
+  rule: PrebuiltRuleAsset;
+  installedRuleId?: string;
+}
+
+export type PrebuiltRulesMapByName = Map<string, PrebuiltRuleMapped>;
+
+interface RetrievePrebuiltRulesParams {
+  soClient: SavedObjectsClientContract;
+  rulesClient: RulesClient;
+}
+
+export const retrievePrebuiltRulesMap = async ({
+  soClient,
+  rulesClient,
+}: RetrievePrebuiltRulesParams): Promise<PrebuiltRulesMapByName> => {
+  const ruleAssetsClient = createPrebuiltRuleAssetsClient(soClient);
+  const ruleObjectsClient = createPrebuiltRuleObjectsClient(rulesClient);
+
+  const prebuiltRulesMap = await fetchRuleVersionsTriad({
+    ruleAssetsClient,
+    ruleObjectsClient,
+  });
+  const prebuiltRulesByName: PrebuiltRulesMapByName = new Map();
+  prebuiltRulesMap.forEach((ruleVersions) => {
+    const rule = ruleVersions.target || ruleVersions.current;
+    if (rule) {
+      prebuiltRulesByName.set(rule.name, {
+        rule,
+        installedRuleId: ruleVersions.current?.id,
+      });
+    }
+  });
+  return prebuiltRulesByName;
+};
+
+export const filterPrebuiltRules = (
+  prebuiltRulesByName: PrebuiltRulesMapByName,
+  mitreAttackIds: string[]
+) => {
+  const filteredPrebuiltRulesByName = new Map();
+  if (mitreAttackIds?.length) {
+    // If this rule has MITRE ATT&CK IDs, remove unrelated prebuilt rules
+    prebuiltRulesByName.forEach(({ rule }, ruleName) => {
+      const mitreAttackThreat = rule.threat?.filter(
+        ({ framework }) => framework === 'MITRE ATT&CK'
+      );
+      if (!mitreAttackThreat) {
+        // If this rule has no MITRE ATT&CK reference we skip it
+        return;
+      }
+
+      const sameTechnique = mitreAttackThreat.find((threat) =>
+        threat.technique?.some(({ id }) => mitreAttackIds?.includes(id))
+      );
+
+      if (sameTechnique) {
+        filteredPrebuiltRulesByName.set(ruleName, prebuiltRulesByName.get(ruleName));
+      }
+    });
+  }
+  return filteredPrebuiltRulesByName;
+};
diff --git a/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/types.ts b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/types.ts
index 1892032a21723..78ec2ef89c7a3 100644
--- a/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/types.ts
+++ b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/types.ts
@@ -5,10 +5,29 @@
  * 2.0.
  */
 
-import type { BulkResponse, SearchResponse } from '@elastic/elasticsearch/lib/api/types';
-import type { IClusterClient, KibanaRequest } from '@kbn/core/server';
+import type {
+  AuthenticatedUser,
+  IClusterClient,
+  KibanaRequest,
+  SavedObjectsClientContract,
+} from '@kbn/core/server';
 import type { Subject } from 'rxjs';
-import type { RuleMigration } from '../../../../common/siem_migrations/model/rule_migration.gen';
+import type { InferenceClient } from '@kbn/inference-plugin/server';
+import type { RunnableConfig } from '@langchain/core/runnables';
+import type { ActionsClient } from '@kbn/actions-plugin/server';
+import type { RulesClient } from '@kbn/alerting-plugin/server';
+import type {
+  RuleMigration,
+  RuleMigrationAllTaskStats,
+  RuleMigrationTaskStats,
+} from '../../../../common/siem_migrations/model/rule_migration.gen';
+import type { RuleMigrationsDataClient } from './data_stream/rule_migrations_data_client';
+import type { RuleMigrationTaskStopResult, RuleMigrationTaskStartResult } from './task/types';
+
+export interface StoredRuleMigration extends RuleMigration {
+  _id: string;
+  _index: string;
+}
 
 export interface SiemRulesMigrationsSetupParams {
   esClusterClient: IClusterClient;
@@ -16,15 +35,28 @@ export interface SiemRulesMigrationsSetupParams {
   tasksTimeoutMs?: number;
 }
 
-export interface SiemRuleMigrationsGetClientParams {
+export interface SiemRuleMigrationsCreateClientParams {
   request: KibanaRequest;
+  currentUser: AuthenticatedUser | null;
   spaceId: string;
 }
 
-export interface RuleMigrationSearchParams {
-  migration_id?: string;
+export interface SiemRuleMigrationsStartTaskParams {
+  migrationId: string;
+  connectorId: string;
+  invocationConfig: RunnableConfig;
+  inferenceClient: InferenceClient;
+  actionsClient: ActionsClient;
+  rulesClient: RulesClient;
+  soClient: SavedObjectsClientContract;
 }
+
 export interface SiemRuleMigrationsClient {
-  create: (body: RuleMigration[]) => Promise<BulkResponse>;
-  search: (params: RuleMigrationSearchParams) => Promise<SearchResponse>;
+  data: RuleMigrationsDataClient;
+  task: {
+    start: (params: SiemRuleMigrationsStartTaskParams) => Promise<RuleMigrationTaskStartResult>;
+    stop: (migrationId: string) => Promise<RuleMigrationTaskStopResult>;
+    getStats: (migrationId: string) => Promise<RuleMigrationTaskStats>;
+    getAllStats: () => Promise<RuleMigrationAllTaskStats>;
+  };
 }
diff --git a/x-pack/plugins/security_solution/server/lib/siem_migrations/siem_migrations_service.test.ts b/x-pack/plugins/security_solution/server/lib/siem_migrations/siem_migrations_service.test.ts
index 3d9e5b9fe179b..adf77756cce34 100644
--- a/x-pack/plugins/security_solution/server/lib/siem_migrations/siem_migrations_service.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/siem_migrations/siem_migrations_service.test.ts
@@ -8,9 +8,15 @@ import {
   loggingSystemMock,
   elasticsearchServiceMock,
   httpServerMock,
+  securityServiceMock,
 } from '@kbn/core/server/mocks';
 import { SiemMigrationsService } from './siem_migrations_service';
-import { MockSiemRuleMigrationsService, mockSetup, mockGetClient } from './rules/__mocks__/mocks';
+import {
+  MockSiemRuleMigrationsService,
+  mockSetup,
+  mockCreateClient,
+  mockStop,
+} from './rules/__mocks__/mocks';
 import type { ConfigType } from '../../config';
 
 jest.mock('./rules/siem_rule_migrations_service');
@@ -25,6 +31,7 @@ describe('SiemMigrationsService', () => {
   let siemMigrationsService: SiemMigrationsService;
   const kibanaVersion = '8.16.0';
 
+  const currentUser = securityServiceMock.createMockAuthenticatedUser();
   const esClusterClient = elasticsearchServiceMock.createClusterClient();
   const logger = loggingSystemMock.createLogger();
 
@@ -57,17 +64,22 @@ describe('SiemMigrationsService', () => {
       });
     });
 
-    describe('when createClient is called', () => {
+    describe('when createRulesClient is called', () => {
       it('should create rules client', async () => {
-        const request = httpServerMock.createKibanaRequest();
-        siemMigrationsService.createClient({ spaceId: 'default', request });
-        expect(mockGetClient).toHaveBeenCalledWith({ spaceId: 'default', request });
+        const createRulesClientParams = {
+          spaceId: 'default',
+          request: httpServerMock.createKibanaRequest(),
+          currentUser,
+        };
+        siemMigrationsService.createRulesClient(createRulesClientParams);
+        expect(mockCreateClient).toHaveBeenCalledWith(createRulesClientParams);
       });
     });
 
     describe('when stop is called', () => {
       it('should trigger the pluginStop subject', async () => {
         siemMigrationsService.stop();
+        expect(mockStop).toHaveBeenCalled();
         expect(mockReplaySubject$.next).toHaveBeenCalled();
         expect(mockReplaySubject$.complete).toHaveBeenCalled();
       });
diff --git a/x-pack/plugins/security_solution/server/lib/siem_migrations/siem_migrations_service.ts b/x-pack/plugins/security_solution/server/lib/siem_migrations/siem_migrations_service.ts
index b84281eb13d9b..7a85dd625feec 100644
--- a/x-pack/plugins/security_solution/server/lib/siem_migrations/siem_migrations_service.ts
+++ b/x-pack/plugins/security_solution/server/lib/siem_migrations/siem_migrations_service.ts
@@ -9,11 +9,8 @@ import type { Logger } from '@kbn/core/server';
 import { ReplaySubject, type Subject } from 'rxjs';
 import type { ConfigType } from '../../config';
 import { SiemRuleMigrationsService } from './rules/siem_rule_migrations_service';
-import type {
-  SiemMigrationsClient,
-  SiemMigrationsSetupParams,
-  SiemMigrationsGetClientParams,
-} from './types';
+import type { SiemMigrationsSetupParams, SiemMigrationsCreateClientParams } from './types';
+import type { SiemRuleMigrationsClient } from './rules/types';
 
 export class SiemMigrationsService {
   private pluginStop$: Subject<void>;
@@ -30,13 +27,12 @@ export class SiemMigrationsService {
     }
   }
 
-  createClient(params: SiemMigrationsGetClientParams): SiemMigrationsClient {
-    return {
-      rules: this.rules.getClient(params),
-    };
+  createRulesClient(params: SiemMigrationsCreateClientParams): SiemRuleMigrationsClient {
+    return this.rules.createClient(params);
   }
 
   stop() {
+    this.rules.stop();
     this.pluginStop$.next();
     this.pluginStop$.complete();
   }
diff --git a/x-pack/plugins/security_solution/server/lib/siem_migrations/types.ts b/x-pack/plugins/security_solution/server/lib/siem_migrations/types.ts
index b5647ff65e214..d2af1e2518722 100644
--- a/x-pack/plugins/security_solution/server/lib/siem_migrations/types.ts
+++ b/x-pack/plugins/security_solution/server/lib/siem_migrations/types.ts
@@ -6,15 +6,11 @@
  */
 
 import type { IClusterClient } from '@kbn/core/server';
-import type { SiemRuleMigrationsClient, SiemRuleMigrationsGetClientParams } from './rules/types';
+import type { SiemRuleMigrationsCreateClientParams } from './rules/types';
 
 export interface SiemMigrationsSetupParams {
   esClusterClient: IClusterClient;
   tasksTimeoutMs?: number;
 }
 
-export type SiemMigrationsGetClientParams = SiemRuleMigrationsGetClientParams;
-
-export interface SiemMigrationsClient {
-  rules: SiemRuleMigrationsClient;
-}
+export type SiemMigrationsCreateClientParams = SiemRuleMigrationsCreateClientParams;
diff --git a/x-pack/plugins/security_solution/server/plugin_contract.ts b/x-pack/plugins/security_solution/server/plugin_contract.ts
index c7ec67c1b07fc..c178f0654d9bd 100644
--- a/x-pack/plugins/security_solution/server/plugin_contract.ts
+++ b/x-pack/plugins/security_solution/server/plugin_contract.ts
@@ -45,6 +45,7 @@ import type { SharePluginStart } from '@kbn/share-plugin/server';
 import type { GuidedOnboardingPluginSetup } from '@kbn/guided-onboarding-plugin/server';
 import type { PluginSetup as UnifiedSearchServerPluginSetup } from '@kbn/unified-search-plugin/server';
 import type { ElasticAssistantPluginStart } from '@kbn/elastic-assistant-plugin/server';
+import type { InferenceServerStart } from '@kbn/inference-plugin/server';
 import type { ProductFeaturesService } from './lib/product_features_service/product_features_service';
 import type { ExperimentalFeatures } from '../common';
 
@@ -88,6 +89,7 @@ export interface SecuritySolutionPluginStartDependencies {
   telemetry?: TelemetryPluginStart;
   share: SharePluginStart;
   actions: ActionsPluginStartContract;
+  inference: InferenceServerStart;
 }
 
 export interface SecuritySolutionPluginSetup {
diff --git a/x-pack/plugins/security_solution/server/request_context_factory.ts b/x-pack/plugins/security_solution/server/request_context_factory.ts
index 2907c3a57ac72..eb1fed5826158 100644
--- a/x-pack/plugins/security_solution/server/request_context_factory.ts
+++ b/x-pack/plugins/security_solution/server/request_context_factory.ts
@@ -168,10 +168,16 @@ export class RequestContextFactory implements IRequestContextFactory {
         })
       ),
 
-      getSiemMigrationsClient: memoize(() =>
-        siemMigrationsService.createClient({ request, spaceId: getSpaceId() })
+      getSiemRuleMigrationsClient: memoize(() =>
+        siemMigrationsService.createRulesClient({
+          request,
+          currentUser: coreContext.security.authc.getCurrentUser(),
+          spaceId: getSpaceId(),
+        })
       ),
 
+      getInferenceClient: memoize(() => startPlugins.inference.getClient({ request })),
+
       getExceptionListClient: () => {
         if (!lists) {
           return null;
diff --git a/x-pack/plugins/security_solution/server/types.ts b/x-pack/plugins/security_solution/server/types.ts
index 5d8a168548a22..97b35133f8242 100644
--- a/x-pack/plugins/security_solution/server/types.ts
+++ b/x-pack/plugins/security_solution/server/types.ts
@@ -20,6 +20,7 @@ import type { AlertsClient, IRuleDataService } from '@kbn/rule-registry-plugin/s
 
 import type { Readable } from 'stream';
 import type { AuditLogger } from '@kbn/security-plugin-types-server';
+import type { InferenceClient } from '@kbn/inference-plugin/server';
 import type { DataViewsService } from '@kbn/data-views-plugin/common';
 import type { Immutable } from '../common/endpoint/types';
 import { AppClient } from './client';
@@ -36,7 +37,7 @@ import type { RiskScoreDataClient } from './lib/entity_analytics/risk_score/risk
 import type { AssetCriticalityDataClient } from './lib/entity_analytics/asset_criticality';
 import type { IDetectionRulesClient } from './lib/detection_engine/rule_management/logic/detection_rules_client/detection_rules_client_interface';
 import type { EntityStoreDataClient } from './lib/entity_analytics/entity_store/entity_store_data_client';
-import type { SiemMigrationsClient } from './lib/siem_migrations/types';
+import type { SiemRuleMigrationsClient } from './lib/siem_migrations/rules/types';
 export { AppClient };
 
 export interface SecuritySolutionApiRequestHandlerContext {
@@ -60,7 +61,8 @@ export interface SecuritySolutionApiRequestHandlerContext {
   getRiskScoreDataClient: () => RiskScoreDataClient;
   getAssetCriticalityDataClient: () => AssetCriticalityDataClient;
   getEntityStoreDataClient: () => EntityStoreDataClient;
-  getSiemMigrationsClient: () => SiemMigrationsClient;
+  getSiemRuleMigrationsClient: () => SiemRuleMigrationsClient;
+  getInferenceClient: () => InferenceClient;
 }
 
 export type SecuritySolutionRequestHandlerContext = CustomRequestHandlerContext<{
diff --git a/x-pack/plugins/security_solution/server/utils/with_security_span.ts b/x-pack/plugins/security_solution/server/utils/with_security_span.ts
index 58787dc45d09b..f9f78600cfb8d 100644
--- a/x-pack/plugins/security_solution/server/utils/with_security_span.ts
+++ b/x-pack/plugins/security_solution/server/utils/with_security_span.ts
@@ -6,7 +6,7 @@
  */
 import type { SpanOptions } from '@kbn/apm-utils';
 import { withSpan } from '@kbn/apm-utils';
-import type agent from 'elastic-apm-node';
+import agent from 'elastic-apm-node';
 import { APP_ID } from '../../common/constants';
 
 type Span = Exclude<typeof agent.currentSpan, undefined | null>;
@@ -35,3 +35,16 @@ export const withSecuritySpan = <T>(
     },
     cb
   );
+
+export const withSecuritySpanSync = <T>(name: string, fn: (span: Span | null) => T): T => {
+  const span = agent.startSpan(name, APP_ID);
+
+  try {
+    const result = fn(span);
+    return result;
+  } finally {
+    if (span) {
+      span.end();
+    }
+  }
+};
diff --git a/x-pack/plugins/security_solution/tsconfig.json b/x-pack/plugins/security_solution/tsconfig.json
index f8fdcfcd8f438..62b77b7c02f18 100644
--- a/x-pack/plugins/security_solution/tsconfig.json
+++ b/x-pack/plugins/security_solution/tsconfig.json
@@ -228,5 +228,6 @@
     "@kbn/data-stream-adapter",
     "@kbn/core-lifecycle-server",
     "@kbn/core-user-profile-common",
+    "@kbn/langchain",
   ]
 }
diff --git a/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.test.ts b/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.test.ts
index d48095638babf..688f8297271a3 100644
--- a/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.test.ts
+++ b/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.test.ts
@@ -66,7 +66,7 @@ const features = [
     category: { id: 'securitySolution' },
   },
   {
-    // feature 4 intentionally delcares the same items as feature 3
+    // feature 4 intentionally declares the same items as feature 3
     id: 'feature_4',
     name: 'Feature 4',
     app: ['feature3', 'feature3_app'],
@@ -87,6 +87,32 @@ const features = [
     },
     category: { id: 'observability' },
   },
+  {
+    deprecated: { notice: 'It was a mistake.' },
+    id: 'deprecated_feature',
+    name: 'Deprecated Feature',
+    // Expose the same `app` and `catalogue` entries as `feature_2` to make sure they are disabled
+    // when `feature_2` is disabled even if the deprecated feature isn't explicitly disabled.
+    app: ['feature2'],
+    catalogue: ['feature2Entry'],
+    category: { id: 'deprecated', label: 'deprecated' },
+    privileges: {
+      all: {
+        savedObject: { all: [], read: [] },
+        ui: ['ui_deprecated_all'],
+        app: ['feature2'],
+        catalogue: ['feature2Entry'],
+        replacedBy: [{ feature: 'feature_2', privileges: ['all'] }],
+      },
+      read: {
+        savedObject: { all: [], read: [] },
+        ui: ['ui_deprecated_read'],
+        app: ['feature2'],
+        catalogue: ['feature2Entry'],
+        replacedBy: [{ feature: 'feature_2', privileges: ['all'] }],
+      },
+    },
+  },
 ] as unknown as KibanaFeature[];
 
 const buildCapabilities = () =>
diff --git a/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.ts b/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.ts
index 90ee85fece486..41d5dcdf2cb14 100644
--- a/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.ts
+++ b/x-pack/plugins/spaces/server/capabilities/capabilities_switcher.ts
@@ -72,7 +72,7 @@ function toggleDisabledFeatures(
     (acc, feature) => {
       if (disabledFeatureKeys.includes(feature.id)) {
         acc.disabledFeatures.push(feature);
-      } else {
+      } else if (!feature.deprecated) {
         acc.enabledFeatures.push(feature);
       }
       return acc;
diff --git a/x-pack/plugins/spaces/server/lib/utils/space_solution_disabled_features.ts b/x-pack/plugins/spaces/server/lib/utils/space_solution_disabled_features.ts
index 066166e7e87dd..6d30645325535 100644
--- a/x-pack/plugins/spaces/server/lib/utils/space_solution_disabled_features.ts
+++ b/x-pack/plugins/spaces/server/lib/utils/space_solution_disabled_features.ts
@@ -39,6 +39,7 @@ const enabledFeaturesPerSolution: Record<SolutionId, string[]> = {
  * This function takes the current space's disabled features and the space solution and returns
  * the updated array of disabled features.
  *
+ * @param features The list of all Kibana registered features.
  * @param spaceDisabledFeatures The current space's disabled features
  * @param spaceSolution The current space's solution (es, oblt, security or classic)
  * @returns The updated array of disabled features
diff --git a/x-pack/plugins/spaces/server/routes/api/external/post.test.ts b/x-pack/plugins/spaces/server/routes/api/external/post.test.ts
index 984d684762159..88c846b77eb53 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/post.test.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/post.test.ts
@@ -56,13 +56,9 @@ describe('Spaces Public API', () => {
       basePath: httpService.basePath,
     });
 
-    const featuresPluginMockStart = featuresPluginMock.createStart();
-
-    featuresPluginMockStart.getKibanaFeatures.mockReturnValue([]);
-
     const usageStatsServicePromise = Promise.resolve(usageStatsServiceMock.createSetupContract());
 
-    const clientServiceStart = clientService.start(coreStart, featuresPluginMockStart);
+    const clientServiceStart = clientService.start(coreStart, featuresPluginMock.createStart());
 
     const spacesServiceStart = service.start({
       basePath: coreStart.http.basePath,
diff --git a/x-pack/plugins/spaces/server/routes/api/external/put.test.ts b/x-pack/plugins/spaces/server/routes/api/external/put.test.ts
index 8aa71d30fc4bb..cf2e9981fd024 100644
--- a/x-pack/plugins/spaces/server/routes/api/external/put.test.ts
+++ b/x-pack/plugins/spaces/server/routes/api/external/put.test.ts
@@ -56,13 +56,9 @@ describe('PUT /api/spaces/space', () => {
       basePath: httpService.basePath,
     });
 
-    const featuresPluginMockStart = featuresPluginMock.createStart();
-
-    featuresPluginMockStart.getKibanaFeatures.mockReturnValue([]);
-
     const usageStatsServicePromise = Promise.resolve(usageStatsServiceMock.createSetupContract());
 
-    const clientServiceStart = clientService.start(coreStart, featuresPluginMockStart);
+    const clientServiceStart = clientService.start(coreStart, featuresPluginMock.createStart());
 
     const spacesServiceStart = service.start({
       basePath: coreStart.http.basePath,
diff --git a/x-pack/plugins/spaces/server/spaces_client/spaces_client.test.ts b/x-pack/plugins/spaces/server/spaces_client/spaces_client.test.ts
index 364afdcaba66a..4b7c1de0b3fcb 100644
--- a/x-pack/plugins/spaces/server/spaces_client/spaces_client.test.ts
+++ b/x-pack/plugins/spaces/server/spaces_client/spaces_client.test.ts
@@ -55,6 +55,37 @@ const features = [
     catalogue: ['feature3Entry'],
     category: { id: 'securitySolution' },
   },
+  {
+    deprecated: { notice: 'It was a mistake.' },
+    id: 'feature_4_deprecated',
+    name: 'Deprecated Feature',
+    app: ['feature2', 'feature3'],
+    catalogue: ['feature2Entry', 'feature3Entry'],
+    category: { id: 'deprecated', label: 'deprecated' },
+    scope: ['spaces', 'security'],
+    privileges: {
+      all: {
+        savedObject: { all: [], read: [] },
+        ui: [],
+        app: ['feature2', 'feature3'],
+        catalogue: ['feature2Entry', 'feature3Entry'],
+        replacedBy: [
+          { feature: 'feature_2', privileges: ['all'] },
+          { feature: 'feature_3', privileges: ['all'] },
+        ],
+      },
+      read: {
+        savedObject: { all: [], read: [] },
+        ui: [],
+        app: ['feature2', 'feature3'],
+        catalogue: ['feature2Entry', 'feature3Entry'],
+        replacedBy: [
+          { feature: 'feature_2', privileges: ['read'] },
+          { feature: 'feature_3', privileges: ['read'] },
+        ],
+      },
+    },
+  },
 ] as unknown as KibanaFeature[];
 const featuresStart = featuresPluginMock.createStart();
 
@@ -103,6 +134,17 @@ describe('#getAll', () => {
         bar: 'baz-bar', // an extra attribute that will be ignored during conversion
       },
     },
+    {
+      // alpha only has deprecated disabled features
+      id: 'alpha',
+      type: 'space',
+      references: [],
+      attributes: {
+        name: 'alpha-name',
+        description: 'alpha-description',
+        disabledFeatures: ['feature_1', 'feature_4_deprecated'],
+      },
+    },
   ];
 
   const expectedSpaces: Space[] = [
@@ -130,6 +172,12 @@ describe('#getAll', () => {
       description: 'baz-description',
       disabledFeatures: [],
     },
+    {
+      id: 'alpha',
+      name: 'alpha-name',
+      description: 'alpha-description',
+      disabledFeatures: ['feature_1', 'feature_2', 'feature_3'],
+    },
   ];
 
   test(`finds spaces using callWithRequestRepository`, async () => {
diff --git a/x-pack/plugins/spaces/server/spaces_client/spaces_client.ts b/x-pack/plugins/spaces/server/spaces_client/spaces_client.ts
index 5d7ae1159f5ea..66728636f9752 100644
--- a/x-pack/plugins/spaces/server/spaces_client/spaces_client.ts
+++ b/x-pack/plugins/spaces/server/spaces_client/spaces_client.ts
@@ -14,6 +14,7 @@ import type {
   SavedObject,
 } from '@kbn/core/server';
 import type { LegacyUrlAliasTarget } from '@kbn/core-saved-objects-common';
+import type { KibanaFeature } from '@kbn/features-plugin/common';
 import { KibanaFeatureScope } from '@kbn/features-plugin/common';
 import type { FeaturesPluginStart } from '@kbn/features-plugin/server';
 
@@ -84,7 +85,13 @@ export interface ISpacesClient {
  * Client for interacting with spaces.
  */
 export class SpacesClient implements ISpacesClient {
-  private isServerless = false;
+  private readonly isServerless: boolean;
+
+  /**
+   * A map of deprecated feature IDs to the feature IDs that replace them used to transform the disabled features
+   * of a space to make sure they only reference non-deprecated features.
+   */
+  private readonly deprecatedFeaturesReferences: Map<string, Set<string>>;
 
   constructor(
     private readonly debugLogger: (message: string) => void,
@@ -95,6 +102,9 @@ export class SpacesClient implements ISpacesClient {
     private readonly features: FeaturesPluginStart
   ) {
     this.isServerless = this.buildFlavour === 'serverless';
+    this.deprecatedFeaturesReferences = this.collectDeprecatedFeaturesReferences(
+      features.getKibanaFeatures()
+    );
   }
 
   public async getAll(options: v1.GetAllSpacesOptions = {}): Promise<v1.GetSpaceResult[]> {
@@ -247,6 +257,8 @@ export class SpacesClient implements ISpacesClient {
   };
 
   private transformSavedObjectToSpace = (savedObject: SavedObject<any>): v1.Space => {
+    // Solution isn't supported in the serverless offering.
+    const solution = !this.isServerless ? savedObject.attributes.solution : undefined;
     return {
       id: savedObject.id,
       name: savedObject.attributes.name ?? '',
@@ -256,11 +268,13 @@ export class SpacesClient implements ISpacesClient {
       imageUrl: savedObject.attributes.imageUrl,
       disabledFeatures: withSpaceSolutionDisabledFeatures(
         this.features.getKibanaFeatures(),
-        savedObject.attributes.disabledFeatures ?? [],
-        !this.isServerless ? savedObject.attributes.solution : undefined
+        savedObject.attributes.disabledFeatures?.flatMap((featureId: string) =>
+          Array.from(this.deprecatedFeaturesReferences.get(featureId) ?? [featureId])
+        ) ?? [],
+        solution
       ),
       _reserved: savedObject.attributes._reserved,
-      ...(!this.isServerless ? { solution: savedObject.attributes.solution } : {}),
+      ...(solution ? { solution } : {}),
     } as v1.Space;
   };
 
@@ -275,4 +289,41 @@ export class SpacesClient implements ISpacesClient {
       ...(!this.isServerless && space.solution ? { solution: space.solution } : {}),
     };
   };
+
+  /**
+   * Collects a map of all deprecated feature IDs and the feature IDs that replace them.
+   * @param features A list of all available Kibana features including deprecated ones.
+   */
+  private collectDeprecatedFeaturesReferences(features: KibanaFeature[]) {
+    const deprecatedFeatureReferences = new Map();
+    for (const feature of features) {
+      if (!feature.deprecated || !feature.scope?.includes(KibanaFeatureScope.Spaces)) {
+        continue;
+      }
+
+      // Collect all feature privileges including the ones provided by sub-features, if any.
+      const allPrivileges = Object.values(feature.privileges ?? {}).concat(
+        feature.subFeatures?.flatMap((subFeature) =>
+          subFeature.privilegeGroups.flatMap(({ privileges }) => privileges)
+        ) ?? []
+      );
+
+      // Collect all features IDs that are referenced by the deprecated feature privileges.
+      const referencedFeaturesIds = new Set();
+      for (const privilege of allPrivileges) {
+        const replacedBy = privilege.replacedBy
+          ? 'default' in privilege.replacedBy
+            ? privilege.replacedBy.default.concat(privilege.replacedBy.minimal)
+            : privilege.replacedBy
+          : [];
+        for (const privilegeReference of replacedBy) {
+          referencedFeaturesIds.add(privilegeReference.feature);
+        }
+      }
+
+      deprecatedFeatureReferences.set(feature.id, referencedFeaturesIds);
+    }
+
+    return deprecatedFeatureReferences;
+  }
 }
diff --git a/x-pack/plugins/task_manager/server/lib/bulk_update_error.ts b/x-pack/plugins/task_manager/server/lib/bulk_update_error.ts
new file mode 100644
index 0000000000000..f7e0552e5a738
--- /dev/null
+++ b/x-pack/plugins/task_manager/server/lib/bulk_update_error.ts
@@ -0,0 +1,45 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export class BulkUpdateError extends Error {
+  private _statusCode: number;
+  private _type: string;
+
+  constructor({
+    statusCode,
+    message = 'Bulk update failed with unknown reason',
+    type,
+  }: {
+    statusCode: number;
+    message?: string;
+    type: string;
+  }) {
+    super(message);
+    this._statusCode = statusCode;
+    this._type = type;
+  }
+
+  public get statusCode() {
+    return this._statusCode;
+  }
+
+  public get type() {
+    return this._type;
+  }
+}
+
+export function getBulkUpdateStatusCode(error: Error | BulkUpdateError): number | undefined {
+  if (Boolean(error && error instanceof BulkUpdateError)) {
+    return (error as BulkUpdateError).statusCode;
+  }
+}
+
+export function getBulkUpdateErrorType(error: Error | BulkUpdateError): string | undefined {
+  if (Boolean(error && error instanceof BulkUpdateError)) {
+    return (error as BulkUpdateError).type;
+  }
+}
diff --git a/x-pack/plugins/task_manager/server/lib/create_managed_configuration.test.ts b/x-pack/plugins/task_manager/server/lib/create_managed_configuration.test.ts
index 1da1bb11d1c5d..d453edc8e7003 100644
--- a/x-pack/plugins/task_manager/server/lib/create_managed_configuration.test.ts
+++ b/x-pack/plugins/task_manager/server/lib/create_managed_configuration.test.ts
@@ -15,6 +15,7 @@ import {
 import { mockLogger } from '../test_utils';
 import { CLAIM_STRATEGY_UPDATE_BY_QUERY, CLAIM_STRATEGY_MGET, TaskManagerConfig } from '../config';
 import { MsearchError } from './msearch_error';
+import { BulkUpdateError } from './bulk_update_error';
 
 describe('createManagedConfiguration()', () => {
   let clock: sinon.SinonFakeTimers;
@@ -280,6 +281,45 @@ describe('createManagedConfiguration()', () => {
         expect(subscription).toHaveBeenNthCalledWith(2, 8);
       });
 
+      test('should decrease configuration at the next interval when a bulkPartialUpdate 429 error is emitted', async () => {
+        const { subscription, errors$ } = setupScenario(10);
+        errors$.next(
+          new BulkUpdateError({ statusCode: 429, message: 'test', type: 'too_many_requests' })
+        );
+        clock.tick(ADJUST_THROUGHPUT_INTERVAL - 1);
+        expect(subscription).toHaveBeenCalledTimes(1);
+        expect(subscription).toHaveBeenNthCalledWith(1, 10);
+        clock.tick(1);
+        expect(subscription).toHaveBeenCalledTimes(2);
+        expect(subscription).toHaveBeenNthCalledWith(2, 8);
+      });
+
+      test('should decrease configuration at the next interval when a bulkPartialUpdate 500 error is emitted', async () => {
+        const { subscription, errors$ } = setupScenario(10);
+        errors$.next(
+          new BulkUpdateError({ statusCode: 500, message: 'test', type: 'server_error' })
+        );
+        clock.tick(ADJUST_THROUGHPUT_INTERVAL - 1);
+        expect(subscription).toHaveBeenCalledTimes(1);
+        expect(subscription).toHaveBeenNthCalledWith(1, 10);
+        clock.tick(1);
+        expect(subscription).toHaveBeenCalledTimes(2);
+        expect(subscription).toHaveBeenNthCalledWith(2, 8);
+      });
+
+      test('should decrease configuration at the next interval when a bulkPartialUpdate 503 error is emitted', async () => {
+        const { subscription, errors$ } = setupScenario(10);
+        errors$.next(
+          new BulkUpdateError({ statusCode: 503, message: 'test', type: 'unavailable' })
+        );
+        clock.tick(ADJUST_THROUGHPUT_INTERVAL - 1);
+        expect(subscription).toHaveBeenCalledTimes(1);
+        expect(subscription).toHaveBeenNthCalledWith(1, 10);
+        clock.tick(1);
+        expect(subscription).toHaveBeenCalledTimes(2);
+        expect(subscription).toHaveBeenNthCalledWith(2, 8);
+      });
+
       test('should not change configuration at the next interval when other msearch error is emitted', async () => {
         const { subscription, errors$ } = setupScenario(10);
         errors$.next(new MsearchError(404));
diff --git a/x-pack/plugins/task_manager/server/lib/create_managed_configuration.ts b/x-pack/plugins/task_manager/server/lib/create_managed_configuration.ts
index d13c2511a2a2b..00736f2c36cdb 100644
--- a/x-pack/plugins/task_manager/server/lib/create_managed_configuration.ts
+++ b/x-pack/plugins/task_manager/server/lib/create_managed_configuration.ts
@@ -13,6 +13,7 @@ import { isEsCannotExecuteScriptError } from './identify_es_error';
 import { CLAIM_STRATEGY_MGET, DEFAULT_CAPACITY, MAX_CAPACITY, TaskManagerConfig } from '../config';
 import { TaskCost } from '../task';
 import { getMsearchStatusCode } from './msearch_error';
+import { getBulkUpdateStatusCode } from './bulk_update_error';
 
 const FLUSH_MARKER = Symbol('flush');
 export const ADJUST_THROUGHPUT_INTERVAL = 10 * 1000;
@@ -169,7 +170,10 @@ function countErrors(errors$: Observable<Error>, countInterval: number): Observa
           isEsCannotExecuteScriptError(e) ||
           getMsearchStatusCode(e) === 429 ||
           getMsearchStatusCode(e) === 500 ||
-          getMsearchStatusCode(e) === 503
+          getMsearchStatusCode(e) === 503 ||
+          getBulkUpdateStatusCode(e) === 429 ||
+          getBulkUpdateStatusCode(e) === 500 ||
+          getBulkUpdateStatusCode(e) === 503
       )
     )
   ).pipe(
diff --git a/x-pack/plugins/task_manager/server/task_claimers/strategy_mget.test.ts b/x-pack/plugins/task_manager/server/task_claimers/strategy_mget.test.ts
index e089d3b2d8785..92f2dba988575 100644
--- a/x-pack/plugins/task_manager/server/task_claimers/strategy_mget.test.ts
+++ b/x-pack/plugins/task_manager/server/task_claimers/strategy_mget.test.ts
@@ -1344,15 +1344,15 @@ describe('TaskClaiming', () => {
       expect(result.docs.length).toEqual(3);
     });
 
-    test('should assign startedAt value if bulkGet returns task with null startedAt', async () => {
+    test('should skip tasks where bulkGet returns a newer task document than the bulkPartialUpdate', async () => {
       const store = taskStoreMock.create({ taskManagerId: 'test-test' });
       store.convertToSavedObjectIds.mockImplementation((ids) => ids.map((id) => `task:${id}`));
 
       const fetchedTasks = [
-        mockInstance({ id: `id-1`, taskType: 'report' }),
-        mockInstance({ id: `id-2`, taskType: 'report' }),
-        mockInstance({ id: `id-3`, taskType: 'yawn' }),
-        mockInstance({ id: `id-4`, taskType: 'report' }),
+        mockInstance({ id: `id-1`, taskType: 'report', version: '123' }),
+        mockInstance({ id: `id-2`, taskType: 'report', version: '123' }),
+        mockInstance({ id: `id-3`, taskType: 'yawn', version: '123' }),
+        mockInstance({ id: `id-4`, taskType: 'report', version: '123' }),
       ];
 
       const { versionMap, docLatestVersions } = getVersionMapsFromTasks(fetchedTasks);
@@ -1365,7 +1365,7 @@ describe('TaskClaiming', () => {
       );
       store.bulkGet.mockResolvedValueOnce([
         asOk({ ...fetchedTasks[0], startedAt: new Date() }),
-        asOk(fetchedTasks[1]),
+        asOk({ ...fetchedTasks[1], startedAt: new Date(), version: 'abc' }),
         asOk({ ...fetchedTasks[2], startedAt: new Date() }),
         asOk({ ...fetchedTasks[3], startedAt: new Date() }),
       ]);
@@ -1399,11 +1399,11 @@ describe('TaskClaiming', () => {
       expect(mockApmTrans.end).toHaveBeenCalledWith('success');
 
       expect(taskManagerLogger.debug).toHaveBeenCalledWith(
-        'task claimer claimed: 4; stale: 0; conflicts: 0; missing: 0; capacity reached: 0; updateErrors: 0; getErrors: 0; removed: 0;',
+        'task claimer claimed: 3; stale: 0; conflicts: 1; missing: 0; capacity reached: 0; updateErrors: 0; getErrors: 0; removed: 0;',
         { tags: ['taskClaiming', 'claimAvailableTasksMget'] }
       );
       expect(taskManagerLogger.warn).toHaveBeenCalledWith(
-        'Task id-2 has a null startedAt value, setting to current time - ownerId null, status idle',
+        'Task id-2 was modified during the claiming phase, skipping until the next claiming cycle.',
         { tags: ['taskClaiming', 'claimAvailableTasksMget'] }
       );
 
@@ -1463,14 +1463,14 @@ describe('TaskClaiming', () => {
       expect(store.bulkGet).toHaveBeenCalledWith(['id-1', 'id-2', 'id-3', 'id-4']);
 
       expect(result.stats).toEqual({
-        tasksClaimed: 4,
-        tasksConflicted: 0,
+        tasksClaimed: 3,
+        tasksConflicted: 1,
         tasksErrors: 0,
-        tasksUpdated: 4,
+        tasksUpdated: 3,
         tasksLeftUnclaimed: 0,
         staleTasks: 0,
       });
-      expect(result.docs.length).toEqual(4);
+      expect(result.docs.length).toEqual(3);
       for (const r of result.docs) {
         expect(r.startedAt).not.toBeNull();
       }
diff --git a/x-pack/plugins/task_manager/server/task_claimers/strategy_mget.ts b/x-pack/plugins/task_manager/server/task_claimers/strategy_mget.ts
index 4e74454e8c982..cd3efdc783008 100644
--- a/x-pack/plugins/task_manager/server/task_claimers/strategy_mget.ts
+++ b/x-pack/plugins/task_manager/server/task_claimers/strategy_mget.ts
@@ -195,7 +195,7 @@ async function claimAvailableTasks(opts: TaskClaimerOpts): Promise<ClaimOwnershi
   }
 
   // perform the task object updates, deal with errors
-  const updatedTaskIds: string[] = [];
+  const updatedTasks: Record<string, PartialConcreteTaskInstance> = {};
   let conflicts = 0;
   let bulkUpdateErrors = 0;
   let bulkGetErrors = 0;
@@ -203,7 +203,7 @@ async function claimAvailableTasks(opts: TaskClaimerOpts): Promise<ClaimOwnershi
   const updateResults = await taskStore.bulkPartialUpdate(taskUpdates);
   for (const updateResult of updateResults) {
     if (isOk(updateResult)) {
-      updatedTaskIds.push(updateResult.value.id);
+      updatedTasks[updateResult.value.id] = updateResult.value;
     } else {
       const { id, type, error, status } = updateResult.error;
 
@@ -218,29 +218,23 @@ async function claimAvailableTasks(opts: TaskClaimerOpts): Promise<ClaimOwnershi
   }
 
   // perform an mget to get the full task instance for claiming
-  const fullTasksToRun = (await taskStore.bulkGet(updatedTaskIds)).reduce<ConcreteTaskInstance[]>(
-    (acc, task) => {
-      if (isOk(task)) {
-        acc.push(task.value);
-      } else {
-        const { id, type, error } = task.error;
-        logger.error(`Error getting full task ${id}:${type} during claim: ${error.message}`);
-        bulkGetErrors++;
-      }
-      return acc;
-    },
-    []
-  );
-
-  // Look for tasks that have a null startedAt value, log them and manually set a startedAt field
-  for (const task of fullTasksToRun) {
-    if (task.startedAt == null) {
+  const fullTasksToRun = (await taskStore.bulkGet(Object.keys(updatedTasks))).reduce<
+    ConcreteTaskInstance[]
+  >((acc, task) => {
+    if (isOk(task) && task.value.version !== updatedTasks[task.value.id].version) {
       logger.warn(
-        `Task ${task.id} has a null startedAt value, setting to current time - ownerId ${task.ownerId}, status ${task.status}`
+        `Task ${task.value.id} was modified during the claiming phase, skipping until the next claiming cycle.`
       );
-      task.startedAt = now;
+      conflicts++;
+    } else if (isOk(task)) {
+      acc.push(task.value);
+    } else {
+      const { id, type, error } = task.error;
+      logger.error(`Error getting full task ${id}:${type} during claim: ${error.message}`);
+      bulkGetErrors++;
     }
-  }
+    return acc;
+  }, []);
 
   // separate update for removed tasks; shouldn't happen often, so unlikely
   // a performance concern, and keeps the rest of the logic simpler
diff --git a/x-pack/plugins/task_manager/server/task_store.test.ts b/x-pack/plugins/task_manager/server/task_store.test.ts
index f1374f6d27b76..cbb1c44dde3fc 100644
--- a/x-pack/plugins/task_manager/server/task_store.test.ts
+++ b/x-pack/plugins/task_manager/server/task_store.test.ts
@@ -1020,7 +1020,10 @@ describe('TaskStore', () => {
         refresh: false,
       });
 
-      expect(result).toEqual([asOk(task)]);
+      expect(result).toEqual([
+        // New version returned after update
+        asOk({ ...task, version: 'Wzg0LDFd' }),
+      ]);
     });
 
     test(`should perform partial update with minimal fields`, async () => {
@@ -1062,7 +1065,8 @@ describe('TaskStore', () => {
         refresh: false,
       });
 
-      expect(result).toEqual([asOk(task)]);
+      // New version returned after update
+      expect(result).toEqual([asOk({ ...task, version: 'Wzg0LDFd' })]);
     });
 
     test(`should perform partial update with no version`, async () => {
@@ -1100,7 +1104,8 @@ describe('TaskStore', () => {
         refresh: false,
       });
 
-      expect(result).toEqual([asOk(task)]);
+      // New version returned after update
+      expect(result).toEqual([asOk({ ...task, version: 'Wzg0LDFd' })]);
     });
 
     test(`should gracefully handle errors within the response`, async () => {
@@ -1183,7 +1188,8 @@ describe('TaskStore', () => {
       });
 
       expect(result).toEqual([
-        asOk(task1),
+        // New version returned after update
+        asOk({ ...task1, version: 'Wzg0LDFd' }),
         asErr({
           type: 'task',
           id: '45343254',
@@ -1267,7 +1273,8 @@ describe('TaskStore', () => {
       });
 
       expect(result).toEqual([
-        asOk(task1),
+        // New version returned after update
+        asOk({ ...task1, version: 'Wzg0LDFd' }),
         asErr({
           type: 'task',
           id: 'unknown',
@@ -1290,6 +1297,62 @@ describe('TaskStore', () => {
       );
       expect(await firstErrorPromise).toMatchInlineSnapshot(`[Error: Failure]`);
     });
+
+    test('pushes errors returned by the saved objects client to errors$', async () => {
+      const task = {
+        id: '324242',
+        version: 'WzQsMV0=',
+        attempts: 3,
+      };
+
+      const firstErrorPromise = store.errors$.pipe(first()).toPromise();
+
+      esClient.bulk.mockResolvedValue({
+        errors: true,
+        items: [
+          {
+            update: {
+              _id: '1',
+              _index: 'test-index',
+              status: 403,
+              error: { reason: 'Error reason', type: 'cluster_block_exception' },
+            },
+          },
+        ],
+        took: 10,
+      });
+
+      await store.bulkPartialUpdate([task]);
+
+      expect(await firstErrorPromise).toMatchInlineSnapshot(`[Error: Error reason]`);
+    });
+
+    test('pushes errors for the malformed responses to errors$', async () => {
+      const task = {
+        id: '324242',
+        version: 'WzQsMV0=',
+        attempts: 3,
+      };
+
+      const firstErrorPromise = store.errors$.pipe(first()).toPromise();
+
+      esClient.bulk.mockResolvedValue({
+        errors: false,
+        items: [
+          {
+            update: {
+              _index: 'test-index',
+              status: 200,
+            },
+          },
+        ],
+        took: 10,
+      });
+
+      await store.bulkPartialUpdate([task]);
+
+      expect(await firstErrorPromise).toMatchInlineSnapshot(`[Error: malformed response]`);
+    });
   });
 
   describe('remove', () => {
diff --git a/x-pack/plugins/task_manager/server/task_store.ts b/x-pack/plugins/task_manager/server/task_store.ts
index 2b3440e87c0f8..0946c5c18d328 100644
--- a/x-pack/plugins/task_manager/server/task_store.ts
+++ b/x-pack/plugins/task_manager/server/task_store.ts
@@ -26,7 +26,7 @@ import {
   ElasticsearchClient,
 } from '@kbn/core/server';
 
-import { decodeRequestVersion } from '@kbn/core-saved-objects-base-server-internal';
+import { decodeRequestVersion, encodeVersion } from '@kbn/core-saved-objects-base-server-internal';
 import { RequestTimeoutsConfig } from './config';
 import { asOk, asErr, Result } from './lib/result_type';
 
@@ -48,6 +48,7 @@ import { claimSort } from './queries/mark_available_tasks_as_claimed';
 import { MAX_PARTITIONS } from './lib/task_partitioner';
 import { ErrorOutput } from './lib/bulk_operation_buffer';
 import { MsearchError } from './lib/msearch_error';
+import { BulkUpdateError } from './lib/bulk_update_error';
 
 export interface StoreOpts {
   esClient: ElasticsearchClient;
@@ -386,11 +387,19 @@ export class TaskStore {
     }
 
     return result.items.map((item) => {
+      const malformedResponseType = 'malformed response';
+
       if (!item.update || !item.update._id) {
+        const err = new BulkUpdateError({
+          message: malformedResponseType,
+          type: malformedResponseType,
+          statusCode: 500,
+        });
+        this.errors$.next(err);
         return asErr({
           type: 'task',
           id: 'unknown',
-          error: { type: 'malformed response' },
+          error: { type: malformedResponseType },
         });
       }
 
@@ -399,6 +408,12 @@ export class TaskStore {
         : item.update._id;
 
       if (item.update?.error) {
+        const err = new BulkUpdateError({
+          message: item.update.error.reason,
+          type: item.update.error.type,
+          statusCode: item.update.status,
+        });
+        this.errors$.next(err);
         return asErr({
           type: 'task',
           id: docId,
@@ -412,6 +427,7 @@ export class TaskStore {
       return asOk({
         ...doc,
         id: docId,
+        version: encodeVersion(item.update._seq_no, item.update._primary_term),
       });
     });
   }
diff --git a/x-pack/plugins/telemetry_collection_xpack/server/index.ts b/x-pack/plugins/telemetry_collection_xpack/server/index.ts
index 85a3adc243236..c0226d5eea265 100644
--- a/x-pack/plugins/telemetry_collection_xpack/server/index.ts
+++ b/x-pack/plugins/telemetry_collection_xpack/server/index.ts
@@ -5,8 +5,6 @@
  * 2.0.
  */
 
-export type { ESLicense } from './telemetry_collection';
-
 //  This exports static code and TypeScript types,
 //  as well as, Kibana Platform `plugin()` initializer.
 
diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json
index 1521e3e251702..f92941efc1d3b 100644
--- a/x-pack/plugins/translations/translations/fr-FR.json
+++ b/x-pack/plugins/translations/translations/fr-FR.json
@@ -1209,9 +1209,6 @@
     "dashboard.actions.toggleExpandPanelMenuItem.notExpandedDisplayName": "Maximiser",
     "dashboard.addPanel.newEmbeddableAddedSuccessMessageTitle": "{savedObjectName} a été ajouté.",
     "dashboard.addPanel.newEmbeddableWithNoTitleAddedSuccessMessageTitle": "Un panneau a été ajouté",
-    "dashboard.appLeaveConfirmModal.cancelButtonLabel": "Annuler",
-    "dashboard.appLeaveConfirmModal.unsavedChangesSubtitle": "Quitter Dashboard sans enregistrer ?",
-    "dashboard.appLeaveConfirmModal.unsavedChangesTitle": "Modifications non enregistrées",
     "dashboard.badge.readOnly.text": "Lecture seule",
     "dashboard.badge.readOnly.tooltip": "Impossible d'enregistrer les tableaux de bord",
     "dashboard.createConfirmModal.cancelButtonLabel": "Annuler",
@@ -6074,12 +6071,7 @@
     "reporting.share.modalContent.notification.reportingErrorTitle": "Impossible de créer le rapport",
     "reporting.share.modalContent.successfullyQueuedReportNotificationDescription": "Suivre sa progression dans {path}",
     "reporting.share.modalContent.successfullyQueuedReportNotificationTitle": "Rapport mis en file d'attente pour {objectType}",
-    "reporting.share.panelAction.csvDownloadStartedMessage": "Votre CSV sera téléchargé dans un instant.",
-    "reporting.share.panelAction.csvDownloadStartedTitle": "Téléchargement du CSV démarré",
     "reporting.share.panelAction.csvReportStartedTitle": "Rapport mis en file d'attente pour CSV",
-    "reporting.share.panelAction.downloadCsvPanelTitle": "Télécharger CSV",
-    "reporting.share.panelAction.failedCsvReportMessage": "Nous n'avons pas pu télécharger votre CSV pour le moment.",
-    "reporting.share.panelAction.failedCsvReportTitle": "Le téléchargement du CSV a échoué",
     "reporting.share.panelAction.failedGenerateCsvReportMessage": "Nous n'avons pas pu générer votre CSV pour le moment.",
     "reporting.share.panelAction.failedGenerateCsvReportTitle": "Échec du rapport CSV",
     "reporting.share.panelAction.generateCsvPanelTitle": "Générer des rapports CSV",
@@ -6393,11 +6385,61 @@
     "searchConnectors.content.indices.connectorScheduling.schedulePanel.contentSync.description": "Récupérez du contenu pour créer ou mettre à jour vos documents Elasticsearch.",
     "searchConnectors.content.indices.connectorScheduling.schedulePanel.contentSync.title": "Synchronisation de contenu",
     "searchConnectors.content.indices.connectorScheduling.switch.label": "Activé",
+    "searchConnectors.content.nativeConnectors.azureBlob.description": "Effectuez des recherches sur votre contenu sur Stockage Blob Azure.",
+    "searchConnectors.content.nativeConnectors.azureBlob.name": "Stockage Blob Azure",
+    "searchConnectors.content.nativeConnectors.box.description": "Effectuez des recherches sur votre contenu dans Box.",
+    "searchConnectors.content.nativeConnectors.box.name": "Box",
+    "searchConnectors.content.nativeConnectors.confluence_data_center.name": "Centre de données Confluence",
+    "searchConnectors.content.nativeConnectors.confluence.description": "Effectuez des recherches sur votre contenu dans Confluence Cloud.",
+    "searchConnectors.content.nativeConnectors.confluence.name": "Confluence Cloud & Server",
+    "searchConnectors.content.nativeConnectors.confluenceDataCenter.description": "Effectuez des recherches sur votre contenu dans le centre de données Confluence.",
+    "searchConnectors.content.nativeConnectors.customConnector.description": "Effectuez des recherches sur des données stockées dans des sources de données personnalisées.",
+    "searchConnectors.content.nativeConnectors.customConnector.name": "Connecteur personnalisé",
+    "searchConnectors.content.nativeConnectors.dropbox.description": "Effectuez des recherches dans vos fichiers et dossiers stockés sur Dropbox.",
+    "searchConnectors.content.nativeConnectors.dropbox.name": "Dropbox",
+    "searchConnectors.content.nativeConnectors.github.description": "Effectuez des recherches sur vos projets et référentiels sur GitHub.",
+    "searchConnectors.content.nativeConnectors.github.name": "Serveurs GitHub & GitHub Enterprise",
+    "searchConnectors.content.nativeConnectors.gmail.description": "Effectuez des recherches sur votre contenu dans Gmail.",
+    "searchConnectors.content.nativeConnectors.gmail.name": "Gmail",
+    "searchConnectors.content.nativeConnectors.googleCloud.description": "Effectuez des recherches sur votre contenu sur Google Cloud Storage.",
     "searchConnectors.content.nativeConnectors.googleCloud.name": "Google Cloud Storage",
+    "searchConnectors.content.nativeConnectors.googleDrive.description": "Effectuez des recherches sur votre contenu sur Google Drive.",
+    "searchConnectors.content.nativeConnectors.googleDrive.name": "Google Drive",
+    "searchConnectors.content.nativeConnectors.graphQL.description": "Effectuez des recherches dans votre contenu avec GraphQL.",
+    "searchConnectors.content.nativeConnectors.graphQL.name": "GraphQL",
+    "searchConnectors.content.nativeConnectors.jira_data_center.name": "Centre de données Jira",
+    "searchConnectors.content.nativeConnectors.jira.description": "Effectuez des recherches sur votre contenu dans Jira Cloud.",
+    "searchConnectors.content.nativeConnectors.jira.name": "Jira Cloud",
+    "searchConnectors.content.nativeConnectors.jiraDataCenter.description": "Effectuez des recherches sur votre contenu dans le centre de données Jira.",
+    "searchConnectors.content.nativeConnectors.jiraServer.description": "Effectuez des recherches sur votre contenu dans le serveur Jira.",
+    "searchConnectors.content.nativeConnectors.jiraServer.name": "Serveur Jira",
+    "searchConnectors.content.nativeConnectors.microsoftSQL.name": "Microsoft SQL",
+    "searchConnectors.content.nativeConnectors.mongoDB.description": "Effectuez des recherches sur votre contenu dans MongoDB.",
+    "searchConnectors.content.nativeConnectors.mongodb.name": "MongoDB",
+    "searchConnectors.content.nativeConnectors.msSql.description": "Effectuez des recherches sur votre contenu sur Microsoft SQL Server.",
+    "searchConnectors.content.nativeConnectors.mysql.description": "Effectuez des recherches sur votre contenu dans MySQL.",
+    "searchConnectors.content.nativeConnectors.mysql.name": "MySQL",
+    "searchConnectors.content.nativeConnectors.netowkrDrive.description": "Effectuez des recherches sur le contenu de votre lecteur réseau.",
+    "searchConnectors.content.nativeConnectors.networkDrive.name": "Lecteur réseau",
+    "searchConnectors.content.nativeConnectors.notion.description": "Effectuez des recherches sur votre contenu dans Notion.",
+    "searchConnectors.content.nativeConnectors.notion.name": "Notion",
+    "searchConnectors.content.nativeConnectors.oneDrive.description": "Effectuez des recherches sur votre contenu dans OneDrive.",
+    "searchConnectors.content.nativeConnectors.oneDrive.name": "OneDrive",
+    "searchConnectors.content.nativeConnectors.openTextDocumentum.description": "Recherchez votre contenu sur OpenText Documentum.",
+    "searchConnectors.content.nativeConnectors.openTextDocumentum.name": "OpenText Documentum",
+    "searchConnectors.content.nativeConnectors.oracle.description": "Effectuez des recherches sur votre contenu dans Oracle.",
+    "searchConnectors.content.nativeConnectors.oracle.name": "Oracle",
+    "searchConnectors.content.nativeConnectors.outlook.description": "Effectuez des recherches sur votre contenu dans Outlook.",
+    "searchConnectors.content.nativeConnectors.outlook.name": "Outlook",
+    "searchConnectors.content.nativeConnectors.postgreSQL.description": "Effectuez des recherches sur votre contenu dans PostgreSQL.",
+    "searchConnectors.content.nativeConnectors.postgresql.name": "PostgreSQL",
+    "searchConnectors.content.nativeConnectors.redis.description": "Effectuez des recherches sur votre contenu dans Redis.",
+    "searchConnectors.content.nativeConnectors.redis.name": "Redis",
     "searchConnectors.content.nativeConnectors.s3.accessKey.label": "ID de clé d'accès AWS",
     "searchConnectors.content.nativeConnectors.s3.buckets.label": "Compartiments AWS",
     "searchConnectors.content.nativeConnectors.s3.buckets.tooltip": "Les compartiments AWS sont ignorés lorsque des règles de synchronisation avancées sont appliquées.",
     "searchConnectors.content.nativeConnectors.s3.connectTimeout.label": "Délai d'attente de connexion",
+    "searchConnectors.content.nativeConnectors.s3.description": "Effectuez des recherches sur votre contenu dans Amazon S3.",
     "searchConnectors.content.nativeConnectors.s3.maxAttempts.label": "Nombre maximum de nouvelles tentatives",
     "searchConnectors.content.nativeConnectors.s3.maxPageSize.label": "Taille maximum de la page",
     "searchConnectors.content.nativeConnectors.s3.name": "S3",
@@ -6407,9 +6449,24 @@
     "searchConnectors.content.nativeConnectors.salesforce.clientId.tooltip": "L'ID client de votre application connectée utilisant le protocole OAuth2. Également appelé \"clé consommateur\"",
     "searchConnectors.content.nativeConnectors.salesforce.clientSecret.label": "Identifiant client secret",
     "searchConnectors.content.nativeConnectors.salesforce.clientSecret.tooltip": "L'identifiant client secret de votre application connectée utilisant le protocole OAuth2. Également appelé \"secret consommateur\"",
+    "searchConnectors.content.nativeConnectors.salesforce.description": "Effectuez des recherches sur votre contenu dans Salesforce.",
     "searchConnectors.content.nativeConnectors.salesforce.domain.label": "Domaine",
     "searchConnectors.content.nativeConnectors.salesforce.domain.tooltip": "Le domaine de votre instance Salesforce. Si votre URL Salesforce est \"https://foo.salesforce.com\", le domaine est \"foo\".",
     "searchConnectors.content.nativeConnectors.salesforce.name": "Salesforce",
+    "searchConnectors.content.nativeConnectors.salesforceBox.name": "Sandbox Salesforce",
+    "searchConnectors.content.nativeConnectors.salesforceSandbox.description": "Effectuez des recherches sur votre contenu dans Salesforce Sandbox.",
+    "searchConnectors.content.nativeConnectors.serviceNow.description": "Effectuez des recherches sur votre contenu dans ServiceNow.",
+    "searchConnectors.content.nativeConnectors.serviceNow.name": "ServiceNow",
+    "searchConnectors.content.nativeConnectors.sharepointOnline.description": "Effectuez des recherches sur votre contenu dans SharePoint Online.",
+    "searchConnectors.content.nativeConnectors.sharepointOnline.name": "SharePoint en ligne",
+    "searchConnectors.content.nativeConnectors.sharepointServer.description": "Effectuez des recherches sur votre contenu dans Serveur SharePoint.",
+    "searchConnectors.content.nativeConnectors.sharepointServer.name": "Serveur SharePoint",
+    "searchConnectors.content.nativeConnectors.slack.description": "Effectuez des recherches sur votre contenu dans Slack.",
+    "searchConnectors.content.nativeConnectors.slack.name": "Slack",
+    "searchConnectors.content.nativeConnectors.teams.description": "Effectuez des recherches sur votre contenu dans Teams.",
+    "searchConnectors.content.nativeConnectors.teams.name": "Équipes",
+    "searchConnectors.content.nativeConnectors.zoom.description": "Effectuez des recherches sur votre contenu dans Zoom.",
+    "searchConnectors.content.nativeConnectors.zoom.name": "Effectuer un zoom",
     "searchConnectors.cronEditor.cronDaily.fieldHour.textAtLabel": "À",
     "searchConnectors.cronEditor.cronDaily.fieldTimeLabel": "Heure",
     "searchConnectors.cronEditor.cronDaily.hourSelectLabel": "Heure",
@@ -6783,74 +6840,6 @@
     "searchConnectors.syncStatus.inProgress": "Synchronisation en cours",
     "searchConnectors.syncStatus.pending": "Synchronisation en attente",
     "searchConnectors.syncStatus.suspended": "Synchronisation suspendue",
-    "searchConnectorsPlugin.content.nativeConnectors.azureBlob.description": "Effectuez des recherches sur votre contenu sur Stockage Blob Azure.",
-    "searchConnectorsPlugin.content.nativeConnectors.azureBlob.name": "Stockage Blob Azure",
-    "searchConnectorsPlugin.content.nativeConnectors.box.description": "Effectuez des recherches sur votre contenu dans Box.",
-    "searchConnectorsPlugin.content.nativeConnectors.box.name": "Box",
-    "searchConnectorsPlugin.content.nativeConnectors.confluence_data_center.name": "Centre de données Confluence",
-    "searchConnectorsPlugin.content.nativeConnectors.confluence.description": "Effectuez des recherches sur votre contenu dans Confluence Cloud.",
-    "searchConnectorsPlugin.content.nativeConnectors.confluence.name": "Confluence Cloud & Server",
-    "searchConnectorsPlugin.content.nativeConnectors.confluenceDataCenter.description": "Effectuez des recherches sur votre contenu dans le centre de données Confluence.",
-    "searchConnectorsPlugin.content.nativeConnectors.customConnector.description": "Effectuez des recherches sur des données stockées dans des sources de données personnalisées.",
-    "searchConnectorsPlugin.content.nativeConnectors.customConnector.name": "Connecteur personnalisé",
-    "searchConnectorsPlugin.content.nativeConnectors.dropbox.description": "Effectuez des recherches dans vos fichiers et dossiers stockés sur Dropbox.",
-    "searchConnectorsPlugin.content.nativeConnectors.dropbox.name": "Dropbox",
-    "searchConnectorsPlugin.content.nativeConnectors.github.description": "Effectuez des recherches sur vos projets et référentiels sur GitHub.",
-    "searchConnectorsPlugin.content.nativeConnectors.github.name": "Serveurs GitHub & GitHub Enterprise",
-    "searchConnectorsPlugin.content.nativeConnectors.gmail.description": "Effectuez des recherches sur votre contenu dans Gmail.",
-    "searchConnectorsPlugin.content.nativeConnectors.gmail.name": "Gmail",
-    "searchConnectorsPlugin.content.nativeConnectors.googleCloud.description": "Effectuez des recherches sur votre contenu sur Google Cloud Storage.",
-    "searchConnectorsPlugin.content.nativeConnectors.googleCloud.name": "Google Cloud Storage",
-    "searchConnectorsPlugin.content.nativeConnectors.googleDrive.description": "Effectuez des recherches sur votre contenu sur Google Drive.",
-    "searchConnectorsPlugin.content.nativeConnectors.googleDrive.name": "Google Drive",
-    "searchConnectorsPlugin.content.nativeConnectors.graphQL.description": "Effectuez des recherches dans votre contenu avec GraphQL.",
-    "searchConnectorsPlugin.content.nativeConnectors.graphQL.name": "GraphQL",
-    "searchConnectorsPlugin.content.nativeConnectors.jira_data_center.name": "Centre de données Jira",
-    "searchConnectorsPlugin.content.nativeConnectors.jira.description": "Effectuez des recherches sur votre contenu dans Jira Cloud.",
-    "searchConnectorsPlugin.content.nativeConnectors.jira.name": "Jira Cloud",
-    "searchConnectorsPlugin.content.nativeConnectors.jiraDataCenter.description": "Effectuez des recherches sur votre contenu dans le centre de données Jira.",
-    "searchConnectorsPlugin.content.nativeConnectors.jiraServer.description": "Effectuez des recherches sur votre contenu dans le serveur Jira.",
-    "searchConnectorsPlugin.content.nativeConnectors.jiraServer.name": "Serveur Jira",
-    "searchConnectorsPlugin.content.nativeConnectors.microsoftSQL.name": "Microsoft SQL",
-    "searchConnectorsPlugin.content.nativeConnectors.mongoDB.description": "Effectuez des recherches sur votre contenu dans MongoDB.",
-    "searchConnectorsPlugin.content.nativeConnectors.mongodb.name": "MongoDB",
-    "searchConnectorsPlugin.content.nativeConnectors.msSql.description": "Effectuez des recherches sur votre contenu sur Microsoft SQL Server.",
-    "searchConnectorsPlugin.content.nativeConnectors.mysql.description": "Effectuez des recherches sur votre contenu dans MySQL.",
-    "searchConnectorsPlugin.content.nativeConnectors.mysql.name": "MySQL",
-    "searchConnectorsPlugin.content.nativeConnectors.netowkrDrive.description": "Effectuez des recherches sur le contenu de votre lecteur réseau.",
-    "searchConnectorsPlugin.content.nativeConnectors.networkDrive.name": "Lecteur réseau",
-    "searchConnectorsPlugin.content.nativeConnectors.notion.description": "Effectuez des recherches sur votre contenu dans Notion.",
-    "searchConnectorsPlugin.content.nativeConnectors.notion.name": "Notion",
-    "searchConnectorsPlugin.content.nativeConnectors.oneDrive.description": "Effectuez des recherches sur votre contenu dans OneDrive.",
-    "searchConnectorsPlugin.content.nativeConnectors.oneDrive.name": "OneDrive",
-    "searchConnectorsPlugin.content.nativeConnectors.openTextDocumentum.description": "Recherchez votre contenu sur OpenText Documentum.",
-    "searchConnectorsPlugin.content.nativeConnectors.openTextDocumentum.name": "OpenText Documentum",
-    "searchConnectorsPlugin.content.nativeConnectors.oracle.description": "Effectuez des recherches sur votre contenu dans Oracle.",
-    "searchConnectorsPlugin.content.nativeConnectors.oracle.name": "Oracle",
-    "searchConnectorsPlugin.content.nativeConnectors.outlook.description": "Effectuez des recherches sur votre contenu dans Outlook.",
-    "searchConnectorsPlugin.content.nativeConnectors.outlook.name": "Outlook",
-    "searchConnectorsPlugin.content.nativeConnectors.postgreSQL.description": "Effectuez des recherches sur votre contenu dans PostgreSQL.",
-    "searchConnectorsPlugin.content.nativeConnectors.postgresql.name": "PostgreSQL",
-    "searchConnectorsPlugin.content.nativeConnectors.redis.description": "Effectuez des recherches sur votre contenu dans Redis.",
-    "searchConnectorsPlugin.content.nativeConnectors.redis.name": "Redis",
-    "searchConnectorsPlugin.content.nativeConnectors.s3.description": "Effectuez des recherches sur votre contenu dans Amazon S3.",
-    "searchConnectorsPlugin.content.nativeConnectors.s3.name": "S3",
-    "searchConnectorsPlugin.content.nativeConnectors.salesforce.description": "Effectuez des recherches sur votre contenu dans Salesforce.",
-    "searchConnectorsPlugin.content.nativeConnectors.salesforce.name": "Salesforce",
-    "searchConnectorsPlugin.content.nativeConnectors.salesforceBox.name": "Sandbox Salesforce",
-    "searchConnectorsPlugin.content.nativeConnectors.salesforceSandbox.description": "Effectuez des recherches sur votre contenu dans Salesforce Sandbox.",
-    "searchConnectorsPlugin.content.nativeConnectors.serviceNow.description": "Effectuez des recherches sur votre contenu dans ServiceNow.",
-    "searchConnectorsPlugin.content.nativeConnectors.serviceNow.name": "ServiceNow",
-    "searchConnectorsPlugin.content.nativeConnectors.sharepointOnline.description": "Effectuez des recherches sur votre contenu dans SharePoint Online.",
-    "searchConnectorsPlugin.content.nativeConnectors.sharepointOnline.name": "SharePoint en ligne",
-    "searchConnectorsPlugin.content.nativeConnectors.sharepointServer.description": "Effectuez des recherches sur votre contenu dans Serveur SharePoint.",
-    "searchConnectorsPlugin.content.nativeConnectors.sharepointServer.name": "Serveur SharePoint",
-    "searchConnectorsPlugin.content.nativeConnectors.slack.description": "Effectuez des recherches sur votre contenu dans Slack.",
-    "searchConnectorsPlugin.content.nativeConnectors.slack.name": "Slack",
-    "searchConnectorsPlugin.content.nativeConnectors.teams.description": "Effectuez des recherches sur votre contenu dans Teams.",
-    "searchConnectorsPlugin.content.nativeConnectors.teams.name": "Équipes",
-    "searchConnectorsPlugin.content.nativeConnectors.zoom.description": "Effectuez des recherches sur votre contenu dans Zoom.",
-    "searchConnectorsPlugin.content.nativeConnectors.zoom.name": "Effectuer un zoom",
     "searchErrors.errors.fetchError": "Vérifiez votre connexion réseau et réessayez.",
     "searchErrors.esError.unknownRootCause": "inconnue",
     "searchErrors.esError.viewDetailsButtonLabel": "Afficher les détails",
@@ -15292,7 +15281,7 @@
     "xpack.enterpriseSearch.analytics.productDescription": "Tableaux de bord et outils permettant de visualiser le comportement des utilisateurs finaux et de mesurer les performances de vos applications de recherche.",
     "xpack.enterpriseSearch.analytics.productName": "Behavioral Analytics",
     "xpack.enterpriseSearch.analytics.searchPlaceholder": "Rechercher des noms de collection",
-    "xpack.enterpriseSearch.apiKey.activeKeys": "{number} clés d'API actives.",
+    "xpack.enterpriseSearch.apiKey.activeKeys": "{number} clés d'API actives",
     "xpack.enterpriseSearch.apiKey.apiKeyStepDescription": "Cette clé ne s’affichera qu’une fois, conservez-la donc en lieu sûr. Nous ne conservons pas vos clés d’API, vous devrez donc générer une clé de remplacement si vous la perdez.",
     "xpack.enterpriseSearch.apiKey.apiKeyStepTitle": "Stocker cette clé d'API",
     "xpack.enterpriseSearch.apiKey.cloudId": "Identifiant du cloud :",
@@ -32577,7 +32566,6 @@
     "xpack.observabilityAiAssistantManagement.knowledgeBaseEditManualEntryFlyout.euiFormRow.contentsLabel": "Contenu",
     "xpack.observabilityAiAssistantManagement.knowledgeBaseEditManualEntryFlyout.euiFormRow.idLabel": "Nom",
     "xpack.observabilityAiAssistantManagement.knowledgeBaseEditManualEntryFlyout.euiMarkdownEditor.enterContentsLabel": "Entrer du contenu",
-    "xpack.observabilityAiAssistantManagement.knowledgeBaseNewEntryFlyout.h2.editEntryLabel": "Modifier {id}",
     "xpack.observabilityAiAssistantManagement.knowledgeBaseNewEntryFlyout.h2.newEntryLabel": "Nouvelle entrée",
     "xpack.observabilityAiAssistantManagement.knowledgeBaseNewManualEntryFlyout.cancelButtonEmptyLabel": "Annuler",
     "xpack.observabilityAiAssistantManagement.knowledgeBaseNewManualEntryFlyout.euiMarkdownEditor.observabilityAiAssistantKnowledgeBaseViewMarkdownEditorLabel": "observabilityAiAssistantKnowledgeBaseViewMarkdownEditor",
@@ -44343,8 +44331,6 @@
     "xpack.synthetics.paramForm.namespaces": "Espaces de noms",
     "xpack.synthetics.paramForm.sharedAcrossSpacesLabel": "Partager entre les espaces",
     "xpack.synthetics.paramManagement.deleteParamNameLabel": "Supprimer le paramètre \"{name}\" ?",
-    "xpack.synthetics.paramManagement.paramDeleteFailuresMessage.name": "Impossible de supprimer le paramètre {name}.",
-    "xpack.synthetics.paramManagement.paramDeleteSuccessMessage.name": "Paramètre {name} supprimé avec succès.",
     "xpack.synthetics.params.description": "Définissez les variables et paramètres que vous pouvez utiliser dans la configuration du navigateur et des moniteurs légers, tels que des informations d'identification ou des URL. {learnMore}",
     "xpack.synthetics.params.unprivileged.unprivilegedDescription": "Vous devez disposer de privilèges supplémentaires pour voir les paramètres d'utilisation et de conservation des données des applications Synthetics. {docsLink}",
     "xpack.synthetics.pingList.collapseRow": "Réduire",
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index e10155c086e64..9c7115b026122 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -1209,9 +1209,6 @@
     "dashboard.actions.toggleExpandPanelMenuItem.notExpandedDisplayName": "最大化",
     "dashboard.addPanel.newEmbeddableAddedSuccessMessageTitle": "{savedObjectName} が追加されました",
     "dashboard.addPanel.newEmbeddableWithNoTitleAddedSuccessMessageTitle": "パネルが追加されました",
-    "dashboard.appLeaveConfirmModal.cancelButtonLabel": "キャンセル",
-    "dashboard.appLeaveConfirmModal.unsavedChangesSubtitle": "作業を保存せずにダッシュボードから移動しますか？",
-    "dashboard.appLeaveConfirmModal.unsavedChangesTitle": "保存されていない変更",
     "dashboard.badge.readOnly.text": "読み取り専用",
     "dashboard.badge.readOnly.tooltip": "ダッシュボードを保存できません",
     "dashboard.createConfirmModal.cancelButtonLabel": "キャンセル",
@@ -5828,12 +5825,7 @@
     "reporting.share.modalContent.notification.reportingErrorTitle": "レポートを作成できません",
     "reporting.share.modalContent.successfullyQueuedReportNotificationDescription": "{path}で進捗状況を追跡します。",
     "reporting.share.modalContent.successfullyQueuedReportNotificationTitle": "{objectType} のレポートキュー",
-    "reporting.share.panelAction.csvDownloadStartedMessage": "間もなく CSV がダウンロードされます。",
-    "reporting.share.panelAction.csvDownloadStartedTitle": "CSVダウンロードが開始しました",
     "reporting.share.panelAction.csvReportStartedTitle": "CSVのキューにあるレポート",
-    "reporting.share.panelAction.downloadCsvPanelTitle": "CSV をダウンロード",
-    "reporting.share.panelAction.failedCsvReportMessage": "現在、CSVをダウンロードできませんでした。",
-    "reporting.share.panelAction.failedCsvReportTitle": "CSV のダウンロードに失敗",
     "reporting.share.panelAction.failedGenerateCsvReportMessage": "現在 CSV を生成できません。",
     "reporting.share.panelAction.failedGenerateCsvReportTitle": "CSVレポート失敗",
     "reporting.share.panelAction.generateCsvPanelTitle": "CSVレポートを生成",
@@ -6148,11 +6140,61 @@
     "searchConnectors.content.indices.connectorScheduling.schedulePanel.contentSync.description": "Elasticsearchドキュメントを作成または更新するためにコンテンツを取得します。",
     "searchConnectors.content.indices.connectorScheduling.schedulePanel.contentSync.title": "コンテンツ同期",
     "searchConnectors.content.indices.connectorScheduling.switch.label": "有効",
+    "searchConnectors.content.nativeConnectors.azureBlob.description": "Azure Blob Storageのコンテンツを検索します。",
+    "searchConnectors.content.nativeConnectors.azureBlob.name": "Azure Blob Storage",
+    "searchConnectors.content.nativeConnectors.box.description": "Boxでコンテンツを検索します。",
+    "searchConnectors.content.nativeConnectors.box.name": "Box",
+    "searchConnectors.content.nativeConnectors.confluence_data_center.name": "Confluence Data Center",
+    "searchConnectors.content.nativeConnectors.confluence.description": "Confluence Cloudでコンテンツを検索します。",
+    "searchConnectors.content.nativeConnectors.confluence.name": "Confluence Cloud & Server",
+    "searchConnectors.content.nativeConnectors.confluenceDataCenter.description": "Confluence Data Centerでコンテンツを検索します。",
+    "searchConnectors.content.nativeConnectors.customConnector.description": "カスタムデータソースに格納されているデータを検索します。",
+    "searchConnectors.content.nativeConnectors.customConnector.name": "カスタマイズされたコネクター",
+    "searchConnectors.content.nativeConnectors.dropbox.description": "Dropboxに保存されたファイルとフォルダーを検索します。",
+    "searchConnectors.content.nativeConnectors.dropbox.name": "Dropbox",
+    "searchConnectors.content.nativeConnectors.github.description": "GitHubのプロジェクトとリポジトリを検索します。",
+    "searchConnectors.content.nativeConnectors.github.name": "GitHub & GitHub Enterprise Server",
+    "searchConnectors.content.nativeConnectors.gmail.description": "Gmailでコンテンツを検索します。",
+    "searchConnectors.content.nativeConnectors.gmail.name": "Gmail",
+    "searchConnectors.content.nativeConnectors.googleCloud.description": "Google Cloud Storageのコンテンツを検索します。",
     "searchConnectors.content.nativeConnectors.googleCloud.name": "Google Cloud Storage",
+    "searchConnectors.content.nativeConnectors.googleDrive.description": "Google Driveのコンテンツを検索します。",
+    "searchConnectors.content.nativeConnectors.googleDrive.name": "Google Drive",
+    "searchConnectors.content.nativeConnectors.graphQL.description": "GraphQLでコンテンツを検索します。",
+    "searchConnectors.content.nativeConnectors.graphQL.name": "GraphQL",
+    "searchConnectors.content.nativeConnectors.jira_data_center.name": "Jira Data Center",
+    "searchConnectors.content.nativeConnectors.jira.description": "Jira Cloudでコンテンツを検索します。",
+    "searchConnectors.content.nativeConnectors.jira.name": "Jira Cloud",
+    "searchConnectors.content.nativeConnectors.jiraDataCenter.description": "Jira Data Centerでコンテンツを検索します。",
+    "searchConnectors.content.nativeConnectors.jiraServer.description": "Jira Serverでコンテンツを検索します。",
+    "searchConnectors.content.nativeConnectors.jiraServer.name": "Jira Server",
+    "searchConnectors.content.nativeConnectors.microsoftSQL.name": "Microsoft SQL",
+    "searchConnectors.content.nativeConnectors.mongoDB.description": "MongoDBコンテンツを検索します。",
+    "searchConnectors.content.nativeConnectors.mongodb.name": "MongoDB",
+    "searchConnectors.content.nativeConnectors.msSql.description": "Microsoft SQL Serverでコンテンツを検索します。",
+    "searchConnectors.content.nativeConnectors.mysql.description": "MySQLコンテンツを検索します。",
+    "searchConnectors.content.nativeConnectors.mysql.name": "MySQL",
+    "searchConnectors.content.nativeConnectors.netowkrDrive.description": "ネットワークドライブコンテンツを検索します。",
+    "searchConnectors.content.nativeConnectors.networkDrive.name": "ネットワークドライブ",
+    "searchConnectors.content.nativeConnectors.notion.description": "Notionでコンテンツを検索します。",
+    "searchConnectors.content.nativeConnectors.notion.name": "Notion",
+    "searchConnectors.content.nativeConnectors.oneDrive.description": "OneDriveでコンテンツを検索します。",
+    "searchConnectors.content.nativeConnectors.oneDrive.name": "OneDrive",
+    "searchConnectors.content.nativeConnectors.openTextDocumentum.description": "OpenText Documentumでコンテンツを検索します。",
+    "searchConnectors.content.nativeConnectors.openTextDocumentum.name": "OpenText Documentum",
+    "searchConnectors.content.nativeConnectors.oracle.description": "Oracleでコンテンツを検索します。",
+    "searchConnectors.content.nativeConnectors.oracle.name": "Oracle",
+    "searchConnectors.content.nativeConnectors.outlook.description": "Outlookでコンテンツを検索します。",
+    "searchConnectors.content.nativeConnectors.outlook.name": "Outlook",
+    "searchConnectors.content.nativeConnectors.postgreSQL.description": "PostgreSQLでコンテンツを検索します。",
+    "searchConnectors.content.nativeConnectors.postgresql.name": "PostgreSQL",
+    "searchConnectors.content.nativeConnectors.redis.description": "Redisでコンテンツを検索します。",
+    "searchConnectors.content.nativeConnectors.redis.name": "Redis",
     "searchConnectors.content.nativeConnectors.s3.accessKey.label": "AWSアクセスキーID",
     "searchConnectors.content.nativeConnectors.s3.buckets.label": "AWSバケット",
     "searchConnectors.content.nativeConnectors.s3.buckets.tooltip": "詳細同期ルールが使用されている場合、AWSバケットは無視されます。",
     "searchConnectors.content.nativeConnectors.s3.connectTimeout.label": "接続タイムアウト",
+    "searchConnectors.content.nativeConnectors.s3.description": "Amazon S3でコンテンツを検索します。",
     "searchConnectors.content.nativeConnectors.s3.maxAttempts.label": "最大再試行回数",
     "searchConnectors.content.nativeConnectors.s3.maxPageSize.label": "ページの最大サイズ",
     "searchConnectors.content.nativeConnectors.s3.name": "S3",
@@ -6162,9 +6204,24 @@
     "searchConnectors.content.nativeConnectors.salesforce.clientId.tooltip": "OAuth2対応接続済みアプリのクライアントID。「コンシューマーキー」とも呼ばれます。",
     "searchConnectors.content.nativeConnectors.salesforce.clientSecret.label": "クライアントシークレット",
     "searchConnectors.content.nativeConnectors.salesforce.clientSecret.tooltip": "OAuth2対応接続済みアプリのクライアントシークレット。「コンシューマーシークレット」とも呼ばれます。",
+    "searchConnectors.content.nativeConnectors.salesforce.description": "Salesforceでコンテンツを検索します。",
     "searchConnectors.content.nativeConnectors.salesforce.domain.label": "ドメイン",
     "searchConnectors.content.nativeConnectors.salesforce.domain.tooltip": "Salesforceインスタンスのドメイン。Salesforce URLがhttps://foo.salesforce.comの場合は、ドメインが「foo」になります。",
     "searchConnectors.content.nativeConnectors.salesforce.name": "Salesforce",
+    "searchConnectors.content.nativeConnectors.salesforceBox.name": "Salesforce Sandbox",
+    "searchConnectors.content.nativeConnectors.salesforceSandbox.description": "Salesforce Sandboxでコンテンツを検索します。",
+    "searchConnectors.content.nativeConnectors.serviceNow.description": "ServiceNowでコンテンツを検索します。",
+    "searchConnectors.content.nativeConnectors.serviceNow.name": "ServiceNow",
+    "searchConnectors.content.nativeConnectors.sharepointOnline.description": "SharePoint Onlineでコンテンツを検索します。",
+    "searchConnectors.content.nativeConnectors.sharepointOnline.name": "Sharepoint Online",
+    "searchConnectors.content.nativeConnectors.sharepointServer.description": "SharePoint Serverでコンテンツを検索します。",
+    "searchConnectors.content.nativeConnectors.sharepointServer.name": "Sharepoint Server",
+    "searchConnectors.content.nativeConnectors.slack.description": "Slackでコンテンツを検索します。",
+    "searchConnectors.content.nativeConnectors.slack.name": "Slack",
+    "searchConnectors.content.nativeConnectors.teams.description": "Teamsでコンテンツを検索します。",
+    "searchConnectors.content.nativeConnectors.teams.name": "Teams",
+    "searchConnectors.content.nativeConnectors.zoom.description": "Zoomでコンテンツを検索します。",
+    "searchConnectors.content.nativeConnectors.zoom.name": "ズーム",
     "searchConnectors.cronEditor.cronDaily.fieldHour.textAtLabel": "に",
     "searchConnectors.cronEditor.cronDaily.fieldTimeLabel": "時間",
     "searchConnectors.cronEditor.cronDaily.hourSelectLabel": "時間",
@@ -6538,74 +6595,6 @@
     "searchConnectors.syncStatus.inProgress": "同期は実行中です",
     "searchConnectors.syncStatus.pending": "同期は保留中です",
     "searchConnectors.syncStatus.suspended": "同期が一時停止されました",
-    "searchConnectorsPlugin.content.nativeConnectors.azureBlob.description": "Azure Blob Storageのコンテンツを検索します。",
-    "searchConnectorsPlugin.content.nativeConnectors.azureBlob.name": "Azure Blob Storage",
-    "searchConnectorsPlugin.content.nativeConnectors.box.description": "Boxでコンテンツを検索します。",
-    "searchConnectorsPlugin.content.nativeConnectors.box.name": "Box",
-    "searchConnectorsPlugin.content.nativeConnectors.confluence_data_center.name": "Confluence Data Center",
-    "searchConnectorsPlugin.content.nativeConnectors.confluence.description": "Confluence Cloudでコンテンツを検索します。",
-    "searchConnectorsPlugin.content.nativeConnectors.confluence.name": "Confluence Cloud & Server",
-    "searchConnectorsPlugin.content.nativeConnectors.confluenceDataCenter.description": "Confluence Data Centerでコンテンツを検索します。",
-    "searchConnectorsPlugin.content.nativeConnectors.customConnector.description": "カスタムデータソースに格納されているデータを検索します。",
-    "searchConnectorsPlugin.content.nativeConnectors.customConnector.name": "カスタマイズされたコネクター",
-    "searchConnectorsPlugin.content.nativeConnectors.dropbox.description": "Dropboxに保存されたファイルとフォルダーを検索します。",
-    "searchConnectorsPlugin.content.nativeConnectors.dropbox.name": "Dropbox",
-    "searchConnectorsPlugin.content.nativeConnectors.github.description": "GitHubのプロジェクトとリポジトリを検索します。",
-    "searchConnectorsPlugin.content.nativeConnectors.github.name": "GitHub & GitHub Enterprise Server",
-    "searchConnectorsPlugin.content.nativeConnectors.gmail.description": "Gmailでコンテンツを検索します。",
-    "searchConnectorsPlugin.content.nativeConnectors.gmail.name": "Gmail",
-    "searchConnectorsPlugin.content.nativeConnectors.googleCloud.description": "Google Cloud Storageのコンテンツを検索します。",
-    "searchConnectorsPlugin.content.nativeConnectors.googleCloud.name": "Google Cloud Storage",
-    "searchConnectorsPlugin.content.nativeConnectors.googleDrive.description": "Google Driveのコンテンツを検索します。",
-    "searchConnectorsPlugin.content.nativeConnectors.googleDrive.name": "Google Drive",
-    "searchConnectorsPlugin.content.nativeConnectors.graphQL.description": "GraphQLでコンテンツを検索します。",
-    "searchConnectorsPlugin.content.nativeConnectors.graphQL.name": "GraphQL",
-    "searchConnectorsPlugin.content.nativeConnectors.jira_data_center.name": "Jira Data Center",
-    "searchConnectorsPlugin.content.nativeConnectors.jira.description": "Jira Cloudでコンテンツを検索します。",
-    "searchConnectorsPlugin.content.nativeConnectors.jira.name": "Jira Cloud",
-    "searchConnectorsPlugin.content.nativeConnectors.jiraDataCenter.description": "Jira Data Centerでコンテンツを検索します。",
-    "searchConnectorsPlugin.content.nativeConnectors.jiraServer.description": "Jira Serverでコンテンツを検索します。",
-    "searchConnectorsPlugin.content.nativeConnectors.jiraServer.name": "Jira Server",
-    "searchConnectorsPlugin.content.nativeConnectors.microsoftSQL.name": "Microsoft SQL",
-    "searchConnectorsPlugin.content.nativeConnectors.mongoDB.description": "MongoDBコンテンツを検索します。",
-    "searchConnectorsPlugin.content.nativeConnectors.mongodb.name": "MongoDB",
-    "searchConnectorsPlugin.content.nativeConnectors.msSql.description": "Microsoft SQL Serverでコンテンツを検索します。",
-    "searchConnectorsPlugin.content.nativeConnectors.mysql.description": "MySQLコンテンツを検索します。",
-    "searchConnectorsPlugin.content.nativeConnectors.mysql.name": "MySQL",
-    "searchConnectorsPlugin.content.nativeConnectors.netowkrDrive.description": "ネットワークドライブコンテンツを検索します。",
-    "searchConnectorsPlugin.content.nativeConnectors.networkDrive.name": "ネットワークドライブ",
-    "searchConnectorsPlugin.content.nativeConnectors.notion.description": "Notionでコンテンツを検索します。",
-    "searchConnectorsPlugin.content.nativeConnectors.notion.name": "Notion",
-    "searchConnectorsPlugin.content.nativeConnectors.oneDrive.description": "OneDriveでコンテンツを検索します。",
-    "searchConnectorsPlugin.content.nativeConnectors.oneDrive.name": "OneDrive",
-    "searchConnectorsPlugin.content.nativeConnectors.openTextDocumentum.description": "OpenText Documentumでコンテンツを検索します。",
-    "searchConnectorsPlugin.content.nativeConnectors.openTextDocumentum.name": "OpenText Documentum",
-    "searchConnectorsPlugin.content.nativeConnectors.oracle.description": "Oracleでコンテンツを検索します。",
-    "searchConnectorsPlugin.content.nativeConnectors.oracle.name": "Oracle",
-    "searchConnectorsPlugin.content.nativeConnectors.outlook.description": "Outlookでコンテンツを検索します。",
-    "searchConnectorsPlugin.content.nativeConnectors.outlook.name": "Outlook",
-    "searchConnectorsPlugin.content.nativeConnectors.postgreSQL.description": "PostgreSQLでコンテンツを検索します。",
-    "searchConnectorsPlugin.content.nativeConnectors.postgresql.name": "PostgreSQL",
-    "searchConnectorsPlugin.content.nativeConnectors.redis.description": "Redisでコンテンツを検索します。",
-    "searchConnectorsPlugin.content.nativeConnectors.redis.name": "Redis",
-    "searchConnectorsPlugin.content.nativeConnectors.s3.description": "Amazon S3でコンテンツを検索します。",
-    "searchConnectorsPlugin.content.nativeConnectors.s3.name": "S3",
-    "searchConnectorsPlugin.content.nativeConnectors.salesforce.description": "Salesforceでコンテンツを検索します。",
-    "searchConnectorsPlugin.content.nativeConnectors.salesforce.name": "Salesforce",
-    "searchConnectorsPlugin.content.nativeConnectors.salesforceBox.name": "Salesforce Sandbox",
-    "searchConnectorsPlugin.content.nativeConnectors.salesforceSandbox.description": "Salesforce Sandboxでコンテンツを検索します。",
-    "searchConnectorsPlugin.content.nativeConnectors.serviceNow.description": "ServiceNowでコンテンツを検索します。",
-    "searchConnectorsPlugin.content.nativeConnectors.serviceNow.name": "ServiceNow",
-    "searchConnectorsPlugin.content.nativeConnectors.sharepointOnline.description": "SharePoint Onlineでコンテンツを検索します。",
-    "searchConnectorsPlugin.content.nativeConnectors.sharepointOnline.name": "Sharepoint Online",
-    "searchConnectorsPlugin.content.nativeConnectors.sharepointServer.description": "SharePoint Serverでコンテンツを検索します。",
-    "searchConnectorsPlugin.content.nativeConnectors.sharepointServer.name": "Sharepoint Server",
-    "searchConnectorsPlugin.content.nativeConnectors.slack.description": "Slackでコンテンツを検索します。",
-    "searchConnectorsPlugin.content.nativeConnectors.slack.name": "Slack",
-    "searchConnectorsPlugin.content.nativeConnectors.teams.description": "Teamsでコンテンツを検索します。",
-    "searchConnectorsPlugin.content.nativeConnectors.teams.name": "Teams",
-    "searchConnectorsPlugin.content.nativeConnectors.zoom.description": "Zoomでコンテンツを検索します。",
-    "searchConnectorsPlugin.content.nativeConnectors.zoom.name": "ズーム",
     "searchErrors.errors.fetchError": "ネットワーク接続を確認して再試行してください。",
     "searchErrors.esError.unknownRootCause": "不明",
     "searchErrors.esError.viewDetailsButtonLabel": "詳細を表示",
@@ -15038,7 +15027,7 @@
     "xpack.enterpriseSearch.analytics.productDescription": "エンドユーザーの行動を可視化し、検索アプリケーションのパフォーマンスを測定するためのダッシュボードとツール。",
     "xpack.enterpriseSearch.analytics.productName": "Behavioral Analytics",
     "xpack.enterpriseSearch.analytics.searchPlaceholder": "コレクション名を検索",
-    "xpack.enterpriseSearch.apiKey.activeKeys": "{number}個のアクティブなAPIキー。",
+    "xpack.enterpriseSearch.apiKey.activeKeys": "{number}個のアクティブなAPIキー",
     "xpack.enterpriseSearch.apiKey.apiKeyStepDescription": "このキーは一度しか表示されないため、安全な場所に保存しておいてください。当社はお客様のAPIキーを保存しません。キーを紛失した場合は、代替キーを生成する必要があります。",
     "xpack.enterpriseSearch.apiKey.apiKeyStepTitle": "このAPIキーを保存",
     "xpack.enterpriseSearch.apiKey.cloudId": "クラウドID：",
@@ -32324,7 +32313,6 @@
     "xpack.observabilityAiAssistantManagement.knowledgeBaseEditManualEntryFlyout.euiFormRow.contentsLabel": "目次",
     "xpack.observabilityAiAssistantManagement.knowledgeBaseEditManualEntryFlyout.euiFormRow.idLabel": "名前",
     "xpack.observabilityAiAssistantManagement.knowledgeBaseEditManualEntryFlyout.euiMarkdownEditor.enterContentsLabel": "コンテンツを入力",
-    "xpack.observabilityAiAssistantManagement.knowledgeBaseNewEntryFlyout.h2.editEntryLabel": "{id}を編集",
     "xpack.observabilityAiAssistantManagement.knowledgeBaseNewEntryFlyout.h2.newEntryLabel": "新しいエントリー",
     "xpack.observabilityAiAssistantManagement.knowledgeBaseNewManualEntryFlyout.cancelButtonEmptyLabel": "キャンセル",
     "xpack.observabilityAiAssistantManagement.knowledgeBaseNewManualEntryFlyout.euiMarkdownEditor.observabilityAiAssistantKnowledgeBaseViewMarkdownEditorLabel": "observabilityAiAssistantKnowledgeBaseViewMarkdownEditor",
@@ -44081,8 +44069,6 @@
     "xpack.synthetics.paramForm.namespaces": "名前空間",
     "xpack.synthetics.paramForm.sharedAcrossSpacesLabel": "複数のスペース間で共有",
     "xpack.synthetics.paramManagement.deleteParamNameLabel": "\"{name}\"パラメーターを削除しますか？",
-    "xpack.synthetics.paramManagement.paramDeleteFailuresMessage.name": "パラメーター{name}の削除に失敗しました。",
-    "xpack.synthetics.paramManagement.paramDeleteSuccessMessage.name": "パラメーター\"{name}\"が正常に削除されました。",
     "xpack.synthetics.params.description": "ブラウザーや軽量モニターの設定に使用できる変数やパラメーター（認証情報やURLなど）を定義します。{learnMore}",
     "xpack.synthetics.params.unprivileged.unprivilegedDescription": "Syntheticsアプリデータの使用状況と保持設定を表示する追加の権限が必要です。{docsLink}",
     "xpack.synthetics.pingList.collapseRow": "縮小",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 0ed330ec41630..a9a104b339c30 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -1209,9 +1209,6 @@
     "dashboard.actions.toggleExpandPanelMenuItem.notExpandedDisplayName": "最大化",
     "dashboard.addPanel.newEmbeddableAddedSuccessMessageTitle": "{savedObjectName} 已添加",
     "dashboard.addPanel.newEmbeddableWithNoTitleAddedSuccessMessageTitle": "已添加一个面板",
-    "dashboard.appLeaveConfirmModal.cancelButtonLabel": "取消",
-    "dashboard.appLeaveConfirmModal.unsavedChangesSubtitle": "离开有未保存工作的仪表板？",
-    "dashboard.appLeaveConfirmModal.unsavedChangesTitle": "未保存的更改",
     "dashboard.badge.readOnly.text": "只读",
     "dashboard.badge.readOnly.tooltip": "无法保存仪表板",
     "dashboard.createConfirmModal.cancelButtonLabel": "取消",
@@ -5841,12 +5838,7 @@
     "reporting.share.modalContent.notification.reportingErrorTitle": "无法创建报告",
     "reporting.share.modalContent.successfullyQueuedReportNotificationDescription": "在 {path} 中跟踪其进度。",
     "reporting.share.modalContent.successfullyQueuedReportNotificationTitle": "已为 {objectType} 排队报告",
-    "reporting.share.panelAction.csvDownloadStartedMessage": "您的 CSV 将很快下载。",
-    "reporting.share.panelAction.csvDownloadStartedTitle": "CSV 下载已开始",
     "reporting.share.panelAction.csvReportStartedTitle": "已为 CSV 排队报告",
-    "reporting.share.panelAction.downloadCsvPanelTitle": "下载 CSV",
-    "reporting.share.panelAction.failedCsvReportMessage": "此时无法下载 CSV。",
-    "reporting.share.panelAction.failedCsvReportTitle": "CSV 下载失败。",
     "reporting.share.panelAction.failedGenerateCsvReportMessage": "我们此次无法生成 CSV。",
     "reporting.share.panelAction.failedGenerateCsvReportTitle": "CSV 报告失败",
     "reporting.share.panelAction.generateCsvPanelTitle": "生成 CSV 报告",
@@ -6161,11 +6153,61 @@
     "searchConnectors.content.indices.connectorScheduling.schedulePanel.contentSync.description": "提取内容以创建或更新您的 Elasticsearch 文档。",
     "searchConnectors.content.indices.connectorScheduling.schedulePanel.contentSync.title": "内容同步",
     "searchConnectors.content.indices.connectorScheduling.switch.label": "已启用",
+    "searchConnectors.content.nativeConnectors.azureBlob.description": "在 Azure Blob 存储上搜索您的内容。",
+    "searchConnectors.content.nativeConnectors.azureBlob.name": "Azure Blob 存储",
+    "searchConnectors.content.nativeConnectors.box.description": "在 Box 上搜索您的内容。",
+    "searchConnectors.content.nativeConnectors.box.name": "Box",
+    "searchConnectors.content.nativeConnectors.confluence_data_center.name": "Confluence 数据中心",
+    "searchConnectors.content.nativeConnectors.confluence.description": "在 Confluence Cloud 上搜索您的内容。",
+    "searchConnectors.content.nativeConnectors.confluence.name": "Confluence Cloud 和 Confluence Server",
+    "searchConnectors.content.nativeConnectors.confluenceDataCenter.description": "在 Confluence 数据中心上搜索您的内容。",
+    "searchConnectors.content.nativeConnectors.customConnector.description": "搜索存储在定制数据源上的数据。",
+    "searchConnectors.content.nativeConnectors.customConnector.name": "定制连接器",
+    "searchConnectors.content.nativeConnectors.dropbox.description": "搜索存储在 Dropbox 上的文件和文件夹。",
+    "searchConnectors.content.nativeConnectors.dropbox.name": "Dropbox",
+    "searchConnectors.content.nativeConnectors.github.description": "搜索 GitHub 上的项目和存储库。",
+    "searchConnectors.content.nativeConnectors.github.name": "GitHub 和 GitHub Enterprise Server",
+    "searchConnectors.content.nativeConnectors.gmail.description": "在 Gmail 上搜索您的内容。",
+    "searchConnectors.content.nativeConnectors.gmail.name": "Gmail",
+    "searchConnectors.content.nativeConnectors.googleCloud.description": "在 Google Cloud Storage 上搜索您的内容。",
     "searchConnectors.content.nativeConnectors.googleCloud.name": "Google Cloud Storage",
+    "searchConnectors.content.nativeConnectors.googleDrive.description": "在 Google 云端硬盘上搜索您的内容。",
+    "searchConnectors.content.nativeConnectors.googleDrive.name": "Google 云端硬盘",
+    "searchConnectors.content.nativeConnectors.graphQL.description": "使用 GraphQL 搜索您的内容。",
+    "searchConnectors.content.nativeConnectors.graphQL.name": "GraphQL",
+    "searchConnectors.content.nativeConnectors.jira_data_center.name": "Jira 数据中心",
+    "searchConnectors.content.nativeConnectors.jira.description": "在 Jira Cloud 上搜索您的内容。",
+    "searchConnectors.content.nativeConnectors.jira.name": "Jira Cloud",
+    "searchConnectors.content.nativeConnectors.jiraDataCenter.description": "在 Jira 数据中心上搜索您的内容。",
+    "searchConnectors.content.nativeConnectors.jiraServer.description": "在 Jira Server 上搜索您的内容。",
+    "searchConnectors.content.nativeConnectors.jiraServer.name": "Jira Server",
+    "searchConnectors.content.nativeConnectors.microsoftSQL.name": "Microsoft SQL",
+    "searchConnectors.content.nativeConnectors.mongoDB.description": "搜索您的 MongoDB 内容。",
+    "searchConnectors.content.nativeConnectors.mongodb.name": "MongoDB",
+    "searchConnectors.content.nativeConnectors.msSql.description": "在 Microsoft SQL Server 上搜索您的内容。",
+    "searchConnectors.content.nativeConnectors.mysql.description": "搜索您的 MySQL 内容。",
+    "searchConnectors.content.nativeConnectors.mysql.name": "MySQL",
+    "searchConnectors.content.nativeConnectors.netowkrDrive.description": "搜索您的网络驱动器内容。",
+    "searchConnectors.content.nativeConnectors.networkDrive.name": "网络驱动器",
+    "searchConnectors.content.nativeConnectors.notion.description": "在 Notion 上搜索您的内容。",
+    "searchConnectors.content.nativeConnectors.notion.name": "Notion",
+    "searchConnectors.content.nativeConnectors.oneDrive.description": "在 OneDrive 上搜索您的内容。",
+    "searchConnectors.content.nativeConnectors.oneDrive.name": "OneDrive",
+    "searchConnectors.content.nativeConnectors.openTextDocumentum.description": "在 OpenText Documentum 上搜索您的内容。",
+    "searchConnectors.content.nativeConnectors.openTextDocumentum.name": "OpenText Documentum",
+    "searchConnectors.content.nativeConnectors.oracle.description": "在 Oracle 上搜索您的内容。",
+    "searchConnectors.content.nativeConnectors.oracle.name": "Oracle",
+    "searchConnectors.content.nativeConnectors.outlook.description": "在 Outlook 上搜索您的内容。",
+    "searchConnectors.content.nativeConnectors.outlook.name": "Outlook",
+    "searchConnectors.content.nativeConnectors.postgreSQL.description": "在 PostgreSQL 上搜索您的内容。",
+    "searchConnectors.content.nativeConnectors.postgresql.name": "PostgreSQL",
+    "searchConnectors.content.nativeConnectors.redis.description": "在 Redis 上搜索您的内容。",
+    "searchConnectors.content.nativeConnectors.redis.name": "Redis",
     "searchConnectors.content.nativeConnectors.s3.accessKey.label": "AWS 访问密钥 ID",
     "searchConnectors.content.nativeConnectors.s3.buckets.label": "AWS 存储桶",
     "searchConnectors.content.nativeConnectors.s3.buckets.tooltip": "使用高级同步规则时，将忽略 AWS 存储桶。",
     "searchConnectors.content.nativeConnectors.s3.connectTimeout.label": "连接超时",
+    "searchConnectors.content.nativeConnectors.s3.description": "在 Amazon S3 上搜索您的内容。",
     "searchConnectors.content.nativeConnectors.s3.maxAttempts.label": "最大重试次数",
     "searchConnectors.content.nativeConnectors.s3.maxPageSize.label": "最大页面大小",
     "searchConnectors.content.nativeConnectors.s3.name": "S3",
@@ -6175,9 +6217,24 @@
     "searchConnectors.content.nativeConnectors.salesforce.clientId.tooltip": "启用了 OAuth2 的已连接应用的客户端 ID。也称为“使用者密钥”",
     "searchConnectors.content.nativeConnectors.salesforce.clientSecret.label": "客户端密钥",
     "searchConnectors.content.nativeConnectors.salesforce.clientSecret.tooltip": "启用了 OAuth2 的已连接应用的客户端密钥。也称为“使用者机密”",
+    "searchConnectors.content.nativeConnectors.salesforce.description": "在 Salesforce 上搜索您的内容。",
     "searchConnectors.content.nativeConnectors.salesforce.domain.label": "域",
     "searchConnectors.content.nativeConnectors.salesforce.domain.tooltip": "Salesforce 实例的域。如果 Salesforce URL 为“https://foo.salesforce.com”，则该域将为“foo”。",
     "searchConnectors.content.nativeConnectors.salesforce.name": "Salesforce",
+    "searchConnectors.content.nativeConnectors.salesforceBox.name": "Salesforce Sandbox",
+    "searchConnectors.content.nativeConnectors.salesforceSandbox.description": "在 Salesforce Sandbox 上搜索您的内容。",
+    "searchConnectors.content.nativeConnectors.serviceNow.description": "在 ServiceNow 上搜索您的内容。",
+    "searchConnectors.content.nativeConnectors.serviceNow.name": "ServiceNow",
+    "searchConnectors.content.nativeConnectors.sharepointOnline.description": "在 SharePoint Online 上搜索您的内容。",
+    "searchConnectors.content.nativeConnectors.sharepointOnline.name": "Sharepoint",
+    "searchConnectors.content.nativeConnectors.sharepointServer.description": "在 SharePoint Server 上搜索您的内容。",
+    "searchConnectors.content.nativeConnectors.sharepointServer.name": "SharePoint Server",
+    "searchConnectors.content.nativeConnectors.slack.description": "在 Slack 上搜索您的内容。",
+    "searchConnectors.content.nativeConnectors.slack.name": "Slack",
+    "searchConnectors.content.nativeConnectors.teams.description": "在 Teams 上搜索您的内容。",
+    "searchConnectors.content.nativeConnectors.teams.name": "Teams",
+    "searchConnectors.content.nativeConnectors.zoom.description": "在 Zoom 上搜索您的内容。",
+    "searchConnectors.content.nativeConnectors.zoom.name": "缩放",
     "searchConnectors.cronEditor.cronDaily.fieldHour.textAtLabel": "于",
     "searchConnectors.cronEditor.cronDaily.fieldTimeLabel": "时间",
     "searchConnectors.cronEditor.cronDaily.hourSelectLabel": "小时",
@@ -6551,74 +6608,6 @@
     "searchConnectors.syncStatus.inProgress": "同步进行中",
     "searchConnectors.syncStatus.pending": "同步待处理",
     "searchConnectors.syncStatus.suspended": "同步已挂起",
-    "searchConnectorsPlugin.content.nativeConnectors.azureBlob.description": "在 Azure Blob 存储上搜索您的内容。",
-    "searchConnectorsPlugin.content.nativeConnectors.azureBlob.name": "Azure Blob 存储",
-    "searchConnectorsPlugin.content.nativeConnectors.box.description": "在 Box 上搜索您的内容。",
-    "searchConnectorsPlugin.content.nativeConnectors.box.name": "Box",
-    "searchConnectorsPlugin.content.nativeConnectors.confluence_data_center.name": "Confluence 数据中心",
-    "searchConnectorsPlugin.content.nativeConnectors.confluence.description": "在 Confluence Cloud 上搜索您的内容。",
-    "searchConnectorsPlugin.content.nativeConnectors.confluence.name": "Confluence Cloud 和 Confluence Server",
-    "searchConnectorsPlugin.content.nativeConnectors.confluenceDataCenter.description": "在 Confluence 数据中心上搜索您的内容。",
-    "searchConnectorsPlugin.content.nativeConnectors.customConnector.description": "搜索存储在定制数据源上的数据。",
-    "searchConnectorsPlugin.content.nativeConnectors.customConnector.name": "定制连接器",
-    "searchConnectorsPlugin.content.nativeConnectors.dropbox.description": "搜索存储在 Dropbox 上的文件和文件夹。",
-    "searchConnectorsPlugin.content.nativeConnectors.dropbox.name": "Dropbox",
-    "searchConnectorsPlugin.content.nativeConnectors.github.description": "搜索 GitHub 上的项目和存储库。",
-    "searchConnectorsPlugin.content.nativeConnectors.github.name": "GitHub 和 GitHub Enterprise Server",
-    "searchConnectorsPlugin.content.nativeConnectors.gmail.description": "在 Gmail 上搜索您的内容。",
-    "searchConnectorsPlugin.content.nativeConnectors.gmail.name": "Gmail",
-    "searchConnectorsPlugin.content.nativeConnectors.googleCloud.description": "在 Google Cloud Storage 上搜索您的内容。",
-    "searchConnectorsPlugin.content.nativeConnectors.googleCloud.name": "Google Cloud Storage",
-    "searchConnectorsPlugin.content.nativeConnectors.googleDrive.description": "在 Google 云端硬盘上搜索您的内容。",
-    "searchConnectorsPlugin.content.nativeConnectors.googleDrive.name": "Google 云端硬盘",
-    "searchConnectorsPlugin.content.nativeConnectors.graphQL.description": "使用 GraphQL 搜索您的内容。",
-    "searchConnectorsPlugin.content.nativeConnectors.graphQL.name": "GraphQL",
-    "searchConnectorsPlugin.content.nativeConnectors.jira_data_center.name": "Jira 数据中心",
-    "searchConnectorsPlugin.content.nativeConnectors.jira.description": "在 Jira Cloud 上搜索您的内容。",
-    "searchConnectorsPlugin.content.nativeConnectors.jira.name": "Jira Cloud",
-    "searchConnectorsPlugin.content.nativeConnectors.jiraDataCenter.description": "在 Jira 数据中心上搜索您的内容。",
-    "searchConnectorsPlugin.content.nativeConnectors.jiraServer.description": "在 Jira Server 上搜索您的内容。",
-    "searchConnectorsPlugin.content.nativeConnectors.jiraServer.name": "Jira Server",
-    "searchConnectorsPlugin.content.nativeConnectors.microsoftSQL.name": "Microsoft SQL",
-    "searchConnectorsPlugin.content.nativeConnectors.mongoDB.description": "搜索您的 MongoDB 内容。",
-    "searchConnectorsPlugin.content.nativeConnectors.mongodb.name": "MongoDB",
-    "searchConnectorsPlugin.content.nativeConnectors.msSql.description": "在 Microsoft SQL Server 上搜索您的内容。",
-    "searchConnectorsPlugin.content.nativeConnectors.mysql.description": "搜索您的 MySQL 内容。",
-    "searchConnectorsPlugin.content.nativeConnectors.mysql.name": "MySQL",
-    "searchConnectorsPlugin.content.nativeConnectors.netowkrDrive.description": "搜索您的网络驱动器内容。",
-    "searchConnectorsPlugin.content.nativeConnectors.networkDrive.name": "网络驱动器",
-    "searchConnectorsPlugin.content.nativeConnectors.notion.description": "在 Notion 上搜索您的内容。",
-    "searchConnectorsPlugin.content.nativeConnectors.notion.name": "Notion",
-    "searchConnectorsPlugin.content.nativeConnectors.oneDrive.description": "在 OneDrive 上搜索您的内容。",
-    "searchConnectorsPlugin.content.nativeConnectors.oneDrive.name": "OneDrive",
-    "searchConnectorsPlugin.content.nativeConnectors.openTextDocumentum.description": "在 OpenText Documentum 上搜索您的内容。",
-    "searchConnectorsPlugin.content.nativeConnectors.openTextDocumentum.name": "OpenText Documentum",
-    "searchConnectorsPlugin.content.nativeConnectors.oracle.description": "在 Oracle 上搜索您的内容。",
-    "searchConnectorsPlugin.content.nativeConnectors.oracle.name": "Oracle",
-    "searchConnectorsPlugin.content.nativeConnectors.outlook.description": "在 Outlook 上搜索您的内容。",
-    "searchConnectorsPlugin.content.nativeConnectors.outlook.name": "Outlook",
-    "searchConnectorsPlugin.content.nativeConnectors.postgreSQL.description": "在 PostgreSQL 上搜索您的内容。",
-    "searchConnectorsPlugin.content.nativeConnectors.postgresql.name": "PostgreSQL",
-    "searchConnectorsPlugin.content.nativeConnectors.redis.description": "在 Redis 上搜索您的内容。",
-    "searchConnectorsPlugin.content.nativeConnectors.redis.name": "Redis",
-    "searchConnectorsPlugin.content.nativeConnectors.s3.description": "在 Amazon S3 上搜索您的内容。",
-    "searchConnectorsPlugin.content.nativeConnectors.s3.name": "S3",
-    "searchConnectorsPlugin.content.nativeConnectors.salesforce.description": "在 Salesforce 上搜索您的内容。",
-    "searchConnectorsPlugin.content.nativeConnectors.salesforce.name": "Salesforce",
-    "searchConnectorsPlugin.content.nativeConnectors.salesforceBox.name": "Salesforce Sandbox",
-    "searchConnectorsPlugin.content.nativeConnectors.salesforceSandbox.description": "在 Salesforce Sandbox 上搜索您的内容。",
-    "searchConnectorsPlugin.content.nativeConnectors.serviceNow.description": "在 ServiceNow 上搜索您的内容。",
-    "searchConnectorsPlugin.content.nativeConnectors.serviceNow.name": "ServiceNow",
-    "searchConnectorsPlugin.content.nativeConnectors.sharepointOnline.description": "在 SharePoint Online 上搜索您的内容。",
-    "searchConnectorsPlugin.content.nativeConnectors.sharepointOnline.name": "Sharepoint",
-    "searchConnectorsPlugin.content.nativeConnectors.sharepointServer.description": "在 SharePoint Server 上搜索您的内容。",
-    "searchConnectorsPlugin.content.nativeConnectors.sharepointServer.name": "SharePoint Server",
-    "searchConnectorsPlugin.content.nativeConnectors.slack.description": "在 Slack 上搜索您的内容。",
-    "searchConnectorsPlugin.content.nativeConnectors.slack.name": "Slack",
-    "searchConnectorsPlugin.content.nativeConnectors.teams.description": "在 Teams 上搜索您的内容。",
-    "searchConnectorsPlugin.content.nativeConnectors.teams.name": "Teams",
-    "searchConnectorsPlugin.content.nativeConnectors.zoom.description": "在 Zoom 上搜索您的内容。",
-    "searchConnectorsPlugin.content.nativeConnectors.zoom.name": "缩放",
     "searchErrors.errors.fetchError": "检查您的网络连接，然后重试。",
     "searchErrors.esError.unknownRootCause": "未知",
     "searchErrors.esError.viewDetailsButtonLabel": "查看详情",
@@ -15066,7 +15055,7 @@
     "xpack.enterpriseSearch.analytics.productDescription": "用于对最终用户行为进行可视化并评估搜索应用程序性能的仪表板和工具。",
     "xpack.enterpriseSearch.analytics.productName": "行为分析",
     "xpack.enterpriseSearch.analytics.searchPlaceholder": "搜索集合名称",
-    "xpack.enterpriseSearch.apiKey.activeKeys": "{number} 个活动 API 密钥。",
+    "xpack.enterpriseSearch.apiKey.activeKeys": "{number} 个活动 API 密钥",
     "xpack.enterpriseSearch.apiKey.apiKeyStepDescription": "此密钥仅显示一次，因此请将其保存到某个安全位置。我们不存储您的 API 密钥，因此，如果您丢失了密钥，则需要生成替代密钥。",
     "xpack.enterpriseSearch.apiKey.apiKeyStepTitle": "存储此 API 密钥",
     "xpack.enterpriseSearch.apiKey.cloudId": "云 ID：",
@@ -32366,7 +32355,6 @@
     "xpack.observabilityAiAssistantManagement.knowledgeBaseEditManualEntryFlyout.euiFormRow.contentsLabel": "内容",
     "xpack.observabilityAiAssistantManagement.knowledgeBaseEditManualEntryFlyout.euiFormRow.idLabel": "名称",
     "xpack.observabilityAiAssistantManagement.knowledgeBaseEditManualEntryFlyout.euiMarkdownEditor.enterContentsLabel": "输入内容",
-    "xpack.observabilityAiAssistantManagement.knowledgeBaseNewEntryFlyout.h2.editEntryLabel": "编辑 {id}",
     "xpack.observabilityAiAssistantManagement.knowledgeBaseNewEntryFlyout.h2.newEntryLabel": "新条目",
     "xpack.observabilityAiAssistantManagement.knowledgeBaseNewManualEntryFlyout.cancelButtonEmptyLabel": "取消",
     "xpack.observabilityAiAssistantManagement.knowledgeBaseNewManualEntryFlyout.euiMarkdownEditor.observabilityAiAssistantKnowledgeBaseViewMarkdownEditorLabel": "observabilityAiAssistantKnowledgeBaseViewMarkdownEditor",
@@ -44131,8 +44119,6 @@
     "xpack.synthetics.paramForm.namespaces": "命名空间",
     "xpack.synthetics.paramForm.sharedAcrossSpacesLabel": "跨工作区共享",
     "xpack.synthetics.paramManagement.deleteParamNameLabel": "删除“{name}”参数？",
-    "xpack.synthetics.paramManagement.paramDeleteFailuresMessage.name": "无法删除参数 {name}。",
-    "xpack.synthetics.paramManagement.paramDeleteSuccessMessage.name": "已成功删除参数 {name}。",
     "xpack.synthetics.params.description": "定义可在浏览器和轻量级监测的配置中使用的变量和参数，如凭据或 URL。{learnMore}",
     "xpack.synthetics.params.unprivileged.unprivilegedDescription": "您需要其他权限才能查看 Synthetics 应用数据使用情况和保留设置。{docsLink}",
     "xpack.synthetics.pingList.collapseRow": "折叠",
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.test.tsx
index a938aa6b7e6e5..1c191bf213852 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.test.tsx
@@ -750,6 +750,12 @@ describe('actions_connectors_list', () => {
                 referencedByCount: 1,
                 config: {},
               },
+              {
+                id: '3',
+                actionTypeId: 'test3',
+                isPreconfigured: true,
+                isDeprecated: false,
+              },
             ] as ActionConnector[]
           }
           setActions={() => {}}
@@ -766,7 +772,7 @@ describe('actions_connectors_list', () => {
     it('renders table of connectors', async () => {
       await setup();
       expect(wrapper.find('EuiInMemoryTable')).toHaveLength(1);
-      expect(wrapper.find('EuiTableRow')).toHaveLength(2);
+      expect(wrapper.find('EuiTableRow')).toHaveLength(3);
       expect(wrapper.find('EuiTableRow').at(0).prop('className')).toEqual(
         'actConnectorsList__tableRowDisabled'
       );
@@ -774,6 +780,13 @@ describe('actions_connectors_list', () => {
         'actConnectorsList__tableRowDisabled'
       );
     });
+
+    it('renders preconfigured connectors as enabled', async () => {
+      await setup();
+      expect(wrapper.find('EuiTableRow').at(2).prop('className')).not.toEqual(
+        'actConnectorsList__tableRowDisabled'
+      );
+    });
   });
 
   describe('component with deprecated connectors', () => {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.tsx
index e00b08d9c8512..17e6531a65c20 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/actions_connectors_list/components/actions_connectors_list.tsx
@@ -199,9 +199,9 @@ const ActionsConnectorsList = ({
       truncateText: true,
       render: (value: string, item: ActionConnectorTableItem) => {
         const checkEnabledResult = checkActionTypeEnabled(
-          actionTypesIndex && actionTypesIndex[item.actionTypeId]
+          actionTypesIndex && actionTypesIndex[item.actionTypeId],
+          item.isPreconfigured
         );
-
         /**
          * TODO: Remove when connectors can provide their own UX message.
          * Issue: https://github.com/elastic/kibana/issues/114507
@@ -363,7 +363,8 @@ const ActionsConnectorsList = ({
       columns={actionsTableColumns}
       rowProps={(item: ActionConnectorTableItem) => ({
         className:
-          !actionTypesIndex || !actionTypesIndex[item.actionTypeId]?.enabled
+          !item.isPreconfigured &&
+          (!actionTypesIndex || !actionTypesIndex[item.actionTypeId]?.enabled)
             ? 'actConnectorsList__tableRowDisabled'
             : '',
         'data-test-subj': 'connectors-row',
diff --git a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/es_deprecation_logs/es_deprecation_logs.test.tsx b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/es_deprecation_logs/es_deprecation_logs.test.tsx
index 00a1e684f5273..29600c855dcbf 100644
--- a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/es_deprecation_logs/es_deprecation_logs.test.tsx
+++ b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/es_deprecation_logs/es_deprecation_logs.test.tsx
@@ -165,9 +165,6 @@ describe('ES deprecation logs', () => {
               prepend: (url: string) => url,
             },
           },
-          plugins: {
-            infra: {},
-          },
         });
       });
 
diff --git a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/helpers/app_context.mock.ts b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/helpers/app_context.mock.ts
index 0583c79eb3eff..31fd69648418f 100644
--- a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/helpers/app_context.mock.ts
+++ b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/helpers/app_context.mock.ts
@@ -108,7 +108,6 @@ export const getAppContextMock = (kibanaVersion: SemVer) => ({
   },
   plugins: {
     share: shareMock,
-    infra: undefined,
     cloud: {
       ...cloudMock.createSetup(),
       isCloudEnabled: false,
diff --git a/x-pack/plugins/upgrade_assistant/kibana.jsonc b/x-pack/plugins/upgrade_assistant/kibana.jsonc
index a339a06c9e60d..55a08297937bb 100644
--- a/x-pack/plugins/upgrade_assistant/kibana.jsonc
+++ b/x-pack/plugins/upgrade_assistant/kibana.jsonc
@@ -2,6 +2,8 @@
   "type": "plugin",
   "id": "@kbn/upgrade-assistant-plugin",
   "owner": "@elastic/kibana-management",
+  "group": "platform",
+  "visibility": "private",
   "plugin": {
     "id": "upgradeAssistant",
     "server": true,
@@ -21,7 +23,6 @@
       "usageCollection",
       "cloud",
       "security",
-      "infra",
       "logsShared"
     ],
     "requiredBundles": [
diff --git a/x-pack/plugins/upgrade_assistant/public/plugin.ts b/x-pack/plugins/upgrade_assistant/public/plugin.ts
index 694e29cd7cee3..ceeb674fef961 100644
--- a/x-pack/plugins/upgrade_assistant/public/plugin.ts
+++ b/x-pack/plugins/upgrade_assistant/public/plugin.ts
@@ -51,7 +51,7 @@ export class UpgradeAssistantUIPlugin
         title: pluginName,
         order: 1,
         async mount(params) {
-          const [coreStart, { data, ...plugins }] = await coreSetup.getStartServices();
+          const [coreStart, { data }] = await coreSetup.getStartServices();
 
           const {
             chrome: { docTitle },
@@ -65,10 +65,6 @@ export class UpgradeAssistantUIPlugin
             plugins: {
               cloud,
               share,
-              // Infra plugin doesnt export anything as a public interface. So the only
-              // way we have at this stage for checking if the plugin is available or not
-              // is by checking if the startServices has the `infra` key.
-              infra: Object.hasOwn(plugins, 'infra') ? {} : undefined,
             },
             services: {
               core: coreStart,
diff --git a/x-pack/plugins/upgrade_assistant/public/types.ts b/x-pack/plugins/upgrade_assistant/public/types.ts
index f91a17323b02b..f01271443cb7f 100644
--- a/x-pack/plugins/upgrade_assistant/public/types.ts
+++ b/x-pack/plugins/upgrade_assistant/public/types.ts
@@ -47,7 +47,6 @@ export interface AppDependencies {
   plugins: {
     cloud?: CloudSetup;
     share: SharePluginSetup;
-    infra: object | undefined;
   };
   services: {
     core: CoreStart;
diff --git a/x-pack/test/alerting_api_integration/observability/custom_threshold_rule/avg_pct_no_data.ts b/x-pack/test/alerting_api_integration/observability/custom_threshold_rule/avg_pct_no_data.ts
deleted file mode 100644
index f552eca84b8a4..0000000000000
--- a/x-pack/test/alerting_api_integration/observability/custom_threshold_rule/avg_pct_no_data.ts
+++ /dev/null
@@ -1,240 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { omit } from 'lodash';
-import { Aggregators } from '@kbn/observability-plugin/common/custom_threshold_rule/types';
-import { NO_DATA_ACTIONS_ID } from '@kbn/observability-plugin/server/lib/rules/custom_threshold/constants';
-import { parseSearchParams } from '@kbn/share-plugin/common/url_service';
-import expect from '@kbn/expect';
-import { OBSERVABILITY_THRESHOLD_RULE_TYPE_ID } from '@kbn/rule-data-utils';
-import { COMPARATORS } from '@kbn/alerting-comparators';
-
-import { createIndexConnector, createRule } from '../helpers/alerting_api_helper';
-import { createDataView, deleteDataView } from '../helpers/data_view';
-import {
-  waitForAlertInIndex,
-  waitForDocumentInIndex,
-  waitForRuleStatus,
-} from '../helpers/alerting_wait_for_helpers';
-import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { ISO_DATE_REGEX } from './constants';
-import { ActionDocument, LogsExplorerLocatorParsedParams } from './typings';
-
-// eslint-disable-next-line import/no-default-export
-export default function ({ getService }: FtrProviderContext) {
-  const esClient = getService('es');
-  const supertest = getService('supertest');
-  const esDeleteAllIndices = getService('esDeleteAllIndices');
-  const logger = getService('log');
-  const retryService = getService('retry');
-
-  describe('Custom Threshold rule - AVG - PCT - NoData', () => {
-    const CUSTOM_THRESHOLD_RULE_ALERT_INDEX = '.alerts-observability.threshold.alerts-default';
-    const ALERT_ACTION_INDEX = 'alert-action-threshold';
-    const DATA_VIEW = 'no-data-pattern';
-    const DATA_VIEW_ID = 'data-view-id-no-data';
-    let actionId: string;
-    let ruleId: string;
-    let alertId: string;
-
-    before(async () => {
-      await createDataView({
-        supertest,
-        name: DATA_VIEW,
-        id: DATA_VIEW_ID,
-        title: DATA_VIEW,
-        logger,
-      });
-    });
-
-    after(async () => {
-      await supertest.delete(`/api/alerting/rule/${ruleId}`).set('kbn-xsrf', 'foo');
-      await supertest.delete(`/api/actions/connector/${actionId}`).set('kbn-xsrf', 'foo');
-      await esClient.deleteByQuery({
-        index: CUSTOM_THRESHOLD_RULE_ALERT_INDEX,
-        query: { term: { 'kibana.alert.rule.uuid': ruleId } },
-      });
-      await esClient.deleteByQuery({
-        index: '.kibana-event-log-*',
-        query: { term: { 'kibana.alert.rule.consumer': 'logs' } },
-      });
-      await deleteDataView({
-        supertest,
-        id: DATA_VIEW_ID,
-        logger,
-      });
-      await esDeleteAllIndices([ALERT_ACTION_INDEX]);
-    });
-
-    describe('Rule creation', () => {
-      it('creates rule successfully', async () => {
-        actionId = await createIndexConnector({
-          supertest,
-          name: 'Index Connector: Threshold API test',
-          indexName: ALERT_ACTION_INDEX,
-          logger,
-        });
-
-        const createdRule = await createRule({
-          supertest,
-          logger,
-          esClient,
-          tags: ['observability'],
-          consumer: 'logs',
-          name: 'Threshold rule',
-          ruleTypeId: OBSERVABILITY_THRESHOLD_RULE_TYPE_ID,
-          params: {
-            criteria: [
-              {
-                comparator: COMPARATORS.GREATER_THAN,
-                threshold: [0.5],
-                timeSize: 5,
-                timeUnit: 'm',
-                metrics: [
-                  { name: 'A', field: 'system.cpu.user.pct', aggType: Aggregators.AVERAGE },
-                ],
-              },
-            ],
-            alertOnNoData: true,
-            alertOnGroupDisappear: true,
-            searchConfiguration: {
-              query: {
-                query: '',
-                language: 'kuery',
-              },
-              index: DATA_VIEW_ID,
-            },
-          },
-          actions: [
-            {
-              group: NO_DATA_ACTIONS_ID,
-              id: actionId,
-              params: {
-                documents: [
-                  {
-                    ruleType: '{{rule.type}}',
-                    alertDetailsUrl: '{{context.alertDetailsUrl}}',
-                    reason: '{{context.reason}}',
-                    value: '{{context.value}}',
-                    viewInAppUrl: '{{context.viewInAppUrl}}',
-                  },
-                ],
-              },
-              frequency: {
-                notify_when: 'onActionGroupChange',
-                throttle: null,
-                summary: false,
-              },
-            },
-          ],
-        });
-        ruleId = createdRule.id;
-        expect(ruleId).not.to.be(undefined);
-      });
-
-      it('should be active', async () => {
-        const executionStatus = await waitForRuleStatus({
-          id: ruleId,
-          expectedStatus: 'active',
-          supertest,
-          retryService,
-          logger,
-        });
-        expect(executionStatus.status).to.be('active');
-      });
-
-      it('should set correct information in the alert document', async () => {
-        const resp = await waitForAlertInIndex({
-          esClient,
-          indexName: CUSTOM_THRESHOLD_RULE_ALERT_INDEX,
-          ruleId,
-          retryService,
-          logger,
-        });
-        alertId = (resp.hits.hits[0]._source as any)['kibana.alert.uuid'];
-
-        expect(resp.hits.hits[0]._source).property(
-          'kibana.alert.rule.category',
-          'Custom threshold'
-        );
-        expect(resp.hits.hits[0]._source).property('kibana.alert.rule.consumer', 'logs');
-        expect(resp.hits.hits[0]._source).property('kibana.alert.rule.name', 'Threshold rule');
-        expect(resp.hits.hits[0]._source).property('kibana.alert.rule.producer', 'observability');
-        expect(resp.hits.hits[0]._source).property('kibana.alert.rule.revision', 0);
-        expect(resp.hits.hits[0]._source).property(
-          'kibana.alert.rule.rule_type_id',
-          'observability.rules.custom_threshold'
-        );
-        expect(resp.hits.hits[0]._source).property('kibana.alert.rule.uuid', ruleId);
-        expect(resp.hits.hits[0]._source).property('kibana.space_ids').contain('default');
-        expect(resp.hits.hits[0]._source)
-          .property('kibana.alert.rule.tags')
-          .contain('observability');
-        expect(resp.hits.hits[0]._source).property(
-          'kibana.alert.action_group',
-          'custom_threshold.nodata'
-        );
-        expect(resp.hits.hits[0]._source).property('tags').contain('observability');
-        expect(resp.hits.hits[0]._source).property('kibana.alert.instance.id', '*');
-        expect(resp.hits.hits[0]._source).property('kibana.alert.workflow_status', 'open');
-        expect(resp.hits.hits[0]._source).property('event.kind', 'signal');
-        expect(resp.hits.hits[0]._source).property('event.action', 'open');
-
-        expect(resp.hits.hits[0]._source)
-          .property('kibana.alert.rule.parameters')
-          .eql({
-            criteria: [
-              {
-                comparator: '>',
-                threshold: [0.5],
-                timeSize: 5,
-                timeUnit: 'm',
-                metrics: [{ name: 'A', field: 'system.cpu.user.pct', aggType: 'avg' }],
-              },
-            ],
-            alertOnNoData: true,
-            alertOnGroupDisappear: true,
-            searchConfiguration: {
-              index: 'data-view-id-no-data',
-              query: { query: '', language: 'kuery' },
-            },
-          });
-      });
-
-      it('should set correct action variables', async () => {
-        const resp = await waitForDocumentInIndex<ActionDocument>({
-          esClient,
-          indexName: ALERT_ACTION_INDEX,
-          retryService,
-          logger,
-        });
-
-        expect(resp.hits.hits[0]._source?.ruleType).eql('observability.rules.custom_threshold');
-        expect(resp.hits.hits[0]._source?.alertDetailsUrl).eql(
-          `https://localhost:5601/app/observability/alerts/${alertId}`
-        );
-        expect(resp.hits.hits[0]._source?.reason).eql(
-          'Average system.cpu.user.pct reported no data in the last 5m'
-        );
-        expect(resp.hits.hits[0]._source?.value).eql('[NO DATA]');
-
-        const parsedViewInAppUrl = parseSearchParams<LogsExplorerLocatorParsedParams>(
-          new URL(resp.hits.hits[0]._source?.viewInAppUrl || '').search
-        );
-
-        expect(resp.hits.hits[0]._source?.viewInAppUrl).contain('LOGS_EXPLORER_LOCATOR');
-        expect(omit(parsedViewInAppUrl.params, 'timeRange.from')).eql({
-          dataset: DATA_VIEW_ID,
-          timeRange: { to: 'now' },
-          query: { query: '', language: 'kuery' },
-          filters: [],
-        });
-        expect(parsedViewInAppUrl.params.timeRange.from).match(ISO_DATE_REGEX);
-      });
-    });
-  });
-}
diff --git a/x-pack/test/alerting_api_integration/observability/custom_threshold_rule/custom_eq_avg_bytes_fired.ts b/x-pack/test/alerting_api_integration/observability/custom_threshold_rule/custom_eq_avg_bytes_fired.ts
deleted file mode 100644
index 56370d31a38f7..0000000000000
--- a/x-pack/test/alerting_api_integration/observability/custom_threshold_rule/custom_eq_avg_bytes_fired.ts
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { cleanup, generate, Dataset, PartialConfig } from '@kbn/data-forge';
-import { Aggregators } from '@kbn/observability-plugin/common/custom_threshold_rule/types';
-import { COMPARATORS } from '@kbn/alerting-comparators';
-import { FIRED_ACTIONS_ID } from '@kbn/observability-plugin/server/lib/rules/custom_threshold/constants';
-import expect from '@kbn/expect';
-import { OBSERVABILITY_THRESHOLD_RULE_TYPE_ID } from '@kbn/rule-data-utils';
-import { createIndexConnector, createRule } from '../helpers/alerting_api_helper';
-import { createDataView, deleteDataView } from '../helpers/data_view';
-import {
-  waitForAlertInIndex,
-  waitForDocumentInIndex,
-  waitForRuleStatus,
-} from '../helpers/alerting_wait_for_helpers';
-import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { ActionDocument } from './typings';
-
-// eslint-disable-next-line import/no-default-export
-export default function ({ getService }: FtrProviderContext) {
-  const esClient = getService('es');
-  const supertest = getService('supertest');
-  const esDeleteAllIndices = getService('esDeleteAllIndices');
-  const logger = getService('log');
-  const retryService = getService('retry');
-
-  describe('Custom Threshold rule - CUSTOM_EQ - AVG - BYTES - FIRED', () => {
-    const CUSTOM_THRESHOLD_RULE_ALERT_INDEX = '.alerts-observability.threshold.alerts-default';
-    const ALERT_ACTION_INDEX = 'alert-action-threshold';
-    // DATA_VIEW should match the index template:
-    const DATA_VIEW = 'kbn-data-forge-fake_hosts.fake_hosts-*';
-    const DATA_VIEW_ID = 'data-view-id';
-    let dataForgeConfig: PartialConfig;
-    let dataForgeIndices: string[];
-    let actionId: string;
-    let ruleId: string;
-    let alertId: string;
-
-    before(async () => {
-      dataForgeConfig = {
-        schedule: [
-          {
-            template: 'good',
-            start: 'now-15m',
-            end: 'now+10m',
-            metrics: [
-              { name: 'system.network.in.bytes', method: 'linear', start: 5, end: 5 },
-              { name: 'system.network.out.bytes', method: 'linear', start: 5, end: 5 },
-            ],
-          },
-        ],
-        indexing: {
-          dataset: 'fake_hosts' as Dataset,
-          eventsPerCycle: 1,
-          interval: 60000,
-          alignEventsToInterval: true,
-        },
-      };
-      dataForgeIndices = await generate({ client: esClient, config: dataForgeConfig, logger });
-      await waitForDocumentInIndex({
-        esClient,
-        indexName: DATA_VIEW,
-        docCountTarget: 75,
-        retryService,
-        logger,
-      });
-      await createDataView({
-        supertest,
-        name: DATA_VIEW,
-        id: DATA_VIEW_ID,
-        title: DATA_VIEW,
-        logger,
-      });
-    });
-
-    after(async () => {
-      await supertest.delete(`/api/alerting/rule/${ruleId}`).set('kbn-xsrf', 'foo');
-      await supertest.delete(`/api/actions/connector/${actionId}`).set('kbn-xsrf', 'foo');
-      await esClient.deleteByQuery({
-        index: CUSTOM_THRESHOLD_RULE_ALERT_INDEX,
-        query: { term: { 'kibana.alert.rule.uuid': ruleId } },
-      });
-      await esClient.deleteByQuery({
-        index: '.kibana-event-log-*',
-        query: { term: { 'kibana.alert.rule.consumer': 'logs' } },
-      });
-      await deleteDataView({
-        supertest,
-        id: DATA_VIEW_ID,
-        logger,
-      });
-      await esDeleteAllIndices([ALERT_ACTION_INDEX, ...dataForgeIndices]);
-      await cleanup({ client: esClient, config: dataForgeConfig, logger });
-    });
-
-    describe('Rule creation', () => {
-      it('creates rule successfully', async () => {
-        actionId = await createIndexConnector({
-          supertest,
-          name: 'Index Connector: Threshold API test',
-          indexName: ALERT_ACTION_INDEX,
-          logger,
-        });
-
-        const createdRule = await createRule({
-          supertest,
-          logger,
-          esClient,
-          tags: ['observability'],
-          consumer: 'logs',
-          name: 'Threshold rule',
-          ruleTypeId: OBSERVABILITY_THRESHOLD_RULE_TYPE_ID,
-          params: {
-            criteria: [
-              {
-                comparator: COMPARATORS.GREATER_THAN,
-                threshold: [0.9],
-                timeSize: 1,
-                timeUnit: 'm',
-                metrics: [
-                  { name: 'A', field: 'system.network.in.bytes', aggType: Aggregators.AVERAGE },
-                  { name: 'B', field: 'system.network.out.bytes', aggType: Aggregators.AVERAGE },
-                ],
-                equation: '(A + A) / (B + B)',
-              },
-            ],
-            alertOnNoData: true,
-            alertOnGroupDisappear: true,
-            searchConfiguration: {
-              query: {
-                query: '',
-                language: 'kuery',
-              },
-              index: DATA_VIEW_ID,
-            },
-          },
-          actions: [
-            {
-              group: FIRED_ACTIONS_ID,
-              id: actionId,
-              params: {
-                documents: [
-                  {
-                    ruleType: '{{rule.type}}',
-                    alertDetailsUrl: '{{context.alertDetailsUrl}}',
-                    reason: '{{context.reason}}',
-                    value: '{{context.value}}',
-                  },
-                ],
-              },
-              frequency: {
-                notify_when: 'onActionGroupChange',
-                throttle: null,
-                summary: false,
-              },
-            },
-          ],
-        });
-        ruleId = createdRule.id;
-        expect(ruleId).not.to.be(undefined);
-      });
-
-      it('should be active', async () => {
-        const executionStatus = await waitForRuleStatus({
-          id: ruleId,
-          expectedStatus: 'active',
-          supertest,
-          retryService,
-          logger,
-        });
-        expect(executionStatus.status).to.be('active');
-      });
-
-      it('should set correct information in the alert document', async () => {
-        const resp = await waitForAlertInIndex({
-          esClient,
-          indexName: CUSTOM_THRESHOLD_RULE_ALERT_INDEX,
-          ruleId,
-          retryService,
-          logger,
-        });
-        alertId = (resp.hits.hits[0]._source as any)['kibana.alert.uuid'];
-
-        expect(resp.hits.hits[0]._source).property(
-          'kibana.alert.rule.category',
-          'Custom threshold'
-        );
-        expect(resp.hits.hits[0]._source).property('kibana.alert.rule.consumer', 'logs');
-        expect(resp.hits.hits[0]._source).property('kibana.alert.rule.name', 'Threshold rule');
-        expect(resp.hits.hits[0]._source).property('kibana.alert.rule.producer', 'observability');
-        expect(resp.hits.hits[0]._source).property('kibana.alert.rule.revision', 0);
-        expect(resp.hits.hits[0]._source).property(
-          'kibana.alert.rule.rule_type_id',
-          'observability.rules.custom_threshold'
-        );
-        expect(resp.hits.hits[0]._source).property('kibana.alert.rule.uuid', ruleId);
-        expect(resp.hits.hits[0]._source).property('kibana.space_ids').contain('default');
-        expect(resp.hits.hits[0]._source)
-          .property('kibana.alert.rule.tags')
-          .contain('observability');
-        expect(resp.hits.hits[0]._source).property(
-          'kibana.alert.action_group',
-          'custom_threshold.fired'
-        );
-        expect(resp.hits.hits[0]._source).property('tags').contain('observability');
-        expect(resp.hits.hits[0]._source).property('kibana.alert.instance.id', '*');
-        expect(resp.hits.hits[0]._source).property('kibana.alert.workflow_status', 'open');
-        expect(resp.hits.hits[0]._source).property('event.kind', 'signal');
-        expect(resp.hits.hits[0]._source).property('event.action', 'open');
-        expect(resp.hits.hits[0]._source).property('kibana.alert.evaluation.threshold').eql([0.9]);
-        expect(resp.hits.hits[0]._source)
-          .property('kibana.alert.rule.parameters')
-          .eql({
-            criteria: [
-              {
-                comparator: COMPARATORS.GREATER_THAN,
-                threshold: [0.9],
-                timeSize: 1,
-                timeUnit: 'm',
-                metrics: [
-                  { name: 'A', field: 'system.network.in.bytes', aggType: Aggregators.AVERAGE },
-                  { name: 'B', field: 'system.network.out.bytes', aggType: Aggregators.AVERAGE },
-                ],
-                equation: '(A + A) / (B + B)',
-              },
-            ],
-            alertOnNoData: true,
-            alertOnGroupDisappear: true,
-            searchConfiguration: { index: 'data-view-id', query: { query: '', language: 'kuery' } },
-          });
-      });
-
-      it('should set correct action variables', async () => {
-        const resp = await waitForDocumentInIndex<ActionDocument>({
-          esClient,
-          indexName: ALERT_ACTION_INDEX,
-          retryService,
-          logger,
-        });
-
-        expect(resp.hits.hits[0]._source?.ruleType).eql('observability.rules.custom_threshold');
-        expect(resp.hits.hits[0]._source?.alertDetailsUrl).eql(
-          `https://localhost:5601/app/observability/alerts/${alertId}`
-        );
-        expect(resp.hits.hits[0]._source?.reason).eql(
-          `Custom equation is 1 B, above the threshold of 0.9 B. (duration: 1 min, data view: ${DATA_VIEW})`
-        );
-        expect(resp.hits.hits[0]._source?.value).eql('1 B');
-      });
-    });
-  });
-}
diff --git a/x-pack/test/alerting_api_integration/observability/custom_threshold_rule/documents_count_fired.ts b/x-pack/test/alerting_api_integration/observability/custom_threshold_rule/documents_count_fired.ts
deleted file mode 100644
index 5c56dbdf9e808..0000000000000
--- a/x-pack/test/alerting_api_integration/observability/custom_threshold_rule/documents_count_fired.ts
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { omit } from 'lodash';
-import expect from '@kbn/expect';
-import { cleanup, generate, Dataset, PartialConfig } from '@kbn/data-forge';
-import { Aggregators } from '@kbn/observability-plugin/common/custom_threshold_rule/types';
-import { FIRED_ACTIONS_ID } from '@kbn/observability-plugin/server/lib/rules/custom_threshold/constants';
-import { OBSERVABILITY_THRESHOLD_RULE_TYPE_ID } from '@kbn/rule-data-utils';
-import { parseSearchParams } from '@kbn/share-plugin/common/url_service';
-import { COMPARATORS } from '@kbn/alerting-comparators';
-import { createIndexConnector, createRule } from '../helpers/alerting_api_helper';
-import { createDataView, deleteDataView } from '../helpers/data_view';
-import {
-  waitForAlertInIndex,
-  waitForDocumentInIndex,
-  waitForRuleStatus,
-} from '../helpers/alerting_wait_for_helpers';
-import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { ISO_DATE_REGEX } from './constants';
-import { ActionDocument, LogsExplorerLocatorParsedParams } from './typings';
-
-// eslint-disable-next-line import/no-default-export
-export default function ({ getService }: FtrProviderContext) {
-  const esClient = getService('es');
-  const supertest = getService('supertest');
-  const esDeleteAllIndices = getService('esDeleteAllIndices');
-  const logger = getService('log');
-  const retryService = getService('retry');
-
-  describe('Custom Threshold rule - DOCUMENTS_COUNT - FIRED', () => {
-    const CUSTOM_THRESHOLD_RULE_ALERT_INDEX = '.alerts-observability.threshold.alerts-default';
-    const ALERT_ACTION_INDEX = 'alert-action-threshold';
-    const DATA_VIEW = 'kbn-data-forge-fake_hosts.fake_hosts-*';
-    const DATA_VIEW_ID = 'data-view-id';
-    const DATA_VIEW_NAME = 'data-view-name';
-    let dataForgeConfig: PartialConfig;
-    let dataForgeIndices: string[];
-    let actionId: string;
-    let ruleId: string;
-    let alertId: string;
-
-    before(async () => {
-      dataForgeConfig = {
-        schedule: [
-          {
-            template: 'good',
-            start: 'now-10m',
-            end: 'now+5m',
-            metrics: [
-              { name: 'system.cpu.user.pct', method: 'linear', start: 2.5, end: 2.5 },
-              { name: 'system.cpu.total.pct', method: 'linear', start: 0.5, end: 0.5 },
-              { name: 'system.cpu.total.norm.pct', method: 'linear', start: 0.8, end: 0.8 },
-            ],
-          },
-        ],
-        indexing: {
-          dataset: 'fake_hosts' as Dataset,
-          eventsPerCycle: 1,
-          interval: 60000,
-          alignEventsToInterval: true,
-        },
-      };
-      dataForgeIndices = await generate({ client: esClient, config: dataForgeConfig, logger });
-      await waitForDocumentInIndex({
-        esClient,
-        indexName: dataForgeIndices.join(','),
-        docCountTarget: 45,
-        retryService,
-        logger,
-      });
-      await createDataView({
-        supertest,
-        name: DATA_VIEW_NAME,
-        id: DATA_VIEW_ID,
-        title: DATA_VIEW,
-        logger,
-      });
-    });
-
-    after(async () => {
-      await supertest.delete(`/api/alerting/rule/${ruleId}`).set('kbn-xsrf', 'foo');
-      await supertest.delete(`/api/actions/connector/${actionId}`).set('kbn-xsrf', 'foo');
-      await esClient.deleteByQuery({
-        index: CUSTOM_THRESHOLD_RULE_ALERT_INDEX,
-        query: { term: { 'kibana.alert.rule.uuid': ruleId } },
-      });
-      await esClient.deleteByQuery({
-        index: '.kibana-event-log-*',
-        query: { term: { 'kibana.alert.rule.consumer': 'logs' } },
-      });
-      await deleteDataView({
-        supertest,
-        id: DATA_VIEW_ID,
-        logger,
-      });
-      await esDeleteAllIndices([ALERT_ACTION_INDEX, ...dataForgeIndices]);
-      await cleanup({ client: esClient, config: dataForgeConfig, logger });
-    });
-
-    describe('Rule creation', () => {
-      it('creates rule successfully', async () => {
-        actionId = await createIndexConnector({
-          supertest,
-          name: 'Index Connector: Threshold API test',
-          indexName: ALERT_ACTION_INDEX,
-          logger,
-        });
-
-        const createdRule = await createRule({
-          supertest,
-          logger,
-          esClient,
-          tags: ['observability'],
-          consumer: 'logs',
-          name: 'Threshold rule',
-          ruleTypeId: OBSERVABILITY_THRESHOLD_RULE_TYPE_ID,
-          params: {
-            criteria: [
-              {
-                comparator: COMPARATORS.NOT_BETWEEN,
-                threshold: [1, 2],
-                timeSize: 1,
-                timeUnit: 'm',
-                metrics: [{ name: 'A', filter: 'container.id:*', aggType: Aggregators.COUNT }],
-              },
-            ],
-            alertOnNoData: true,
-            alertOnGroupDisappear: true,
-            searchConfiguration: {
-              query: {
-                query: 'host.name:*',
-                language: 'kuery',
-              },
-              index: DATA_VIEW_ID,
-            },
-          },
-          actions: [
-            {
-              group: FIRED_ACTIONS_ID,
-              id: actionId,
-              params: {
-                documents: [
-                  {
-                    ruleType: '{{rule.type}}',
-                    alertDetailsUrl: '{{context.alertDetailsUrl}}',
-                    reason: '{{context.reason}}',
-                    value: '{{context.value}}',
-                    viewInAppUrl: '{{context.viewInAppUrl}}',
-                  },
-                ],
-              },
-              frequency: {
-                notify_when: 'onActionGroupChange',
-                throttle: null,
-                summary: false,
-              },
-            },
-          ],
-        });
-        ruleId = createdRule.id;
-        expect(ruleId).not.to.be(undefined);
-      });
-
-      it('should be active', async () => {
-        const executionStatus = await waitForRuleStatus({
-          id: ruleId,
-          expectedStatus: 'active',
-          supertest,
-          retryService,
-          logger,
-        });
-        expect(executionStatus.status).to.be('active');
-      });
-
-      it('should set correct information in the alert document', async () => {
-        const resp = await waitForAlertInIndex({
-          esClient,
-          indexName: CUSTOM_THRESHOLD_RULE_ALERT_INDEX,
-          ruleId,
-          retryService,
-          logger,
-        });
-        alertId = (resp.hits.hits[0]._source as any)['kibana.alert.uuid'];
-
-        expect(resp.hits.hits[0]._source).property(
-          'kibana.alert.rule.category',
-          'Custom threshold'
-        );
-        expect(resp.hits.hits[0]._source).property('kibana.alert.rule.consumer', 'logs');
-        expect(resp.hits.hits[0]._source).property('kibana.alert.rule.name', 'Threshold rule');
-        expect(resp.hits.hits[0]._source).property('kibana.alert.rule.producer', 'observability');
-        expect(resp.hits.hits[0]._source).property('kibana.alert.rule.revision', 0);
-        expect(resp.hits.hits[0]._source).property(
-          'kibana.alert.rule.rule_type_id',
-          'observability.rules.custom_threshold'
-        );
-        expect(resp.hits.hits[0]._source).property('kibana.alert.rule.uuid', ruleId);
-        expect(resp.hits.hits[0]._source).property('kibana.space_ids').contain('default');
-        expect(resp.hits.hits[0]._source)
-          .property('kibana.alert.rule.tags')
-          .contain('observability');
-        expect(resp.hits.hits[0]._source).property(
-          'kibana.alert.action_group',
-          'custom_threshold.fired'
-        );
-        expect(resp.hits.hits[0]._source).property('tags').contain('observability');
-        expect(resp.hits.hits[0]._source).property('kibana.alert.instance.id', '*');
-        expect(resp.hits.hits[0]._source).property('kibana.alert.workflow_status', 'open');
-        expect(resp.hits.hits[0]._source).property('event.kind', 'signal');
-        expect(resp.hits.hits[0]._source).property('event.action', 'open');
-
-        expect(resp.hits.hits[0]._source).not.have.property('kibana.alert.group');
-        expect(resp.hits.hits[0]._source).not.have.property('kibana.alert.evaluation.threshold');
-        expect(resp.hits.hits[0]._source)
-          .property('kibana.alert.rule.parameters')
-          .eql({
-            criteria: [
-              {
-                comparator: COMPARATORS.NOT_BETWEEN,
-                threshold: [1, 2],
-                timeSize: 1,
-                timeUnit: 'm',
-                metrics: [{ name: 'A', filter: 'container.id:*', aggType: 'count' }],
-              },
-            ],
-            alertOnNoData: true,
-            alertOnGroupDisappear: true,
-            searchConfiguration: {
-              index: 'data-view-id',
-              query: { query: 'host.name:*', language: 'kuery' },
-            },
-          });
-      });
-
-      it('should set correct action variables', async () => {
-        const resp = await waitForDocumentInIndex<ActionDocument>({
-          esClient,
-          indexName: ALERT_ACTION_INDEX,
-          retryService,
-          logger,
-        });
-
-        expect(resp.hits.hits[0]._source?.ruleType).eql('observability.rules.custom_threshold');
-        expect(resp.hits.hits[0]._source?.alertDetailsUrl).eql(
-          `https://localhost:5601/app/observability/alerts/${alertId}`
-        );
-
-        expect(resp.hits.hits[0]._source?.reason).eql(
-          `Document count is 3, not between the threshold of 1 and 2. (duration: 1 min, data view: ${DATA_VIEW_NAME})`
-        );
-        expect(resp.hits.hits[0]._source?.value).eql('3');
-
-        const parsedViewInAppUrl = parseSearchParams<LogsExplorerLocatorParsedParams>(
-          new URL(resp.hits.hits[0]._source?.viewInAppUrl || '').search
-        );
-
-        expect(resp.hits.hits[0]._source?.viewInAppUrl).contain('LOGS_EXPLORER_LOCATOR');
-        expect(omit(parsedViewInAppUrl.params, 'timeRange.from')).eql({
-          dataset: DATA_VIEW_ID,
-          timeRange: { to: 'now' },
-          query: { query: 'host.name:* and container.id:*', language: 'kuery' },
-          filters: [],
-        });
-        expect(parsedViewInAppUrl.params.timeRange.from).match(ISO_DATE_REGEX);
-      });
-    });
-  });
-}
diff --git a/x-pack/test/alerting_api_integration/observability/custom_threshold_rule/group_by_fired.ts b/x-pack/test/alerting_api_integration/observability/custom_threshold_rule/group_by_fired.ts
deleted file mode 100644
index 6f4402575ac7c..0000000000000
--- a/x-pack/test/alerting_api_integration/observability/custom_threshold_rule/group_by_fired.ts
+++ /dev/null
@@ -1,287 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { cleanup, generate, Dataset, PartialConfig } from '@kbn/data-forge';
-import { Aggregators } from '@kbn/observability-plugin/common/custom_threshold_rule/types';
-import { FIRED_ACTIONS_ID } from '@kbn/observability-plugin/server/lib/rules/custom_threshold/constants';
-import expect from '@kbn/expect';
-import { OBSERVABILITY_THRESHOLD_RULE_TYPE_ID } from '@kbn/rule-data-utils';
-import { COMPARATORS } from '@kbn/alerting-comparators';
-import { createIndexConnector, createRule } from '../helpers/alerting_api_helper';
-import { createDataView, deleteDataView } from '../helpers/data_view';
-import {
-  waitForAlertInIndex,
-  waitForDocumentInIndex,
-  waitForRuleStatus,
-} from '../helpers/alerting_wait_for_helpers';
-import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { ActionDocument } from './typings';
-
-// eslint-disable-next-line import/no-default-export
-export default function ({ getService }: FtrProviderContext) {
-  const esClient = getService('es');
-  const supertest = getService('supertest');
-  const esDeleteAllIndices = getService('esDeleteAllIndices');
-  const logger = getService('log');
-  const retryService = getService('retry');
-
-  describe('Custom Threshold rule - GROUP_BY - FIRED', () => {
-    const CUSTOM_THRESHOLD_RULE_ALERT_INDEX = '.alerts-observability.threshold.alerts-default';
-    const ALERT_ACTION_INDEX = 'alert-action-threshold';
-    const DATA_VIEW = 'kbn-data-forge-fake_hosts.fake_hosts-*';
-    const DATA_VIEW_ID = 'data-view-id';
-    let dataForgeConfig: PartialConfig;
-    let dataForgeIndices: string[];
-    let actionId: string;
-    let ruleId: string;
-    let alertId: string;
-
-    before(async () => {
-      dataForgeConfig = {
-        schedule: [
-          {
-            template: 'good',
-            start: 'now-10m',
-            end: 'now+5m',
-            metrics: [
-              { name: 'system.cpu.user.pct', method: 'linear', start: 2.5, end: 2.5 },
-              { name: 'system.cpu.total.pct', method: 'linear', start: 0.5, end: 0.5 },
-              { name: 'system.cpu.total.norm.pct', method: 'linear', start: 0.8, end: 0.8 },
-            ],
-          },
-        ],
-        indexing: {
-          dataset: 'fake_hosts' as Dataset,
-          eventsPerCycle: 1,
-          interval: 10000,
-          alignEventsToInterval: true,
-        },
-      };
-      dataForgeIndices = await generate({ client: esClient, config: dataForgeConfig, logger });
-      await waitForDocumentInIndex({
-        esClient,
-        indexName: dataForgeIndices.join(','),
-        docCountTarget: 270,
-        retryService,
-        logger,
-      });
-      await createDataView({
-        supertest,
-        name: DATA_VIEW,
-        id: DATA_VIEW_ID,
-        title: DATA_VIEW,
-        logger,
-      });
-    });
-
-    after(async () => {
-      await supertest.delete(`/api/alerting/rule/${ruleId}`).set('kbn-xsrf', 'foo');
-      await supertest.delete(`/api/actions/connector/${actionId}`).set('kbn-xsrf', 'foo');
-      await esClient.deleteByQuery({
-        index: CUSTOM_THRESHOLD_RULE_ALERT_INDEX,
-        query: { term: { 'kibana.alert.rule.uuid': ruleId } },
-      });
-      await esClient.deleteByQuery({
-        index: '.kibana-event-log-*',
-        query: { term: { 'kibana.alert.rule.consumer': 'logs' } },
-      });
-      await deleteDataView({
-        supertest,
-        id: DATA_VIEW_ID,
-        logger,
-      });
-      await esDeleteAllIndices([ALERT_ACTION_INDEX, ...dataForgeIndices]);
-      await cleanup({ client: esClient, config: dataForgeConfig, logger });
-    });
-
-    describe('Rule creation', () => {
-      it('creates rule successfully', async () => {
-        actionId = await createIndexConnector({
-          supertest,
-          name: 'Index Connector: Threshold API test',
-          indexName: ALERT_ACTION_INDEX,
-          logger,
-        });
-
-        const createdRule = await createRule({
-          supertest,
-          logger,
-          esClient,
-          tags: ['observability'],
-          consumer: 'logs',
-          name: 'Threshold rule',
-          ruleTypeId: OBSERVABILITY_THRESHOLD_RULE_TYPE_ID,
-          params: {
-            criteria: [
-              {
-                comparator: COMPARATORS.GREATER_THAN_OR_EQUALS,
-                threshold: [0.2],
-                timeSize: 1,
-                timeUnit: 'm',
-                metrics: [
-                  { name: 'A', field: 'system.cpu.total.norm.pct', aggType: Aggregators.AVERAGE },
-                ],
-              },
-            ],
-            alertOnNoData: true,
-            alertOnGroupDisappear: true,
-            searchConfiguration: {
-              query: {
-                query: '',
-                language: 'kuery',
-              },
-              index: DATA_VIEW_ID,
-            },
-            groupBy: ['host.name', 'container.id', 'event.dataset', '_index'],
-          },
-          actions: [
-            {
-              group: FIRED_ACTIONS_ID,
-              id: actionId,
-              params: {
-                documents: [
-                  {
-                    ruleType: '{{rule.type}}',
-                    alertDetailsUrl: '{{context.alertDetailsUrl}}',
-                    reason: '{{context.reason}}',
-                    value: '{{context.value}}',
-                    host: '{{context.host}}',
-                    group: '{{context.group}}',
-                  },
-                ],
-              },
-              frequency: {
-                notify_when: 'onActionGroupChange',
-                throttle: null,
-                summary: false,
-              },
-            },
-          ],
-        });
-        ruleId = createdRule.id;
-        expect(ruleId).not.to.be(undefined);
-      });
-
-      it('should be active', async () => {
-        const executionStatus = await waitForRuleStatus({
-          id: ruleId,
-          expectedStatus: 'active',
-          supertest,
-          retryService,
-          logger,
-        });
-        expect(executionStatus.status).to.be('active');
-      });
-
-      it('should set correct information in the alert document', async () => {
-        const resp = await waitForAlertInIndex({
-          esClient,
-          indexName: CUSTOM_THRESHOLD_RULE_ALERT_INDEX,
-          ruleId,
-          retryService,
-          logger,
-        });
-        alertId = (resp.hits.hits[0]._source as any)['kibana.alert.uuid'];
-
-        expect(resp.hits.hits[0]._source).property(
-          'kibana.alert.rule.category',
-          'Custom threshold'
-        );
-        expect(resp.hits.hits[0]._source).property('kibana.alert.rule.consumer', 'logs');
-        expect(resp.hits.hits[0]._source).property('kibana.alert.rule.name', 'Threshold rule');
-        expect(resp.hits.hits[0]._source).property('kibana.alert.rule.producer', 'observability');
-        expect(resp.hits.hits[0]._source).property('kibana.alert.rule.revision', 0);
-        expect(resp.hits.hits[0]._source).property(
-          'kibana.alert.rule.rule_type_id',
-          'observability.rules.custom_threshold'
-        );
-        expect(resp.hits.hits[0]._source).property('kibana.alert.rule.uuid', ruleId);
-        expect(resp.hits.hits[0]._source).property('kibana.space_ids').contain('default');
-        expect(resp.hits.hits[0]._source)
-          .property('kibana.alert.rule.tags')
-          .contain('observability');
-        expect(resp.hits.hits[0]._source).property(
-          'kibana.alert.action_group',
-          'custom_threshold.fired'
-        );
-        expect(resp.hits.hits[0]._source).property('tags').contain('observability');
-        expect(resp.hits.hits[0]._source)
-          .property('kibana.alert.instance.id')
-          .contain('host-0,container-0,system.cpu,kbn-data-forge-fake_hosts.fake_hosts');
-        expect(resp.hits.hits[0]._source).property('kibana.alert.workflow_status', 'open');
-        expect(resp.hits.hits[0]._source).property('event.kind', 'signal');
-        expect(resp.hits.hits[0]._source).property('event.action', 'open');
-
-        expect(resp.hits.hits[0]._source).property('host.name', 'host-0');
-        expect(resp.hits.hits[0]._source)
-          .property('host.mac')
-          .eql(['00-00-5E-00-53-23', '00-00-5E-00-53-24']);
-        expect(resp.hits.hits[0]._source).property('container.id', 'container-0');
-        expect(resp.hits.hits[0]._source).property('container.name', 'container-name');
-        expect(resp.hits.hits[0]._source).property('event.dataset', 'system.cpu');
-        expect(resp.hits.hits[0]._source).not.property('container.cpu');
-
-        const alertGroups = (resp.hits.hits[0]._source as any)?.['kibana.alert.group'];
-        expect(alertGroups[0]).eql({
-          field: 'host.name',
-          value: 'host-0',
-        });
-        expect(alertGroups[1]).eql({
-          field: 'container.id',
-          value: 'container-0',
-        });
-        expect(alertGroups[2]).eql({
-          field: 'event.dataset',
-          value: 'system.cpu',
-        });
-        expect(alertGroups[3].value).contain('kbn-data-forge-fake_hosts.fake_hosts');
-        expect(resp.hits.hits[0]._source).property('kibana.alert.evaluation.threshold').eql([0.2]);
-        expect(resp.hits.hits[0]._source)
-          .property('kibana.alert.rule.parameters')
-          .eql({
-            criteria: [
-              {
-                comparator: '>=',
-                threshold: [0.2],
-                timeSize: 1,
-                timeUnit: 'm',
-                metrics: [{ name: 'A', field: 'system.cpu.total.norm.pct', aggType: 'avg' }],
-              },
-            ],
-            alertOnNoData: true,
-            alertOnGroupDisappear: true,
-            searchConfiguration: { index: 'data-view-id', query: { query: '', language: 'kuery' } },
-            groupBy: ['host.name', 'container.id', 'event.dataset', '_index'],
-          });
-      });
-
-      it('should set correct action variables', async () => {
-        const resp = await waitForDocumentInIndex<ActionDocument>({
-          esClient,
-          indexName: ALERT_ACTION_INDEX,
-          retryService,
-          logger,
-        });
-
-        expect(resp.hits.hits[0]._source?.ruleType).eql('observability.rules.custom_threshold');
-        expect(resp.hits.hits[0]._source?.alertDetailsUrl).eql(
-          `https://localhost:5601/app/observability/alerts/${alertId}`
-        );
-        expect(resp.hits.hits[0]._source?.reason).contain(
-          `Average system.cpu.total.norm.pct is 80%, above or equal the threshold of 20%. (duration: 1 min, data view: ${DATA_VIEW}, group: host-0,container-0,system.cpu,kbn-data-forge-fake_hosts.fake_hosts`
-        );
-        expect(resp.hits.hits[0]._source?.value).eql('80%');
-        expect(resp.hits.hits[0]._source?.host).eql(
-          '{"name":"host-0","mac":["00-00-5E-00-53-23","00-00-5E-00-53-24"]}'
-        );
-        expect(resp.hits.hits[0]._source?.group).contain(
-          '{"field":"host.name","value":"host-0"},{"field":"container.id","value":"container-0"},{"field":"event.dataset","value":"system.cpu"},{"field":"_index","value":"kbn-data-forge-fake_hosts.fake_hosts'
-        );
-      });
-    });
-  });
-}
diff --git a/x-pack/test/alerting_api_integration/observability/custom_threshold_rule/p99_pct_fired.ts b/x-pack/test/alerting_api_integration/observability/custom_threshold_rule/p99_pct_fired.ts
deleted file mode 100644
index b76c09c12642d..0000000000000
--- a/x-pack/test/alerting_api_integration/observability/custom_threshold_rule/p99_pct_fired.ts
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { omit } from 'lodash';
-import { cleanup, generate, Dataset, PartialConfig } from '@kbn/data-forge';
-import { Aggregators } from '@kbn/observability-plugin/common/custom_threshold_rule/types';
-import { COMPARATORS } from '@kbn/alerting-comparators';
-import { FIRED_ACTIONS_ID } from '@kbn/observability-plugin/server/lib/rules/custom_threshold/constants';
-import expect from '@kbn/expect';
-import { OBSERVABILITY_THRESHOLD_RULE_TYPE_ID } from '@kbn/rule-data-utils';
-import { parseSearchParams } from '@kbn/share-plugin/common/url_service';
-import { createIndexConnector, createRule } from '../helpers/alerting_api_helper';
-import {
-  waitForAlertInIndex,
-  waitForDocumentInIndex,
-  waitForRuleStatus,
-} from '../helpers/alerting_wait_for_helpers';
-import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { ActionDocument, LogsExplorerLocatorParsedParams } from './typings';
-import { ISO_DATE_REGEX } from './constants';
-
-// eslint-disable-next-line import/no-default-export
-export default function ({ getService }: FtrProviderContext) {
-  const esClient = getService('es');
-  const supertest = getService('supertest');
-  const esDeleteAllIndices = getService('esDeleteAllIndices');
-  const logger = getService('log');
-  const retryService = getService('retry');
-
-  describe('Custom Threshold rule - P99 - PCT - FIRED', () => {
-    const CUSTOM_THRESHOLD_RULE_ALERT_INDEX = '.alerts-observability.threshold.alerts-default';
-    const ALERT_ACTION_INDEX = 'alert-action-threshold';
-    const DATA_VIEW_TITLE = 'kbn-data-forge-fake_hosts.fake_hosts-*';
-    const DATA_VIEW_NAME = 'ad-hoc-data-view-name';
-    const DATA_VIEW_ID = 'data-view-id';
-    const MOCKED_AD_HOC_DATA_VIEW = {
-      id: DATA_VIEW_ID,
-      title: DATA_VIEW_TITLE,
-      timeFieldName: '@timestamp',
-      sourceFilters: [],
-      fieldFormats: {},
-      runtimeFieldMap: {},
-      allowNoIndex: false,
-      name: DATA_VIEW_NAME,
-      allowHidden: false,
-    };
-    let dataForgeConfig: PartialConfig;
-    let dataForgeIndices: string[];
-    let actionId: string;
-    let ruleId: string;
-    let alertId: string;
-
-    before(async () => {
-      dataForgeConfig = {
-        schedule: [
-          {
-            template: 'good',
-            start: 'now-10m',
-            end: 'now+5m',
-            metrics: [{ name: 'system.cpu.user.pct', method: 'linear', start: 2.5, end: 2.5 }],
-          },
-        ],
-        indexing: {
-          dataset: 'fake_hosts' as Dataset,
-          eventsPerCycle: 1,
-          interval: 10000,
-          alignEventsToInterval: true,
-        },
-      };
-      dataForgeIndices = await generate({ client: esClient, config: dataForgeConfig, logger });
-      logger.info(JSON.stringify(dataForgeIndices.join(',')));
-      await waitForDocumentInIndex({
-        esClient,
-        indexName: DATA_VIEW_TITLE,
-        docCountTarget: 270,
-        retryService,
-        logger,
-      });
-    });
-
-    after(async () => {
-      await supertest.delete(`/api/alerting/rule/${ruleId}`).set('kbn-xsrf', 'foo');
-      await supertest.delete(`/api/actions/connector/${actionId}`).set('kbn-xsrf', 'foo');
-      await esClient.deleteByQuery({
-        index: CUSTOM_THRESHOLD_RULE_ALERT_INDEX,
-        query: { term: { 'kibana.alert.rule.uuid': ruleId } },
-      });
-      await esClient.deleteByQuery({
-        index: '.kibana-event-log-*',
-        query: { term: { 'kibana.alert.rule.consumer': 'logs' } },
-      });
-      await esDeleteAllIndices([ALERT_ACTION_INDEX, ...dataForgeIndices]);
-      await cleanup({ client: esClient, config: dataForgeConfig, logger });
-    });
-
-    describe('Rule creation', () => {
-      it('creates rule successfully', async () => {
-        actionId = await createIndexConnector({
-          supertest,
-          name: 'Index Connector: Threshold API test',
-          indexName: ALERT_ACTION_INDEX,
-          logger,
-        });
-
-        const createdRule = await createRule({
-          supertest,
-          logger,
-          esClient,
-          tags: ['observability'],
-          consumer: 'logs',
-          name: 'Threshold rule',
-          ruleTypeId: OBSERVABILITY_THRESHOLD_RULE_TYPE_ID,
-          params: {
-            criteria: [
-              {
-                comparator: COMPARATORS.GREATER_THAN,
-                threshold: [0.5],
-                timeSize: 5,
-                timeUnit: 'm',
-                metrics: [{ name: 'A', field: 'system.cpu.user.pct', aggType: Aggregators.P99 }],
-              },
-            ],
-            alertOnNoData: true,
-            alertOnGroupDisappear: true,
-            searchConfiguration: {
-              query: {
-                query: '',
-                language: 'kuery',
-              },
-              index: MOCKED_AD_HOC_DATA_VIEW,
-            },
-          },
-          actions: [
-            {
-              group: FIRED_ACTIONS_ID,
-              id: actionId,
-              params: {
-                documents: [
-                  {
-                    ruleType: '{{rule.type}}',
-                    alertDetailsUrl: '{{context.alertDetailsUrl}}',
-                    reason: '{{context.reason}}',
-                    value: '{{context.value}}',
-                    host: '{{context.host}}',
-                    viewInAppUrl: '{{context.viewInAppUrl}}',
-                  },
-                ],
-              },
-              frequency: {
-                notify_when: 'onActionGroupChange',
-                throttle: null,
-                summary: false,
-              },
-            },
-          ],
-        });
-        ruleId = createdRule.id;
-        expect(ruleId).not.to.be(undefined);
-      });
-
-      it('should be active', async () => {
-        const executionStatus = await waitForRuleStatus({
-          id: ruleId,
-          expectedStatus: 'active',
-          supertest,
-          retryService,
-          logger,
-        });
-        expect(executionStatus.status).to.be('active');
-      });
-
-      it('should set correct information in the alert document', async () => {
-        const resp = await waitForAlertInIndex({
-          esClient,
-          indexName: CUSTOM_THRESHOLD_RULE_ALERT_INDEX,
-          ruleId,
-          retryService,
-          logger,
-        });
-        alertId = (resp.hits.hits[0]._source as any)['kibana.alert.uuid'];
-
-        expect(resp.hits.hits[0]._source).property(
-          'kibana.alert.rule.category',
-          'Custom threshold'
-        );
-        expect(resp.hits.hits[0]._source).property('kibana.alert.rule.consumer', 'logs');
-        expect(resp.hits.hits[0]._source).property('kibana.alert.rule.name', 'Threshold rule');
-        expect(resp.hits.hits[0]._source).property('kibana.alert.rule.producer', 'observability');
-        expect(resp.hits.hits[0]._source).property('kibana.alert.rule.revision', 0);
-        expect(resp.hits.hits[0]._source).property(
-          'kibana.alert.rule.rule_type_id',
-          'observability.rules.custom_threshold'
-        );
-        expect(resp.hits.hits[0]._source).property('kibana.alert.rule.uuid', ruleId);
-        expect(resp.hits.hits[0]._source).property('kibana.space_ids').contain('default');
-        expect(resp.hits.hits[0]._source)
-          .property('kibana.alert.rule.tags')
-          .contain('observability');
-        expect(resp.hits.hits[0]._source).property(
-          'kibana.alert.action_group',
-          'custom_threshold.fired'
-        );
-        expect(resp.hits.hits[0]._source).property('tags').contain('observability');
-        expect(resp.hits.hits[0]._source).property('kibana.alert.instance.id', '*');
-        expect(resp.hits.hits[0]._source).property('kibana.alert.workflow_status', 'open');
-        expect(resp.hits.hits[0]._source).property('event.kind', 'signal');
-        expect(resp.hits.hits[0]._source).property('event.action', 'open');
-
-        expect(resp.hits.hits[0]._source)
-          .property('kibana.alert.rule.parameters')
-          .eql({
-            criteria: [
-              {
-                comparator: '>',
-                threshold: [0.5],
-                timeSize: 5,
-                timeUnit: 'm',
-                metrics: [{ name: 'A', field: 'system.cpu.user.pct', aggType: 'p99' }],
-              },
-            ],
-            alertOnNoData: true,
-            alertOnGroupDisappear: true,
-            searchConfiguration: {
-              index: MOCKED_AD_HOC_DATA_VIEW,
-              query: { query: '', language: 'kuery' },
-            },
-          });
-      });
-
-      it('should set correct action variables', async () => {
-        const resp = await waitForDocumentInIndex<ActionDocument>({
-          esClient,
-          indexName: ALERT_ACTION_INDEX,
-          retryService,
-          logger,
-        });
-
-        expect(resp.hits.hits[0]._source?.ruleType).eql('observability.rules.custom_threshold');
-        expect(resp.hits.hits[0]._source?.alertDetailsUrl).eql(
-          `https://localhost:5601/app/observability/alerts/${alertId}`
-        );
-        expect(resp.hits.hits[0]._source?.reason).eql(
-          `99th percentile of system.cpu.user.pct is 250%, above the threshold of 50%. (duration: 5 mins, data view: ${DATA_VIEW_NAME})`
-        );
-        expect(resp.hits.hits[0]._source?.value).eql('250%');
-
-        const parsedViewInAppUrl = parseSearchParams<LogsExplorerLocatorParsedParams>(
-          new URL(resp.hits.hits[0]._source?.viewInAppUrl || '').search
-        );
-
-        expect(resp.hits.hits[0]._source?.viewInAppUrl).contain('LOGS_EXPLORER_LOCATOR');
-        expect(omit(parsedViewInAppUrl.params, 'timeRange.from')).eql({
-          dataset: DATA_VIEW_TITLE,
-          timeRange: { to: 'now' },
-          query: { query: '', language: 'kuery' },
-          filters: [],
-        });
-        expect(parsedViewInAppUrl.params.timeRange.from).match(ISO_DATE_REGEX);
-      });
-    });
-  });
-}
diff --git a/x-pack/test/alerting_api_integration/observability/custom_threshold_rule/typings.ts b/x-pack/test/alerting_api_integration/observability/custom_threshold_rule/typings.ts
deleted file mode 100644
index 9002e9991292f..0000000000000
--- a/x-pack/test/alerting_api_integration/observability/custom_threshold_rule/typings.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { Query, TimeRange } from '@kbn/es-query';
-import { SerializableRecord } from '@kbn/utility-types';
-
-export interface ActionDocument {
-  ruleType: string;
-  alertDetailsUrl: string;
-  reason: string;
-  value: string;
-  viewInAppUrl: string;
-  host?: string;
-  group?: string;
-}
-
-export interface LogsExplorerLocatorParsedParams extends SerializableRecord {
-  dataset: string;
-  timeRange: TimeRange;
-  query: Query;
-}
diff --git a/x-pack/test/alerting_api_integration/observability/index.ts b/x-pack/test/alerting_api_integration/observability/index.ts
index 8b2f7b5b4c20e..8763332d504e0 100644
--- a/x-pack/test/alerting_api_integration/observability/index.ts
+++ b/x-pack/test/alerting_api_integration/observability/index.ts
@@ -10,13 +10,6 @@ export default function ({ loadTestFile }: any) {
   describe('Observability Rules', () => {
     describe('Rules Endpoints', () => {
       loadTestFile(require.resolve('./metric_threshold_rule'));
-      loadTestFile(require.resolve('./custom_threshold_rule/p99_pct_fired'));
-      loadTestFile(require.resolve('./custom_threshold_rule/rate_bytes_fired'));
-      loadTestFile(require.resolve('./custom_threshold_rule/avg_pct_no_data'));
-      loadTestFile(require.resolve('./custom_threshold_rule/avg_us_fired'));
-      loadTestFile(require.resolve('./custom_threshold_rule/custom_eq_avg_bytes_fired'));
-      loadTestFile(require.resolve('./custom_threshold_rule/documents_count_fired'));
-      loadTestFile(require.resolve('./custom_threshold_rule/group_by_fired'));
       loadTestFile(require.resolve('./custom_threshold_rule_data_view'));
     });
     describe('Synthetics', () => {
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group1/create.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group1/create.ts
index 57d41424186b3..5a6385a3895d2 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group1/create.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/group1/create.ts
@@ -395,20 +395,18 @@ export default function createAlertTests({ getService }: FtrProviderContext) {
       });
     });
 
-    it('should not allow providing simple custom ids (non uuid)', async () => {
-      const customId = '1';
+    it('should create a rule with a predefined non random ID', async () => {
+      const ruleId = 'my_id';
+
       const response = await supertest
-        .post(`${getUrlPrefix(Spaces.space1.id)}/api/alerting/rule/${customId}`)
+        .post(`${getUrlPrefix(Spaces.space1.id)}/api/alerting/rule/${ruleId}`)
         .set('kbn-xsrf', 'foo')
-        .send(getTestRuleData());
+        .send(getTestRuleData())
+        .expect(200);
 
-      expect(response.status).to.eql(400);
-      expect(response.body).to.eql({
-        statusCode: 400,
-        error: 'Bad Request',
-        message:
-          'Predefined IDs are not allowed for saved objects with encrypted attributes unless the ID is a UUID.: Bad Request',
-      });
+      objectRemover.add(Spaces.space1.id, response.body.id, 'rule', 'alerting');
+
+      expect(response.body.id).to.eql(ruleId);
     });
 
     it('should return 409 when document with id already exists', async () => {
diff --git a/x-pack/test/api_integration/apis/synthetics/add_edit_params.ts b/x-pack/test/api_integration/apis/synthetics/add_edit_params.ts
index 7b27aaa621f46..0aae85864bf16 100644
--- a/x-pack/test/api_integration/apis/synthetics/add_edit_params.ts
+++ b/x-pack/test/api_integration/apis/synthetics/add_edit_params.ts
@@ -353,5 +353,45 @@ export default function ({ getService }: FtrProviderContext) {
         expect(param.key).to.not.empty();
       });
     });
+
+    it('should handle bulk deleting params', async () => {
+      await kServer.savedObjects.clean({ types: [syntheticsParamType] });
+
+      const params = [
+        { key: 'param1', value: 'value1' },
+        { key: 'param2', value: 'value2' },
+        { key: 'param3', value: 'value3' },
+      ];
+
+      for (const param of params) {
+        await supertestAPI
+          .post(SYNTHETICS_API_URLS.PARAMS)
+          .set('kbn-xsrf', 'true')
+          .send(param)
+          .expect(200);
+      }
+
+      const getResponse = await supertestAPI
+        .get(SYNTHETICS_API_URLS.PARAMS)
+        .set('kbn-xsrf', 'true')
+        .expect(200);
+
+      expect(getResponse.body.length).to.eql(3);
+
+      const ids = getResponse.body.map((param: any) => param.id);
+
+      await supertestAPI
+        .post(SYNTHETICS_API_URLS.PARAMS + '/_bulk_delete')
+        .set('kbn-xsrf', 'true')
+        .send({ ids })
+        .expect(200);
+
+      const getResponseAfterDelete = await supertestAPI
+        .get(SYNTHETICS_API_URLS.PARAMS)
+        .set('kbn-xsrf', 'true')
+        .expect(200);
+
+      expect(getResponseAfterDelete.body.length).to.eql(0);
+    });
   });
 }
diff --git a/x-pack/test/api_integration/apis/synthetics/delete_monitor.ts b/x-pack/test/api_integration/apis/synthetics/delete_monitor.ts
index c96175d2982b3..f8781295e8005 100644
--- a/x-pack/test/api_integration/apis/synthetics/delete_monitor.ts
+++ b/x-pack/test/api_integration/apis/synthetics/delete_monitor.ts
@@ -121,6 +121,33 @@ export default function ({ getService }: FtrProviderContext) {
       await supertest.get(SYNTHETICS_API_URLS.SYNTHETICS_MONITORS + '/' + monitorId).expect(404);
     });
 
+    it('deletes multiple monitors by bulk delete', async () => {
+      const { id: monitorId } = await saveMonitor(httpMonitorJson as MonitorFields);
+      const { id: monitorId2 } = await saveMonitor({
+        ...httpMonitorJson,
+        name: 'another -2',
+      } as MonitorFields);
+
+      const deleteResponse = await monitorTestService.deleteMonitorBulk(
+        [monitorId2, monitorId],
+        200
+      );
+
+      expect(
+        deleteResponse.body.result.sort((a: { id: string }, b: { id: string }) =>
+          a.id > b.id ? 1 : -1
+        )
+      ).eql(
+        [
+          { id: monitorId2, deleted: true },
+          { id: monitorId, deleted: true },
+        ].sort((a, b) => (a.id > b.id ? 1 : -1))
+      );
+
+      // Hit get endpoint and expect 404 as well
+      await supertest.get(SYNTHETICS_API_URLS.SYNTHETICS_MONITORS + '/' + monitorId).expect(404);
+    });
+
     it('returns 404 if monitor id is not found', async () => {
       const invalidMonitorId = 'invalid-id';
       const expected404Message = `Monitor id ${invalidMonitorId} not found!`;
diff --git a/x-pack/test/api_integration/apis/synthetics/services/synthetics_monitor_test_service.ts b/x-pack/test/api_integration/apis/synthetics/services/synthetics_monitor_test_service.ts
index 1c7376e41c4d7..c0c15024b5401 100644
--- a/x-pack/test/api_integration/apis/synthetics/services/synthetics_monitor_test_service.ts
+++ b/x-pack/test/api_integration/apis/synthetics/services/synthetics_monitor_test_service.ts
@@ -230,4 +230,17 @@ export class SyntheticsMonitorTestService {
     expect(deleteResponse.status).to.eql(statusCode);
     return deleteResponse;
   }
+
+  async deleteMonitorBulk(monitorIds: string[], statusCode = 200, spaceId?: string) {
+    const deleteResponse = await this.supertest
+      .post(
+        spaceId
+          ? `/s/${spaceId}${SYNTHETICS_API_URLS.SYNTHETICS_MONITORS}/_bulk_delete`
+          : SYNTHETICS_API_URLS.SYNTHETICS_MONITORS + '/_bulk_delete'
+      )
+      .send({ ids: monitorIds })
+      .set('kbn-xsrf', 'true');
+    expect(deleteResponse.status).to.eql(statusCode);
+    return deleteResponse;
+  }
 }
diff --git a/x-pack/test/api_integration/apis/synthetics/sync_global_params.ts b/x-pack/test/api_integration/apis/synthetics/sync_global_params.ts
index 8e0aaeff21580..e0a79a8905ee8 100644
--- a/x-pack/test/api_integration/apis/synthetics/sync_global_params.ts
+++ b/x-pack/test/api_integration/apis/synthetics/sync_global_params.ts
@@ -287,8 +287,9 @@ export default function ({ getService }: FtrProviderContext) {
       const deleteResponse = await supertestAPI
         .delete(SYNTHETICS_API_URLS.PARAMS)
         .set('kbn-xsrf', 'true')
-        .send({ ids })
-        .expect(200);
+        .send({ ids });
+
+      expect(deleteResponse.status).eql(200);
 
       expect(deleteResponse.body).to.have.length(2);
 
diff --git a/x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/burn_rate_rule.ts b/x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/burn_rate_rule.ts
index e556db2e09a28..09823fccb5589 100644
--- a/x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/burn_rate_rule.ts
+++ b/x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/burn_rate_rule.ts
@@ -33,6 +33,7 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
     let dataForgeIndices: string[];
     let actionId: string;
     let ruleId: string;
+    let dependencyRuleId: string;
     let adminRoleAuthc: RoleCredentials;
     let internalHeaders: InternalRequestHeader;
 
@@ -76,6 +77,18 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
         .delete(`/api/actions/connector/${actionId}`)
         .set(adminRoleAuthc.apiKeyHeader)
         .set(internalHeaders);
+      await esClient.deleteByQuery({
+        index: RULE_ALERT_INDEX,
+        query: {
+          bool: {
+            should: [
+              { term: { 'kibana.alert.rule.uuid': ruleId } },
+              { term: { 'kibana.alert.rule.uuid': dependencyRuleId } },
+            ],
+          },
+        },
+        conflicts: 'proceed',
+      });
       await esClient.deleteByQuery({
         index: '.kibana-event-log-*',
         query: { term: { 'rule.id': ruleId } },
@@ -202,6 +215,7 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
           actions: [],
         });
 
+        dependencyRuleId = dependencyRule.id;
         const createdRule = await alertingApi.createRule({
           roleAuthc: adminRoleAuthc,
           tags: ['observability'],
diff --git a/x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/custom_threshold/avg_pct_fired.ts b/x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/custom_threshold/avg_pct_fired.ts
index 63530c98c26df..8ed42269e569b 100644
--- a/x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/custom_threshold/avg_pct_fired.ts
+++ b/x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/custom_threshold/avg_pct_fired.ts
@@ -27,11 +27,11 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
   const alertingApi = getService('alertingApi');
   const dataViewApi = getService('dataViewApi');
   const logger = getService('log');
-  let roleAuthc: RoleCredentials;
-  let internalReqHeader: InternalRequestHeader;
   const config = getService('config');
   const isServerless = config.get('serverless');
   const expectedConsumer = isServerless ? 'observability' : 'logs';
+  let roleAuthc: RoleCredentials;
+  let internalReqHeader: InternalRequestHeader;
 
   describe('AVG - PCT - FIRED', () => {
     const CUSTOM_THRESHOLD_RULE_ALERT_INDEX = '.alerts-observability.threshold.alerts-default';
diff --git a/x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/avg_pct_no_data.ts b/x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/custom_threshold/avg_pct_no_data.ts
similarity index 86%
rename from x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/avg_pct_no_data.ts
rename to x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/custom_threshold/avg_pct_no_data.ts
index 4928e69a939c1..f439bb2fedca9 100644
--- a/x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/avg_pct_no_data.ts
+++ b/x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/custom_threshold/avg_pct_no_data.ts
@@ -5,31 +5,33 @@
  * 2.0.
  */
 
+import { omit } from 'lodash';
+import expect from '@kbn/expect';
 import { Aggregators } from '@kbn/observability-plugin/common/custom_threshold_rule/types';
 import { NO_DATA_ACTIONS_ID } from '@kbn/observability-plugin/server/lib/rules/custom_threshold/constants';
-import expect from '@kbn/expect';
 import { OBSERVABILITY_THRESHOLD_RULE_TYPE_ID } from '@kbn/rule-data-utils';
 import { parseSearchParams } from '@kbn/share-plugin/common/url_service';
-import { omit } from 'lodash';
 import { COMPARATORS } from '@kbn/alerting-comparators';
 import { kbnTestConfig } from '@kbn/test';
-import { FtrProviderContext } from '../../../ftr_provider_context';
+import type { InternalRequestHeader, RoleCredentials } from '@kbn/ftr-common-functional-services';
+import { DeploymentAgnosticFtrProviderContext } from '../../../../ftr_provider_context';
 import { ISO_DATE_REGEX } from './constants';
-import { ActionDocument, LogsExplorerLocatorParsedParams } from './typings';
-import type { InternalRequestHeader, RoleCredentials } from '../../../../shared/services';
+import { ActionDocument, LogsExplorerLocatorParsedParams } from './types';
 
-export default function ({ getService }: FtrProviderContext) {
+export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
   const esClient = getService('es');
-  const supertest = getService('supertest');
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
   const alertingApi = getService('alertingApi');
   const dataViewApi = getService('dataViewApi');
   const esDeleteAllIndices = getService('esDeleteAllIndices');
-  const svlUserManager = getService('svlUserManager');
-  const svlCommonApi = getService('svlCommonApi');
+  const samlAuth = getService('samlAuth');
   let roleAuthc: RoleCredentials;
   let internalReqHeader: InternalRequestHeader;
+  const config = getService('config');
+  const isServerless = config.get('serverless');
+  const expectedConsumer = isServerless ? 'observability' : 'logs';
 
-  describe('Custom Threshold rule - AVG - PCT - NoData', () => {
+  describe('AVG - PCT - NoData', () => {
     const CUSTOM_THRESHOLD_RULE_ALERT_INDEX = '.alerts-observability.threshold.alerts-default';
     const ALERT_ACTION_INDEX = 'alert-action-threshold';
     const DATA_VIEW_NAME = 'no-data-pattern-name';
@@ -40,18 +42,25 @@ export default function ({ getService }: FtrProviderContext) {
     let alertId: string;
 
     before(async () => {
-      roleAuthc = await svlUserManager.createM2mApiKeyWithRoleScope('admin');
-      internalReqHeader = svlCommonApi.getInternalRequestHeader();
+      roleAuthc = await samlAuth.createM2mApiKeyWithRoleScope('admin');
+      internalReqHeader = samlAuth.getInternalRequestHeader();
       await dataViewApi.create({
         name: DATA_VIEW_NAME,
         id: DATA_VIEW_ID,
         title: DATA_VIEW_TITLE,
+        roleAuthc,
       });
     });
 
     after(async () => {
-      await supertest.delete(`/api/alerting/rule/${ruleId}`).set(internalReqHeader);
-      await supertest.delete(`/api/actions/connector/${actionId}`).set(internalReqHeader);
+      await supertestWithoutAuth
+        .delete(`/api/alerting/rule/${ruleId}`)
+        .set(roleAuthc.apiKeyHeader)
+        .set(internalReqHeader);
+      await supertestWithoutAuth
+        .delete(`/api/actions/connector/${actionId}`)
+        .set(roleAuthc.apiKeyHeader)
+        .set(internalReqHeader);
       await esClient.deleteByQuery({
         index: CUSTOM_THRESHOLD_RULE_ALERT_INDEX,
         query: { term: { 'kibana.alert.rule.uuid': ruleId } },
@@ -64,9 +73,10 @@ export default function ({ getService }: FtrProviderContext) {
       });
       await dataViewApi.delete({
         id: DATA_VIEW_ID,
+        roleAuthc,
       });
       await esDeleteAllIndices([ALERT_ACTION_INDEX]);
-      await svlUserManager.invalidateM2mApiKeyWithRoleScope(roleAuthc);
+      await samlAuth.invalidateM2mApiKeyWithRoleScope(roleAuthc);
     });
 
     describe('Rule creation', () => {
@@ -80,7 +90,7 @@ export default function ({ getService }: FtrProviderContext) {
         const createdRule = await alertingApi.createRule({
           roleAuthc,
           tags: ['observability'],
-          consumer: 'observability',
+          consumer: expectedConsumer,
           name: 'Threshold rule',
           ruleTypeId: OBSERVABILITY_THRESHOLD_RULE_TYPE_ID,
           params: {
@@ -144,7 +154,7 @@ export default function ({ getService }: FtrProviderContext) {
       it('should find the created rule with correct information about the consumer', async () => {
         const match = await alertingApi.findInRules(roleAuthc, ruleId);
         expect(match).not.to.be(undefined);
-        expect(match.consumer).to.be('observability');
+        expect(match.consumer).to.be(expectedConsumer);
       });
 
       it('should set correct information in the alert document', async () => {
@@ -158,7 +168,7 @@ export default function ({ getService }: FtrProviderContext) {
           'kibana.alert.rule.category',
           'Custom threshold'
         );
-        expect(resp.hits.hits[0]._source).property('kibana.alert.rule.consumer', 'observability');
+        expect(resp.hits.hits[0]._source).property('kibana.alert.rule.consumer', expectedConsumer);
         expect(resp.hits.hits[0]._source).property('kibana.alert.rule.name', 'Threshold rule');
         expect(resp.hits.hits[0]._source).property('kibana.alert.rule.producer', 'observability');
         expect(resp.hits.hits[0]._source).property('kibana.alert.rule.revision', 0);
@@ -208,7 +218,7 @@ export default function ({ getService }: FtrProviderContext) {
           docCountTarget: 1,
         });
 
-        const { protocol, hostname, port } = kbnTestConfig.getUrlParts();
+        const { protocol, hostname, port } = kbnTestConfig.getUrlPartsWithStrippedDefaultPort();
         expect(resp.hits.hits[0]._source?.ruleType).eql('observability.rules.custom_threshold');
         expect(resp.hits.hits[0]._source?.alertDetailsUrl).eql(
           `${protocol}://${hostname}${port ? `:${port}` : ''}/app/observability/alerts/${alertId}`
diff --git a/x-pack/test/alerting_api_integration/observability/custom_threshold_rule/avg_us_fired.ts b/x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/custom_threshold/avg_us_fired.ts
similarity index 74%
rename from x-pack/test/alerting_api_integration/observability/custom_threshold_rule/avg_us_fired.ts
rename to x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/custom_threshold/avg_us_fired.ts
index 391acf747eb25..05b6ded5191d1 100644
--- a/x-pack/test/alerting_api_integration/observability/custom_threshold_rule/avg_us_fired.ts
+++ b/x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/custom_threshold/avg_us_fired.ts
@@ -6,38 +6,37 @@
  */
 
 import moment from 'moment';
-import { ApmSynthtraceEsClient } from '@kbn/apm-synthtrace';
 import { format } from 'url';
+import expect from '@kbn/expect';
+import { COMPARATORS } from '@kbn/alerting-comparators';
+import { ApmSynthtraceEsClient } from '@kbn/apm-synthtrace';
 import { Aggregators } from '@kbn/observability-plugin/common/custom_threshold_rule/types';
 import { FIRED_ACTIONS_ID } from '@kbn/observability-plugin/server/lib/rules/custom_threshold/constants';
-import expect from '@kbn/expect';
 import { OBSERVABILITY_THRESHOLD_RULE_TYPE_ID } from '@kbn/rule-data-utils';
-import { COMPARATORS } from '@kbn/alerting-comparators';
-import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { createIndexConnector, createRule } from '../helpers/alerting_api_helper';
-import { createDataView, deleteDataView } from '../helpers/data_view';
-import { getSyntraceClient, generateData } from '../helpers/syntrace';
-import {
-  waitForAlertInIndex,
-  waitForDocumentInIndex,
-  waitForRuleStatus,
-} from '../helpers/alerting_wait_for_helpers';
-import { ActionDocument } from './typings';
+import { kbnTestConfig } from '@kbn/test';
+import type { InternalRequestHeader, RoleCredentials } from '@kbn/ftr-common-functional-services';
+import { DeploymentAgnosticFtrProviderContext } from '../../../../ftr_provider_context';
+import { getSyntraceClient, generateData } from './helpers/syntrace';
+import { ActionDocument } from './types';
 
-// eslint-disable-next-line import/no-default-export
-export default function ({ getService }: FtrProviderContext) {
+export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
   const start = moment(Date.now()).subtract(10, 'minutes').valueOf();
-  const end = moment(Date.now()).valueOf();
+  const end = moment(Date.now()).add(15, 'minutes').valueOf();
   const esClient = getService('es');
+  const samlAuth = getService('samlAuth');
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
   const esDeleteAllIndices = getService('esDeleteAllIndices');
+  const alertingApi = getService('alertingApi');
+  const dataViewApi = getService('dataViewApi');
   const config = getService('config');
   const kibanaServerConfig = config.get('servers.kibana');
+  const isServerless = config.get('serverless');
+  const expectedConsumer = isServerless ? 'observability' : 'logs';
   const kibanaUrl = format(kibanaServerConfig);
-  const supertest = getService('supertest');
-  const logger = getService('log');
-  const retryService = getService('retry');
+  let roleAuthc: RoleCredentials;
+  let internalReqHeader: InternalRequestHeader;
 
-  describe('Custom Threshold rule - AVG - US - FIRED', () => {
+  describe('AVG - US - FIRED', () => {
     const CUSTOM_THRESHOLD_RULE_ALERT_INDEX = '.alerts-observability.threshold.alerts-default';
     const ALERT_ACTION_INDEX = 'alert-action-threshold';
     const DATA_VIEW = 'traces-apm*,metrics-apm*,logs-apm*';
@@ -50,20 +49,27 @@ export default function ({ getService }: FtrProviderContext) {
     let alertId: string;
 
     before(async () => {
+      roleAuthc = await samlAuth.createM2mApiKeyWithRoleScope('admin');
+      internalReqHeader = samlAuth.getInternalRequestHeader();
       synthtraceEsClient = await getSyntraceClient({ esClient, kibanaUrl });
       await generateData({ synthtraceEsClient, start, end });
-      await createDataView({
-        supertest,
+      await dataViewApi.create({
         name: DATA_VIEW_NAME,
         id: DATA_VIEW_ID,
         title: DATA_VIEW,
-        logger,
+        roleAuthc,
       });
     });
 
     after(async () => {
-      await supertest.delete(`/api/alerting/rule/${ruleId}`).set('kbn-xsrf', 'foo');
-      await supertest.delete(`/api/actions/connector/${actionId}`).set('kbn-xsrf', 'foo');
+      await supertestWithoutAuth
+        .delete(`/api/alerting/rule/${ruleId}`)
+        .set(roleAuthc.apiKeyHeader)
+        .set(internalReqHeader);
+      await supertestWithoutAuth
+        .delete(`/api/actions/connector/${actionId}`)
+        .set(roleAuthc.apiKeyHeader)
+        .set(internalReqHeader);
       await esDeleteAllIndices([ALERT_ACTION_INDEX]);
       await esClient.deleteByQuery({
         index: CUSTOM_THRESHOLD_RULE_ALERT_INDEX,
@@ -71,37 +77,33 @@ export default function ({ getService }: FtrProviderContext) {
       });
       await esClient.deleteByQuery({
         index: '.kibana-event-log-*',
-        query: { term: { 'kibana.alert.rule.consumer': 'logs' } },
+        query: { term: { 'kibana.alert.rule.consumer': expectedConsumer } },
       });
       await synthtraceEsClient.clean();
-      await deleteDataView({
-        supertest,
+      await dataViewApi.delete({
         id: DATA_VIEW_ID,
-        logger,
+        roleAuthc,
       });
+      await samlAuth.invalidateM2mApiKeyWithRoleScope(roleAuthc);
     });
 
     describe('Rule creation', () => {
       it('creates rule successfully', async () => {
-        actionId = await createIndexConnector({
-          supertest,
+        actionId = await alertingApi.createIndexConnector({
+          roleAuthc,
           name: 'Index Connector: Threshold API test',
           indexName: ALERT_ACTION_INDEX,
-          logger,
         });
 
-        const createdRule = await createRule({
-          supertest,
-          logger,
-          esClient,
+        const createdRule = await alertingApi.createRule({
+          roleAuthc,
           tags: ['observability'],
-          consumer: 'logs',
+          consumer: expectedConsumer,
           name: 'Threshold rule',
           ruleTypeId: OBSERVABILITY_THRESHOLD_RULE_TYPE_ID,
           params: {
             criteria: [
               {
-                aggType: 'custom',
                 comparator: COMPARATORS.GREATER_THAN,
                 threshold: [7500000],
                 timeSize: 5,
@@ -148,23 +150,18 @@ export default function ({ getService }: FtrProviderContext) {
       });
 
       it('should be active', async () => {
-        const executionStatus = await waitForRuleStatus({
-          id: ruleId,
+        const executionStatus = await alertingApi.waitForRuleStatus({
+          roleAuthc,
+          ruleId,
           expectedStatus: 'active',
-          supertest,
-          retryService,
-          logger,
         });
-        expect(executionStatus.status).to.be('active');
+        expect(executionStatus).to.be('active');
       });
 
       it('should set correct information in the alert document', async () => {
-        const resp = await waitForAlertInIndex({
-          esClient,
+        const resp = await alertingApi.waitForAlertInIndex({
           indexName: CUSTOM_THRESHOLD_RULE_ALERT_INDEX,
           ruleId,
-          retryService,
-          logger,
         });
         alertId = (resp.hits.hits[0]._source as any)['kibana.alert.uuid'];
 
@@ -172,7 +169,7 @@ export default function ({ getService }: FtrProviderContext) {
           'kibana.alert.rule.category',
           'Custom threshold'
         );
-        expect(resp.hits.hits[0]._source).property('kibana.alert.rule.consumer', 'logs');
+        expect(resp.hits.hits[0]._source).property('kibana.alert.rule.consumer', expectedConsumer);
         expect(resp.hits.hits[0]._source).property('kibana.alert.rule.name', 'Threshold rule');
         expect(resp.hits.hits[0]._source).property('kibana.alert.rule.producer', 'observability');
         expect(resp.hits.hits[0]._source).property('kibana.alert.rule.revision', 0);
@@ -202,7 +199,6 @@ export default function ({ getService }: FtrProviderContext) {
           .eql({
             criteria: [
               {
-                aggType: 'custom',
                 comparator: '>',
                 threshold: [7500000],
                 timeSize: 5,
@@ -217,16 +213,14 @@ export default function ({ getService }: FtrProviderContext) {
       });
 
       it('should set correct action parameter: ruleType', async () => {
-        const resp = await waitForDocumentInIndex<ActionDocument>({
-          esClient,
+        const resp = await alertingApi.waitForDocumentInIndex<ActionDocument>({
           indexName: ALERT_ACTION_INDEX,
-          retryService,
-          logger,
+          docCountTarget: 1,
         });
-
+        const { protocol, hostname, port } = kbnTestConfig.getUrlPartsWithStrippedDefaultPort();
         expect(resp.hits.hits[0]._source?.ruleType).eql('observability.rules.custom_threshold');
         expect(resp.hits.hits[0]._source?.alertDetailsUrl).eql(
-          `https://localhost:5601/app/observability/alerts/${alertId}`
+          `${protocol}://${hostname}${port ? `:${port}` : ''}/app/observability/alerts/${alertId}`
         );
         expect(resp.hits.hits[0]._source?.reason).eql(
           `Average span.self_time.sum.us is 10,000,000, above the threshold of 7,500,000. (duration: 5 mins, data view: ${DATA_VIEW_NAME})`
diff --git a/x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/custom_eq_avg_bytes_fired.ts b/x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/custom_threshold/custom_eq_avg_bytes_fired.ts
similarity index 87%
rename from x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/custom_eq_avg_bytes_fired.ts
rename to x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/custom_threshold/custom_eq_avg_bytes_fired.ts
index f2f98fe1ff2de..4163c85c849f4 100644
--- a/x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/custom_eq_avg_bytes_fired.ts
+++ b/x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/custom_threshold/custom_eq_avg_bytes_fired.ts
@@ -11,30 +11,32 @@
  * 2.0.
  */
 
+import expect from '@kbn/expect';
 import { cleanup, Dataset, generate, PartialConfig } from '@kbn/data-forge';
 import { Aggregators } from '@kbn/observability-plugin/common/custom_threshold_rule/types';
 import { COMPARATORS } from '@kbn/alerting-comparators';
 import { FIRED_ACTIONS_ID } from '@kbn/observability-plugin/server/lib/rules/custom_threshold/constants';
-import expect from '@kbn/expect';
 import { OBSERVABILITY_THRESHOLD_RULE_TYPE_ID } from '@kbn/rule-data-utils';
 import { kbnTestConfig } from '@kbn/test';
-import type { InternalRequestHeader, RoleCredentials } from '../../../../shared/services';
-import { FtrProviderContext } from '../../../ftr_provider_context';
-import { ActionDocument } from './typings';
+import type { InternalRequestHeader, RoleCredentials } from '@kbn/ftr-common-functional-services';
+import { DeploymentAgnosticFtrProviderContext } from '../../../../ftr_provider_context';
+import { ActionDocument } from './types';
 
-export default function ({ getService }: FtrProviderContext) {
+export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
   const esClient = getService('es');
-  const supertest = getService('supertest');
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
   const esDeleteAllIndices = getService('esDeleteAllIndices');
   const logger = getService('log');
   const alertingApi = getService('alertingApi');
   const dataViewApi = getService('dataViewApi');
-  const svlUserManager = getService('svlUserManager');
-  const svlCommonApi = getService('svlCommonApi');
+  const samlAuth = getService('samlAuth');
   let roleAuthc: RoleCredentials;
   let internalReqHeader: InternalRequestHeader;
+  const config = getService('config');
+  const isServerless = config.get('serverless');
+  const expectedConsumer = isServerless ? 'observability' : 'logs';
 
-  describe('Custom Threshold rule - CUSTOM_EQ - AVG - BYTES - FIRED', () => {
+  describe('CUSTOM_EQ - AVG - BYTES - FIRED', () => {
     const CUSTOM_THRESHOLD_RULE_ALERT_INDEX = '.alerts-observability.threshold.alerts-default';
     const DATA_VIEW = 'kbn-data-forge-fake_hosts.fake_hosts-*';
     const ALERT_ACTION_INDEX = 'alert-action-threshold';
@@ -46,8 +48,8 @@ export default function ({ getService }: FtrProviderContext) {
     let alertId: string;
 
     before(async () => {
-      roleAuthc = await svlUserManager.createM2mApiKeyWithRoleScope('admin');
-      internalReqHeader = svlCommonApi.getInternalRequestHeader();
+      roleAuthc = await samlAuth.createM2mApiKeyWithRoleScope('admin');
+      internalReqHeader = samlAuth.getInternalRequestHeader();
       dataForgeConfig = {
         schedule: [
           {
@@ -74,12 +76,19 @@ export default function ({ getService }: FtrProviderContext) {
         name: DATA_VIEW,
         id: DATA_VIEW_ID,
         title: DATA_VIEW,
+        roleAuthc,
       });
     });
 
     after(async () => {
-      await supertest.delete(`/api/alerting/rule/${ruleId}`).set(internalReqHeader);
-      await supertest.delete(`/api/actions/connector/${actionId}`).set(internalReqHeader);
+      await supertestWithoutAuth
+        .delete(`/api/alerting/rule/${ruleId}`)
+        .set(roleAuthc.apiKeyHeader)
+        .set(internalReqHeader);
+      await supertestWithoutAuth
+        .delete(`/api/actions/connector/${actionId}`)
+        .set(roleAuthc.apiKeyHeader)
+        .set(internalReqHeader);
       await esClient.deleteByQuery({
         index: CUSTOM_THRESHOLD_RULE_ALERT_INDEX,
         query: { term: { 'kibana.alert.rule.uuid': ruleId } },
@@ -92,10 +101,11 @@ export default function ({ getService }: FtrProviderContext) {
       });
       await dataViewApi.delete({
         id: DATA_VIEW_ID,
+        roleAuthc,
       });
       await esDeleteAllIndices([ALERT_ACTION_INDEX, ...dataForgeIndices]);
       await cleanup({ client: esClient, config: dataForgeConfig, logger });
-      await svlUserManager.invalidateM2mApiKeyWithRoleScope(roleAuthc);
+      await samlAuth.invalidateM2mApiKeyWithRoleScope(roleAuthc);
     });
 
     describe('Rule creation', () => {
@@ -109,7 +119,7 @@ export default function ({ getService }: FtrProviderContext) {
         const createdRule = await alertingApi.createRule({
           roleAuthc,
           tags: ['observability'],
-          consumer: 'observability',
+          consumer: expectedConsumer,
           name: 'Threshold rule',
           ruleTypeId: OBSERVABILITY_THRESHOLD_RULE_TYPE_ID,
           params: {
@@ -174,7 +184,7 @@ export default function ({ getService }: FtrProviderContext) {
       it('should find the created rule with correct information about the consumer', async () => {
         const match = await alertingApi.findInRules(roleAuthc, ruleId);
         expect(match).not.to.be(undefined);
-        expect(match.consumer).to.be('observability');
+        expect(match.consumer).to.be(expectedConsumer);
       });
 
       it('should set correct information in the alert document', async () => {
@@ -188,7 +198,7 @@ export default function ({ getService }: FtrProviderContext) {
           'kibana.alert.rule.category',
           'Custom threshold'
         );
-        expect(resp.hits.hits[0]._source).property('kibana.alert.rule.consumer', 'observability');
+        expect(resp.hits.hits[0]._source).property('kibana.alert.rule.consumer', expectedConsumer);
         expect(resp.hits.hits[0]._source).property('kibana.alert.rule.name', 'Threshold rule');
         expect(resp.hits.hits[0]._source).property('kibana.alert.rule.producer', 'observability');
         expect(resp.hits.hits[0]._source).property('kibana.alert.rule.revision', 0);
diff --git a/x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/documents_count_fired.ts b/x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/custom_threshold/documents_count_fired.ts
similarity index 88%
rename from x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/documents_count_fired.ts
rename to x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/custom_threshold/documents_count_fired.ts
index ac0e034279cbe..f9d7067f0e0a4 100644
--- a/x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/documents_count_fired.ts
+++ b/x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/custom_threshold/documents_count_fired.ts
@@ -5,33 +5,35 @@
  * 2.0.
  */
 
+import { omit } from 'lodash';
+import expect from '@kbn/expect';
 import { cleanup, generate, Dataset, PartialConfig } from '@kbn/data-forge';
 import { Aggregators } from '@kbn/observability-plugin/common/custom_threshold_rule/types';
 import { FIRED_ACTIONS_ID } from '@kbn/observability-plugin/server/lib/rules/custom_threshold/constants';
-import expect from '@kbn/expect';
 import { OBSERVABILITY_THRESHOLD_RULE_TYPE_ID } from '@kbn/rule-data-utils';
 import { parseSearchParams } from '@kbn/share-plugin/common/url_service';
-import { omit } from 'lodash';
 import { COMPARATORS } from '@kbn/alerting-comparators';
 import { kbnTestConfig } from '@kbn/test';
-import { FtrProviderContext } from '../../../ftr_provider_context';
+import type { InternalRequestHeader, RoleCredentials } from '@kbn/ftr-common-functional-services';
+import { DeploymentAgnosticFtrProviderContext } from '../../../../ftr_provider_context';
 import { ISO_DATE_REGEX } from './constants';
-import { ActionDocument, LogsExplorerLocatorParsedParams } from './typings';
-import type { InternalRequestHeader, RoleCredentials } from '../../../../shared/services';
+import { ActionDocument, LogsExplorerLocatorParsedParams } from './types';
 
-export default function ({ getService }: FtrProviderContext) {
+export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
   const esClient = getService('es');
-  const supertest = getService('supertest');
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
   const esDeleteAllIndices = getService('esDeleteAllIndices');
   const logger = getService('log');
   const alertingApi = getService('alertingApi');
   const dataViewApi = getService('dataViewApi');
-  const svlUserManager = getService('svlUserManager');
-  const svlCommonApi = getService('svlCommonApi');
+  const samlAuth = getService('samlAuth');
   let roleAuthc: RoleCredentials;
   let internalReqHeader: InternalRequestHeader;
+  const config = getService('config');
+  const isServerless = config.get('serverless');
+  const expectedConsumer = isServerless ? 'observability' : 'logs';
 
-  describe('Custom Threshold rule - DOCUMENTS_COUNT - FIRED', () => {
+  describe('DOCUMENTS_COUNT - FIRED', () => {
     const CUSTOM_THRESHOLD_RULE_ALERT_INDEX = '.alerts-observability.threshold.alerts-default';
     const ALERT_ACTION_INDEX = 'alert-action-threshold';
     const DATA_VIEW = 'kbn-data-forge-fake_hosts.fake_hosts-*';
@@ -44,8 +46,8 @@ export default function ({ getService }: FtrProviderContext) {
     let alertId: string;
 
     before(async () => {
-      roleAuthc = await svlUserManager.createM2mApiKeyWithRoleScope('admin');
-      internalReqHeader = svlCommonApi.getInternalRequestHeader();
+      roleAuthc = await samlAuth.createM2mApiKeyWithRoleScope('admin');
+      internalReqHeader = samlAuth.getInternalRequestHeader();
       dataForgeConfig = {
         schedule: [
           {
@@ -75,12 +77,19 @@ export default function ({ getService }: FtrProviderContext) {
         name: DATA_VIEW_NAME,
         id: DATA_VIEW_ID,
         title: DATA_VIEW,
+        roleAuthc,
       });
     });
 
     after(async () => {
-      await supertest.delete(`/api/alerting/rule/${ruleId}`).set(internalReqHeader);
-      await supertest.delete(`/api/actions/connector/${actionId}`).set(internalReqHeader);
+      await supertestWithoutAuth
+        .delete(`/api/alerting/rule/${ruleId}`)
+        .set(roleAuthc.apiKeyHeader)
+        .set(internalReqHeader);
+      await supertestWithoutAuth
+        .delete(`/api/actions/connector/${actionId}`)
+        .set(roleAuthc.apiKeyHeader)
+        .set(internalReqHeader);
       await esClient.deleteByQuery({
         index: CUSTOM_THRESHOLD_RULE_ALERT_INDEX,
         query: { term: { 'kibana.alert.rule.uuid': ruleId } },
@@ -93,10 +102,11 @@ export default function ({ getService }: FtrProviderContext) {
       });
       await dataViewApi.delete({
         id: DATA_VIEW_ID,
+        roleAuthc,
       });
       await esDeleteAllIndices([ALERT_ACTION_INDEX, ...dataForgeIndices]);
       await cleanup({ client: esClient, config: dataForgeConfig, logger });
-      await svlUserManager.invalidateM2mApiKeyWithRoleScope(roleAuthc);
+      await samlAuth.invalidateM2mApiKeyWithRoleScope(roleAuthc);
     });
 
     describe('Rule creation', () => {
@@ -110,7 +120,7 @@ export default function ({ getService }: FtrProviderContext) {
         const createdRule = await alertingApi.createRule({
           roleAuthc,
           tags: ['observability'],
-          consumer: 'observability',
+          consumer: expectedConsumer,
           name: 'Threshold rule',
           ruleTypeId: OBSERVABILITY_THRESHOLD_RULE_TYPE_ID,
           params: {
@@ -172,7 +182,7 @@ export default function ({ getService }: FtrProviderContext) {
       it('should find the created rule with correct information about the consumer', async () => {
         const match = await alertingApi.findInRules(roleAuthc, ruleId);
         expect(match).not.to.be(undefined);
-        expect(match.consumer).to.be('observability');
+        expect(match.consumer).to.be(expectedConsumer);
       });
 
       it('should set correct information in the alert document', async () => {
@@ -186,7 +196,7 @@ export default function ({ getService }: FtrProviderContext) {
           'kibana.alert.rule.category',
           'Custom threshold'
         );
-        expect(resp.hits.hits[0]._source).property('kibana.alert.rule.consumer', 'observability');
+        expect(resp.hits.hits[0]._source).property('kibana.alert.rule.consumer', expectedConsumer);
         expect(resp.hits.hits[0]._source).property('kibana.alert.rule.name', 'Threshold rule');
         expect(resp.hits.hits[0]._source).property('kibana.alert.rule.producer', 'observability');
         expect(resp.hits.hits[0]._source).property('kibana.alert.rule.revision', 0);
diff --git a/x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/group_by_fired.ts b/x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/custom_threshold/group_by_fired.ts
similarity index 89%
rename from x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/group_by_fired.ts
rename to x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/custom_threshold/group_by_fired.ts
index 3b38eed6b6166..3a554a16c5cec 100644
--- a/x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/group_by_fired.ts
+++ b/x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/custom_threshold/group_by_fired.ts
@@ -11,31 +11,33 @@
  * 2.0.
  */
 
+import expect from '@kbn/expect';
 import { kbnTestConfig } from '@kbn/test';
 import { cleanup, generate, Dataset, PartialConfig } from '@kbn/data-forge';
 import { Aggregators } from '@kbn/observability-plugin/common/custom_threshold_rule/types';
 import { FIRED_ACTIONS_ID } from '@kbn/observability-plugin/server/lib/rules/custom_threshold/constants';
-import expect from '@kbn/expect';
 import { OBSERVABILITY_THRESHOLD_RULE_TYPE_ID } from '@kbn/rule-data-utils';
 import { COMPARATORS } from '@kbn/alerting-comparators';
-import { FtrProviderContext } from '../../../ftr_provider_context';
-import { ActionDocument } from './typings';
-import type { InternalRequestHeader, RoleCredentials } from '../../../../shared/services';
+import type { InternalRequestHeader, RoleCredentials } from '@kbn/ftr-common-functional-services';
+import { DeploymentAgnosticFtrProviderContext } from '../../../../ftr_provider_context';
+import { ActionDocument } from './types';
 
-export default function ({ getService }: FtrProviderContext) {
+export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
   const esClient = getService('es');
-  const supertest = getService('supertest');
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
   const esDeleteAllIndices = getService('esDeleteAllIndices');
   const logger = getService('log');
   const alertingApi = getService('alertingApi');
   const dataViewApi = getService('dataViewApi');
-  const svlUserManager = getService('svlUserManager');
-  const svlCommonApi = getService('svlCommonApi');
+  const samlAuth = getService('samlAuth');
   let alertId: string;
   let roleAuthc: RoleCredentials;
   let internalReqHeader: InternalRequestHeader;
+  const config = getService('config');
+  const isServerless = config.get('serverless');
+  const expectedConsumer = isServerless ? 'observability' : 'logs';
 
-  describe('Custom Threshold rule - GROUP_BY - FIRED', () => {
+  describe('GROUP_BY - FIRED', () => {
     const CUSTOM_THRESHOLD_RULE_ALERT_INDEX = '.alerts-observability.threshold.alerts-default';
     const DATA_VIEW = 'kbn-data-forge-fake_hosts.fake_hosts-*';
     const ALERT_ACTION_INDEX = 'alert-action-threshold';
@@ -46,8 +48,8 @@ export default function ({ getService }: FtrProviderContext) {
     let ruleId: string;
 
     before(async () => {
-      roleAuthc = await svlUserManager.createM2mApiKeyWithRoleScope('admin');
-      internalReqHeader = svlCommonApi.getInternalRequestHeader();
+      roleAuthc = await samlAuth.createM2mApiKeyWithRoleScope('admin');
+      internalReqHeader = samlAuth.getInternalRequestHeader();
       dataForgeConfig = {
         schedule: [
           {
@@ -74,12 +76,19 @@ export default function ({ getService }: FtrProviderContext) {
         name: DATA_VIEW,
         id: DATA_VIEW_ID,
         title: DATA_VIEW,
+        roleAuthc,
       });
     });
 
     after(async () => {
-      await supertest.delete(`/api/alerting/rule/${ruleId}`).set(internalReqHeader);
-      await supertest.delete(`/api/actions/connector/${actionId}`).set(internalReqHeader);
+      await supertestWithoutAuth
+        .delete(`/api/alerting/rule/${ruleId}`)
+        .set(roleAuthc.apiKeyHeader)
+        .set(internalReqHeader);
+      await supertestWithoutAuth
+        .delete(`/api/actions/connector/${actionId}`)
+        .set(roleAuthc.apiKeyHeader)
+        .set(internalReqHeader);
       await esClient.deleteByQuery({
         index: CUSTOM_THRESHOLD_RULE_ALERT_INDEX,
         query: { term: { 'kibana.alert.rule.uuid': ruleId } },
@@ -92,10 +101,11 @@ export default function ({ getService }: FtrProviderContext) {
       });
       await dataViewApi.delete({
         id: DATA_VIEW_ID,
+        roleAuthc,
       });
       await esDeleteAllIndices([ALERT_ACTION_INDEX, ...dataForgeIndices]);
       await cleanup({ client: esClient, config: dataForgeConfig, logger });
-      await svlUserManager.invalidateM2mApiKeyWithRoleScope(roleAuthc);
+      await samlAuth.invalidateM2mApiKeyWithRoleScope(roleAuthc);
     });
 
     describe('Rule creation', () => {
@@ -109,7 +119,7 @@ export default function ({ getService }: FtrProviderContext) {
         const createdRule = await alertingApi.createRule({
           roleAuthc,
           tags: ['observability'],
-          consumer: 'observability',
+          consumer: expectedConsumer,
           name: 'Threshold rule',
           ruleTypeId: OBSERVABILITY_THRESHOLD_RULE_TYPE_ID,
           params: {
@@ -179,7 +189,7 @@ export default function ({ getService }: FtrProviderContext) {
       it('should find the created rule with correct information about the consumer', async () => {
         const match = await alertingApi.findInRules(roleAuthc, ruleId);
         expect(match).not.to.be(undefined);
-        expect(match.consumer).to.be('observability');
+        expect(match.consumer).to.be(expectedConsumer);
       });
 
       it('should set correct information in the alert document', async () => {
@@ -193,7 +203,7 @@ export default function ({ getService }: FtrProviderContext) {
           'kibana.alert.rule.category',
           'Custom threshold'
         );
-        expect(resp.hits.hits[0]._source).property('kibana.alert.rule.consumer', 'observability');
+        expect(resp.hits.hits[0]._source).property('kibana.alert.rule.consumer', expectedConsumer);
         expect(resp.hits.hits[0]._source).property('kibana.alert.rule.name', 'Threshold rule');
         expect(resp.hits.hits[0]._source).property('kibana.alert.rule.producer', 'observability');
         expect(resp.hits.hits[0]._source).property('kibana.alert.rule.revision', 0);
diff --git a/x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/custom_threshold/helpers/syntrace.ts b/x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/custom_threshold/helpers/syntrace.ts
new file mode 100644
index 0000000000000..259924e80d64d
--- /dev/null
+++ b/x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/custom_threshold/helpers/syntrace.ts
@@ -0,0 +1,159 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { Client } from '@elastic/elasticsearch';
+import {
+  ApmSynthtraceEsClient,
+  ApmSynthtraceKibanaClient,
+  createLogger,
+  LogLevel,
+} from '@kbn/apm-synthtrace';
+import { apm, timerange } from '@kbn/apm-synthtrace-client';
+
+export const getSyntraceClient = async ({
+  kibanaUrl,
+  esClient,
+}: {
+  kibanaUrl: string;
+  esClient: Client;
+}) => {
+  const kibanaClient = new ApmSynthtraceKibanaClient({
+    logger: createLogger(LogLevel.info),
+    target: kibanaUrl,
+  });
+  const packageVersion = await kibanaClient.fetchLatestApmPackageVersion();
+  return new ApmSynthtraceEsClient({
+    client: esClient,
+    logger: createLogger(LogLevel.info),
+    refreshAfterIndex: true,
+    version: packageVersion,
+  });
+};
+
+export const dataConfig = {
+  rate: 10,
+  transaction: {
+    name: 'GET /data',
+    duration: 1000,
+  },
+  service: {
+    name: 'lambda-python-dev-hello',
+    version: '$LATEST',
+    runtime: {
+      name: 'AWS_Lambda_python3.8',
+      version: '3.8.11',
+    },
+    framework: 'AWS Lambda',
+    agent: {
+      name: 'python',
+      version: '6.6.0',
+    },
+  },
+  containerOs: 'linux',
+  serverless: {
+    firstFunctionName: 'my-function-1',
+    secondFunctionName: 'my-function-2',
+    faasTriggerType: 'other',
+  },
+  cloud: {
+    provider: 'aws',
+    availabilityZone: 'us-central1-c',
+    region: 'us-east-1',
+    machineType: 'e2-standard-4',
+    projectName: 'elastic-observability',
+    serviceName: 'lambda',
+  },
+};
+
+export async function generateData({
+  synthtraceEsClient,
+  start,
+  end,
+}: {
+  synthtraceEsClient: ApmSynthtraceEsClient;
+  start: number;
+  end: number;
+}) {
+  const { rate, service, containerOs, serverless, cloud, transaction } = dataConfig;
+  const {
+    provider,
+    availabilityZone,
+    region,
+    machineType,
+    projectName,
+    serviceName: cloudServiceName,
+  } = cloud;
+  const { faasTriggerType, firstFunctionName, secondFunctionName } = serverless;
+  const { version, runtime, framework, agent, name: serviceName } = service;
+  const { name: serviceRunTimeName, version: serviceRunTimeVersion } = runtime;
+  const { name: agentName, version: agentVersion } = agent;
+
+  const instance = apm
+    .service({ name: serviceName, environment: 'production', agentName })
+    .instance('instance-a');
+
+  const traceEvents = [
+    timerange(start, end)
+      .interval('30s')
+      .rate(rate)
+      .generator((timestamp) =>
+        instance
+          .containerId('instance-a')
+          .transaction({ transactionName: transaction.name })
+          .timestamp(timestamp)
+          .defaults({
+            'cloud.provider': provider,
+            'cloud.project.name': projectName,
+            'cloud.service.name': cloudServiceName,
+            'cloud.availability_zone': availabilityZone,
+            'cloud.machine.type': machineType,
+            'cloud.region': region,
+            'faas.id': `arn:aws:lambda:us-west-2:123456789012:function:${firstFunctionName}`,
+            'faas.trigger.type': faasTriggerType,
+            'host.os.platform': containerOs,
+            'kubernetes.pod.uid': '48f4c5a5-0625-4bea-9d94-77ee94a17e70',
+            'service.version': version,
+            'service.runtime.name': serviceRunTimeName,
+            'service.runtime.version': serviceRunTimeVersion,
+            'service.framework.name': framework,
+            'agent.version': agentVersion,
+          })
+          .duration(transaction.duration)
+          .success()
+      ),
+
+    timerange(start, end)
+      .interval('30s')
+      .rate(rate)
+      .generator((timestamp) =>
+        instance
+          .transaction({ transactionName: transaction.name })
+          .timestamp(timestamp)
+          .defaults({
+            'cloud.provider': provider,
+            'cloud.project.name': projectName,
+            'cloud.service.name': cloudServiceName,
+            'cloud.availability_zone': availabilityZone,
+            'cloud.machine.type': machineType,
+            'cloud.region': region,
+            'faas.id': `arn:aws:lambda:us-west-2:123456789012:function:${secondFunctionName}`,
+            'faas.trigger.type': faasTriggerType,
+            'host.os.platform': containerOs,
+            'kubernetes.pod.uid': '48f4c5a5-0625-4bea-9d94-77ee94a17e70',
+            'service.version': version,
+            'service.runtime.name': serviceRunTimeName,
+            'service.runtime.version': serviceRunTimeVersion,
+            'service.framework.name': framework,
+            'agent.version': agentVersion,
+          })
+          .duration(transaction.duration)
+          .success()
+      ),
+  ];
+
+  await synthtraceEsClient.index(traceEvents);
+}
diff --git a/x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/custom_threshold/index.ts b/x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/custom_threshold/index.ts
index 505cbba20eb7c..96a3351043ae6 100644
--- a/x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/custom_threshold/index.ts
+++ b/x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/custom_threshold/index.ts
@@ -10,5 +10,12 @@ import { DeploymentAgnosticFtrProviderContext } from '../../../../ftr_provider_c
 export default function ({ loadTestFile }: DeploymentAgnosticFtrProviderContext) {
   describe('Custom Threshold rule', () => {
     loadTestFile(require.resolve('./avg_pct_fired'));
+    loadTestFile(require.resolve('./avg_pct_no_data'));
+    loadTestFile(require.resolve('./avg_us_fired'));
+    loadTestFile(require.resolve('./custom_eq_avg_bytes_fired'));
+    loadTestFile(require.resolve('./documents_count_fired'));
+    loadTestFile(require.resolve('./group_by_fired'));
+    loadTestFile(require.resolve('./p99_pct_fired'));
+    loadTestFile(require.resolve('./rate_bytes_fired'));
   });
 }
diff --git a/x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/p99_pct_fired.ts b/x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/custom_threshold/p99_pct_fired.ts
similarity index 88%
rename from x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/p99_pct_fired.ts
rename to x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/custom_threshold/p99_pct_fired.ts
index 291db4defac47..743bca2683895 100644
--- a/x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/p99_pct_fired.ts
+++ b/x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/custom_threshold/p99_pct_fired.ts
@@ -5,32 +5,34 @@
  * 2.0.
  */
 
+import { omit } from 'lodash';
 import { cleanup, generate, Dataset, PartialConfig } from '@kbn/data-forge';
 import { Aggregators } from '@kbn/observability-plugin/common/custom_threshold_rule/types';
 import { FIRED_ACTIONS_ID } from '@kbn/observability-plugin/server/lib/rules/custom_threshold/constants';
 import expect from '@kbn/expect';
 import { OBSERVABILITY_THRESHOLD_RULE_TYPE_ID } from '@kbn/rule-data-utils';
 import { parseSearchParams } from '@kbn/share-plugin/common/url_service';
-import { omit } from 'lodash';
 import { COMPARATORS } from '@kbn/alerting-comparators';
 import { kbnTestConfig } from '@kbn/test';
-import { FtrProviderContext } from '../../../ftr_provider_context';
+import type { InternalRequestHeader, RoleCredentials } from '@kbn/ftr-common-functional-services';
+import { DeploymentAgnosticFtrProviderContext } from '../../../../ftr_provider_context';
 import { ISO_DATE_REGEX } from './constants';
-import { ActionDocument, LogsExplorerLocatorParsedParams } from './typings';
-import type { InternalRequestHeader, RoleCredentials } from '../../../../shared/services';
+import { ActionDocument, LogsExplorerLocatorParsedParams } from './types';
 
-export default function ({ getService }: FtrProviderContext) {
+export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
   const esClient = getService('es');
-  const supertest = getService('supertest');
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
   const esDeleteAllIndices = getService('esDeleteAllIndices');
   const alertingApi = getService('alertingApi');
   const logger = getService('log');
-  const svlUserManager = getService('svlUserManager');
-  const svlCommonApi = getService('svlCommonApi');
+  const samlAuth = getService('samlAuth');
   let roleAuthc: RoleCredentials;
   let internalReqHeader: InternalRequestHeader;
+  const config = getService('config');
+  const isServerless = config.get('serverless');
+  const expectedConsumer = isServerless ? 'observability' : 'logs';
 
-  describe('Custom Threshold rule - P99 - PCT - FIRED', () => {
+  describe('P99 - PCT - FIRED', () => {
     const CUSTOM_THRESHOLD_RULE_ALERT_INDEX = '.alerts-observability.threshold.alerts-default';
     const ALERT_ACTION_INDEX = 'alert-action-threshold';
     const DATA_VIEW_TITLE = 'kbn-data-forge-fake_hosts.fake_hosts-*';
@@ -54,8 +56,8 @@ export default function ({ getService }: FtrProviderContext) {
     let alertId: string;
 
     before(async () => {
-      roleAuthc = await svlUserManager.createM2mApiKeyWithRoleScope('admin');
-      internalReqHeader = svlCommonApi.getInternalRequestHeader();
+      roleAuthc = await samlAuth.createM2mApiKeyWithRoleScope('admin');
+      internalReqHeader = samlAuth.getInternalRequestHeader();
       dataForgeConfig = {
         schedule: [
           {
@@ -81,8 +83,14 @@ export default function ({ getService }: FtrProviderContext) {
     });
 
     after(async () => {
-      await supertest.delete(`/api/alerting/rule/${ruleId}`).set(internalReqHeader);
-      await supertest.delete(`/api/actions/connector/${actionId}`).set(internalReqHeader);
+      await supertestWithoutAuth
+        .delete(`/api/alerting/rule/${ruleId}`)
+        .set(roleAuthc.apiKeyHeader)
+        .set(internalReqHeader);
+      await supertestWithoutAuth
+        .delete(`/api/actions/connector/${actionId}`)
+        .set(roleAuthc.apiKeyHeader)
+        .set(internalReqHeader);
       await esClient.deleteByQuery({
         index: CUSTOM_THRESHOLD_RULE_ALERT_INDEX,
         query: { term: { 'kibana.alert.rule.uuid': ruleId } },
@@ -95,7 +103,7 @@ export default function ({ getService }: FtrProviderContext) {
       });
       await esDeleteAllIndices([ALERT_ACTION_INDEX, ...dataForgeIndices]);
       await cleanup({ client: esClient, config: dataForgeConfig, logger });
-      await svlUserManager.invalidateM2mApiKeyWithRoleScope(roleAuthc);
+      await samlAuth.invalidateM2mApiKeyWithRoleScope(roleAuthc);
     });
 
     describe('Rule creation', () => {
@@ -109,7 +117,7 @@ export default function ({ getService }: FtrProviderContext) {
         const createdRule = await alertingApi.createRule({
           roleAuthc,
           tags: ['observability'],
-          consumer: 'observability',
+          consumer: expectedConsumer,
           name: 'Threshold rule',
           ruleTypeId: OBSERVABILITY_THRESHOLD_RULE_TYPE_ID,
           params: {
@@ -172,7 +180,7 @@ export default function ({ getService }: FtrProviderContext) {
       it('should find the created rule with correct information about the consumer', async () => {
         const match = await alertingApi.findInRules(roleAuthc, ruleId);
         expect(match).not.to.be(undefined);
-        expect(match.consumer).to.be('observability');
+        expect(match.consumer).to.be(expectedConsumer);
       });
 
       it('should set correct information in the alert document', async () => {
@@ -186,7 +194,7 @@ export default function ({ getService }: FtrProviderContext) {
           'kibana.alert.rule.category',
           'Custom threshold'
         );
-        expect(resp.hits.hits[0]._source).property('kibana.alert.rule.consumer', 'observability');
+        expect(resp.hits.hits[0]._source).property('kibana.alert.rule.consumer', expectedConsumer);
         expect(resp.hits.hits[0]._source).property('kibana.alert.rule.name', 'Threshold rule');
         expect(resp.hits.hits[0]._source).property('kibana.alert.rule.producer', 'observability');
         expect(resp.hits.hits[0]._source).property('kibana.alert.rule.revision', 0);
diff --git a/x-pack/test/alerting_api_integration/observability/custom_threshold_rule/rate_bytes_fired.ts b/x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/custom_threshold/rate_bytes_fired.ts
similarity index 78%
rename from x-pack/test/alerting_api_integration/observability/custom_threshold_rule/rate_bytes_fired.ts
rename to x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/custom_threshold/rate_bytes_fired.ts
index d56310dd9b0d8..4011917659110 100644
--- a/x-pack/test/alerting_api_integration/observability/custom_threshold_rule/rate_bytes_fired.ts
+++ b/x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/custom_threshold/rate_bytes_fired.ts
@@ -5,31 +5,32 @@
  * 2.0.
  */
 
+import expect from '@kbn/expect';
 import { cleanup, generate, Dataset, PartialConfig } from '@kbn/data-forge';
+import type { InternalRequestHeader, RoleCredentials } from '@kbn/ftr-common-functional-services';
 import { Aggregators } from '@kbn/observability-plugin/common/custom_threshold_rule/types';
 import { COMPARATORS } from '@kbn/alerting-comparators';
 import { FIRED_ACTIONS_ID } from '@kbn/observability-plugin/server/lib/rules/custom_threshold/constants';
-import expect from '@kbn/expect';
 import { OBSERVABILITY_THRESHOLD_RULE_TYPE_ID } from '@kbn/rule-data-utils';
-import { createIndexConnector, createRule } from '../helpers/alerting_api_helper';
-import { createDataView, deleteDataView } from '../helpers/data_view';
-import {
-  waitForAlertInIndex,
-  waitForDocumentInIndex,
-  waitForRuleStatus,
-} from '../helpers/alerting_wait_for_helpers';
-import { FtrProviderContext } from '../../common/ftr_provider_context';
-import { ActionDocument } from './typings';
+import { kbnTestConfig } from '@kbn/test';
+import { DeploymentAgnosticFtrProviderContext } from '../../../../ftr_provider_context';
+import { ActionDocument } from './types';
 
-// eslint-disable-next-line import/no-default-export
-export default function ({ getService }: FtrProviderContext) {
+export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
   const esClient = getService('es');
-  const supertest = getService('supertest');
+  const samlAuth = getService('samlAuth');
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
   const esDeleteAllIndices = getService('esDeleteAllIndices');
+  const alertingApi = getService('alertingApi');
+  const dataViewApi = getService('dataViewApi');
   const logger = getService('log');
-  const retryService = getService('retry');
+  const config = getService('config');
+  const isServerless = config.get('serverless');
+  const expectedConsumer = isServerless ? 'observability' : 'logs';
+  let roleAuthc: RoleCredentials;
+  let internalReqHeader: InternalRequestHeader;
 
-  describe('Custom Threshold rule RATE - GROUP_BY - BYTES - FIRED', () => {
+  describe('RATE - GROUP_BY - BYTES - FIRED', () => {
     const CUSTOM_THRESHOLD_RULE_ALERT_INDEX = '.alerts-observability.threshold.alerts-default';
     const ALERT_ACTION_INDEX = 'alert-action-threshold';
     const DATE_VIEW = 'kbn-data-forge-fake_hosts.fake_hosts-*';
@@ -41,6 +42,8 @@ export default function ({ getService }: FtrProviderContext) {
     let alertId: string;
 
     before(async () => {
+      roleAuthc = await samlAuth.createM2mApiKeyWithRoleScope('admin');
+      internalReqHeader = samlAuth.getInternalRequestHeader();
       dataForgeConfig = {
         schedule: [
           {
@@ -60,57 +63,56 @@ export default function ({ getService }: FtrProviderContext) {
         },
       };
       dataForgeIndices = await generate({ client: esClient, config: dataForgeConfig, logger });
-      await waitForDocumentInIndex({
-        esClient,
+      await alertingApi.waitForDocumentInIndex({
         indexName: dataForgeIndices.join(','),
         docCountTarget: 270,
-        retryService,
-        logger,
       });
-      await createDataView({
-        supertest,
+      await dataViewApi.create({
         name: DATE_VIEW,
         id: DATA_VIEW_ID,
         title: DATE_VIEW,
-        logger,
+        roleAuthc,
       });
     });
 
     after(async () => {
-      await supertest.delete(`/api/alerting/rule/${ruleId}`).set('kbn-xsrf', 'foo');
-      await supertest.delete(`/api/actions/connector/${actionId}`).set('kbn-xsrf', 'foo');
+      await supertestWithoutAuth
+        .delete(`/api/alerting/rule/${ruleId}`)
+        .set(roleAuthc.apiKeyHeader)
+        .set(internalReqHeader);
+      await supertestWithoutAuth
+        .delete(`/api/actions/connector/${actionId}`)
+        .set(roleAuthc.apiKeyHeader)
+        .set(internalReqHeader);
       await esClient.deleteByQuery({
         index: CUSTOM_THRESHOLD_RULE_ALERT_INDEX,
         query: { term: { 'kibana.alert.rule.uuid': ruleId } },
       });
       await esClient.deleteByQuery({
         index: '.kibana-event-log-*',
-        query: { term: { 'kibana.alert.rule.consumer': 'logs' } },
+        query: { term: { 'kibana.alert.rule.consumer': expectedConsumer } },
       });
-      await deleteDataView({
-        supertest,
+      await dataViewApi.delete({
         id: DATA_VIEW_ID,
-        logger,
+        roleAuthc,
       });
       await esDeleteAllIndices([ALERT_ACTION_INDEX, ...dataForgeIndices]);
       await cleanup({ client: esClient, config: dataForgeConfig, logger });
+      await samlAuth.invalidateM2mApiKeyWithRoleScope(roleAuthc);
     });
 
     describe('Rule creation', () => {
       it('creates rule successfully', async () => {
-        actionId = await createIndexConnector({
-          supertest,
+        actionId = await alertingApi.createIndexConnector({
+          roleAuthc,
           name: 'Index Connector: Threshold API test',
           indexName: ALERT_ACTION_INDEX,
-          logger,
         });
 
-        const createdRule = await createRule({
-          supertest,
-          logger,
-          esClient,
+        const createdRule = await alertingApi.createRule({
+          roleAuthc,
           tags: ['observability'],
-          consumer: 'logs',
+          consumer: expectedConsumer,
           name: 'Threshold rule',
           ruleTypeId: OBSERVABILITY_THRESHOLD_RULE_TYPE_ID,
           params: {
@@ -165,23 +167,18 @@ export default function ({ getService }: FtrProviderContext) {
       });
 
       it('should be active', async () => {
-        const executionStatus = await waitForRuleStatus({
-          id: ruleId,
+        const executionStatus = await alertingApi.waitForRuleStatus({
+          roleAuthc,
+          ruleId,
           expectedStatus: 'active',
-          supertest,
-          retryService,
-          logger,
         });
-        expect(executionStatus.status).to.be('active');
+        expect(executionStatus).to.be('active');
       });
 
       it('should set correct information in the alert document', async () => {
-        const resp = await waitForAlertInIndex({
-          esClient,
+        const resp = await alertingApi.waitForAlertInIndex({
           indexName: CUSTOM_THRESHOLD_RULE_ALERT_INDEX,
           ruleId,
-          retryService,
-          logger,
         });
         alertId = (resp.hits.hits[0]._source as any)['kibana.alert.uuid'];
 
@@ -189,7 +186,7 @@ export default function ({ getService }: FtrProviderContext) {
           'kibana.alert.rule.category',
           'Custom threshold'
         );
-        expect(resp.hits.hits[0]._source).property('kibana.alert.rule.consumer', 'logs');
+        expect(resp.hits.hits[0]._source).property('kibana.alert.rule.consumer', expectedConsumer);
         expect(resp.hits.hits[0]._source).property('kibana.alert.rule.name', 'Threshold rule');
         expect(resp.hits.hits[0]._source).property('kibana.alert.rule.producer', 'observability');
         expect(resp.hits.hits[0]._source).property('kibana.alert.rule.revision', 0);
@@ -256,16 +253,15 @@ export default function ({ getService }: FtrProviderContext) {
       });
 
       it('should set correct action variables', async () => {
-        const resp = await waitForDocumentInIndex<ActionDocument>({
-          esClient,
+        const resp = await alertingApi.waitForDocumentInIndex<ActionDocument>({
           indexName: ALERT_ACTION_INDEX,
-          retryService,
-          logger,
+          docCountTarget: 1,
         });
 
+        const { protocol, hostname, port } = kbnTestConfig.getUrlPartsWithStrippedDefaultPort();
         expect(resp.hits.hits[0]._source?.ruleType).eql('observability.rules.custom_threshold');
         expect(resp.hits.hits[0]._source?.alertDetailsUrl).eql(
-          `https://localhost:5601/app/observability/alerts/${alertId}`
+          `${protocol}://${hostname}${port ? `:${port}` : ''}/app/observability/alerts/${alertId}`
         );
         expect(resp.hits.hits[0]._source?.reason).eql(
           `Rate of system.network.in.bytes is 60 kB/s, above or equal the threshold of 50 kB/s. (duration: 1 min, data view: kbn-data-forge-fake_hosts.fake_hosts-*, group: host-0,container-0)`
diff --git a/x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/es_query_rule.ts b/x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/es_query_rule.ts
index 81527f552a928..1484158a9a991 100644
--- a/x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/es_query_rule.ts
+++ b/x-pack/test/api_integration/deployment_agnostic/apis/observability/alerting/es_query_rule.ts
@@ -25,6 +25,7 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
   describe('ElasticSearch query rule', () => {
     const RULE_TYPE_ID = '.es-query';
     const ALERT_ACTION_INDEX = 'alert-action-es-query';
+    const RULE_ALERT_INDEX = '.alerts-stack.alerts-default';
     let actionId: string;
     let ruleId: string;
 
@@ -42,7 +43,11 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
         .delete(`/api/actions/connector/${actionId}`)
         .set(adminRoleAuthc.apiKeyHeader)
         .set(internalReqHeader);
-
+      await esClient.deleteByQuery({
+        index: RULE_ALERT_INDEX,
+        query: { term: { 'kibana.alert.rule.uuid': ruleId } },
+        conflicts: 'proceed',
+      });
       await esClient.deleteByQuery({
         index: '.kibana-event-log-*',
         query: { term: { 'rule.id': ruleId } },
diff --git a/x-pack/test/apm_api_integration/tests/agent_explorer/agent_explorer.spec.ts b/x-pack/test/api_integration/deployment_agnostic/apis/observability/apm/agent_explorer/agent_explorer.spec.ts
similarity index 91%
rename from x-pack/test/apm_api_integration/tests/agent_explorer/agent_explorer.spec.ts
rename to x-pack/test/api_integration/deployment_agnostic/apis/observability/apm/agent_explorer/agent_explorer.spec.ts
index 95e71167aaab4..95d438ba87cad 100644
--- a/x-pack/test/apm_api_integration/tests/agent_explorer/agent_explorer.spec.ts
+++ b/x-pack/test/api_integration/deployment_agnostic/apis/observability/apm/agent_explorer/agent_explorer.spec.ts
@@ -8,13 +8,13 @@ import expect from '@kbn/expect';
 import { apm, timerange } from '@kbn/apm-synthtrace-client';
 import { APIClientRequestParamsOf } from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
 import { RecursivePartial } from '@kbn/apm-plugin/typings/common';
+import type { ApmSynthtraceEsClient } from '@kbn/apm-synthtrace';
 import { keyBy } from 'lodash';
-import { FtrProviderContext } from '../../common/ftr_provider_context';
+import type { DeploymentAgnosticFtrProviderContext } from '../../../../ftr_provider_context';
 
-export default function ApiTest({ getService }: FtrProviderContext) {
-  const registry = getService('registry');
-  const apmApiClient = getService('apmApiClient');
-  const apmSynthtraceEsClient = getService('apmSynthtraceEsClient');
+export default function ApiTest({ getService }: DeploymentAgnosticFtrProviderContext) {
+  const apmApiClient = getService('apmApi');
+  const synthtrace = getService('synthtrace');
 
   const start = new Date('2021-01-01T00:00:00.000Z').getTime();
   const end = new Date('2021-01-01T00:15:00.000Z').getTime() - 1;
@@ -42,18 +42,22 @@ export default function ApiTest({ getService }: FtrProviderContext) {
     });
   }
 
-  registry.when('Agent explorer when data is not loaded', { config: 'basic', archives: [] }, () => {
-    it('handles empty state', async () => {
-      const { status, body } = await callApi();
+  describe('Agent explorer', () => {
+    describe('when data is not loaded', () => {
+      it('handles empty state', async () => {
+        const { status, body } = await callApi();
 
-      expect(status).to.be(200);
-      expect(body.items).to.be.empty();
+        expect(status).to.be(200);
+        expect(body.items).to.be.empty();
+      });
     });
-  });
 
-  registry.when('Agent explorer', { config: 'basic', archives: [] }, () => {
     describe('when data is loaded', () => {
+      let apmSynthtraceEsClient: ApmSynthtraceEsClient;
+
       before(async () => {
+        apmSynthtraceEsClient = await synthtrace.createApmSynthtraceEsClient();
+
         const serviceOtelJava = apm
           .service({
             name: otelJavaServiceName,
diff --git a/x-pack/test/api_integration/deployment_agnostic/apis/observability/apm/agent_explorer/index.ts b/x-pack/test/api_integration/deployment_agnostic/apis/observability/apm/agent_explorer/index.ts
new file mode 100644
index 0000000000000..f77b13923930a
--- /dev/null
+++ b/x-pack/test/api_integration/deployment_agnostic/apis/observability/apm/agent_explorer/index.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { DeploymentAgnosticFtrProviderContext } from '../../../../ftr_provider_context';
+
+export default function ({ loadTestFile }: DeploymentAgnosticFtrProviderContext) {
+  describe('agent_explorer', () => {
+    loadTestFile(require.resolve('./agent_explorer.spec.ts'));
+    loadTestFile(require.resolve('./latest_agent_versions.spec.ts'));
+  });
+}
diff --git a/x-pack/test/api_integration/deployment_agnostic/apis/observability/apm/agent_explorer/latest_agent_versions.spec.ts b/x-pack/test/api_integration/deployment_agnostic/apis/observability/apm/agent_explorer/latest_agent_versions.spec.ts
new file mode 100644
index 0000000000000..7d40993885255
--- /dev/null
+++ b/x-pack/test/api_integration/deployment_agnostic/apis/observability/apm/agent_explorer/latest_agent_versions.spec.ts
@@ -0,0 +1,44 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import { ElasticApmAgentLatestVersion } from '@kbn/apm-plugin/common/agent_explorer';
+import expect from '@kbn/expect';
+import type { DeploymentAgnosticFtrProviderContext } from '../../../../ftr_provider_context';
+
+export default function ApiTest({ getService }: DeploymentAgnosticFtrProviderContext) {
+  const apmApiClient = getService('apmApi');
+  const nodeAgentName = 'nodejs';
+  const unlistedAgentName = 'unlistedAgent';
+
+  async function callApi() {
+    return await apmApiClient.readUser({
+      endpoint: 'GET /internal/apm/get_latest_agent_versions',
+    });
+  }
+
+  describe('Agent latest versions when configuration is defined', () => {
+    it('returns a version when agent is listed in the file', async () => {
+      const { status, body } = await callApi();
+      expect(status).to.be(200);
+
+      const agents = body.data;
+
+      const nodeAgent = agents[nodeAgentName] as ElasticApmAgentLatestVersion;
+      expect(nodeAgent?.latest_version).not.to.be(undefined);
+    });
+
+    it('returns undefined when agent is not listed in the file', async () => {
+      const { status, body } = await callApi();
+      expect(status).to.be(200);
+
+      const agents = body.data;
+
+      // @ts-ignore
+      const unlistedAgent = agents[unlistedAgentName] as ElasticApmAgentLatestVersion;
+      expect(unlistedAgent?.latest_version).to.be(undefined);
+    });
+  });
+}
diff --git a/x-pack/test/api_integration/deployment_agnostic/apis/observability/apm/index.ts b/x-pack/test/api_integration/deployment_agnostic/apis/observability/apm/index.ts
new file mode 100644
index 0000000000000..a62c11d40b1af
--- /dev/null
+++ b/x-pack/test/api_integration/deployment_agnostic/apis/observability/apm/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { DeploymentAgnosticFtrProviderContext } from '../../../ftr_provider_context';
+
+export default function apmApiIntegrationTests({
+  loadTestFile,
+}: DeploymentAgnosticFtrProviderContext) {
+  describe('APM', function () {
+    loadTestFile(require.resolve('./agent_explorer'));
+  });
+}
diff --git a/x-pack/test/api_integration/deployment_agnostic/apis/observability/dataset_quality/data_stream_total_docs.ts b/x-pack/test/api_integration/deployment_agnostic/apis/observability/dataset_quality/data_stream_total_docs.ts
new file mode 100644
index 0000000000000..18baaa2d74c34
--- /dev/null
+++ b/x-pack/test/api_integration/deployment_agnostic/apis/observability/dataset_quality/data_stream_total_docs.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 { log, timerange } from '@kbn/apm-synthtrace-client';
+import expect from '@kbn/expect';
+
+import { APIClientRequestParamsOf } from '@kbn/dataset-quality-plugin/common/rest';
+import { LogsSynthtraceEsClient } from '@kbn/apm-synthtrace';
+import { DeploymentAgnosticFtrProviderContext } from '../../../ftr_provider_context';
+import { RoleCredentials, SupertestWithRoleScopeType } from '../../../services';
+
+export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
+  const samlAuth = getService('samlAuth');
+  const roleScopedSupertest = getService('roleScopedSupertest');
+  const synthtrace = getService('synthtrace');
+  const from = '2024-09-20T11:00:00.000Z';
+  const to = '2024-09-20T11:01:00.000Z';
+  const dataStreamType = 'logs';
+  const dataset = 'synth';
+  const syntheticsDataset = 'synthetics';
+  const namespace = 'default';
+  const serviceName = 'my-service';
+  const hostName = 'synth-host';
+  const dataStreamName = `${dataStreamType}-${dataset}-${namespace}`;
+  const syntheticsDataStreamName = `${dataStreamType}-${syntheticsDataset}-${namespace}`;
+
+  const endpoint = 'GET /internal/dataset_quality/data_streams/total_docs';
+  type ApiParams = APIClientRequestParamsOf<typeof endpoint>['params']['query'];
+
+  async function callApiAs({
+    roleScopedSupertestWithCookieCredentials,
+    apiParams: { type, start, end },
+  }: {
+    roleScopedSupertestWithCookieCredentials: SupertestWithRoleScopeType;
+    apiParams: ApiParams;
+  }) {
+    return roleScopedSupertestWithCookieCredentials
+      .get(`/internal/dataset_quality/data_streams/total_docs`)
+      .query({
+        type,
+        start,
+        end,
+      });
+  }
+
+  describe('DataStream total docs', function () {
+    let adminRoleAuthc: RoleCredentials;
+    let supertestAdminWithCookieCredentials: SupertestWithRoleScopeType;
+    let synthtraceLogsEsClient: LogsSynthtraceEsClient;
+
+    before(async () => {
+      synthtraceLogsEsClient = await synthtrace.createLogsSynthtraceEsClient();
+      adminRoleAuthc = await samlAuth.createM2mApiKeyWithRoleScope('admin');
+      supertestAdminWithCookieCredentials = await roleScopedSupertest.getSupertestWithRoleScope(
+        'admin',
+        {
+          useCookieHeader: true,
+          withInternalHeaders: true,
+        }
+      );
+
+      await synthtraceLogsEsClient.index([
+        timerange(from, to)
+          .interval('1m')
+          .rate(1)
+          .generator((timestamp) => [
+            log
+              .create()
+              .message('This is a log message')
+              .timestamp(timestamp)
+              .dataset(dataset)
+              .namespace(namespace)
+              .defaults({
+                'log.file.path': '/my-service.log',
+                'service.name': serviceName,
+                'host.name': hostName,
+              }),
+            log
+              .create()
+              .message('This is a log message')
+              .timestamp(timestamp)
+              .dataset(syntheticsDataset)
+              .namespace(namespace)
+              .defaults({
+                'log.file.path': '/my-service.log',
+                'service.name': serviceName,
+                'host.name': hostName,
+              }),
+          ]),
+      ]);
+    });
+
+    after(async () => {
+      await synthtraceLogsEsClient.clean();
+      await samlAuth.invalidateM2mApiKeyWithRoleScope(adminRoleAuthc);
+    });
+
+    it('returns number of documents per DataStream', async () => {
+      const resp = await callApiAs({
+        roleScopedSupertestWithCookieCredentials: supertestAdminWithCookieCredentials,
+        apiParams: {
+          type: dataStreamType,
+          start: from,
+          end: to,
+        },
+      });
+
+      expect(resp.body.totalDocs.length).to.be(2);
+      expect(resp.body.totalDocs[0].dataset).to.be(dataStreamName);
+      expect(resp.body.totalDocs[0].count).to.be(1);
+      expect(resp.body.totalDocs[1].dataset).to.be(syntheticsDataStreamName);
+      expect(resp.body.totalDocs[1].count).to.be(1);
+    });
+
+    it('returns empty when all documents are outside timeRange', async () => {
+      const resp = await callApiAs({
+        roleScopedSupertestWithCookieCredentials: supertestAdminWithCookieCredentials,
+        apiParams: {
+          type: dataStreamType,
+          start: '2024-09-21T11:00:00.000Z',
+          end: '2024-09-21T11:01:00.000Z',
+        },
+      });
+
+      expect(resp.body.totalDocs.length).to.be(0);
+    });
+  });
+}
diff --git a/x-pack/test/api_integration/deployment_agnostic/apis/observability/dataset_quality/index.ts b/x-pack/test/api_integration/deployment_agnostic/apis/observability/dataset_quality/index.ts
index 7e555b7a310e1..28133d6c8e613 100644
--- a/x-pack/test/api_integration/deployment_agnostic/apis/observability/dataset_quality/index.ts
+++ b/x-pack/test/api_integration/deployment_agnostic/apis/observability/dataset_quality/index.ts
@@ -14,5 +14,6 @@ export default function ({ loadTestFile }: DeploymentAgnosticFtrProviderContext)
     loadTestFile(require.resolve('./data_stream_settings'));
     loadTestFile(require.resolve('./data_stream_rollover'));
     loadTestFile(require.resolve('./update_field_limit'));
+    loadTestFile(require.resolve('./data_stream_total_docs'));
   });
 }
diff --git a/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/infra_asset_count.ts b/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/infra_asset_count.ts
index 0c139ccb2023b..c76e7dbff888c 100644
--- a/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/infra_asset_count.ts
+++ b/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/infra_asset_count.ts
@@ -48,6 +48,7 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
         before(async () => {
           supertestWithAdminScope = await roleScopedSupertest.getSupertestWithRoleScope('admin', {
             withInternalHeaders: true,
+            useCookieHeader: true,
           });
           await esArchiver.load('x-pack/test/functional/es_archives/infra/8.0.0/logs_and_metrics');
         });
diff --git a/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/infra_custom_dashboards.ts b/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/infra_custom_dashboards.ts
index 140b0540c7d71..0357d7b1fff7a 100644
--- a/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/infra_custom_dashboards.ts
+++ b/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/infra_custom_dashboards.ts
@@ -28,6 +28,7 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
     before(async () => {
       supertestWithAdminScope = await roleScopedSupertest.getSupertestWithRoleScope('admin', {
         withInternalHeaders: true,
+        useCookieHeader: true,
       });
     });
 
diff --git a/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/ip_to_hostname.ts b/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/ip_to_hostname.ts
index d75c16aacd7cb..084a7ea9ac276 100644
--- a/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/ip_to_hostname.ts
+++ b/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/ip_to_hostname.ts
@@ -19,6 +19,7 @@ export default function ipToHostNameTest({ getService }: DeploymentAgnosticFtrPr
     before(async () => {
       supertestWithAdminScope = await roleScopedSupertest.getSupertestWithRoleScope('admin', {
         withInternalHeaders: true,
+        useCookieHeader: true,
       });
       await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs');
     });
diff --git a/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/metrics_overview_top.ts b/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/metrics_overview_top.ts
index 8411d0e9d664d..2a1ee8d3e6821 100644
--- a/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/metrics_overview_top.ts
+++ b/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/metrics_overview_top.ts
@@ -25,6 +25,7 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
     before(async () => {
       supertestWithAdminScope = await roleScopedSupertest.getSupertestWithRoleScope('admin', {
         withInternalHeaders: true,
+        useCookieHeader: true,
       });
       await esArchiver.load('x-pack/test/functional/es_archives/infra/7.0.0/hosts');
     });
diff --git a/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/metrics_process_list.ts b/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/metrics_process_list.ts
index 7b49950ef9963..c10d5181372b8 100644
--- a/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/metrics_process_list.ts
+++ b/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/metrics_process_list.ts
@@ -24,6 +24,7 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
     before(async () => {
       supertestWithAdminScope = await roleScopedSupertest.getSupertestWithRoleScope('admin', {
         withInternalHeaders: true,
+        useCookieHeader: true,
       });
       await esArchiver.load('x-pack/test/functional/es_archives/infra/8.0.0/metrics_and_apm');
     });
diff --git a/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/metrics_process_list_chart.ts b/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/metrics_process_list_chart.ts
index a1b453d5b074a..10f214ea642f8 100644
--- a/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/metrics_process_list_chart.ts
+++ b/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/metrics_process_list_chart.ts
@@ -25,6 +25,7 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
     before(async () => {
       supertestWithAdminScope = await roleScopedSupertest.getSupertestWithRoleScope('admin', {
         withInternalHeaders: true,
+        useCookieHeader: true,
       });
       await esArchiver.load('x-pack/test/functional/es_archives/infra/8.0.0/metrics_and_apm');
     });
diff --git a/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/node_details.ts b/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/node_details.ts
index e492e0dc9723d..7452c319be911 100644
--- a/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/node_details.ts
+++ b/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/node_details.ts
@@ -36,6 +36,7 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
     before(async () => {
       supertestWithAdminScope = await roleScopedSupertest.getSupertestWithRoleScope('admin', {
         withInternalHeaders: true,
+        useCookieHeader: true,
       });
       await esArchiver.load('x-pack/test/functional/es_archives/infra/8.0.0/pods_only');
     });
diff --git a/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/services.ts b/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/services.ts
index 54a74ff72c26c..b8e47a40a9120 100644
--- a/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/services.ts
+++ b/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/services.ts
@@ -106,10 +106,10 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
     before(async () => {
       supertestWithAdminScope = await roleScopedSupertest.getSupertestWithRoleScope('admin', {
         withInternalHeaders: true,
+        useCookieHeader: true,
       });
 
-      const version = (await synthtrace.apmSynthtraceKibanaClient.installApmPackage()).version;
-      synthtraceApmClient = await synthtrace.createApmSynthtraceEsClient(version);
+      synthtraceApmClient = await synthtrace.createApmSynthtraceEsClient();
     });
     after(async () => {
       await synthtrace.apmSynthtraceKibanaClient.uninstallApmPackage();
diff --git a/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/snapshot.ts b/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/snapshot.ts
index 0b32cf5b8ce8c..f3636662f2b54 100644
--- a/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/snapshot.ts
+++ b/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/snapshot.ts
@@ -37,6 +37,7 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
     before(async () => {
       supertestWithAdminScope = await roleScopedSupertest.getSupertestWithRoleScope('admin', {
         withInternalHeaders: true,
+        useCookieHeader: true,
       });
     });
     after(async () => {
diff --git a/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/sources.ts b/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/sources.ts
index a2f7d7ca591ad..0710c5112b0fe 100644
--- a/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/sources.ts
+++ b/x-pack/test/api_integration/deployment_agnostic/apis/observability/infra/sources.ts
@@ -39,6 +39,7 @@ export default function ({ getService }: DeploymentAgnosticFtrProviderContext) {
     before(async () => {
       supertestWithAdminScope = await roleScopedSupertest.getSupertestWithRoleScope('admin', {
         withInternalHeaders: true,
+        useCookieHeader: true,
       });
       await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs');
       await kibanaServer.savedObjects.cleanStandardList();
diff --git a/x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.index.ts b/x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.index.ts
index a4c568713063c..6353f871a8078 100644
--- a/x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.index.ts
+++ b/x-pack/test/api_integration/deployment_agnostic/configs/serverless/oblt.index.ts
@@ -20,5 +20,6 @@ export default function ({ loadTestFile }: DeploymentAgnosticFtrProviderContext)
     loadTestFile(require.resolve('../../apis/painless_lab'));
     loadTestFile(require.resolve('../../apis/saved_objects_management'));
     loadTestFile(require.resolve('../../apis/observability/slo'));
+    loadTestFile(require.resolve('../../apis/observability/apm'));
   });
 }
diff --git a/x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.index.ts b/x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.index.ts
index 06eaa9cc217b1..c5a3ad90f81f4 100644
--- a/x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.index.ts
+++ b/x-pack/test/api_integration/deployment_agnostic/configs/stateful/oblt.index.ts
@@ -14,5 +14,6 @@ export default function ({ loadTestFile }: DeploymentAgnosticFtrProviderContext)
     loadTestFile(require.resolve('../../apis/observability/dataset_quality'));
     loadTestFile(require.resolve('../../apis/observability/slo'));
     loadTestFile(require.resolve('../../apis/observability/infra'));
+    loadTestFile(require.resolve('../../apis/observability/apm'));
   });
 }
diff --git a/x-pack/test/api_integration/deployment_agnostic/services/apm_api.ts b/x-pack/test/api_integration/deployment_agnostic/services/apm_api.ts
new file mode 100644
index 0000000000000..26d92997a6021
--- /dev/null
+++ b/x-pack/test/api_integration/deployment_agnostic/services/apm_api.ts
@@ -0,0 +1,137 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { format } from 'url';
+import request from 'superagent';
+import type {
+  APIReturnType,
+  APIClientRequestParamsOf,
+} from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
+import { APIEndpoint } from '@kbn/apm-plugin/server';
+import { formatRequest } from '@kbn/server-route-repository';
+import { RoleCredentials } from '@kbn/ftr-common-functional-services';
+import type { DeploymentAgnosticFtrProviderContext } from '../ftr_provider_context';
+
+const INTERNAL_API_REGEX = /^\S+\s(\/)?internal\/[^\s]*$/;
+
+type InternalApi = `${string} /internal/${string}`;
+interface ExternalEndpointParams {
+  roleAuthc: RoleCredentials;
+}
+
+type Options<TEndpoint extends APIEndpoint> = (TEndpoint extends InternalApi
+  ? {}
+  : ExternalEndpointParams) & {
+  type?: 'form-data';
+  endpoint: TEndpoint;
+  spaceId?: string;
+} & APIClientRequestParamsOf<TEndpoint> & {
+    params?: { query?: { _inspect?: boolean } };
+  };
+
+function isPublicApi<TEndpoint extends APIEndpoint>(
+  options: Options<TEndpoint>
+): options is Options<TEndpoint> & ExternalEndpointParams {
+  return !INTERNAL_API_REGEX.test(options.endpoint);
+}
+
+function createApmApiClient({ getService }: DeploymentAgnosticFtrProviderContext, role: string) {
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
+  const samlAuth = getService('samlAuth');
+  const logger = getService('log');
+
+  return async <TEndpoint extends APIEndpoint>(
+    options: Options<TEndpoint>
+  ): Promise<SupertestReturnType<TEndpoint>> => {
+    const { endpoint, type } = options;
+
+    const params = 'params' in options ? (options.params as Record<string, any>) : {};
+
+    const credentials = isPublicApi(options)
+      ? options.roleAuthc.apiKeyHeader
+      : await samlAuth.getM2MApiCookieCredentialsWithRoleScope(role);
+
+    const headers: Record<string, string> = {
+      ...samlAuth.getInternalRequestHeader(),
+      ...credentials,
+    };
+
+    const { method, pathname, version } = formatRequest(endpoint, params.path);
+    const pathnameWithSpaceId = options.spaceId ? `/s/${options.spaceId}${pathname}` : pathname;
+    const url = format({ pathname: pathnameWithSpaceId, query: params?.query });
+
+    logger.debug(`Calling APM API: ${method.toUpperCase()} ${url}`);
+
+    if (version) {
+      headers['Elastic-Api-Version'] = version;
+    }
+
+    let res: request.Response;
+    if (type === 'form-data') {
+      const fields: Array<[string, any]> = Object.entries(params.body);
+      const formDataRequest = supertestWithoutAuth[method](url)
+        .set(headers)
+        .set('Content-type', 'multipart/form-data');
+
+      for (const field of fields) {
+        void formDataRequest.field(field[0], field[1]);
+      }
+
+      res = await formDataRequest;
+    } else if (params.body) {
+      res = await supertestWithoutAuth[method](url).send(params.body).set(headers);
+    } else {
+      res = await supertestWithoutAuth[method](url).set(headers);
+    }
+
+    // supertest doesn't throw on http errors
+    if (res?.status !== 200) {
+      throw new ApmApiError(res, endpoint);
+    }
+
+    return res;
+  };
+}
+
+type ApiErrorResponse = Omit<request.Response, 'body'> & {
+  body: {
+    statusCode: number;
+    error: string;
+    message: string;
+    attributes: object;
+  };
+};
+
+export type ApmApiSupertest = ReturnType<typeof createApmApiClient>;
+
+export class ApmApiError extends Error {
+  res: ApiErrorResponse;
+
+  constructor(res: request.Response, endpoint: string) {
+    super(
+      `Unhandled ApmApiError.
+Status: "${res.status}"
+Endpoint: "${endpoint}"
+Body: ${JSON.stringify(res.body)}`
+    );
+
+    this.res = res;
+  }
+}
+
+export interface SupertestReturnType<TEndpoint extends APIEndpoint> {
+  status: number;
+  body: APIReturnType<TEndpoint>;
+}
+
+export function ApmApiProvider(context: DeploymentAgnosticFtrProviderContext) {
+  return {
+    readUser: createApmApiClient(context, 'viewer'),
+    adminUser: createApmApiClient(context, 'admin'),
+    writeUser: createApmApiClient(context, 'editor'),
+  };
+}
diff --git a/x-pack/test/api_integration/deployment_agnostic/services/index.ts b/x-pack/test/api_integration/deployment_agnostic/services/index.ts
index 2b51bb1902dd1..01dc52571ee5a 100644
--- a/x-pack/test/api_integration/deployment_agnostic/services/index.ts
+++ b/x-pack/test/api_integration/deployment_agnostic/services/index.ts
@@ -13,6 +13,7 @@ import { PackageApiProvider } from './package_api';
 import { RoleScopedSupertestProvider, SupertestWithRoleScope } from './role_scoped_supertest';
 import { SloApiProvider } from './slo_api';
 import { SynthtraceProvider } from './synthtrace';
+import { ApmApiProvider } from './apm_api';
 
 export type {
   InternalRequestHeader,
@@ -31,6 +32,7 @@ export const services = {
   roleScopedSupertest: RoleScopedSupertestProvider,
   // create a new deployment-agnostic service and load here
   synthtrace: SynthtraceProvider,
+  apmApi: ApmApiProvider,
 };
 
 export type SupertestWithRoleScopeType = SupertestWithRoleScope;
diff --git a/x-pack/test/api_integration/deployment_agnostic/services/synthtrace.ts b/x-pack/test/api_integration/deployment_agnostic/services/synthtrace.ts
index 1ab2692095ca3..eda492ff37a43 100644
--- a/x-pack/test/api_integration/deployment_agnostic/services/synthtrace.ts
+++ b/x-pack/test/api_integration/deployment_agnostic/services/synthtrace.ts
@@ -39,7 +39,8 @@ export function SynthtraceProvider({ getService }: DeploymentAgnosticFtrProvider
   return {
     apmSynthtraceKibanaClient,
     createLogsSynthtraceEsClient: () => getLogsSynthtraceEsClient(client),
-    async createApmSynthtraceEsClient(packageVersion: string) {
+    async createApmSynthtraceEsClient() {
+      const packageVersion = (await apmSynthtraceKibanaClient.installApmPackage()).version;
       return getApmSynthtraceEsClient({ client, packageVersion });
     },
   };
diff --git a/x-pack/test/api_integration/services/security_solution_api.gen.ts b/x-pack/test/api_integration/services/security_solution_api.gen.ts
index 4a7efdc167299..67dcee5be34dc 100644
--- a/x-pack/test/api_integration/services/security_solution_api.gen.ts
+++ b/x-pack/test/api_integration/services/security_solution_api.gen.ts
@@ -95,6 +95,8 @@ import {
   GetRuleExecutionResultsRequestQueryInput,
   GetRuleExecutionResultsRequestParamsInput,
 } from '@kbn/security-solution-plugin/common/api/detection_engine/rule_monitoring/rule_execution_logs/get_rule_execution_results/get_rule_execution_results_route.gen';
+import { GetRuleMigrationRequestParamsInput } from '@kbn/security-solution-plugin/common/siem_migrations/model/api/rules/rules_migration.gen';
+import { GetRuleMigrationStatsRequestParamsInput } from '@kbn/security-solution-plugin/common/siem_migrations/model/api/rules/rules_migration.gen';
 import { GetTimelineRequestQueryInput } from '@kbn/security-solution-plugin/common/api/timeline/get_timeline/get_timeline_route.gen';
 import { GetTimelinesRequestQueryInput } from '@kbn/security-solution-plugin/common/api/timeline/get_timelines/get_timelines_route.gen';
 import { ImportRulesRequestQueryInput } from '@kbn/security-solution-plugin/common/api/detection_engine/rule_management/import_rules/import_rules_route.gen';
@@ -127,7 +129,12 @@ import { SetAlertAssigneesRequestBodyInput } from '@kbn/security-solution-plugin
 import { SetAlertsStatusRequestBodyInput } from '@kbn/security-solution-plugin/common/api/detection_engine/signals/set_signal_status/set_signals_status_route.gen';
 import { SetAlertTagsRequestBodyInput } from '@kbn/security-solution-plugin/common/api/detection_engine/alert_tags/set_alert_tags/set_alert_tags.gen';
 import { StartEntityEngineRequestParamsInput } from '@kbn/security-solution-plugin/common/api/entity_analytics/entity_store/engine/start.gen';
+import {
+  StartRuleMigrationRequestParamsInput,
+  StartRuleMigrationRequestBodyInput,
+} from '@kbn/security-solution-plugin/common/siem_migrations/model/api/rules/rules_migration.gen';
 import { StopEntityEngineRequestParamsInput } from '@kbn/security-solution-plugin/common/api/entity_analytics/entity_store/engine/stop.gen';
+import { StopRuleMigrationRequestParamsInput } from '@kbn/security-solution-plugin/common/siem_migrations/model/api/rules/rules_migration.gen';
 import { SuggestUserProfilesRequestQueryInput } from '@kbn/security-solution-plugin/common/api/detection_engine/users/suggest_user_profiles_route.gen';
 import { TriggerRiskScoreCalculationRequestBodyInput } from '@kbn/security-solution-plugin/common/api/entity_analytics/risk_engine/entity_calculation_route.gen';
 import { UpdateRuleRequestBodyInput } from '@kbn/security-solution-plugin/common/api/detection_engine/rule_management/crud/update_rule/update_rule_route.gen';
@@ -782,6 +789,16 @@ finalize it.
         .set(X_ELASTIC_INTERNAL_ORIGIN_REQUEST, 'kibana')
         .query(props.query);
     },
+    /**
+     * Retrieves the rule migrations stats for all migrations stored in the system
+     */
+    getAllStatsRuleMigration(kibanaSpace: string = 'default') {
+      return supertest
+        .get(routeWithNamespace('/internal/siem_migrations/rules/stats', kibanaSpace))
+        .set('kbn-xsrf', 'true')
+        .set(ELASTIC_HTTP_VERSION_HEADER, '1')
+        .set(X_ELASTIC_INTERNAL_ORIGIN_REQUEST, 'kibana');
+    },
     /**
      * Get the asset criticality record for a specific entity.
      */
@@ -939,11 +956,31 @@ finalize it.
         .query(props.query);
     },
     /**
-     * Retrieves the rule migrations stored in the system
+     * Retrieves the rule documents stored in the system given the rule migration id
      */
-    getRuleMigration(kibanaSpace: string = 'default') {
+    getRuleMigration(props: GetRuleMigrationProps, kibanaSpace: string = 'default') {
       return supertest
-        .get(routeWithNamespace('/internal/siem_migrations/rules', kibanaSpace))
+        .get(
+          routeWithNamespace(
+            replaceParams('/internal/siem_migrations/rules/{migration_id}', props.params),
+            kibanaSpace
+          )
+        )
+        .set('kbn-xsrf', 'true')
+        .set(ELASTIC_HTTP_VERSION_HEADER, '1')
+        .set(X_ELASTIC_INTERNAL_ORIGIN_REQUEST, 'kibana');
+    },
+    /**
+     * Retrieves the stats of a SIEM rules migration using the migration id provided
+     */
+    getRuleMigrationStats(props: GetRuleMigrationStatsProps, kibanaSpace: string = 'default') {
+      return supertest
+        .get(
+          routeWithNamespace(
+            replaceParams('/internal/siem_migrations/rules/{migration_id}/stats', props.params),
+            kibanaSpace
+          )
+        )
         .set('kbn-xsrf', 'true')
         .set(ELASTIC_HTTP_VERSION_HEADER, '1')
         .set(X_ELASTIC_INTERNAL_ORIGIN_REQUEST, 'kibana');
@@ -1314,6 +1351,22 @@ detection engine rules.
         .set(ELASTIC_HTTP_VERSION_HEADER, '2023-10-31')
         .set(X_ELASTIC_INTERNAL_ORIGIN_REQUEST, 'kibana');
     },
+    /**
+     * Starts a SIEM rules migration using the migration id provided
+     */
+    startRuleMigration(props: StartRuleMigrationProps, kibanaSpace: string = 'default') {
+      return supertest
+        .put(
+          routeWithNamespace(
+            replaceParams('/internal/siem_migrations/rules/{migration_id}/start', props.params),
+            kibanaSpace
+          )
+        )
+        .set('kbn-xsrf', 'true')
+        .set(ELASTIC_HTTP_VERSION_HEADER, '1')
+        .set(X_ELASTIC_INTERNAL_ORIGIN_REQUEST, 'kibana')
+        .send(props.body as object);
+    },
     stopEntityEngine(props: StopEntityEngineProps, kibanaSpace: string = 'default') {
       return supertest
         .post(
@@ -1326,6 +1379,21 @@ detection engine rules.
         .set(ELASTIC_HTTP_VERSION_HEADER, '2023-10-31')
         .set(X_ELASTIC_INTERNAL_ORIGIN_REQUEST, 'kibana');
     },
+    /**
+     * Stops a running SIEM rules migration using the migration id provided
+     */
+    stopRuleMigration(props: StopRuleMigrationProps, kibanaSpace: string = 'default') {
+      return supertest
+        .put(
+          routeWithNamespace(
+            replaceParams('/internal/siem_migrations/rules/{migration_id}/stop', props.params),
+            kibanaSpace
+          )
+        )
+        .set('kbn-xsrf', 'true')
+        .set(ELASTIC_HTTP_VERSION_HEADER, '1')
+        .set(X_ELASTIC_INTERNAL_ORIGIN_REQUEST, 'kibana');
+    },
     /**
      * Suggests user profiles.
      */
@@ -1544,6 +1612,12 @@ export interface GetRuleExecutionResultsProps {
   query: GetRuleExecutionResultsRequestQueryInput;
   params: GetRuleExecutionResultsRequestParamsInput;
 }
+export interface GetRuleMigrationProps {
+  params: GetRuleMigrationRequestParamsInput;
+}
+export interface GetRuleMigrationStatsProps {
+  params: GetRuleMigrationStatsRequestParamsInput;
+}
 export interface GetTimelineProps {
   query: GetTimelineRequestQueryInput;
 }
@@ -1616,9 +1690,16 @@ export interface SetAlertTagsProps {
 export interface StartEntityEngineProps {
   params: StartEntityEngineRequestParamsInput;
 }
+export interface StartRuleMigrationProps {
+  params: StartRuleMigrationRequestParamsInput;
+  body: StartRuleMigrationRequestBodyInput;
+}
 export interface StopEntityEngineProps {
   params: StopEntityEngineRequestParamsInput;
 }
+export interface StopRuleMigrationProps {
+  params: StopRuleMigrationRequestParamsInput;
+}
 export interface SuggestUserProfilesProps {
   query: SuggestUserProfilesRequestQueryInput;
 }
diff --git a/x-pack/test/apm_api_integration/tests/agent_explorer/latest_agent_versions.spec.ts b/x-pack/test/apm_api_integration/tests/agent_explorer/latest_agent_versions.spec.ts
deleted file mode 100644
index 00e3fedf4620c..0000000000000
--- a/x-pack/test/apm_api_integration/tests/agent_explorer/latest_agent_versions.spec.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-import { ElasticApmAgentLatestVersion } from '@kbn/apm-plugin/common/agent_explorer';
-import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../common/ftr_provider_context';
-
-export default function ApiTest({ getService }: FtrProviderContext) {
-  const registry = getService('registry');
-  const apmApiClient = getService('apmApiClient');
-
-  const nodeAgentName = 'nodejs';
-  const unlistedAgentName = 'unlistedAgent';
-
-  async function callApi() {
-    return await apmApiClient.readUser({
-      endpoint: 'GET /internal/apm/get_latest_agent_versions',
-    });
-  }
-
-  registry.when(
-    'Agent latest versions when configuration is defined',
-    { config: 'basic', archives: [] },
-    () => {
-      it('returns a version when agent is listed in the file', async () => {
-        const { status, body } = await callApi();
-        expect(status).to.be(200);
-
-        const agents = body.data;
-
-        const nodeAgent = agents[nodeAgentName] as ElasticApmAgentLatestVersion;
-        expect(nodeAgent?.latest_version).not.to.be(undefined);
-      });
-
-      it('returns undefined when agent is not listed in the file', async () => {
-        const { status, body } = await callApi();
-        expect(status).to.be(200);
-
-        const agents = body.data;
-
-        // @ts-ignore
-        const unlistedAgent = agents[unlistedAgentName] as ElasticApmAgentLatestVersion;
-        expect(unlistedAgent?.latest_version).to.be(undefined);
-      });
-    }
-  );
-}
diff --git a/x-pack/test/dataset_quality_api_integration/tests/data_streams/degraded_docs.spec.ts b/x-pack/test/dataset_quality_api_integration/tests/data_streams/degraded_docs.spec.ts
index 92aa69610a66d..60aeef1af9c93 100644
--- a/x-pack/test/dataset_quality_api_integration/tests/data_streams/degraded_docs.spec.ts
+++ b/x-pack/test/dataset_quality_api_integration/tests/data_streams/degraded_docs.spec.ts
@@ -7,8 +7,7 @@
 
 import { log, timerange } from '@kbn/apm-synthtrace-client';
 import expect from '@kbn/expect';
-import { DatasetQualityApiError } from '../../common/dataset_quality_api_supertest';
-import { expectToReject } from '../../utils';
+import rison from '@kbn/rison';
 import { DatasetQualityApiClientKey } from '../../common/config';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 
@@ -24,7 +23,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
       endpoint: 'GET /internal/dataset_quality/data_streams/degraded_docs',
       params: {
         query: {
-          type: 'logs',
+          types: rison.encodeArray(['logs']),
           start,
           end,
         },
@@ -33,13 +32,6 @@ export default function ApiTest({ getService }: FtrProviderContext) {
   }
 
   registry.when('Degraded docs', { config: 'basic' }, () => {
-    describe('authorization', () => {
-      it('should return a 403 when the user does not have sufficient privileges', async () => {
-        const err = await expectToReject<DatasetQualityApiError>(() => callApiAs('noAccessUser'));
-        expect(err.res.status).to.be(403);
-      });
-    });
-
     describe('and there are log documents', () => {
       before(async () => {
         await synthtrace.index([
@@ -75,25 +67,19 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
       it('returns stats correctly', async () => {
         const stats = await callApiAs('datasetQualityMonitorUser');
-        expect(stats.body.degradedDocs.length).to.be(2);
+        expect(stats.body.degradedDocs.length).to.be(1);
 
         const degradedDocsStats = stats.body.degradedDocs.reduce(
           (acc, curr) => ({
             ...acc,
             [curr.dataset]: {
-              percentage: curr.percentage,
               count: curr.count,
             },
           }),
-          {} as Record<string, { percentage: number; count: number }>
+          {} as Record<string, { count: number }>
         );
 
-        expect(degradedDocsStats['logs-synth.1-default']).to.eql({
-          percentage: 0,
-          count: 0,
-        });
         expect(degradedDocsStats['logs-synth.2-default']).to.eql({
-          percentage: 100,
           count: 1,
         });
       });
@@ -155,117 +141,45 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
       it('returns counts and list of datasets correctly', async () => {
         const stats = await callApiAs('datasetQualityMonitorUser');
-        expect(stats.body.degradedDocs.length).to.be(18);
+        expect(stats.body.degradedDocs.length).to.be(9);
 
         const expected = {
           degradedDocs: [
-            {
-              dataset: 'logs-apache.access-default',
-              count: 0,
-              docsCount: 1,
-              percentage: 0,
-            },
-            {
-              dataset: 'logs-apache.access-space1',
-              count: 0,
-              docsCount: 1,
-              percentage: 0,
-            },
-            {
-              dataset: 'logs-apache.access-space2',
-              count: 0,
-              docsCount: 1,
-              percentage: 0,
-            },
             {
               dataset: 'logs-apache.error-default',
               count: 1,
-              docsCount: 2,
-              percentage: 50,
             },
             {
               dataset: 'logs-apache.error-space1',
               count: 1,
-              docsCount: 2,
-              percentage: 50,
             },
             {
               dataset: 'logs-apache.error-space2',
               count: 1,
-              docsCount: 2,
-              percentage: 50,
-            },
-            {
-              dataset: 'logs-mysql.access-default',
-              count: 0,
-              docsCount: 1,
-              percentage: 0,
-            },
-            {
-              dataset: 'logs-mysql.access-space1',
-              count: 0,
-              docsCount: 1,
-              percentage: 0,
-            },
-            {
-              dataset: 'logs-mysql.access-space2',
-              count: 0,
-              docsCount: 1,
-              percentage: 0,
             },
             {
               dataset: 'logs-mysql.error-default',
               count: 1,
-              docsCount: 2,
-              percentage: 50,
             },
             {
               dataset: 'logs-mysql.error-space1',
               count: 1,
-              docsCount: 2,
-              percentage: 50,
             },
             {
               dataset: 'logs-mysql.error-space2',
               count: 1,
-              docsCount: 2,
-              percentage: 50,
-            },
-            {
-              dataset: 'logs-nginx.access-default',
-              count: 0,
-              docsCount: 1,
-              percentage: 0,
-            },
-            {
-              dataset: 'logs-nginx.access-space1',
-              count: 0,
-              docsCount: 1,
-              percentage: 0,
-            },
-            {
-              dataset: 'logs-nginx.access-space2',
-              count: 0,
-              docsCount: 1,
-              percentage: 0,
             },
             {
               dataset: 'logs-nginx.error-default',
               count: 1,
-              docsCount: 2,
-              percentage: 50,
             },
             {
               dataset: 'logs-nginx.error-space1',
               count: 1,
-              docsCount: 2,
-              percentage: 50,
             },
             {
               dataset: 'logs-nginx.error-space2',
               count: 1,
-              docsCount: 2,
-              percentage: 50,
             },
           ],
         };
diff --git a/x-pack/test/dataset_quality_api_integration/tests/data_streams/total_docs.spec.ts b/x-pack/test/dataset_quality_api_integration/tests/data_streams/total_docs.spec.ts
new file mode 100644
index 0000000000000..71442e1300a2b
--- /dev/null
+++ b/x-pack/test/dataset_quality_api_integration/tests/data_streams/total_docs.spec.ts
@@ -0,0 +1,41 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from '@kbn/expect';
+import { DatasetQualityApiClientKey } from '../../common/config';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
+import { expectToReject } from '../../utils';
+import { DatasetQualityApiError } from '../../common/dataset_quality_api_supertest';
+
+export default function ApiTest({ getService }: FtrProviderContext) {
+  const registry = getService('registry');
+  const datasetQualityApiClient = getService('datasetQualityApiClient');
+  const start = '2023-12-11T18:00:00.000Z';
+  const end = '2023-12-11T18:01:00.000Z';
+
+  async function callApiAs(user: DatasetQualityApiClientKey) {
+    return await datasetQualityApiClient[user]({
+      endpoint: 'GET /internal/dataset_quality/data_streams/total_docs',
+      params: {
+        query: {
+          type: 'logs',
+          start,
+          end,
+        },
+      },
+    });
+  }
+
+  registry.when('Total docs', { config: 'basic' }, () => {
+    describe('authorization', () => {
+      it('should return a 403 when the user does not have sufficient privileges', async () => {
+        const err = await expectToReject<DatasetQualityApiError>(() => callApiAs('noAccessUser'));
+        expect(err.res.status).to.be(403);
+      });
+    });
+  });
+}
diff --git a/x-pack/test/fleet_api_integration/apis/enrollment_api_keys/crud.ts b/x-pack/test/fleet_api_integration/apis/enrollment_api_keys/crud.ts
index 9cb11df2b34de..24d1520d8d6f8 100644
--- a/x-pack/test/fleet_api_integration/apis/enrollment_api_keys/crud.ts
+++ b/x-pack/test/fleet_api_integration/apis/enrollment_api_keys/crud.ts
@@ -285,32 +285,5 @@ export default function (providerContext: FtrProviderContext) {
         });
       });
     });
-
-    describe('deprecated API', () => {
-      let keyId: string;
-      before(async () => {
-        const { body: apiResponse } = await supertest
-          .post(`/api/fleet/enrollment-api-keys`)
-          .set('kbn-xsrf', 'xxx')
-          .send({
-            policy_id: 'policy1',
-          })
-          .expect(200);
-        keyId = apiResponse.item.id;
-      });
-
-      it('should get and delete with deprecated API', async () => {
-        await supertest.get(`/api/fleet/enrollment-api-keys`).set('kbn-xsrf', 'xxx').expect(200);
-        await supertest
-          .get(`/api/fleet/enrollment-api-keys/${ENROLLMENT_KEY_ID}`)
-          .set('kbn-xsrf', 'xxx')
-          .expect(200);
-
-        await supertest
-          .delete(`/api/fleet/enrollment-api-keys/${keyId}`)
-          .set('kbn-xsrf', 'xxx')
-          .expect(200);
-      });
-    });
   });
 }
diff --git a/x-pack/test/fleet_api_integration/apis/epm/bulk_get_assets.ts b/x-pack/test/fleet_api_integration/apis/epm/bulk_get_assets.ts
index 3fa96c96018e1..16515df902185 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/bulk_get_assets.ts
+++ b/x-pack/test/fleet_api_integration/apis/epm/bulk_get_assets.ts
@@ -48,15 +48,12 @@ export default function (providerContext: FtrProviderContext) {
         const packageInfo = await supertest
           .get(`/api/fleet/epm/packages/${pkgName}/${pkgVersion}`)
           .expect(200);
-        const packageSOAttributes = packageInfo.body.item.savedObject.attributes;
+        const installationInfo = packageInfo.body.item.installationInfo;
         const { body }: { body: GetBulkAssetsResponse } = await supertest
           .post(`/api/fleet/epm/bulk_assets`)
           .set('kbn-xsrf', 'xxxx')
           .send({
-            assetIds: [
-              ...packageSOAttributes.installed_es,
-              ...packageSOAttributes.installed_kibana,
-            ],
+            assetIds: [...installationInfo.installed_es, ...installationInfo.installed_kibana],
           })
           .expect(200);
 
diff --git a/x-pack/test/fleet_api_integration/apis/epm/install_error_rollback.ts b/x-pack/test/fleet_api_integration/apis/epm/install_error_rollback.ts
index 30d20498c9559..7bb3bca9aa16e 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/install_error_rollback.ts
+++ b/x-pack/test/fleet_api_integration/apis/epm/install_error_rollback.ts
@@ -73,7 +73,7 @@ export default function (providerContext: FtrProviderContext) {
       expect(JSON.parse(goodPkgInfoResponse.text).item.status).to.be('installed');
       expect(JSON.parse(goodPkgInfoResponse.text).item.version).to.be('0.1.0');
       const latestInstallFailedAttempts =
-        goodPkgInfoResponse.body.item.savedObject.attributes.latest_install_failed_attempts;
+        goodPkgInfoResponse.body.item.installationInfo.latest_install_failed_attempts;
       expect(latestInstallFailedAttempts).to.have.length(1);
       expect(latestInstallFailedAttempts[0].target_version).to.be('0.2.0');
       expect(latestInstallFailedAttempts[0].error.message).to.contain(
@@ -90,7 +90,7 @@ export default function (providerContext: FtrProviderContext) {
       expect(JSON.parse(goodPkgInfoResponse.text).item.status).to.be('installed');
       expect(JSON.parse(goodPkgInfoResponse.text).item.version).to.be('0.3.0');
       const latestInstallFailedAttempts =
-        goodPkgInfoResponse.body.item.savedObject.attributes.latest_install_failed_attempts;
+        goodPkgInfoResponse.body.item.installationInfo.latest_install_failed_attempts;
       expect(latestInstallFailedAttempts).to.have.length(0);
     });
   });
diff --git a/x-pack/test/fleet_api_integration/apis/epm/setup.ts b/x-pack/test/fleet_api_integration/apis/epm/setup.ts
index 9c42b254f9578..8d0b78e8688fb 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/setup.ts
+++ b/x-pack/test/fleet_api_integration/apis/epm/setup.ts
@@ -61,8 +61,8 @@ export default function (providerContext: FtrProviderContext) {
         ({ body } = await supertest
           .get(`/api/fleet/epm/packages/endpoint/${latestEndpointVersion}`)
           .expect(200));
-        expect(body.item).to.have.property('savedObject');
-        expect((body.item as InstalledRegistry).savedObject?.attributes.install_version).to.eql(
+        expect(body.item).to.have.property('installationInfo');
+        expect((body.item as InstalledRegistry).installationInfo?.version).to.eql(
           latestEndpointVersion
         );
       });
diff --git a/x-pack/test/fleet_api_integration/apis/fleet_setup.ts b/x-pack/test/fleet_api_integration/apis/fleet_setup.ts
index ae196f13d9dc3..844ab3a82bcd8 100644
--- a/x-pack/test/fleet_api_integration/apis/fleet_setup.ts
+++ b/x-pack/test/fleet_api_integration/apis/fleet_setup.ts
@@ -61,7 +61,7 @@ export default function (providerContext: FtrProviderContext) {
       const { body: apiResponse } = await supertest
         .get(`/api/fleet/epm/packages?prerelease=true`)
         .expect(200);
-      const installedPackages = apiResponse.response
+      const installedPackages = apiResponse.items
         .filter((p: any) => p.status === 'installed')
         .map((p: any) => p.name)
         .sort();
diff --git a/x-pack/test/fleet_api_integration/apis/fleet_telemetry.ts b/x-pack/test/fleet_api_integration/apis/fleet_telemetry.ts
index 474d777fcd906..5afd57dbe1531 100644
--- a/x-pack/test/fleet_api_integration/apis/fleet_telemetry.ts
+++ b/x-pack/test/fleet_api_integration/apis/fleet_telemetry.ts
@@ -144,7 +144,7 @@ export default function (providerContext: FtrProviderContext) {
       if (_attemptsMade >= attempts) {
         throw new Error(
           `Agents not loaded correctly, failing test. All agents: \n: ${JSON.stringify(
-            apiResponse.list,
+            apiResponse.items,
             null,
             2
           )}`
diff --git a/x-pack/test/fleet_api_integration/apis/package_policy/helper.ts b/x-pack/test/fleet_api_integration/apis/package_policy/helper.ts
new file mode 100644
index 0000000000000..2c53248905521
--- /dev/null
+++ b/x-pack/test/fleet_api_integration/apis/package_policy/helper.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { Agent } from 'supertest';
+
+export async function getInstallationInfo(supertest: Agent, name: string, version: string) {
+  const res = await supertest.get(`/api/fleet/epm/packages/${name}/${version}`).expect(200);
+  return res.body.item.installationInfo;
+}
diff --git a/x-pack/test/fleet_api_integration/apis/package_policy/input_package_create_upgrade.ts b/x-pack/test/fleet_api_integration/apis/package_policy/input_package_create_upgrade.ts
index 481f4e09c68d9..bbd55641ce916 100644
--- a/x-pack/test/fleet_api_integration/apis/package_policy/input_package_create_upgrade.ts
+++ b/x-pack/test/fleet_api_integration/apis/package_policy/input_package_create_upgrade.ts
@@ -8,6 +8,7 @@ import expect from '@kbn/expect';
 import { sortBy } from 'lodash';
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
 import { skipIfNoDockerRegistry } from '../../helpers';
+import { getInstallationInfo } from './helper';
 const PACKAGE_NAME = 'input_package_upgrade';
 const START_VERSION = '1.0.0';
 const UPGRADE_VERSION = '1.1.0';
@@ -33,11 +34,6 @@ export default function (providerContext: FtrProviderContext) {
       .expect(200);
   };
 
-  const getInstallationSavedObject = async (name: string, version: string) => {
-    const res = await supertest.get(`/api/fleet/epm/packages/${name}/${version}`).expect(200);
-    return res.body.item.savedObject.attributes;
-  };
-
   const createPackagePolicyWithDataset = async (
     agentPolicyId: string,
     dataset: string,
@@ -195,13 +191,13 @@ export default function (providerContext: FtrProviderContext) {
     });
 
     it('should not have created any ES assets on install', async () => {
-      const installation = await getInstallationSavedObject(PACKAGE_NAME, START_VERSION);
+      const installation = await getInstallationInfo(supertest, PACKAGE_NAME, START_VERSION);
       expect(installation.installed_es).to.eql([]);
     });
 
     it('should create index templates and update installed_es on package policy creation', async () => {
       await createPackagePolicyWithDataset(agentPolicyId, 'dataset1');
-      const installation = await getInstallationSavedObject(PACKAGE_NAME, START_VERSION);
+      const installation = await getInstallationInfo(supertest, PACKAGE_NAME, START_VERSION);
       expectIdArraysEqual(installation.installed_es, [
         { id: 'logs-dataset1-1.0.0', type: 'ingest_pipeline' },
         { id: 'logs-dataset1', type: 'index_template' },
@@ -249,7 +245,7 @@ export default function (providerContext: FtrProviderContext) {
 
     it('should create index templates and update installed_es on second package policy creation', async () => {
       await createPackagePolicyWithDataset(agentPolicyId, 'dataset2');
-      const installation = await getInstallationSavedObject(PACKAGE_NAME, START_VERSION);
+      const installation = await getInstallationInfo(supertest, PACKAGE_NAME, START_VERSION);
       let found = 0;
       [
         { id: 'logs-dataset2-1.0.0', type: 'ingest_pipeline' },
@@ -268,7 +264,7 @@ export default function (providerContext: FtrProviderContext) {
       await createFakeFleetDataStream('dataset3');
 
       await createPackagePolicyWithDataset(agentPolicyId, 'dataset3');
-      const installation = await getInstallationSavedObject(PACKAGE_NAME, START_VERSION);
+      const installation = await getInstallationInfo(supertest, PACKAGE_NAME, START_VERSION);
       let found = 0;
       [
         { id: 'logs-dataset3-1.0.0', type: 'ingest_pipeline' },
diff --git a/x-pack/test/fleet_api_integration/apis/package_policy/input_package_rollback.ts b/x-pack/test/fleet_api_integration/apis/package_policy/input_package_rollback.ts
index 2ea9c64ee2507..7ccd2fad8bdde 100644
--- a/x-pack/test/fleet_api_integration/apis/package_policy/input_package_rollback.ts
+++ b/x-pack/test/fleet_api_integration/apis/package_policy/input_package_rollback.ts
@@ -8,6 +8,7 @@ import expect from '@kbn/expect';
 import { sortBy } from 'lodash';
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
 import { skipIfNoDockerRegistry } from '../../helpers';
+import { getInstallationInfo } from './helper';
 const PACKAGE_NAME = 'input_package_upgrade';
 const START_VERSION = '1.0.0';
 
@@ -31,11 +32,6 @@ export default function (providerContext: FtrProviderContext) {
       .expect(200);
   };
 
-  const getInstallationSavedObject = async (name: string, version: string) => {
-    const res = await supertest.get(`/api/fleet/epm/packages/${name}/${version}`).expect(200);
-    return res.body.item.savedObject.attributes;
-  };
-
   const getPackage = async (name: string, version: string) => {
     const res = await supertest.get(`/api/fleet/epm/packages/${name}/${version}`).expect(200);
     return res.body.item;
@@ -131,7 +127,7 @@ export default function (providerContext: FtrProviderContext) {
       await installPackage(PACKAGE_NAME, START_VERSION);
       await createPackagePolicyWithDataset(agentPolicyId, 'test*', 400);
 
-      const installation = await getInstallationSavedObject(PACKAGE_NAME, START_VERSION);
+      const installation = await getInstallationInfo(supertest, PACKAGE_NAME, START_VERSION);
       expectIdArraysEqual(installation.installed_es, []);
 
       await uninstallPackage(PACKAGE_NAME, START_VERSION);
diff --git a/x-pack/test/fleet_api_integration/apis/package_policy/update.ts b/x-pack/test/fleet_api_integration/apis/package_policy/update.ts
index 273f051dfcec6..619ddeb0544e7 100644
--- a/x-pack/test/fleet_api_integration/apis/package_policy/update.ts
+++ b/x-pack/test/fleet_api_integration/apis/package_policy/update.ts
@@ -15,6 +15,7 @@ import {
   enableSecrets,
 } from '../../helpers';
 import { testUsers } from '../test_users';
+import { getInstallationInfo } from './helper';
 
 export default function (providerContext: FtrProviderContext) {
   const { getService } = providerContext;
@@ -28,11 +29,6 @@ export default function (providerContext: FtrProviderContext) {
     expect(sortBy(arr1, 'id')).to.eql(sortBy(arr2, 'id'));
   };
 
-  const getInstallationSavedObject = async (name: string, version: string) => {
-    const res = await supertest.get(`/api/fleet/epm/packages/${name}/${version}`).expect(200);
-    return res.body.item.savedObject.attributes;
-  };
-
   const getPackagePolicyById = async (id: string) => {
     const { body } = await supertest.get(`/api/fleet/package_policies/${id}`);
     return body;
@@ -935,7 +931,7 @@ export default function (providerContext: FtrProviderContext) {
           })
           .expect(200);
 
-        const installation = await getInstallationSavedObject('integration_to_input', '2.0.0');
+        const installation = await getInstallationInfo(supertest, 'integration_to_input', '2.0.0');
 
         expectIdArraysEqual(installation.installed_es, [
           // assets from version 1.0.0
diff --git a/x-pack/test/fleet_api_integration/apis/package_policy/upgrade.ts b/x-pack/test/fleet_api_integration/apis/package_policy/upgrade.ts
index 021eebcdcc0c1..e0fbddb578a91 100644
--- a/x-pack/test/fleet_api_integration/apis/package_policy/upgrade.ts
+++ b/x-pack/test/fleet_api_integration/apis/package_policy/upgrade.ts
@@ -12,6 +12,7 @@ import {
 import { sortBy } from 'lodash';
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
 import { skipIfNoDockerRegistry } from '../../helpers';
+import { getInstallationInfo } from './helper';
 
 const expectIdArraysEqual = (arr1: any[], arr2: any[]) => {
   expect(sortBy(arr1, 'id')).to.eql(sortBy(arr2, 'id'));
@@ -36,11 +37,6 @@ export default function (providerContext: FtrProviderContext) {
     });
   }
 
-  const getInstallationSavedObject = async (name: string, version: string) => {
-    const res = await supertest.get(`/api/fleet/epm/packages/${name}/${version}`).expect(200);
-    return res.body.item.savedObject.attributes;
-  };
-
   const getComponentTemplate = async (name: string) => {
     try {
       const { component_templates: templates } = await es.cluster.getComponentTemplate({ name });
@@ -1358,7 +1354,11 @@ export default function (providerContext: FtrProviderContext) {
             })
             .expect(200);
 
-          const installation = await getInstallationSavedObject('integration_to_input', '3.0.0');
+          const installation = await getInstallationInfo(
+            supertest,
+            'integration_to_input',
+            '3.0.0'
+          );
           expectIdArraysEqual(installation.installed_es, expectedAssets);
 
           const expectedComponentTemplates = expectedAssets.filter(
diff --git a/x-pack/test/fleet_api_integration/apis/settings/get.ts b/x-pack/test/fleet_api_integration/apis/settings/get.ts
index e035dbc580e72..2a453a40db2cd 100644
--- a/x-pack/test/fleet_api_integration/apis/settings/get.ts
+++ b/x-pack/test/fleet_api_integration/apis/settings/get.ts
@@ -5,7 +5,6 @@
  * 2.0.
  */
 
-import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
 import { skipIfNoDockerRegistry } from '../../helpers';
 
@@ -28,29 +27,8 @@ export default function (providerContext: FtrProviderContext) {
       await esArchiver.unload('x-pack/test/functional/es_archives/fleet/empty_fleet_server');
     });
 
-    it('should respond with fleet_server_hosts', async function () {
-      // Create a fleet server host
-      await supertest
-        .post(`/api/fleet/fleet_server_hosts`)
-        .set('kbn-xsrf', 'xxxx')
-        .send({
-          id: 'test-default-123',
-          name: 'Default',
-          is_default: true,
-          host_urls: ['https://test.com:8080', 'https://test.com:8081'],
-        })
-        .expect(200);
-
-      // Assert that the hosts appear in the setting response
-      const response = await supertest
-        .get(`/api/fleet/settings`)
-        .set('kbn-xsrf', 'xxxx')
-        .expect(200);
-
-      expect(response.body.item.fleet_server_hosts).to.eql([
-        'https://test.com:8080',
-        'https://test.com:8081',
-      ]);
+    it('should respond return settings', async function () {
+      await supertest.get(`/api/fleet/settings`).set('kbn-xsrf', 'xxxx').expect(200);
     });
   });
 }
diff --git a/x-pack/test/fleet_api_integration/apis/settings/index.js b/x-pack/test/fleet_api_integration/apis/settings/index.js
index e74a278f61ad8..b7a51abf746f7 100644
--- a/x-pack/test/fleet_api_integration/apis/settings/index.js
+++ b/x-pack/test/fleet_api_integration/apis/settings/index.js
@@ -8,7 +8,6 @@
 export default function loadTests({ loadTestFile }) {
   describe('Settings Endpoints', () => {
     loadTestFile(require.resolve('./get'));
-    loadTestFile(require.resolve('./update'));
     loadTestFile(require.resolve('./enrollment'));
     loadTestFile(require.resolve('./enrollment_privileges'));
   });
diff --git a/x-pack/test/fleet_api_integration/apis/settings/update.ts b/x-pack/test/fleet_api_integration/apis/settings/update.ts
deleted file mode 100644
index b4abd6414c865..0000000000000
--- a/x-pack/test/fleet_api_integration/apis/settings/update.ts
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import expect from '@kbn/expect';
-import { AGENT_POLICY_INDEX } from '@kbn/fleet-plugin/common';
-import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
-import { skipIfNoDockerRegistry } from '../../helpers';
-
-export default function (providerContext: FtrProviderContext) {
-  const { getService } = providerContext;
-  const supertest = getService('supertest');
-  const kibanaServer = getService('kibanaServer');
-  const esClient = getService('es');
-  const esArchiver = getService('esArchiver');
-  const fleetAndAgents = getService('fleetAndAgents');
-
-  // Skipped as the Fleet Server hosts settings values are no longer used as of https://github.com/elastic/kibana/issues/137785
-  describe.skip('Settings - update', function () {
-    skipIfNoDockerRegistry(providerContext);
-    before(async () => {
-      await esArchiver.load('x-pack/test/functional/es_archives/fleet/empty_fleet_server');
-      await fleetAndAgents.setup();
-    });
-
-    const createdAgentPolicyIds: string[] = [];
-    after(async () => {
-      const deletedPromises = createdAgentPolicyIds.map((agentPolicyId) =>
-        supertest
-          .post(`/api/fleet/agent_policies/delete`)
-          .set('kbn-xsrf', 'xxxx')
-          .send({ agentPolicyId })
-      );
-      await Promise.all(deletedPromises);
-      await esArchiver.unload('x-pack/test/functional/es_archives/fleet/empty_fleet_server');
-    });
-
-    it('should explicitly set port on fleet_server_hosts', async function () {
-      await supertest
-        .put(`/api/fleet/settings`)
-        .set('kbn-xsrf', 'xxxx')
-        .send({ fleet_server_hosts: ['https://test.fr'] })
-        .expect(200);
-
-      const { body: getSettingsRes } = await supertest.get(`/api/fleet/settings`).expect(200);
-      expect(getSettingsRes.item.fleet_server_hosts).to.eql(['https://test.fr:443']);
-    });
-
-    it("should bump all agent policy's revision", async function () {
-      const { body: testPolicy1PostRes } = await supertest
-        .post(`/api/fleet/agent_policies`)
-        .set('kbn-xsrf', 'xxxx')
-        .send({
-          name: 'test 1',
-          description: '',
-          namespace: 'default',
-        });
-      createdAgentPolicyIds.push(testPolicy1PostRes.item.id);
-
-      const { body: testPolicy2PostRes } = await supertest
-        .post(`/api/fleet/agent_policies`)
-        .set('kbn-xsrf', 'xxxx')
-        .send({
-          name: 'test2',
-          description: '',
-          namespace: 'default',
-        });
-      createdAgentPolicyIds.push(testPolicy2PostRes.item.id);
-
-      await supertest
-        .put(`/api/fleet/settings`)
-        .set('kbn-xsrf', 'xxxx')
-        .send({ fleet_server_hosts: ['http://localhost:1232/abc', 'http://localhost:1232/abc'] })
-        .expect(200);
-
-      const getTestPolicy1Res = await kibanaServer.savedObjects.get({
-        type: 'ingest-agent-policies',
-        id: testPolicy1PostRes.item.id,
-      });
-      const getTestPolicy2Res = await kibanaServer.savedObjects.get({
-        type: 'ingest-agent-policies',
-        id: testPolicy2PostRes.item.id,
-      });
-      expect(getTestPolicy1Res.attributes.revision).equal(2);
-      expect(getTestPolicy2Res.attributes.revision).equal(2);
-    });
-
-    it('should create agent actions', async function () {
-      const { body: testPolicyRes } = await supertest
-        .post(`/api/fleet/agent_policies`)
-        .set('kbn-xsrf', 'xxxx')
-        .send({
-          name: 'test',
-          description: '',
-          namespace: 'default',
-        });
-      createdAgentPolicyIds.push(testPolicyRes.item.id);
-
-      const beforeRes = await esClient.search({
-        index: AGENT_POLICY_INDEX,
-        ignore_unavailable: true,
-        body: {
-          query: {
-            term: {
-              policy_id: testPolicyRes.item.id,
-            },
-          },
-        },
-      });
-
-      await supertest
-        .put(`/api/fleet/settings`)
-        .set('kbn-xsrf', 'xxxx')
-        .send({ fleet_server_hosts: ['http://localhost:1232/abc', 'http://localhost:1232/abc'] })
-        .expect(200);
-
-      const res = await esClient.search({
-        index: AGENT_POLICY_INDEX,
-        ignore_unavailable: true,
-        body: {
-          query: {
-            term: {
-              policy_id: testPolicyRes.item.id,
-            },
-          },
-        },
-      });
-
-      expect(res.hits.hits.length).equal(beforeRes.hits.hits.length + 1);
-    });
-  });
-}
diff --git a/x-pack/test/functional/apps/dashboard/group3/reporting/__snapshots__/download_csv.snap b/x-pack/test/functional/apps/dashboard/group3/reporting/__snapshots__/download_csv.snap
deleted file mode 100644
index c062cae2f66bd..0000000000000
--- a/x-pack/test/functional/apps/dashboard/group3/reporting/__snapshots__/download_csv.snap
+++ /dev/null
@@ -1,35 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`dashboard Reporting Dashboard Generate CSV Default Saved Search Data Downloads a filtered CSV export of a saved search panel 1`] = `
-"\\"order_date\\",category,currency,\\"customer_id\\",\\"order_id\\",\\"day_of_week_i\\",\\"products.created_on\\",sku
-\\"Jun 22, 2019 @ 00:00:00.000\\",\\"Men's Clothing, Men's Shoes\\",EUR,13,715752,6,\\"Dec 11, 2016 @ 00:00:00.000, Dec 11, 2016 @ 00:00:00.000, Dec 11, 2016 @ 00:00:00.000, Dec 11, 2016 @ 00:00:00.000\\",\\"ZO0130801308, ZO0402604026, ZO0630506305, ZO0297402974\\"
-\\"Jun 22, 2019 @ 00:00:00.000\\",\\"Men's Shoes, Men's Clothing\\",EUR,50,565284,6,\\"Dec 11, 2016 @ 00:00:00.000, Dec 11, 2016 @ 00:00:00.000\\",\\"ZO0687206872, ZO0422304223\\"
-\\"Jun 22, 2019 @ 00:00:00.000\\",\\"Men's Shoes, Men's Accessories\\",EUR,49,565266,6,\\"Dec 11, 2016 @ 00:00:00.000, Dec 11, 2016 @ 00:00:00.000\\",\\"ZO0255602556, ZO0468304683\\""
-`;
-
-exports[`dashboard Reporting Dashboard Generate CSV Default Saved Search Data Downloads a saved search panel with a custom time range that does not intersect with dashboard time range 1`] = `
-"\\"order_date\\",category,currency,\\"customer_id\\",\\"order_id\\",\\"day_of_week_i\\",\\"products.created_on\\",sku
-\\"Jun 15, 2019 @ 00:00:00.000\\",\\"Women's Clothing, Women's Shoes\\",EUR,27,732985,6,\\"Dec 4, 2016 @ 00:00:00.000, Dec 4, 2016 @ 00:00:00.000, Dec 4, 2016 @ 00:00:00.000, Dec 4, 2016 @ 00:00:00.000\\",\\"ZO0048100481, ZO0133401334, ZO0153201532, ZO0381603816\\"
-\\"Jun 15, 2019 @ 00:00:00.000\\",\\"Women's Accessories, Women's Clothing, Women's Shoes\\",EUR,5,731613,6,\\"Dec 4, 2016 @ 00:00:00.000, Dec 4, 2016 @ 00:00:00.000, Dec 4, 2016 @ 00:00:00.000, Dec 4, 2016 @ 00:00:00.000\\",\\"ZO0203502035, ZO0706807068, ZO0072000720, ZO0011200112\\"
-\\"Jun 15, 2019 @ 00:00:00.000\\",\\"Women's Clothing, Women's Shoes, Women's Accessories\\",EUR,5,731534,6,\\"Dec 4, 2016 @ 00:00:00.000, Dec 4, 2016 @ 00:00:00.000, Dec 4, 2016 @ 00:00:00.000, Dec 4, 2016 @ 00:00:00.000\\",\\"ZO0032800328, ZO0026900269, ZO0220602206, ZO0209802098\\""
-`;
-
-exports[`dashboard Reporting Dashboard Generate CSV Default Saved Search Data Generate CSV export of a saved search panel 1`] = `
-"\\"order_date\\",category,currency,\\"customer_id\\",\\"order_id\\",\\"day_of_week_i\\",\\"products.created_on\\",sku
-\\"Jun 22, 2019 @ 00:00:00.000\\",\\"Women's Clothing, Women's Shoes\\",EUR,27,731788,6,\\"Dec 11, 2016 @ 00:00:00.000, Dec 11, 2016 @ 00:00:00.000, Dec 11, 2016 @ 00:00:00.000, Dec 11, 2016 @ 00:00:00.000\\",\\"ZO0486004860, ZO0177901779, ZO0680506805, ZO0340503405\\"
-\\"Jun 22, 2019 @ 00:00:00.000\\",\\"Women's Accessories, Women's Shoes\\",EUR,17,730663,6,\\"Dec 11, 2016 @ 00:00:00.000, Dec 11, 2016 @ 00:00:00.000, Dec 11, 2016 @ 00:00:00.000, Dec 11, 2016 @ 00:00:00.000\\",\\"ZO0697406974, ZO0370303703, ZO0368103681, ZO0013800138\\"
-\\"Jun 22, 2019 @ 00:00:00.000\\",\\"Women's Accessories, Women's Clothing\\",EUR,5,727071,6,\\"Dec 11, 2016 @ 00:00:00.000, Dec 11, 2016 @ 00:00:00.000, Dec 11, 2016 @ 00:00:00.000, Dec 11, 2016 @ 00:00:00.000\\",\\"ZO0091900919, ZO0660006600, ZO0197001970, ZO0074600746\\""
-`;
-
-exports[`dashboard Reporting Dashboard Generate CSV Field Formatters and Scripted Fields Generate CSV export of a saved search panel 1`] = `
-"date,\\"_id\\",name,gender,value,year,\\"years_ago\\",\\"date_informal\\"
-\\"Jan 1, 1982 @ 00:00:00.000\\",\\"1982-Fethany-F\\",Fethany,F,780,1982,\\"37.00000000000000000000\\",\\"Jan 1st 82\\"
-"
-`;
-
-exports[`dashboard Reporting Dashboard Generate CSV Filtered Saved Search Downloads filtered Discover saved search report 1`] = `
-"\\"order_date\\",category,\\"order_id\\",\\"customer_full_name\\",\\"taxful_total_price\\",currency
-\\"Jun 25, 2019 @ 00:00:00.000\\",\\"Women's Clothing\\",569144,\\"Betty Perkins\\",\\"61.969\\",EUR
-\\"Jun 25, 2019 @ 00:00:00.000\\",\\"Women's Clothing, Women's Shoes\\",568503,\\"Betty Bryant\\",68,EUR
-\\"Jun 25, 2019 @ 00:00:00.000\\",\\"Women's Accessories\\",568229,\\"Betty Reese\\",\\"22.984\\",EUR"
-`;
diff --git a/x-pack/test/functional/apps/dashboard/group3/reporting/download_csv.ts b/x-pack/test/functional/apps/dashboard/group3/reporting/download_csv.ts
deleted file mode 100644
index ea2a66028ada5..0000000000000
--- a/x-pack/test/functional/apps/dashboard/group3/reporting/download_csv.ts
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import expect from '@kbn/expect';
-import { WebElementWrapper } from '@kbn/ftr-common-functional-ui-services';
-import { FtrProviderContext } from '../../../../ftr_provider_context';
-
-export default function ({ getService, getPageObjects }: FtrProviderContext) {
-  const esArchiver = getService('esArchiver');
-  const kibanaServer = getService('kibanaServer');
-  const dashboardPanelActions = getService('dashboardPanelActions');
-  const log = getService('log');
-  const testSubjects = getService('testSubjects');
-  const reportingService = getService('reporting');
-  const dashboardAddPanel = getService('dashboardAddPanel');
-  const filterBar = getService('filterBar');
-  const retry = getService('retry');
-  const toasts = getService('toasts');
-  const { reporting, common, dashboard, timePicker } = getPageObjects([
-    'reporting',
-    'common',
-    'dashboard',
-    'timePicker',
-  ]);
-
-  const navigateToDashboardApp = async () => {
-    log.debug('in navigateToDashboardApp');
-    await dashboard.navigateToApp();
-    await retry.tryForTime(10000, async () => {
-      expect(await dashboard.onDashboardLandingPage()).to.be(true);
-    });
-  };
-
-  const getCsvReportData = async () => {
-    await toasts.dismissAll();
-    const url = await reporting.getReportURL(60000);
-    const res = await reporting.getResponse(url ?? '');
-
-    expect(res.status).to.equal(200);
-    expect(res.get('content-type')).to.equal('text/csv; charset=utf-8');
-    return res.text;
-  };
-
-  const clickDownloadCsv = async (wrapper?: WebElementWrapper) => {
-    log.debug('click "Generate CSV"');
-    await dashboardPanelActions.clickPanelAction(
-      'embeddablePanelAction-generateCsvReport',
-      wrapper
-    );
-    await testSubjects.existOrFail('csvReportStarted'); // validate toast panel
-  };
-
-  const clickDownloadCsvByTitle = async (title?: string) => {
-    log.debug(`click "Generate CSV" on "${title}"`);
-    await dashboardPanelActions.clickPanelActionByTitle(
-      'embeddablePanelAction-generateCsvReport',
-      title
-    );
-    await testSubjects.existOrFail('csvReportStarted'); // validate toast panel
-  };
-
-  const createPartialCsv = (csvFile: unknown) => {
-    const partialCsvFile = (csvFile as string).split('\n').slice(0, 4);
-    return partialCsvFile.join('\n');
-  };
-
-  /*
-   * Tests
-   */
-  describe('Dashboard Generate CSV', () => {
-    describe('Default Saved Search Data', () => {
-      before(async () => {
-        await esArchiver.emptyKibanaIndex();
-        await reportingService.initEcommerce();
-        await kibanaServer.uiSettings.update({ 'dateFormat:tz': 'UTC' });
-      });
-
-      beforeEach(async () => {
-        await navigateToDashboardApp();
-      });
-
-      after(async () => {
-        await reportingService.teardownEcommerce();
-      });
-
-      it('Generate CSV export of a saved search panel', async function () {
-        await dashboard.loadSavedDashboard('Ecom Dashboard - 3 Day Period');
-        await clickDownloadCsvByTitle('EcommerceData');
-
-        const csvFile = await getCsvReportData();
-        expect(csvFile.length).to.be(76137);
-        expectSnapshot(createPartialCsv(csvFile)).toMatch();
-      });
-
-      it('Downloads a filtered CSV export of a saved search panel', async function () {
-        await dashboard.loadSavedDashboard('Ecom Dashboard - 3 Day Period');
-
-        // add a filter
-        await filterBar.addFilter({ field: 'category', operation: 'is', value: `Men's Shoes` });
-        await clickDownloadCsvByTitle('EcommerceData');
-
-        const csvFile = await getCsvReportData();
-        expect(csvFile.length).to.be(17106);
-        expectSnapshot(createPartialCsv(csvFile)).toMatch();
-      });
-
-      it('Downloads a saved search panel with a custom time range that does not intersect with dashboard time range', async function () {
-        await dashboard.loadSavedDashboard('Ecom Dashboard - 3 Day Period - custom time range');
-        await clickDownloadCsvByTitle('EcommerceData');
-
-        const csvFile = await getCsvReportData();
-        expect(csvFile.length).to.be(23277);
-        expectSnapshot(createPartialCsv(csvFile)).toMatch();
-      });
-
-      it('Gets the correct filename if panel titles are hidden', async () => {
-        await dashboard.loadSavedDashboard('Ecom Dashboard Hidden Panel Titles');
-        const savedSearchPanel = await dashboardPanelActions.getPanelWrapperById(
-          '94eab06f-60ac-4a85-b771-3a8ed475c9bb'
-        ); // panel title is hidden
-
-        await clickDownloadCsv(savedSearchPanel);
-        await testSubjects.existOrFail('csvReportStarted');
-
-        const csvFile = await getCsvReportData();
-        expect(csvFile).to.not.be(null);
-      });
-    });
-
-    describe('Filtered Saved Search', () => {
-      const TEST_SEARCH_TITLE = 'Customer Betty';
-      const TEST_DASHBOARD_TITLE = 'Filtered Search Data';
-      const from = 'Jun 20, 2019 @ 23:56:51.374';
-      const to = 'Jun 25, 2019 @ 16:18:51.821';
-
-      before(async () => {
-        await esArchiver.emptyKibanaIndex();
-        await reportingService.initEcommerce();
-        await kibanaServer.uiSettings.update({ 'dateFormat:tz': 'UTC' });
-      });
-
-      beforeEach(async () => {
-        await navigateToDashboardApp();
-        log.info(`Creating empty dashboard`);
-        await dashboard.clickNewDashboard();
-        await timePicker.setAbsoluteRange(from, to);
-        log.info(`Adding "${TEST_SEARCH_TITLE}" to dashboard`);
-        await dashboardAddPanel.addSavedSearch(TEST_SEARCH_TITLE);
-        await dashboard.saveDashboard(TEST_DASHBOARD_TITLE);
-      });
-
-      after(async () => {
-        await reportingService.teardownEcommerce();
-        await common.unsetTime();
-      });
-
-      it('Downloads filtered Discover saved search report', async () => {
-        await clickDownloadCsvByTitle(TEST_SEARCH_TITLE);
-
-        const csvFile = await getCsvReportData();
-        expect(csvFile.length).to.be(2446);
-        expectSnapshot(createPartialCsv(csvFile)).toMatch();
-      });
-    });
-
-    describe('Field Formatters and Scripted Fields', () => {
-      const dashboardWithScriptedFieldsSearch = 'names dashboard';
-
-      before(async () => {
-        await esArchiver.emptyKibanaIndex();
-        await reportingService.initLogs();
-        await esArchiver.load('x-pack/test/functional/es_archives/reporting/hugedata');
-        await kibanaServer.uiSettings.update({ 'dateFormat:tz': 'UTC' });
-      });
-
-      beforeEach(async () => {
-        await navigateToDashboardApp();
-        await dashboard.loadSavedDashboard(dashboardWithScriptedFieldsSearch);
-        await timePicker.setAbsoluteRange(
-          'Nov 26, 1981 @ 21:54:15.526',
-          'Mar 5, 1982 @ 18:17:44.821'
-        );
-
-        await common.sleep(1000);
-        await filterBar.addFilter({ field: 'name.keyword', operation: 'is', value: 'Fethany' });
-        await common.sleep(1000);
-      });
-
-      after(async () => {
-        await reportingService.teardownLogs();
-        await esArchiver.unload('x-pack/test/functional/es_archives/reporting/hugedata');
-      });
-
-      it('Generate CSV export of a saved search panel', async () => {
-        await clickDownloadCsvByTitle('namessearch');
-
-        const csvFile = await getCsvReportData();
-        expect(csvFile.length).to.be(166);
-        expectSnapshot(createPartialCsv(csvFile)).toMatch();
-      });
-    });
-  });
-}
diff --git a/x-pack/test/functional/apps/dashboard/group3/reporting/index.ts b/x-pack/test/functional/apps/dashboard/group3/reporting/index.ts
index ef9821a544b3a..9dfbd61473302 100644
--- a/x-pack/test/functional/apps/dashboard/group3/reporting/index.ts
+++ b/x-pack/test/functional/apps/dashboard/group3/reporting/index.ts
@@ -10,6 +10,5 @@ import { FtrProviderContext } from '../../../../ftr_provider_context';
 export default function ({ loadTestFile }: FtrProviderContext) {
   describe('Reporting', function () {
     loadTestFile(require.resolve('./screenshots'));
-    loadTestFile(require.resolve('./download_csv'));
   });
 }
diff --git a/x-pack/test/functional/apps/reporting/README.md b/x-pack/test/functional/apps/reporting/README.md
index 5d47804fef284..ed2402e9d9d58 100644
--- a/x-pack/test/functional/apps/reporting/README.md
+++ b/x-pack/test/functional/apps/reporting/README.md
@@ -9,7 +9,6 @@ Functional tests on report generation are under the applications that use report
  - `x-pack/test/functional/apps/visualize/reporting.ts`
 
 **CSV Report testing:**
- - `x-pack/test/functional/apps/dashboard/reporting/download_csv.ts`
  - `x-pack/test/functional/apps/discover/reporting.ts`
 
 Reporting Management app tests are in `functional/apps/reporting_management`.
diff --git a/x-pack/test/functional/page_objects/search_playground_page.ts b/x-pack/test/functional/page_objects/search_playground_page.ts
index 9b44addce9e25..3a47da067097f 100644
--- a/x-pack/test/functional/page_objects/search_playground_page.ts
+++ b/x-pack/test/functional/page_objects/search_playground_page.ts
@@ -146,7 +146,7 @@ export function SearchPlaygroundPageProvider({ getService }: FtrProviderContext)
         const model = await testSubjects.find('summarizationModelSelect');
         const defaultModel = await model.getVisibleText();
 
-        expect(defaultModel).to.equal('OpenAI GPT-3.5 Turbo');
+        expect(defaultModel).to.equal('OpenAI GPT-4o');
         expect(defaultModel).not.to.be.empty();
 
         expect(
diff --git a/x-pack/test/functional/services/ml/test_resources.ts b/x-pack/test/functional/services/ml/test_resources.ts
index 5035b6844b9c3..915060b152f24 100644
--- a/x-pack/test/functional/services/ml/test_resources.ts
+++ b/x-pack/test/functional/services/ml/test_resources.ts
@@ -594,12 +594,12 @@ export function MachineLearningTestResourcesProvider(
 
       await retry.tryForTime(10 * 1000, async () => {
         const { body, status } = await supertest
-          .get(`/api/fleet/epm/packages?experimental=true`)
+          .get(`/api/fleet/epm/packages?prerelease=true`)
           .set(getCommonRequestHeader(`${API_VERSIONS.public.v1}`));
         mlApi.assertResponseStatusCode(200, status, body);
 
         packageVersion =
-          body.response.find(
+          body.items.find(
             ({ name, version }: { name: string; version: string }) =>
               name === packageName && version
           )?.version ?? '';
diff --git a/x-pack/test/observability_ai_assistant_api_integration/common/config.ts b/x-pack/test/observability_ai_assistant_api_integration/common/config.ts
index 198fcefdc2bc8..427258a6e2910 100644
--- a/x-pack/test/observability_ai_assistant_api_integration/common/config.ts
+++ b/x-pack/test/observability_ai_assistant_api_integration/common/config.ts
@@ -11,7 +11,7 @@ import { ObservabilityAIAssistantFtrConfigName } from '../configs';
 import { getApmSynthtraceEsClient } from './create_synthtrace_client';
 import { InheritedFtrProviderContext, InheritedServices } from './ftr_provider_context';
 import { getScopedApiClient } from './observability_ai_assistant_api_client';
-import { editorUser, viewerUser } from './users/users';
+import { editor, secondaryEditor, viewer } from './users/users';
 
 export interface ObservabilityAIAssistantFtrConfig {
   name: ObservabilityAIAssistantFtrConfigName;
@@ -23,6 +23,10 @@ export type CreateTestConfig = ReturnType<typeof createTestConfig>;
 
 export type CreateTest = ReturnType<typeof createObservabilityAIAssistantAPIConfig>;
 
+export type ObservabilityAIAssistantApiClients = Awaited<
+  ReturnType<CreateTest['services']['observabilityAIAssistantAPIClient']>
+>;
+
 export type ObservabilityAIAssistantAPIClient = Awaited<
   ReturnType<CreateTest['services']['observabilityAIAssistantAPIClient']>
 >;
@@ -46,21 +50,23 @@ export function createObservabilityAIAssistantAPIConfig({
   const apmSynthtraceKibanaClient = services.apmSynthtraceKibanaClient();
   const allConfigs = config.getAll() as Record<string, any>;
 
+  const getScopedApiClientForUsername = (username: string) =>
+    getScopedApiClient(kibanaServer, username);
+
   return {
     ...allConfigs,
     servers,
     services: {
       ...services,
-      getScopedApiClientForUsername: () => {
-        return (username: string) => getScopedApiClient(kibanaServer, username);
-      },
+      getScopedApiClientForUsername: () => getScopedApiClientForUsername,
       apmSynthtraceEsClient: (context: InheritedFtrProviderContext) =>
         getApmSynthtraceEsClient(context, apmSynthtraceKibanaClient),
       observabilityAIAssistantAPIClient: async () => {
         return {
-          adminUser: await getScopedApiClient(kibanaServer, 'elastic'),
-          viewerUser: await getScopedApiClient(kibanaServer, viewerUser.username),
-          editorUser: await getScopedApiClient(kibanaServer, editorUser.username),
+          admin: getScopedApiClientForUsername('elastic'),
+          viewer: getScopedApiClientForUsername(viewer.username),
+          editor: getScopedApiClientForUsername(editor.username),
+          secondaryEditor: getScopedApiClientForUsername(secondaryEditor.username),
         };
       },
     },
diff --git a/x-pack/test/observability_ai_assistant_api_integration/common/users/users.ts b/x-pack/test/observability_ai_assistant_api_integration/common/users/users.ts
index b6fa38e52e60b..898954a9bfb97 100644
--- a/x-pack/test/observability_ai_assistant_api_integration/common/users/users.ts
+++ b/x-pack/test/observability_ai_assistant_api_integration/common/users/users.ts
@@ -9,21 +9,27 @@ import { kbnTestConfig } from '@kbn/test';
 const password = kbnTestConfig.getUrlParts().password!;
 
 export interface User {
-  username: 'elastic' | 'editor' | 'viewer';
+  username: 'elastic' | 'editor' | 'viewer' | 'secondary_editor';
   password: string;
   roles: string[];
 }
 
-export const editorUser: User = {
+export const editor: User = {
   username: 'editor',
   password,
   roles: ['editor'],
 };
 
-export const viewerUser: User = {
+export const secondaryEditor: User = {
+  username: 'secondary_editor',
+  password,
+  roles: ['editor'],
+};
+
+export const viewer: User = {
   username: 'viewer',
   password,
   roles: ['viewer'],
 };
 
-export const allUsers = [editorUser, viewerUser];
+export const allUsers = [editor, secondaryEditor, viewer];
diff --git a/x-pack/test/observability_ai_assistant_api_integration/tests/complete/complete.spec.ts b/x-pack/test/observability_ai_assistant_api_integration/tests/complete/complete.spec.ts
index a7606d21408c5..2eb7c6f986cfd 100644
--- a/x-pack/test/observability_ai_assistant_api_integration/tests/complete/complete.spec.ts
+++ b/x-pack/test/observability_ai_assistant_api_integration/tests/complete/complete.spec.ts
@@ -290,7 +290,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
         )[0]?.conversation.id;
 
         await observabilityAIAssistantAPIClient
-          .adminUser({
+          .admin({
             endpoint: 'DELETE /internal/observability_ai_assistant/conversation/{conversationId}',
             params: {
               path: {
@@ -366,7 +366,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
         ).to.eql(0);
 
         const conversations = await observabilityAIAssistantAPIClient
-          .editorUser({
+          .editor({
             endpoint: 'POST /internal/observability_ai_assistant/conversations',
           })
           .expect(200);
@@ -396,7 +396,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           .completeAfterIntercept();
 
         const createResponse = await observabilityAIAssistantAPIClient
-          .editorUser({
+          .editor({
             endpoint: 'POST /internal/observability_ai_assistant/chat/complete',
             params: {
               body: {
@@ -415,7 +415,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
         conversationCreatedEvent = getConversationCreatedEvent(createResponse.body);
 
         const conversationId = conversationCreatedEvent.conversation.id;
-        const fullConversation = await observabilityAIAssistantAPIClient.editorUser({
+        const fullConversation = await observabilityAIAssistantAPIClient.editor({
           endpoint: 'GET /internal/observability_ai_assistant/conversation/{conversationId}',
           params: {
             path: {
@@ -429,7 +429,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           .completeAfterIntercept();
 
         const updatedResponse = await observabilityAIAssistantAPIClient
-          .editorUser({
+          .editor({
             endpoint: 'POST /internal/observability_ai_assistant/chat/complete',
             params: {
               body: {
@@ -460,7 +460,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
       after(async () => {
         await observabilityAIAssistantAPIClient
-          .editorUser({
+          .editor({
             endpoint: 'DELETE /internal/observability_ai_assistant/conversation/{conversationId}',
             params: {
               path: {
diff --git a/x-pack/test/observability_ai_assistant_api_integration/tests/complete/functions/helpers.ts b/x-pack/test/observability_ai_assistant_api_integration/tests/complete/functions/helpers.ts
index b83221869baec..6ce506c502b5e 100644
--- a/x-pack/test/observability_ai_assistant_api_integration/tests/complete/functions/helpers.ts
+++ b/x-pack/test/observability_ai_assistant_api_integration/tests/complete/functions/helpers.ts
@@ -43,7 +43,7 @@ export async function invokeChatCompleteWithFunctionRequest({
   scopes?: AssistantScope[];
 }) {
   const { body } = await observabilityAIAssistantAPIClient
-    .editorUser({
+    .editor({
       endpoint: 'POST /internal/observability_ai_assistant/chat/complete',
       params: {
         body: {
diff --git a/x-pack/test/observability_ai_assistant_api_integration/tests/complete/functions/summarize.spec.ts b/x-pack/test/observability_ai_assistant_api_integration/tests/complete/functions/summarize.spec.ts
index 238be31220aa9..34da4270f7721 100644
--- a/x-pack/test/observability_ai_assistant_api_integration/tests/complete/functions/summarize.spec.ts
+++ b/x-pack/test/observability_ai_assistant_api_integration/tests/complete/functions/summarize.spec.ts
@@ -14,18 +14,31 @@ import {
   createProxyActionConnector,
   deleteActionConnector,
 } from '../../../common/action_connectors';
+import {
+  clearKnowledgeBase,
+  createKnowledgeBaseModel,
+  deleteKnowledgeBaseModel,
+} from '../../knowledge_base/helpers';
 
 export default function ApiTest({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const log = getService('log');
+  const ml = getService('ml');
+  const es = getService('es');
   const observabilityAIAssistantAPIClient = getService('observabilityAIAssistantAPIClient');
 
-  // Skipped until Elser is available in tests
-  describe.skip('when calling summarize function', () => {
+  describe('when calling summarize function', () => {
     let proxy: LlmProxy;
     let connectorId: string;
 
     before(async () => {
+      await createKnowledgeBaseModel(ml);
+      await observabilityAIAssistantAPIClient
+        .editor({
+          endpoint: 'POST /internal/observability_ai_assistant/kb/setup',
+        })
+        .expect(200);
+
       proxy = await createLlmProxy(log);
       connectorId = await createProxyActionConnector({ supertest, log, port: proxy.getPort() });
 
@@ -41,10 +54,10 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           name: 'summarize',
           trigger: MessageRole.User,
           arguments: JSON.stringify({
-            id: 'my-id',
+            title: 'My Title',
             text: 'Hello world',
             is_correction: false,
-            confidence: 1,
+            confidence: 'high',
             public: false,
           }),
         },
@@ -55,21 +68,32 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
     after(async () => {
       proxy.close();
+
       await deleteActionConnector({ supertest, connectorId, log });
+      await deleteKnowledgeBaseModel(ml);
+      await clearKnowledgeBase(es);
     });
 
     it('persists entry in knowledge base', async () => {
-      const res = await observabilityAIAssistantAPIClient.editorUser({
+      const res = await observabilityAIAssistantAPIClient.editor({
         endpoint: 'GET /internal/observability_ai_assistant/kb/entries',
         params: {
           query: {
             query: '',
-            sortBy: 'doc_id',
+            sortBy: 'title',
             sortDirection: 'asc',
           },
         },
       });
 
+      const { role, public: isPublic, text, type, user, title } = res.body.entries[0];
+
+      expect(role).to.eql('assistant_summarization');
+      expect(isPublic).to.eql(false);
+      expect(text).to.eql('Hello world');
+      expect(type).to.eql('contextual');
+      expect(user?.name).to.eql('editor');
+      expect(title).to.eql('My Title');
       expect(res.body.entries).to.have.length(1);
     });
   });
diff --git a/x-pack/test/observability_ai_assistant_api_integration/tests/connectors/connectors.spec.ts b/x-pack/test/observability_ai_assistant_api_integration/tests/connectors/connectors.spec.ts
index e8363ba41513b..41700b21555fa 100644
--- a/x-pack/test/observability_ai_assistant_api_integration/tests/connectors/connectors.spec.ts
+++ b/x-pack/test/observability_ai_assistant_api_integration/tests/connectors/connectors.spec.ts
@@ -26,14 +26,14 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
     it('Returns a 2xx for enterprise license', async () => {
       await observabilityAIAssistantAPIClient
-        .editorUser({
+        .editor({
           endpoint: 'GET /internal/observability_ai_assistant/connectors',
         })
         .expect(200);
     });
 
     it('returns an empty list of connectors', async () => {
-      const res = await observabilityAIAssistantAPIClient.editorUser({
+      const res = await observabilityAIAssistantAPIClient.editor({
         endpoint: 'GET /internal/observability_ai_assistant/connectors',
       });
 
@@ -43,7 +43,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
     it("returns the gen ai connector if it's been created", async () => {
       const connectorId = await createProxyActionConnector({ supertest, log, port: 1234 });
 
-      const res = await observabilityAIAssistantAPIClient.editorUser({
+      const res = await observabilityAIAssistantAPIClient.editor({
         endpoint: 'GET /internal/observability_ai_assistant/connectors',
       });
 
diff --git a/x-pack/test/observability_ai_assistant_api_integration/tests/conversations/conversations.spec.ts b/x-pack/test/observability_ai_assistant_api_integration/tests/conversations/conversations.spec.ts
index 91a418b3000ee..71eb37d357696 100644
--- a/x-pack/test/observability_ai_assistant_api_integration/tests/conversations/conversations.spec.ts
+++ b/x-pack/test/observability_ai_assistant_api_integration/tests/conversations/conversations.spec.ts
@@ -48,7 +48,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
     describe('without conversations', () => {
       it('returns no conversations when listing', async () => {
         const response = await observabilityAIAssistantAPIClient
-          .editorUser({
+          .editor({
             endpoint: 'POST /internal/observability_ai_assistant/conversations',
           })
           .expect(200);
@@ -58,7 +58,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
       it('returns a 404 for updating conversations', async () => {
         await observabilityAIAssistantAPIClient
-          .editorUser({
+          .editor({
             endpoint: 'PUT /internal/observability_ai_assistant/conversation/{conversationId}',
             params: {
               path: {
@@ -74,7 +74,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
       it('returns a 404 for retrieving a conversation', async () => {
         await observabilityAIAssistantAPIClient
-          .editorUser({
+          .editor({
             endpoint: 'GET /internal/observability_ai_assistant/conversation/{conversationId}',
             params: {
               path: {
@@ -92,7 +92,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
       >;
       before(async () => {
         createResponse = await observabilityAIAssistantAPIClient
-          .editorUser({
+          .editor({
             endpoint: 'POST /internal/observability_ai_assistant/conversation',
             params: {
               body: {
@@ -105,7 +105,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
       after(async () => {
         await observabilityAIAssistantAPIClient
-          .editorUser({
+          .editor({
             endpoint: 'DELETE /internal/observability_ai_assistant/conversation/{conversationId}',
             params: {
               path: {
@@ -116,7 +116,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           .expect(200);
 
         await observabilityAIAssistantAPIClient
-          .editorUser({
+          .editor({
             endpoint: 'GET /internal/observability_ai_assistant/conversation/{conversationId}',
             params: {
               path: {
@@ -148,7 +148,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
       it('returns a 404 for updating a non-existing conversation', async () => {
         await observabilityAIAssistantAPIClient
-          .editorUser({
+          .editor({
             endpoint: 'PUT /internal/observability_ai_assistant/conversation/{conversationId}',
             params: {
               path: {
@@ -164,7 +164,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
       it('returns a 404 for retrieving a non-existing conversation', async () => {
         await observabilityAIAssistantAPIClient
-          .editorUser({
+          .editor({
             endpoint: 'GET /internal/observability_ai_assistant/conversation/{conversationId}',
             params: {
               path: {
@@ -177,7 +177,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
       it('returns the conversation that was created', async () => {
         const response = await observabilityAIAssistantAPIClient
-          .editorUser({
+          .editor({
             endpoint: 'GET /internal/observability_ai_assistant/conversation/{conversationId}',
             params: {
               path: {
@@ -192,7 +192,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
       it('returns the created conversation when listing', async () => {
         const response = await observabilityAIAssistantAPIClient
-          .editorUser({
+          .editor({
             endpoint: 'POST /internal/observability_ai_assistant/conversations',
           })
           .expect(200);
@@ -210,7 +210,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
         before(async () => {
           updateResponse = await observabilityAIAssistantAPIClient
-            .editorUser({
+            .editor({
               endpoint: 'PUT /internal/observability_ai_assistant/conversation/{conversationId}',
               params: {
                 path: {
@@ -234,7 +234,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
         it('returns the updated conversation after get', async () => {
           const updateAfterCreateResponse = await observabilityAIAssistantAPIClient
-            .editorUser({
+            .editor({
               endpoint: 'GET /internal/observability_ai_assistant/conversation/{conversationId}',
               params: {
                 path: {
diff --git a/x-pack/test/observability_ai_assistant_api_integration/tests/knowledge_base/knowledge_base.spec.ts b/x-pack/test/observability_ai_assistant_api_integration/tests/knowledge_base/knowledge_base.spec.ts
index c8881e82e43bb..27659f62ad579 100644
--- a/x-pack/test/observability_ai_assistant_api_integration/tests/knowledge_base/knowledge_base.spec.ts
+++ b/x-pack/test/observability_ai_assistant_api_integration/tests/knowledge_base/knowledge_base.spec.ts
@@ -6,67 +6,66 @@
  */
 
 import expect from '@kbn/expect';
+import { type KnowledgeBaseEntry } from '@kbn/observability-ai-assistant-plugin/common';
 import { FtrProviderContext } from '../../common/ftr_provider_context';
 import { clearKnowledgeBase, createKnowledgeBaseModel, deleteKnowledgeBaseModel } from './helpers';
 
 export default function ApiTest({ getService }: FtrProviderContext) {
   const ml = getService('ml');
   const es = getService('es');
-
   const observabilityAIAssistantAPIClient = getService('observabilityAIAssistantAPIClient');
 
   describe('Knowledge base', () => {
     before(async () => {
       await createKnowledgeBaseModel(ml);
+
+      await observabilityAIAssistantAPIClient
+        .editor({ endpoint: 'POST /internal/observability_ai_assistant/kb/setup' })
+        .expect(200);
     });
 
     after(async () => {
       await deleteKnowledgeBaseModel(ml);
+      await clearKnowledgeBase(es);
     });
 
-    it('returns 200 on knowledge base setup', async () => {
-      const res = await observabilityAIAssistantAPIClient
-        .editorUser({
-          endpoint: 'POST /internal/observability_ai_assistant/kb/setup',
-        })
-        .expect(200);
-      expect(res.body).to.eql({});
-    });
     describe('when managing a single entry', () => {
       const knowledgeBaseEntry = {
         id: 'my-doc-id-1',
+        title: 'My title',
         text: 'My content',
       };
       it('returns 200 on create', async () => {
         await observabilityAIAssistantAPIClient
-          .editorUser({
+          .editor({
             endpoint: 'POST /internal/observability_ai_assistant/kb/entries/save',
             params: { body: knowledgeBaseEntry },
           })
           .expect(200);
-        const res = await observabilityAIAssistantAPIClient.editorUser({
+        const res = await observabilityAIAssistantAPIClient.editor({
           endpoint: 'GET /internal/observability_ai_assistant/kb/entries',
           params: {
             query: {
               query: '',
-              sortBy: 'doc_id',
+              sortBy: 'title',
               sortDirection: 'asc',
             },
           },
         });
         const entry = res.body.entries[0];
         expect(entry.id).to.equal(knowledgeBaseEntry.id);
+        expect(entry.title).to.equal(knowledgeBaseEntry.title);
         expect(entry.text).to.equal(knowledgeBaseEntry.text);
       });
 
       it('returns 200 on get entries and entry exists', async () => {
         const res = await observabilityAIAssistantAPIClient
-          .editorUser({
+          .editor({
             endpoint: 'GET /internal/observability_ai_assistant/kb/entries',
             params: {
               query: {
                 query: '',
-                sortBy: 'doc_id',
+                sortBy: 'title',
                 sortDirection: 'asc',
               },
             },
@@ -74,13 +73,14 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           .expect(200);
         const entry = res.body.entries[0];
         expect(entry.id).to.equal(knowledgeBaseEntry.id);
+        expect(entry.title).to.equal(knowledgeBaseEntry.title);
         expect(entry.text).to.equal(knowledgeBaseEntry.text);
       });
 
       it('returns 200 on delete', async () => {
         const entryId = 'my-doc-id-1';
         await observabilityAIAssistantAPIClient
-          .editorUser({
+          .editor({
             endpoint: 'DELETE /internal/observability_ai_assistant/kb/entries/{entryId}',
             params: {
               path: { entryId },
@@ -89,12 +89,12 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           .expect(200);
 
         const res = await observabilityAIAssistantAPIClient
-          .editorUser({
+          .editor({
             endpoint: 'GET /internal/observability_ai_assistant/kb/entries',
             params: {
               query: {
                 query: '',
-                sortBy: 'doc_id',
+                sortBy: 'title',
                 sortDirection: 'asc',
               },
             },
@@ -108,7 +108,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
       it('returns 500 on delete not found', async () => {
         const entryId = 'my-doc-id-1';
         await observabilityAIAssistantAPIClient
-          .editorUser({
+          .editor({
             endpoint: 'DELETE /internal/observability_ai_assistant/kb/entries/{entryId}',
             params: {
               path: { entryId },
@@ -117,119 +117,88 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           .expect(500);
       });
     });
-    describe('when managing multiple entries', () => {
-      before(async () => {
-        await clearKnowledgeBase(es);
-      });
-      afterEach(async () => {
-        await clearKnowledgeBase(es);
-      });
-      const knowledgeBaseEntries = [
-        {
-          id: 'my_doc_a',
-          text: 'My content a',
-        },
-        {
-          id: 'my_doc_b',
-          text: 'My content b',
-        },
-        {
-          id: 'my_doc_c',
-          text: 'My content c',
-        },
-      ];
-      it('returns 200 on create', async () => {
-        await observabilityAIAssistantAPIClient
-          .editorUser({
-            endpoint: 'POST /internal/observability_ai_assistant/kb/entries/import',
-            params: { body: { entries: knowledgeBaseEntries } },
-          })
-          .expect(200);
 
+    describe('when managing multiple entries', () => {
+      async function getEntries({
+        query = '',
+        sortBy = 'title',
+        sortDirection = 'asc',
+      }: { query?: string; sortBy?: string; sortDirection?: 'asc' | 'desc' } = {}) {
         const res = await observabilityAIAssistantAPIClient
-          .editorUser({
+          .editor({
             endpoint: 'GET /internal/observability_ai_assistant/kb/entries',
             params: {
-              query: {
-                query: '',
-                sortBy: 'doc_id',
-                sortDirection: 'asc',
-              },
+              query: { query, sortBy, sortDirection },
             },
           })
           .expect(200);
-        expect(res.body.entries.filter((entry) => entry.id.startsWith('my_doc')).length).to.eql(3);
-      });
 
-      it('allows sorting', async () => {
+        return omitCategories(res.body.entries);
+      }
+
+      beforeEach(async () => {
+        await clearKnowledgeBase(es);
+
         await observabilityAIAssistantAPIClient
-          .editorUser({
+          .editor({
             endpoint: 'POST /internal/observability_ai_assistant/kb/entries/import',
-            params: { body: { entries: knowledgeBaseEntries } },
-          })
-          .expect(200);
-
-        const res = await observabilityAIAssistantAPIClient
-          .editorUser({
-            endpoint: 'GET /internal/observability_ai_assistant/kb/entries',
             params: {
-              query: {
-                query: '',
-                sortBy: 'doc_id',
-                sortDirection: 'desc',
+              body: {
+                entries: [
+                  {
+                    id: 'my_doc_a',
+                    title: 'My title a',
+                    text: 'My content a',
+                  },
+                  {
+                    id: 'my_doc_b',
+                    title: 'My title b',
+                    text: 'My content b',
+                  },
+                  {
+                    id: 'my_doc_c',
+                    title: 'My title c',
+                    text: 'My content c',
+                  },
+                ],
               },
             },
           })
           .expect(200);
+      });
 
-        const entries = res.body.entries.filter((entry) => entry.id.startsWith('my_doc'));
-        expect(entries[0].id).to.eql('my_doc_c');
-        expect(entries[1].id).to.eql('my_doc_b');
-        expect(entries[2].id).to.eql('my_doc_a');
-
-        // asc
-        const resAsc = await observabilityAIAssistantAPIClient
-          .editorUser({
-            endpoint: 'GET /internal/observability_ai_assistant/kb/entries',
-            params: {
-              query: {
-                query: '',
-                sortBy: 'doc_id',
-                sortDirection: 'asc',
-              },
-            },
-          })
-          .expect(200);
+      afterEach(async () => {
+        await clearKnowledgeBase(es);
+      });
 
-        const entriesAsc = resAsc.body.entries.filter((entry) => entry.id.startsWith('my_doc'));
-        expect(entriesAsc[0].id).to.eql('my_doc_a');
-        expect(entriesAsc[1].id).to.eql('my_doc_b');
-        expect(entriesAsc[2].id).to.eql('my_doc_c');
+      it('returns 200 on create', async () => {
+        const entries = await getEntries();
+        expect(omitCategories(entries).length).to.eql(3);
       });
-      it('allows searching', async () => {
-        await observabilityAIAssistantAPIClient
-          .editorUser({
-            endpoint: 'POST /internal/observability_ai_assistant/kb/entries/import',
-            params: { body: { entries: knowledgeBaseEntries } },
-          })
-          .expect(200);
 
-        const res = await observabilityAIAssistantAPIClient
-          .editorUser({
-            endpoint: 'GET /internal/observability_ai_assistant/kb/entries',
-            params: {
-              query: {
-                query: 'my_doc_a',
-                sortBy: 'doc_id',
-                sortDirection: 'asc',
-              },
-            },
-          })
-          .expect(200);
+      describe('when sorting ', () => {
+        const ascendingOrder = ['my_doc_a', 'my_doc_b', 'my_doc_c'];
+
+        it('allows sorting ascending', async () => {
+          const entries = await getEntries({ sortBy: 'title', sortDirection: 'asc' });
+          expect(entries.map(({ id }) => id)).to.eql(ascendingOrder);
+        });
+
+        it('allows sorting descending', async () => {
+          const entries = await getEntries({ sortBy: 'title', sortDirection: 'desc' });
+          expect(entries.map(({ id }) => id)).to.eql([...ascendingOrder].reverse());
+        });
+      });
 
-        expect(res.body.entries.length).to.eql(1);
-        expect(res.body.entries[0].id).to.eql('my_doc_a');
+      it('allows searching by title', async () => {
+        const entries = await getEntries({ query: 'b' });
+        expect(entries.length).to.eql(1);
+        expect(entries[0].title).to.eql('My title b');
       });
     });
   });
 }
+
+function omitCategories(entries: KnowledgeBaseEntry[]) {
+  return entries.filter((entry) => entry.labels?.category === undefined);
+}
diff --git a/x-pack/test/observability_ai_assistant_api_integration/tests/knowledge_base/knowledge_base_setup.spec.ts b/x-pack/test/observability_ai_assistant_api_integration/tests/knowledge_base/knowledge_base_setup.spec.ts
index 9099eff540d35..77f010d851f3c 100644
--- a/x-pack/test/observability_ai_assistant_api_integration/tests/knowledge_base/knowledge_base_setup.spec.ts
+++ b/x-pack/test/observability_ai_assistant_api_integration/tests/knowledge_base/knowledge_base_setup.spec.ts
@@ -17,7 +17,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
     it('returns empty object when successful', async () => {
       await createKnowledgeBaseModel(ml);
       const res = await observabilityAIAssistantAPIClient
-        .editorUser({
+        .editor({
           endpoint: 'POST /internal/observability_ai_assistant/kb/setup',
         })
         .expect(200);
@@ -27,7 +27,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
     it('returns bad request if model cannot be installed', async () => {
       await observabilityAIAssistantAPIClient
-        .editorUser({
+        .editor({
           endpoint: 'POST /internal/observability_ai_assistant/kb/setup',
         })
         .expect(400);
diff --git a/x-pack/test/observability_ai_assistant_api_integration/tests/knowledge_base/knowledge_base_status.spec.ts b/x-pack/test/observability_ai_assistant_api_integration/tests/knowledge_base/knowledge_base_status.spec.ts
index 4e9778630a535..6561c416f02cf 100644
--- a/x-pack/test/observability_ai_assistant_api_integration/tests/knowledge_base/knowledge_base_status.spec.ts
+++ b/x-pack/test/observability_ai_assistant_api_integration/tests/knowledge_base/knowledge_base_status.spec.ts
@@ -17,7 +17,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
     before(async () => {
       await createKnowledgeBaseModel(ml);
       await observabilityAIAssistantAPIClient
-        .editorUser({
+        .editor({
           endpoint: 'POST /internal/observability_ai_assistant/kb/setup',
         })
         .expect(200);
@@ -29,7 +29,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
     it('returns correct status after knowledge base is setup', async () => {
       const res = await observabilityAIAssistantAPIClient
-        .editorUser({
+        .editor({
           endpoint: 'GET /internal/observability_ai_assistant/kb/status',
         })
         .expect(200);
@@ -41,7 +41,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
       await ml.api.stopTrainedModelDeploymentES(TINY_ELSER.id, true);
 
       const res = await observabilityAIAssistantAPIClient
-        .editorUser({
+        .editor({
           endpoint: 'GET /internal/observability_ai_assistant/kb/status',
         })
         .expect(200);
diff --git a/x-pack/test/observability_ai_assistant_api_integration/tests/knowledge_base/knowledge_base_user_instructions.spec.ts b/x-pack/test/observability_ai_assistant_api_integration/tests/knowledge_base/knowledge_base_user_instructions.spec.ts
index a93c194c85daa..a9c1f245a1ac3 100644
--- a/x-pack/test/observability_ai_assistant_api_integration/tests/knowledge_base/knowledge_base_user_instructions.spec.ts
+++ b/x-pack/test/observability_ai_assistant_api_integration/tests/knowledge_base/knowledge_base_user_instructions.spec.ts
@@ -6,7 +6,6 @@
  */
 
 import expect from '@kbn/expect';
-import { kbnTestConfig } from '@kbn/test';
 import { sortBy } from 'lodash';
 import { Message, MessageRole } from '@kbn/observability-ai-assistant-plugin/common';
 import { CONTEXT_FUNCTION_NAME } from '@kbn/observability-ai-assistant-plugin/server/functions/context';
@@ -21,33 +20,27 @@ import {
 import { getConversationCreatedEvent } from '../conversations/helpers';
 import { LlmProxy, createLlmProxy } from '../../common/create_llm_proxy';
 import { createProxyActionConnector, deleteActionConnector } from '../../common/action_connectors';
+import { User } from '../../common/users/users';
 
 export default function ApiTest({ getService }: FtrProviderContext) {
   const observabilityAIAssistantAPIClient = getService('observabilityAIAssistantAPIClient');
-  const getScopedApiClientForUsername = getService('getScopedApiClientForUsername');
-  const security = getService('security');
   const supertest = getService('supertest');
   const es = getService('es');
   const ml = getService('ml');
   const log = getService('log');
+  const getScopedApiClientForUsername = getService('getScopedApiClientForUsername');
 
   describe('Knowledge base user instructions', () => {
-    const userJohn = 'john';
-
     before(async () => {
-      // create user
-      const password = kbnTestConfig.getUrlParts().password!;
-      await security.user.create(userJohn, { password, roles: ['editor'] });
       await createKnowledgeBaseModel(ml);
 
       await observabilityAIAssistantAPIClient
-        .editorUser({ endpoint: 'POST /internal/observability_ai_assistant/kb/setup' })
+        .editor({ endpoint: 'POST /internal/observability_ai_assistant/kb/setup' })
         .expect(200);
     });
 
     after(async () => {
       await deleteKnowledgeBaseModel(ml);
-      await security.user.delete(userJohn);
       await clearKnowledgeBase(es);
       await clearConversations(es);
     });
@@ -58,19 +51,19 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
         const promises = [
           {
-            username: 'editor',
+            username: 'editor' as const,
             isPublic: true,
           },
           {
-            username: 'editor',
+            username: 'editor' as const,
             isPublic: false,
           },
           {
-            username: userJohn,
+            username: 'secondary_editor' as const,
             isPublic: true,
           },
           {
-            username: userJohn,
+            username: 'secondary_editor' as const,
             isPublic: false,
           },
         ].map(async ({ username, isPublic }) => {
@@ -92,61 +85,59 @@ export default function ApiTest({ getService }: FtrProviderContext) {
       });
 
       it('"editor" can retrieve their own private instructions and the public instruction', async () => {
-        const res = await observabilityAIAssistantAPIClient.editorUser({
+        const res = await observabilityAIAssistantAPIClient.editor({
           endpoint: 'GET /internal/observability_ai_assistant/kb/user_instructions',
         });
 
         const instructions = res.body.userInstructions;
 
-        const sortByDocId = (data: Array<Instruction & { public?: boolean }>) =>
-          sortBy(data, 'doc_id');
+        const sortById = (data: Array<Instruction & { public?: boolean }>) => sortBy(data, 'id');
 
-        expect(sortByDocId(instructions)).to.eql(
-          sortByDocId([
+        expect(sortById(instructions)).to.eql(
+          sortById([
             {
-              doc_id: 'private-doc-from-editor',
+              id: 'private-doc-from-editor',
               public: false,
               text: 'Private user instruction from "editor"',
             },
             {
-              doc_id: 'public-doc-from-editor',
+              id: 'public-doc-from-editor',
               public: true,
               text: 'Public user instruction from "editor"',
             },
             {
-              doc_id: 'public-doc-from-john',
+              id: 'public-doc-from-secondary_editor',
               public: true,
-              text: 'Public user instruction from "john"',
+              text: 'Public user instruction from "secondary_editor"',
             },
           ])
         );
       });
 
-      it('"john" can retrieve their own private instructions and the public instruction', async () => {
-        const res = await getScopedApiClientForUsername(userJohn)({
+      it('"secondaryEditor" can retrieve their own private instructions and the public instruction', async () => {
+        const res = await observabilityAIAssistantAPIClient.secondaryEditor({
           endpoint: 'GET /internal/observability_ai_assistant/kb/user_instructions',
         });
         const instructions = res.body.userInstructions;
 
-        const sortByDocId = (data: Array<Instruction & { public?: boolean }>) =>
-          sortBy(data, 'doc_id');
+        const sortById = (data: Array<Instruction & { public?: boolean }>) => sortBy(data, 'id');
 
-        expect(sortByDocId(instructions)).to.eql(
-          sortByDocId([
+        expect(sortById(instructions)).to.eql(
+          sortById([
             {
-              doc_id: 'public-doc-from-editor',
+              id: 'public-doc-from-editor',
               public: true,
               text: 'Public user instruction from "editor"',
             },
             {
-              doc_id: 'public-doc-from-john',
+              id: 'public-doc-from-secondary_editor',
               public: true,
-              text: 'Public user instruction from "john"',
+              text: 'Public user instruction from "secondary_editor"',
             },
             {
-              doc_id: 'private-doc-from-john',
+              id: 'private-doc-from-secondary_editor',
               public: false,
-              text: 'Private user instruction from "john"',
+              text: 'Private user instruction from "secondary_editor"',
             },
           ])
         );
@@ -158,7 +149,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
         await clearKnowledgeBase(es);
 
         await observabilityAIAssistantAPIClient
-          .editorUser({
+          .editor({
             endpoint: 'PUT /internal/observability_ai_assistant/kb/user_instructions',
             params: {
               body: {
@@ -171,7 +162,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
           .expect(200);
 
         await observabilityAIAssistantAPIClient
-          .editorUser({
+          .editor({
             endpoint: 'PUT /internal/observability_ai_assistant/kb/user_instructions',
             params: {
               body: {
@@ -185,14 +176,14 @@ export default function ApiTest({ getService }: FtrProviderContext) {
       });
 
       it('updates the user instruction', async () => {
-        const res = await observabilityAIAssistantAPIClient.editorUser({
+        const res = await observabilityAIAssistantAPIClient.editor({
           endpoint: 'GET /internal/observability_ai_assistant/kb/user_instructions',
         });
         const instructions = res.body.userInstructions;
 
         expect(instructions).to.eql([
           {
-            doc_id: 'doc-to-update',
+            id: 'doc-to-update',
             text: 'Updated text',
             public: false,
           },
@@ -207,12 +198,12 @@ export default function ApiTest({ getService }: FtrProviderContext) {
       const userInstructionText =
         'Be polite and use language that is easy to understand. Never disagree with the user.';
 
-      async function getConversationForUser(username: string) {
+      async function getConversationForUser(username: User['username']) {
         const apiClient = getScopedApiClientForUsername(username);
 
         // the user instruction is always created by "editor" user
         await observabilityAIAssistantAPIClient
-          .editorUser({
+          .editor({
             endpoint: 'PUT /internal/observability_ai_assistant/kb/user_instructions',
             params: {
               body: {
@@ -314,7 +305,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
       });
 
       it('does not add the instruction conversation for other users', async () => {
-        const conversation = await getConversationForUser('john');
+        const conversation = await getConversationForUser('secondary_editor');
         const systemMessage = conversation.messages.find(
           (message) => message.message.role === MessageRole.System
         )!;
diff --git a/x-pack/test/observability_ai_assistant_api_integration/tests/public_complete/public_complete.spec.ts b/x-pack/test/observability_ai_assistant_api_integration/tests/public_complete/public_complete.spec.ts
index a25a7cf5ef8eb..bb8984256f27c 100644
--- a/x-pack/test/observability_ai_assistant_api_integration/tests/public_complete/public_complete.spec.ts
+++ b/x-pack/test/observability_ai_assistant_api_integration/tests/public_complete/public_complete.spec.ts
@@ -70,7 +70,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
         (body) => !isFunctionTitleRequest(body)
       );
 
-      const responsePromise = observabilityAIAssistantAPIClient.adminUser({
+      const responsePromise = observabilityAIAssistantAPIClient.admin({
         endpoint: 'POST /api/observability_ai_assistant/chat/complete 2023-10-31',
         params: {
           query: { format },
diff --git a/x-pack/test/observability_ai_assistant_functional/common/config.ts b/x-pack/test/observability_ai_assistant_functional/common/config.ts
index c0f649d51d90d..99213e629e0e3 100644
--- a/x-pack/test/observability_ai_assistant_functional/common/config.ts
+++ b/x-pack/test/observability_ai_assistant_functional/common/config.ts
@@ -13,8 +13,9 @@ import {
   KibanaEBTUIProvider,
 } from '@kbn/test-suites-src/analytics/services/kibana_ebt';
 import {
-  editorUser,
-  viewerUser,
+  secondaryEditor,
+  editor,
+  viewer,
 } from '../../observability_ai_assistant_api_integration/common/users/users';
 import {
   ObservabilityAIAssistantFtrConfig,
@@ -61,9 +62,10 @@ async function getTestConfig({
           ObservabilityAIAssistantUIProvider(context),
         observabilityAIAssistantAPIClient: async (context: InheritedFtrProviderContext) => {
           return {
-            adminUser: await getScopedApiClient(kibanaServer, 'elastic'),
-            viewerUser: await getScopedApiClient(kibanaServer, viewerUser.username),
-            editorUser: await getScopedApiClient(kibanaServer, editorUser.username),
+            admin: getScopedApiClient(kibanaServer, 'elastic'),
+            viewer: getScopedApiClient(kibanaServer, viewer.username),
+            editor: getScopedApiClient(kibanaServer, editor.username),
+            secondaryEditor: getScopedApiClient(kibanaServer, secondaryEditor.username),
           };
         },
         kibana_ebt_server: KibanaEBTServerProvider,
diff --git a/x-pack/test/observability_ai_assistant_functional/common/ui/index.ts b/x-pack/test/observability_ai_assistant_functional/common/ui/index.ts
index 2c6852988cde5..d072cc3777a7d 100644
--- a/x-pack/test/observability_ai_assistant_functional/common/ui/index.ts
+++ b/x-pack/test/observability_ai_assistant_functional/common/ui/index.ts
@@ -27,6 +27,11 @@ export interface ObservabilityAIAssistantUIService {
 }
 
 const pages = {
+  kbManagementTab: {
+    table: 'knowledgeBaseTable',
+    tableTitleCell: 'knowledgeBaseTableTitleCell',
+    tableAuthorCell: 'knowledgeBaseTableAuthorCell',
+  },
   conversations: {
     setupGenAiConnectorsButtonSelector: `observabilityAiAssistantInitialSetupPanelSetUpGenerativeAiConnectorButton`,
     chatInput: 'observabilityAiAssistantChatPromptEditorTextArea',
diff --git a/x-pack/test/observability_ai_assistant_functional/tests/conversations/index.spec.ts b/x-pack/test/observability_ai_assistant_functional/tests/conversations/index.spec.ts
index 68b1d97d531dc..de780d2f46b0e 100644
--- a/x-pack/test/observability_ai_assistant_functional/tests/conversations/index.spec.ts
+++ b/x-pack/test/observability_ai_assistant_functional/tests/conversations/index.spec.ts
@@ -36,12 +36,12 @@ export default function ApiTest({ getService, getPageObjects }: FtrProviderConte
   const flyoutService = getService('flyout');
 
   async function deleteConversations() {
-    const response = await observabilityAIAssistantAPIClient.editorUser({
+    const response = await observabilityAIAssistantAPIClient.editor({
       endpoint: 'POST /internal/observability_ai_assistant/conversations',
     });
 
     for (const conversation of response.body.conversations) {
-      await observabilityAIAssistantAPIClient.editorUser({
+      await observabilityAIAssistantAPIClient.editor({
         endpoint: `DELETE /internal/observability_ai_assistant/conversation/{conversationId}`,
         params: {
           path: {
@@ -53,7 +53,7 @@ export default function ApiTest({ getService, getPageObjects }: FtrProviderConte
   }
 
   async function deleteConnectors() {
-    const response = await observabilityAIAssistantAPIClient.editorUser({
+    const response = await observabilityAIAssistantAPIClient.editor({
       endpoint: 'GET /internal/observability_ai_assistant/connectors',
     });
 
@@ -66,7 +66,7 @@ export default function ApiTest({ getService, getPageObjects }: FtrProviderConte
   }
 
   async function createOldConversation() {
-    await observabilityAIAssistantAPIClient.editorUser({
+    await observabilityAIAssistantAPIClient.editor({
       endpoint: 'POST /internal/observability_ai_assistant/conversation',
       params: {
         body: {
@@ -204,7 +204,7 @@ export default function ApiTest({ getService, getPageObjects }: FtrProviderConte
           });
 
           it('creates a connector', async () => {
-            const response = await observabilityAIAssistantAPIClient.editorUser({
+            const response = await observabilityAIAssistantAPIClient.editor({
               endpoint: 'GET /internal/observability_ai_assistant/connectors',
             });
 
@@ -259,7 +259,7 @@ export default function ApiTest({ getService, getPageObjects }: FtrProviderConte
               });
 
               it('creates a conversation and updates the URL', async () => {
-                const response = await observabilityAIAssistantAPIClient.editorUser({
+                const response = await observabilityAIAssistantAPIClient.editor({
                   endpoint: 'POST /internal/observability_ai_assistant/conversations',
                 });
 
@@ -325,7 +325,7 @@ export default function ApiTest({ getService, getPageObjects }: FtrProviderConte
                 });
 
                 it('does not create another conversation', async () => {
-                  const response = await observabilityAIAssistantAPIClient.editorUser({
+                  const response = await observabilityAIAssistantAPIClient.editor({
                     endpoint: 'POST /internal/observability_ai_assistant/conversations',
                   });
 
@@ -333,7 +333,7 @@ export default function ApiTest({ getService, getPageObjects }: FtrProviderConte
                 });
 
                 it('appends to the existing one', async () => {
-                  const response = await observabilityAIAssistantAPIClient.editorUser({
+                  const response = await observabilityAIAssistantAPIClient.editor({
                     endpoint: 'POST /internal/observability_ai_assistant/conversations',
                   });
 
diff --git a/x-pack/test/observability_ai_assistant_functional/tests/knowledge_base_management/index.spec.ts b/x-pack/test/observability_ai_assistant_functional/tests/knowledge_base_management/index.spec.ts
new file mode 100644
index 0000000000000..7a5a51ae58b6a
--- /dev/null
+++ b/x-pack/test/observability_ai_assistant_functional/tests/knowledge_base_management/index.spec.ts
@@ -0,0 +1,124 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from '@kbn/expect';
+import { subj as testSubjSelector } from '@kbn/test-subj-selector';
+import {
+  clearKnowledgeBase,
+  createKnowledgeBaseModel,
+  deleteKnowledgeBaseModel,
+} from '../../../observability_ai_assistant_api_integration/tests/knowledge_base/helpers';
+import { ObservabilityAIAssistantApiClient } from '../../../observability_ai_assistant_api_integration/common/observability_ai_assistant_api_client';
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export default function ApiTest({ getService, getPageObjects }: FtrProviderContext) {
+  const observabilityAIAssistantAPIClient = getService('observabilityAIAssistantAPIClient');
+  const ui = getService('observabilityAIAssistantUI');
+  const testSubjects = getService('testSubjects');
+  const log = getService('log');
+  const ml = getService('ml');
+  const es = getService('es');
+  const { common } = getPageObjects(['common']);
+
+  async function saveKbEntry({
+    apiClient,
+    text,
+  }: {
+    apiClient: ObservabilityAIAssistantApiClient;
+    text: string;
+  }) {
+    return apiClient({
+      endpoint: 'POST /internal/observability_ai_assistant/functions/summarize',
+      params: {
+        body: {
+          title: 'Favourite color',
+          text,
+          confidence: 'high',
+          is_correction: false,
+          public: false,
+          labels: {},
+        },
+      },
+    }).expect(200);
+  }
+
+  describe('Knowledge management tab', () => {
+    before(async () => {
+      await clearKnowledgeBase(es);
+
+      // create a knowledge base model
+      await createKnowledgeBaseModel(ml);
+
+      await Promise.all([
+        // setup the knowledge base
+        observabilityAIAssistantAPIClient
+          .editor({ endpoint: 'POST /internal/observability_ai_assistant/kb/setup' })
+          .expect(200),
+
+        // login as editor
+        ui.auth.login('editor'),
+      ]);
+    });
+
+    after(async () => {
+      await Promise.all([deleteKnowledgeBaseModel(ml), clearKnowledgeBase(es), ui.auth.logout()]);
+    });
+
+    describe('when the LLM calls the "summarize" function for two different users', () => {
+      async function getKnowledgeBaseEntries() {
+        await common.navigateToUrlWithBrowserHistory(
+          'management',
+          '/kibana/observabilityAiAssistantManagement',
+          'tab=knowledge_base'
+        );
+
+        const entryTitleCells = await testSubjects.findAll(ui.pages.kbManagementTab.tableTitleCell);
+
+        const rows = await Promise.all(
+          entryTitleCells.map(async (cell) => {
+            const title = await cell.getVisibleText();
+            const parentRow = await cell.findByXpath('ancestor::tr');
+
+            const authorElm = await parentRow.findByCssSelector(
+              testSubjSelector(ui.pages.kbManagementTab.tableAuthorCell)
+            );
+            const author = await authorElm.getVisibleText();
+            const rowText = (await parentRow.getVisibleText()).split('\n');
+
+            return { rowText, author, title };
+          })
+        );
+
+        log.debug(`Found ${rows.length} rows in the KB management table: ${JSON.stringify(rows)}`);
+
+        return rows.filter(({ title }) => title === 'Favourite color');
+      }
+
+      before(async () => {
+        await saveKbEntry({
+          apiClient: observabilityAIAssistantAPIClient.editor,
+          text: 'My favourite color is red',
+        });
+
+        await saveKbEntry({
+          apiClient: observabilityAIAssistantAPIClient.secondaryEditor,
+          text: 'My favourite color is blue',
+        });
+      });
+
+      it('shows two entries', async () => {
+        const entries = await getKnowledgeBaseEntries();
+        expect(entries.length).to.eql(2);
+      });
+
+      it('shows two different authors', async () => {
+        const entries = await getKnowledgeBaseEntries();
+        expect(entries.map(({ author }) => author)).to.eql(['secondary_editor', 'editor']);
+      });
+    });
+  });
+}
diff --git a/x-pack/test/plugin_api_integration/test_suites/task_manager/check_registered_task_types.ts b/x-pack/test/plugin_api_integration/test_suites/task_manager/check_registered_task_types.ts
index 79bdd3ad7df09..091e0fe01e415 100644
--- a/x-pack/test/plugin_api_integration/test_suites/task_manager/check_registered_task_types.ts
+++ b/x-pack/test/plugin_api_integration/test_suites/task_manager/check_registered_task_types.ts
@@ -151,7 +151,6 @@ export default function ({ getService }: FtrProviderContext) {
         'fleet:update_agent_tags:retry',
         'fleet:upgrade_action:retry',
         'logs-data-telemetry',
-        'observabilityAIAssistant:indexQueuedDocumentsTaskType',
         'osquery:telemetry-configs',
         'osquery:telemetry-packs',
         'osquery:telemetry-saved-queries',
diff --git a/x-pack/test/security_api_integration/plugins/features_provider/server/index.ts b/x-pack/test/security_api_integration/plugins/features_provider/server/index.ts
index 646fe327a0015..61100babefea7 100644
--- a/x-pack/test/security_api_integration/plugins/features_provider/server/index.ts
+++ b/x-pack/test/security_api_integration/plugins/features_provider/server/index.ts
@@ -9,8 +9,11 @@ import type { PluginSetupContract as AlertingPluginsSetup } from '@kbn/alerting-
 import { schema } from '@kbn/config-schema';
 import type { CoreSetup, Plugin, PluginInitializer } from '@kbn/core/server';
 import { DEFAULT_APP_CATEGORIES } from '@kbn/core/server';
+import { KibanaFeatureScope } from '@kbn/features-plugin/common';
 import type { FeaturesPluginSetup, FeaturesPluginStart } from '@kbn/features-plugin/server';
 
+import { initRoutes } from './init_routes';
+
 export interface PluginSetupDependencies {
   features: FeaturesPluginSetup;
   alerting: AlertingPluginsSetup;
@@ -23,7 +26,7 @@ export interface PluginStartDependencies {
 export const plugin: PluginInitializer<void, void> = async (): Promise<
   Plugin<void, void, PluginSetupDependencies, PluginStartDependencies>
 > => ({
-  setup: (_: CoreSetup<PluginStartDependencies>, deps: PluginSetupDependencies) => {
+  setup: (core: CoreSetup<PluginStartDependencies>, deps: PluginSetupDependencies) => {
     // Case #1: feature A needs to be renamed to feature B. It's unfortunate, but the existing feature A
     // should be deprecated and re-created as a new feature with the same privileges.
     case1FeatureRename(deps);
@@ -46,6 +49,8 @@ export const plugin: PluginInitializer<void, void> = async (): Promise<
     // * `case_4_feature_b_v2` (new, decoupled from `ab` SO, partially replaces `case_4_feature_b`)
     // * `case_4_feature_c` (new, only for `ab` SO access)
     case4FeatureExtract(deps);
+
+    initRoutes(core);
   },
   start: () => {},
   stop: () => {},
@@ -61,6 +66,7 @@ function case1FeatureRename(deps: PluginSetupDependencies) {
       all: { savedObject: { all: ['one'], read: [] }, ui: ['ui_all'] },
       read: { savedObject: { all: [], read: ['one'] }, ui: ['ui_read'] },
     },
+    scope: [KibanaFeatureScope.Security, KibanaFeatureScope.Spaces],
   };
 
   // Step 2: mark feature A as deprecated and provide proper replacements for all feature and
@@ -96,6 +102,8 @@ function case2FeatureSplit(deps: PluginSetupDependencies) {
   deps.features.registerKibanaFeature({
     deprecated: { notice: 'Case #2 is deprecated.' },
 
+    scope: [KibanaFeatureScope.Security, KibanaFeatureScope.Spaces],
+
     app: ['app_one', 'app_two'],
     catalogue: ['cat_one', 'cat_two'],
     management: { kibana: ['management_one', 'management_two'] },
@@ -139,6 +147,8 @@ function case2FeatureSplit(deps: PluginSetupDependencies) {
       read: {
         savedObject: { all: [], read: ['one', 'two'] },
         ui: ['ui_read_one', 'ui_read_two'],
+        catalogue: ['cat_one', 'cat_two'],
+        app: ['app_one', 'app_two'],
         replacedBy: [
           { feature: 'case_2_feature_b', privileges: ['read'] },
           { feature: 'case_2_feature_c', privileges: ['read'] },
@@ -149,6 +159,8 @@ function case2FeatureSplit(deps: PluginSetupDependencies) {
 
   // Step 2: define new features
   deps.features.registerKibanaFeature({
+    scope: [KibanaFeatureScope.Security, KibanaFeatureScope.Spaces],
+
     category: DEFAULT_APP_CATEGORIES.kibana,
     id: 'case_2_feature_b',
     name: 'Case #2 feature B',
@@ -182,10 +194,14 @@ function case2FeatureSplit(deps: PluginSetupDependencies) {
       read: {
         savedObject: { all: [], read: ['one'] },
         ui: ['ui_read_one'],
+        catalogue: ['cat_one'],
+        app: ['app_one'],
       },
     },
   });
   deps.features.registerKibanaFeature({
+    scope: [KibanaFeatureScope.Security, KibanaFeatureScope.Spaces],
+
     category: DEFAULT_APP_CATEGORIES.kibana,
     id: 'case_2_feature_c',
     name: 'Case #2 feature C',
@@ -219,6 +235,8 @@ function case2FeatureSplit(deps: PluginSetupDependencies) {
       read: {
         savedObject: { all: [], read: ['two'] },
         ui: ['ui_read_two'],
+        app: ['app_two'],
+        catalogue: ['cat_two'],
       },
     },
   });
@@ -249,6 +267,8 @@ function case3FeatureSplitSubFeature(deps: PluginSetupDependencies) {
   deps.features.registerKibanaFeature({
     deprecated: { notice: 'Case #3 is deprecated.' },
 
+    scope: [KibanaFeatureScope.Security, KibanaFeatureScope.Spaces],
+
     category: DEFAULT_APP_CATEGORIES.kibana,
     id: 'case_3_feature_a',
     name: 'Case #3 feature A (DEPRECATED)',
@@ -275,6 +295,8 @@ function case3FeatureSplitSubFeature(deps: PluginSetupDependencies) {
 
   // Step 2: Create a new feature with the desired privileges structure.
   deps.features.registerKibanaFeature({
+    scope: [KibanaFeatureScope.Security, KibanaFeatureScope.Spaces],
+
     category: DEFAULT_APP_CATEGORIES.kibana,
     id: 'case_3_feature_a_v2',
     name: 'Case #3 feature A',
@@ -324,6 +346,8 @@ function case4FeatureExtract(deps: PluginSetupDependencies) {
     deps.features.registerKibanaFeature({
       deprecated: { notice: 'Case #4 is deprecated.' },
 
+      scope: [KibanaFeatureScope.Security, KibanaFeatureScope.Spaces],
+
       category: DEFAULT_APP_CATEGORIES.kibana,
       id: `case_4_feature_${suffix.toLowerCase()}`,
       name: `Case #4 feature ${suffix} (DEPRECATED)`,
@@ -350,6 +374,8 @@ function case4FeatureExtract(deps: PluginSetupDependencies) {
 
     // Step 2: introduce new features (v2) with privileges that don't grant access to `ab`.
     deps.features.registerKibanaFeature({
+      scope: [KibanaFeatureScope.Security, KibanaFeatureScope.Spaces],
+
       category: DEFAULT_APP_CATEGORIES.kibana,
       id: `case_4_feature_${suffix.toLowerCase()}_v2`,
       name: `Case #4 feature ${suffix}`,
@@ -363,6 +389,8 @@ function case4FeatureExtract(deps: PluginSetupDependencies) {
 
   // Step 3: introduce new feature C that only grants access to `ab`.
   deps.features.registerKibanaFeature({
+    scope: [KibanaFeatureScope.Security, KibanaFeatureScope.Spaces],
+
     category: DEFAULT_APP_CATEGORIES.kibana,
     id: 'case_4_feature_c',
     name: 'Case #4 feature C',
diff --git a/x-pack/test/security_api_integration/plugins/features_provider/server/init_routes.ts b/x-pack/test/security_api_integration/plugins/features_provider/server/init_routes.ts
new file mode 100644
index 0000000000000..d58f2f3078a3a
--- /dev/null
+++ b/x-pack/test/security_api_integration/plugins/features_provider/server/init_routes.ts
@@ -0,0 +1,25 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { CoreSetup } from '@kbn/core/server';
+
+import type { PluginStartDependencies } from '.';
+
+export function initRoutes(core: CoreSetup<PluginStartDependencies>) {
+  const router = core.http.createRouter();
+
+  // This route mirrors existing `GET /api/features` route except that it also returns all deprecated features.
+  router.get(
+    { path: '/internal/features_provider/features', validate: false },
+    async (context, request, response) => {
+      const [, pluginDeps] = await core.getStartServices();
+      return response.ok({
+        body: pluginDeps.features.getKibanaFeatures().map((feature) => feature.toRaw()),
+      });
+    }
+  );
+}
diff --git a/x-pack/test/security_api_integration/tests/features/deprecated_features.ts b/x-pack/test/security_api_integration/tests/features/deprecated_features.ts
index 030f5ac704d8b..6e868fc5946ec 100644
--- a/x-pack/test/security_api_integration/tests/features/deprecated_features.ts
+++ b/x-pack/test/security_api_integration/tests/features/deprecated_features.ts
@@ -14,6 +14,7 @@ import type {
   FeatureKibanaPrivilegesReference,
   KibanaFeatureConfig,
 } from '@kbn/features-plugin/common';
+import { KibanaFeatureScope } from '@kbn/features-plugin/common';
 import type { Role } from '@kbn/security-plugin-types-common';
 
 import type { FtrProviderContext } from '../../ftr_provider_context';
@@ -163,11 +164,97 @@ export default function ({ getService }: FtrProviderContext) {
       }
     });
 
+    it('all deprecated features are known', async () => {
+      const { body: features } = await supertest
+        .get('/internal/features_provider/features')
+        .expect(200);
+
+      // **NOTE**: This test is to ensure the AppEx Security team has a chance to review all features marked as
+      // deprecated. If you’re adding a new deprecated feature, make sure to add it to the list below manually or by
+      // running the API integration test locally with the --updateSnapshot flag.
+      expectSnapshot(
+        (features as KibanaFeatureConfig[]).flatMap((f) => (f.deprecated ? [f.id] : [])).sort()
+      ).toMatchInline(`
+        Array [
+          "case_1_feature_a",
+          "case_2_feature_a",
+          "case_3_feature_a",
+          "case_4_feature_a",
+          "case_4_feature_b",
+        ]
+      `);
+    });
+
+    it('all deprecated features are replaced by a single feature only', async () => {
+      const featuresResponse = await supertest
+        .get('/internal/features_provider/features')
+        .expect(200);
+      const features = featuresResponse.body as KibanaFeatureConfig[];
+
+      // **NOTE**: This test ensures that deprecated features displayed in the Space’s feature visibility toggles screen
+      // are only replaced by a single feature. This way, if a feature is toggled off for a particular Space, there
+      // won’t be any ambiguity about which replacement feature should also be toggled off. Currently, we don’t
+      // anticipate having a deprecated feature replaced by more than one feature, so this test is intended to catch
+      // such scenarios early. If there’s a need for a deprecated feature to be replaced by multiple features, please
+      // reach out to the AppEx Security team to discuss how this should affect Space’s feature visibility toggles.
+      const featureIdsThatSupportMultipleReplacements = new Set([
+        'case_2_feature_a',
+        'case_4_feature_a',
+        'case_4_feature_b',
+      ]);
+      for (const feature of features) {
+        if (
+          !feature.deprecated ||
+          !feature.scope?.includes(KibanaFeatureScope.Spaces) ||
+          featureIdsThatSupportMultipleReplacements.has(feature.id)
+        ) {
+          continue;
+        }
+
+        // Collect all feature privileges including the ones provided by sub-features, if any.
+        const allPrivileges = Object.values(feature.privileges ?? {}).concat(
+          feature.subFeatures?.flatMap((subFeature) =>
+            subFeature.privilegeGroups.flatMap(({ privileges }) => privileges)
+          ) ?? []
+        );
+
+        // Collect all features IDs that are referenced by the deprecated feature privileges.
+        const referencedFeaturesIds = new Set();
+        for (const privilege of allPrivileges) {
+          const replacedBy = privilege.replacedBy
+            ? 'default' in privilege.replacedBy
+              ? privilege.replacedBy.default.concat(privilege.replacedBy.minimal)
+              : privilege.replacedBy
+            : [];
+          for (const privilegeReference of replacedBy) {
+            referencedFeaturesIds.add(privilegeReference.feature);
+          }
+        }
+
+        if (referencedFeaturesIds.size > 1) {
+          throw new Error(
+            `Feature "${feature.id}" is deprecated and replaced by more than one feature: ${
+              referencedFeaturesIds.size
+            } features: ${Array.from(referencedFeaturesIds).join(
+              ', '
+            )}. If it's intentional, please contact the AppEx Security team.`
+          );
+        }
+      }
+    });
+
     it('all privileges of the deprecated features should have a proper replacement', async () => {
       // Fetch all features first.
-      const featuresResponse = await supertest.get('/api/features').expect(200);
+      const featuresResponse = await supertest
+        .get('/internal/features_provider/features')
+        .expect(200);
       const features = featuresResponse.body as KibanaFeatureConfig[];
 
+      // Check if the action provided by the deprecated feature is directly replaceable by other
+      // features. The `ui:`-prefixed actions are special since they are prefixed with a feature ID,
+      // and do not need to be replaced like any other privilege actions.
+      const isReplaceableAction = (action: string) => !action.startsWith('ui:');
+
       // Collect all deprecated features.
       const deprecatedFeatures = features.filter((f) => f.deprecated);
       log.info(`Found ${deprecatedFeatures.length} deprecated features.`);
@@ -207,7 +294,10 @@ export default function ({ getService }: FtrProviderContext) {
           );
 
           for (const deprecatedAction of deprecatedActions) {
-            if (!replacementActions.has(deprecatedAction)) {
+            if (
+              isReplaceableAction(deprecatedAction) &&
+              !replacementActions.has(deprecatedAction)
+            ) {
               throw new Error(
                 `Action "${deprecatedAction}" granted by the privilege "${privilegeId}" of the deprecated feature "${feature.id}" is not properly replaced.`
               );
@@ -225,22 +315,23 @@ export default function ({ getService }: FtrProviderContext) {
         .send({ applications: [] })
         .expect(200);
 
-      // Both deprecated and new UI capabilities should be toggled.
+      // Only new UI capabilities should be toggled, deprecated ones should not be present.
       expect(capabilities).toEqual(
         expect.objectContaining({
-          // UI flags from the deprecated feature privilege.
-          case_2_feature_a: {
-            ui_all_one: true,
-            ui_all_two: true,
-            ui_read_one: false,
-            ui_read_two: false,
-          },
-
           // UI flags from the feature privileges that replace deprecated one.
           case_2_feature_b: { ui_all_one: true, ui_read_one: false },
           case_2_feature_c: { ui_all_two: true, ui_read_two: false },
         })
       );
+      for (const deprecatedFeatureId of [
+        'case_1_feature_a',
+        'case_2_feature_a',
+        'case_3_feature_a',
+        'case_4_feature_a',
+        'case_4_feature_b',
+      ]) {
+        expect(capabilities).not.toHaveProperty(deprecatedFeatureId);
+      }
     });
 
     it('Cases privileges are properly handled for deprecated privileges', async () => {
diff --git a/x-pack/test/security_solution_api_integration/package.json b/x-pack/test/security_solution_api_integration/package.json
index 57342fdc264c6..26f8a8ff80695 100644
--- a/x-pack/test/security_solution_api_integration/package.json
+++ b/x-pack/test/security_solution_api_integration/package.json
@@ -36,6 +36,9 @@
     "initialize-server:lists:complete": "node ./scripts/index.js server lists_and_exception_lists trial_license_complete_tier",
     "run-tests:lists:complete": "node ./scripts/index.js runner lists_and_exception_lists trial_license_complete_tier",
 
+    "initialize-server:lists:essentials_only": "node ./scripts/index.js server lists_and_exception_lists essentials_tier",
+    "run-tests:lists:essentials_only": "node ./scripts/index.js runner lists_and_exception_lists essentials_tier",
+
     "initialize-server:edr-workflows": "node ./scripts/index.js server edr_workflows trial_license_complete_tier",
     "run-tests:edr-workflows": "node ./scripts/index.js runner edr_workflows trial_license_complete_tier",
 
@@ -136,6 +139,21 @@
     "edr_workflows:response_actions:server:ess": "npm run initialize-server:edr-workflows response_actions ess",
     "edr_workflows:response_actions:runner:ess": "npm run run-tests:edr-workflows response_actions ess essEnv",
 
+    "exception_lists:auth:lists:server:serverless": "npm run initialize-server:lists:essentials_only authorization/exceptions/lists serverless",
+    "exception_lists:auth:lists:runner:serverless": "npm run run-tests:lists:essentials_only authorization/exceptions/lists serverless serverlessEnv",
+    "exception_lists:auth:lists:qa:serverless": "npm run run-tests:lists:essentials_only authorization/exceptions/lists serverless qaPeriodicEnv",
+    "exception_lists:auth:lists:qa:serverless:release": "npm run run-tests:lists:essentials_only authorization/exceptions/lists serverless qaEnv",
+
+    "exception_lists:auth:common:server:serverless": "npm run initialize-server:lists:essentials_only authorization/exceptions/common serverless",
+    "exception_lists:auth:common:runner:serverless": "npm run run-tests:lists:essentials_only authorization/exceptions/common serverless serverlessEnv",
+    "exception_lists:auth:common:qa:serverless": "npm run run-tests:lists:essentials_only authorization/exceptions/common serverless qaPeriodicEnv",
+    "exception_lists:auth:common:qa:serverless:release": "npm run run-tests:lists:essentials_only authorization/exceptions/common serverless qaEnv",
+
+    "exception_lists:auth:items:server:serverless": "npm run initialize-server:lists:essentials_only authorization/exceptions/items serverless",
+    "exception_lists:auth:items:runner:serverless": "npm run run-tests:lists:essentials_only authorization/exceptions/items serverless serverlessEnv",
+    "exception_lists:auth:items:qa:serverless": "npm run run-tests:lists:essentials_only authorization/exceptions/items serverless qaPeriodicEnv",
+    "exception_lists:auth:items:qa:serverless:release": "npm run run-tests:lists:essentials_only authorization/exceptions/items serverless qaEnv",
+
     "exception_lists_items:server:serverless": "npm run initialize-server:lists:complete exception_lists_items serverless",
     "exception_lists_items:runner:serverless": "npm run run-tests:lists:complete exception_lists_items serverless serverlessEnv",
     "exception_lists_items:qa:serverless": "npm run run-tests:lists:complete exception_lists_items serverless qaPeriodicEnv",
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/utils/rules/prebuilt_rules/delete_endpoint_fleet_package.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/utils/rules/prebuilt_rules/delete_endpoint_fleet_package.ts
index e53e24f98de3b..cea8363d9085c 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/utils/rules/prebuilt_rules/delete_endpoint_fleet_package.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/utils/rules/prebuilt_rules/delete_endpoint_fleet_package.ts
@@ -21,9 +21,9 @@ export async function deleteEndpointFleetPackage(supertest: SuperTest.Agent) {
     .set('elastic-api-version', '2023-10-31')
     .send();
 
-  if (resp.status === 200 && resp.body.response.status === 'installed') {
+  if (resp.status === 200 && resp.body.item.status === 'installed') {
     await supertest
-      .delete(epmRouteService.getRemovePath(ENDPOINT_PACKAGE_NAME, resp.body.response.version))
+      .delete(epmRouteService.getRemovePath(ENDPOINT_PACKAGE_NAME, resp.body.item.version))
       .set('kbn-xsrf', 'true')
       .send({ force: true });
   }
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/utils/rules/prebuilt_rules/delete_prebuilt_rules_fleet_package.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/utils/rules/prebuilt_rules/delete_prebuilt_rules_fleet_package.ts
index 930c9d39757f4..084d59c55df0d 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/utils/rules/prebuilt_rules/delete_prebuilt_rules_fleet_package.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/utils/rules/prebuilt_rules/delete_prebuilt_rules_fleet_package.ts
@@ -21,11 +21,9 @@ export async function deletePrebuiltRulesFleetPackage(supertest: SuperTest.Agent
     .set('elastic-api-version', '2023-10-31')
     .send();
 
-  if (resp.status === 200 && resp.body.response.status === 'installed') {
+  if (resp.status === 200 && resp.body.item.status === 'installed') {
     await supertest
-      .delete(
-        epmRouteService.getRemovePath(PREBUILT_RULES_PACKAGE_NAME, resp.body.response.version)
-      )
+      .delete(epmRouteService.getRemovePath(PREBUILT_RULES_PACKAGE_NAME, resp.body.item.version))
       .set('kbn-xsrf', 'true')
       .send({ force: true });
   }
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/admin.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/admin.ts
new file mode 100644
index 0000000000000..a9deaeccc00ba
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/admin.ts
@@ -0,0 +1,111 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import TestAgent from 'supertest/lib/agent';
+import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import {
+  getCreateExceptionListDetectionSchemaMock,
+  getCreateExceptionListMinimalSchemaMock,
+} from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import {
+  getImportExceptionsListItemSchemaMock,
+  getImportExceptionsListSchemaMock,
+  toNdJsonString,
+} from '@kbn/lists-plugin/common/schemas/request/import_exceptions_schema.mock';
+import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+import { deleteAllExceptions } from '../../../../utils';
+
+export default ({ getService }: FtrProviderContext): void => {
+  const log = getService('log');
+  const utils = getService('securitySolutionUtils');
+
+  let admin: TestAgent;
+
+  describe('@serverless @serverlessQA admin exception list and item API behaviors', () => {
+    before(async () => {
+      admin = await utils.createSuperTest('admin');
+      await deleteAllExceptions(admin, log);
+    });
+
+    afterEach(async () => {
+      await deleteAllExceptions(admin, log);
+    });
+
+    describe('duplicate exception list', () => {
+      it('should return 200 for admin', async () => {
+        // create an exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListDetectionSchemaMock())
+          .expect(200);
+
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send({
+            ...getCreateExceptionListItemMinimalSchemaMock(),
+            list_id: getCreateExceptionListDetectionSchemaMock().list_id,
+          })
+          .expect(200);
+
+        await admin
+          .post(
+            `${EXCEPTION_LIST_URL}/_duplicate?list_id=${
+              getCreateExceptionListDetectionSchemaMock().list_id
+            }&namespace_type=single&include_expired_exceptions=true`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('export exception list', () => {
+      it('should return 200 for admin', async () => {
+        const { body } = await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        await admin
+          .post(
+            `${EXCEPTION_LIST_URL}/_export?id=${body.id}&list_id=${body.list_id}&namespace_type=single&include_expired_exceptions=true`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('import exception list', () => {
+      it('should return 200 for admin', async () => {
+        await admin
+          .post(`${EXCEPTION_LIST_URL}/_import?overwrite=true`)
+          .set('kbn-xsrf', 'true')
+          .attach(
+            'file',
+            Buffer.from(
+              toNdJsonString([
+                getImportExceptionsListSchemaMock('test_list_id'),
+                getImportExceptionsListItemSchemaMock('test_item_id', 'test_list_id'),
+              ])
+            ),
+            'exceptions.ndjson'
+          )
+          .expect('Content-Type', 'application/json; charset=utf-8')
+          .expect(200);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/configs/serverless.config.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/configs/serverless.config.ts
new file mode 100644
index 0000000000000..2fcd8d232299f
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/configs/serverless.config.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { createTestConfig } from '../../../../../../../config/serverless/config.base.essentials';
+
+export default createTestConfig({
+  testFiles: [require.resolve('..')],
+  junit: {
+    reportName:
+      'Detection Engine - Exception List and Items Authentication Tests - Serverless Env - Essentials Tier',
+  },
+});
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/editor.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/editor.ts
new file mode 100644
index 0000000000000..b136ba3cd5e86
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/editor.ts
@@ -0,0 +1,113 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import TestAgent from 'supertest/lib/agent';
+import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import {
+  getCreateExceptionListDetectionSchemaMock,
+  getCreateExceptionListMinimalSchemaMock,
+} from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import {
+  getImportExceptionsListItemSchemaMock,
+  getImportExceptionsListSchemaMock,
+  toNdJsonString,
+} from '@kbn/lists-plugin/common/schemas/request/import_exceptions_schema.mock';
+import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+import { deleteAllExceptions } from '../../../../utils';
+
+export default ({ getService }: FtrProviderContext): void => {
+  const log = getService('log');
+  const utils = getService('securitySolutionUtils');
+
+  let admin: TestAgent;
+  let editor: TestAgent;
+
+  describe('@serverless @serverlessQA editor exception list and item API behaviors', () => {
+    before(async () => {
+      admin = await utils.createSuperTest('admin');
+      editor = await utils.createSuperTest('editor');
+      await deleteAllExceptions(admin, log);
+    });
+
+    afterEach(async () => {
+      await deleteAllExceptions(admin, log);
+    });
+
+    describe('duplicate exception list', () => {
+      it('should return 200 for editor', async () => {
+        // create an exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListDetectionSchemaMock())
+          .expect(200);
+
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send({
+            ...getCreateExceptionListItemMinimalSchemaMock(),
+            list_id: getCreateExceptionListDetectionSchemaMock().list_id,
+          })
+          .expect(200);
+
+        await editor
+          .post(
+            `${EXCEPTION_LIST_URL}/_duplicate?list_id=${
+              getCreateExceptionListDetectionSchemaMock().list_id
+            }&namespace_type=single&include_expired_exceptions=true`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('export exception list', () => {
+      it('should return 200 for editor', async () => {
+        const { body } = await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        await editor
+          .post(
+            `${EXCEPTION_LIST_URL}/_export?id=${body.id}&list_id=${body.list_id}&namespace_type=single&include_expired_exceptions=true`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('import exception list', () => {
+      it('should return 200 for editor', async () => {
+        await editor
+          .post(`${EXCEPTION_LIST_URL}/_import?overwrite=true`)
+          .set('kbn-xsrf', 'true')
+          .attach(
+            'file',
+            Buffer.from(
+              toNdJsonString([
+                getImportExceptionsListSchemaMock('test_list_id'),
+                getImportExceptionsListItemSchemaMock('test_item_id', 'test_list_id'),
+              ])
+            ),
+            'exceptions.ndjson'
+          )
+          .expect('Content-Type', 'application/json; charset=utf-8')
+          .expect(200);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/endpoint_operations_analyst.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/endpoint_operations_analyst.ts
new file mode 100644
index 0000000000000..98b0ac438c513
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/endpoint_operations_analyst.ts
@@ -0,0 +1,113 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import TestAgent from 'supertest/lib/agent';
+import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import {
+  getCreateExceptionListDetectionSchemaMock,
+  getCreateExceptionListMinimalSchemaMock,
+} from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import {
+  getImportExceptionsListItemSchemaMock,
+  getImportExceptionsListSchemaMock,
+  toNdJsonString,
+} from '@kbn/lists-plugin/common/schemas/request/import_exceptions_schema.mock';
+import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+import { deleteAllExceptions } from '../../../../utils';
+
+export default ({ getService }: FtrProviderContext): void => {
+  const log = getService('log');
+  const utils = getService('securitySolutionUtils');
+
+  let admin: TestAgent;
+  let endpointOperationsAnalyst: TestAgent;
+
+  describe('@serverless @serverlessQA endpoint_operations_analyst exception list and item API behaviors', () => {
+    before(async () => {
+      admin = await utils.createSuperTest('admin');
+      endpointOperationsAnalyst = await utils.createSuperTest('endpoint_operations_analyst');
+      await deleteAllExceptions(admin, log);
+    });
+
+    afterEach(async () => {
+      await deleteAllExceptions(admin, log);
+    });
+
+    describe('duplicate exception list', () => {
+      it('should return 200 for endpoint_operations_analyst', async () => {
+        // create an exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListDetectionSchemaMock())
+          .expect(200);
+
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send({
+            ...getCreateExceptionListItemMinimalSchemaMock(),
+            list_id: getCreateExceptionListDetectionSchemaMock().list_id,
+          })
+          .expect(200);
+
+        await endpointOperationsAnalyst
+          .post(
+            `${EXCEPTION_LIST_URL}/_duplicate?list_id=${
+              getCreateExceptionListDetectionSchemaMock().list_id
+            }&namespace_type=single&include_expired_exceptions=true`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('export exception list', () => {
+      it('should return 200 for endpoint_operations_analyst', async () => {
+        const { body } = await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        await endpointOperationsAnalyst
+          .post(
+            `${EXCEPTION_LIST_URL}/_export?id=${body.id}&list_id=${body.list_id}&namespace_type=single&include_expired_exceptions=true`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('import exception list', () => {
+      it('should return 200 for endpoint_operations_analyst', async () => {
+        await endpointOperationsAnalyst
+          .post(`${EXCEPTION_LIST_URL}/_import?overwrite=true`)
+          .set('kbn-xsrf', 'true')
+          .attach(
+            'file',
+            Buffer.from(
+              toNdJsonString([
+                getImportExceptionsListSchemaMock('test_list_id'),
+                getImportExceptionsListItemSchemaMock('test_item_id', 'test_list_id'),
+              ])
+            ),
+            'exceptions.ndjson'
+          )
+          .expect('Content-Type', 'application/json; charset=utf-8')
+          .expect(200);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/endpoint_policy_manager.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/endpoint_policy_manager.ts
new file mode 100644
index 0000000000000..697c08055bc95
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/endpoint_policy_manager.ts
@@ -0,0 +1,113 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import TestAgent from 'supertest/lib/agent';
+import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import {
+  getCreateExceptionListDetectionSchemaMock,
+  getCreateExceptionListMinimalSchemaMock,
+} from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import {
+  getImportExceptionsListItemSchemaMock,
+  getImportExceptionsListSchemaMock,
+  toNdJsonString,
+} from '@kbn/lists-plugin/common/schemas/request/import_exceptions_schema.mock';
+import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+import { deleteAllExceptions } from '../../../../utils';
+
+export default ({ getService }: FtrProviderContext): void => {
+  const log = getService('log');
+  const utils = getService('securitySolutionUtils');
+
+  let admin: TestAgent;
+  let endpointPolicyManager: TestAgent;
+
+  describe('@serverless @serverlessQA endpoint_policy_manager exception list and item API behaviors', () => {
+    before(async () => {
+      admin = await utils.createSuperTest('admin');
+      endpointPolicyManager = await utils.createSuperTest('endpoint_policy_manager');
+      await deleteAllExceptions(admin, log);
+    });
+
+    afterEach(async () => {
+      await deleteAllExceptions(admin, log);
+    });
+
+    describe('duplicate exception list', () => {
+      it('should return 200 for endpoint_policy_manager', async () => {
+        // create an exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListDetectionSchemaMock())
+          .expect(200);
+
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send({
+            ...getCreateExceptionListItemMinimalSchemaMock(),
+            list_id: getCreateExceptionListDetectionSchemaMock().list_id,
+          })
+          .expect(200);
+
+        await endpointPolicyManager
+          .post(
+            `${EXCEPTION_LIST_URL}/_duplicate?list_id=${
+              getCreateExceptionListDetectionSchemaMock().list_id
+            }&namespace_type=single&include_expired_exceptions=true`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('export exception list', () => {
+      it('should return 200 for endpoint_policy_manager', async () => {
+        const { body } = await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        await endpointPolicyManager
+          .post(
+            `${EXCEPTION_LIST_URL}/_export?id=${body.id}&list_id=${body.list_id}&namespace_type=single&include_expired_exceptions=true`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('import exception list', () => {
+      it('should return 200 for endpoint_policy_manager', async () => {
+        await endpointPolicyManager
+          .post(`${EXCEPTION_LIST_URL}/_import?overwrite=true`)
+          .set('kbn-xsrf', 'true')
+          .attach(
+            'file',
+            Buffer.from(
+              toNdJsonString([
+                getImportExceptionsListSchemaMock('test_list_id'),
+                getImportExceptionsListItemSchemaMock('test_item_id', 'test_list_id'),
+              ])
+            ),
+            'exceptions.ndjson'
+          )
+          .expect('Content-Type', 'application/json; charset=utf-8')
+          .expect(200);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/index.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/index.ts
new file mode 100644
index 0000000000000..272ba9e4ffa5f
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/index.ts
@@ -0,0 +1,24 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+
+export default function ({ loadTestFile }: FtrProviderContext) {
+  describe('Exception list and items APIs Authentication - Complete Tier', function () {
+    loadTestFile(require.resolve('./tier_1_analyst'));
+    loadTestFile(require.resolve('./tier_2_analyst'));
+    loadTestFile(require.resolve('./threat_intel_analyst'));
+    loadTestFile(require.resolve('./tier_3_analyst'));
+    loadTestFile(require.resolve('./viewer'));
+    loadTestFile(require.resolve('./rule_author'));
+    loadTestFile(require.resolve('./soc_manager'));
+    loadTestFile(require.resolve('./endpoint_operations_analyst'));
+    loadTestFile(require.resolve('./endpoint_policy_manager'));
+    loadTestFile(require.resolve('./platform_engineer'));
+    loadTestFile(require.resolve('./editor'));
+    loadTestFile(require.resolve('./admin'));
+  });
+}
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/platform_engineer.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/platform_engineer.ts
new file mode 100644
index 0000000000000..7168027c45025
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/platform_engineer.ts
@@ -0,0 +1,113 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import TestAgent from 'supertest/lib/agent';
+import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import {
+  getCreateExceptionListDetectionSchemaMock,
+  getCreateExceptionListMinimalSchemaMock,
+} from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import {
+  getImportExceptionsListItemSchemaMock,
+  getImportExceptionsListSchemaMock,
+  toNdJsonString,
+} from '@kbn/lists-plugin/common/schemas/request/import_exceptions_schema.mock';
+import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+import { deleteAllExceptions } from '../../../../utils';
+
+export default ({ getService }: FtrProviderContext): void => {
+  const log = getService('log');
+  const utils = getService('securitySolutionUtils');
+
+  let admin: TestAgent;
+  let platformEngineer: TestAgent;
+
+  describe('@serverless @serverlessQA platform_engineer exception list and item API behaviors', () => {
+    before(async () => {
+      admin = await utils.createSuperTest('admin');
+      platformEngineer = await utils.createSuperTest('platform_engineer');
+      await deleteAllExceptions(admin, log);
+    });
+
+    afterEach(async () => {
+      await deleteAllExceptions(admin, log);
+    });
+
+    describe('duplicate exception list', () => {
+      it('should return 200 for platform_engineer', async () => {
+        // create an exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListDetectionSchemaMock())
+          .expect(200);
+
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send({
+            ...getCreateExceptionListItemMinimalSchemaMock(),
+            list_id: getCreateExceptionListDetectionSchemaMock().list_id,
+          })
+          .expect(200);
+
+        await platformEngineer
+          .post(
+            `${EXCEPTION_LIST_URL}/_duplicate?list_id=${
+              getCreateExceptionListDetectionSchemaMock().list_id
+            }&namespace_type=single&include_expired_exceptions=true`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('export exception list', () => {
+      it('should return 200 for platform_engineer', async () => {
+        const { body } = await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        await platformEngineer
+          .post(
+            `${EXCEPTION_LIST_URL}/_export?id=${body.id}&list_id=${body.list_id}&namespace_type=single&include_expired_exceptions=true`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('import exception list', () => {
+      it('should return 200 for platform_engineer', async () => {
+        await platformEngineer
+          .post(`${EXCEPTION_LIST_URL}/_import?overwrite=true`)
+          .set('kbn-xsrf', 'true')
+          .attach(
+            'file',
+            Buffer.from(
+              toNdJsonString([
+                getImportExceptionsListSchemaMock('test_list_id'),
+                getImportExceptionsListItemSchemaMock('test_item_id', 'test_list_id'),
+              ])
+            ),
+            'exceptions.ndjson'
+          )
+          .expect('Content-Type', 'application/json; charset=utf-8')
+          .expect(200);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/rule_author.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/rule_author.ts
new file mode 100644
index 0000000000000..d7f164d2d0fcf
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/rule_author.ts
@@ -0,0 +1,113 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import TestAgent from 'supertest/lib/agent';
+import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import {
+  getCreateExceptionListDetectionSchemaMock,
+  getCreateExceptionListMinimalSchemaMock,
+} from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import {
+  getImportExceptionsListItemSchemaMock,
+  getImportExceptionsListSchemaMock,
+  toNdJsonString,
+} from '@kbn/lists-plugin/common/schemas/request/import_exceptions_schema.mock';
+import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+import { deleteAllExceptions } from '../../../../utils';
+
+export default ({ getService }: FtrProviderContext): void => {
+  const log = getService('log');
+  const utils = getService('securitySolutionUtils');
+
+  let admin: TestAgent;
+  let ruleAuthor: TestAgent;
+
+  describe('@serverless @serverlessQA rule_author exception list and item API behaviors', () => {
+    before(async () => {
+      admin = await utils.createSuperTest('admin');
+      ruleAuthor = await utils.createSuperTest('rule_author');
+      await deleteAllExceptions(admin, log);
+    });
+
+    afterEach(async () => {
+      await deleteAllExceptions(admin, log);
+    });
+
+    describe('duplicate exception list', () => {
+      it('should return 200 for rule_author', async () => {
+        // create an exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListDetectionSchemaMock())
+          .expect(200);
+
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send({
+            ...getCreateExceptionListItemMinimalSchemaMock(),
+            list_id: getCreateExceptionListDetectionSchemaMock().list_id,
+          })
+          .expect(200);
+
+        await ruleAuthor
+          .post(
+            `${EXCEPTION_LIST_URL}/_duplicate?list_id=${
+              getCreateExceptionListDetectionSchemaMock().list_id
+            }&namespace_type=single&include_expired_exceptions=true`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('export exception list', () => {
+      it('should return 200 for rule_author', async () => {
+        const { body } = await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        await ruleAuthor
+          .post(
+            `${EXCEPTION_LIST_URL}/_export?id=${body.id}&list_id=${body.list_id}&namespace_type=single&include_expired_exceptions=true`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('import exception list', () => {
+      it('should return 200 for rule_author', async () => {
+        await ruleAuthor
+          .post(`${EXCEPTION_LIST_URL}/_import?overwrite=true`)
+          .set('kbn-xsrf', 'true')
+          .attach(
+            'file',
+            Buffer.from(
+              toNdJsonString([
+                getImportExceptionsListSchemaMock('test_list_id'),
+                getImportExceptionsListItemSchemaMock('test_item_id', 'test_list_id'),
+              ])
+            ),
+            'exceptions.ndjson'
+          )
+          .expect('Content-Type', 'application/json; charset=utf-8')
+          .expect(200);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/soc_manager.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/soc_manager.ts
new file mode 100644
index 0000000000000..1c94880578d2c
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/soc_manager.ts
@@ -0,0 +1,113 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import TestAgent from 'supertest/lib/agent';
+import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import {
+  getCreateExceptionListDetectionSchemaMock,
+  getCreateExceptionListMinimalSchemaMock,
+} from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import {
+  getImportExceptionsListItemSchemaMock,
+  getImportExceptionsListSchemaMock,
+  toNdJsonString,
+} from '@kbn/lists-plugin/common/schemas/request/import_exceptions_schema.mock';
+import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+import { deleteAllExceptions } from '../../../../utils';
+
+export default ({ getService }: FtrProviderContext): void => {
+  const log = getService('log');
+  const utils = getService('securitySolutionUtils');
+
+  let admin: TestAgent;
+  let socManager: TestAgent;
+
+  describe('@serverless @serverlessQA soc_manager exception list and item API behaviors', () => {
+    before(async () => {
+      admin = await utils.createSuperTest('admin');
+      socManager = await utils.createSuperTest('soc_manager');
+      await deleteAllExceptions(admin, log);
+    });
+
+    afterEach(async () => {
+      await deleteAllExceptions(admin, log);
+    });
+
+    describe('duplicate exception list', () => {
+      it('should return 200 for soc_manager', async () => {
+        // create an exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListDetectionSchemaMock())
+          .expect(200);
+
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send({
+            ...getCreateExceptionListItemMinimalSchemaMock(),
+            list_id: getCreateExceptionListDetectionSchemaMock().list_id,
+          })
+          .expect(200);
+
+        await socManager
+          .post(
+            `${EXCEPTION_LIST_URL}/_duplicate?list_id=${
+              getCreateExceptionListDetectionSchemaMock().list_id
+            }&namespace_type=single&include_expired_exceptions=true`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('export exception list', () => {
+      it('should return 200 for soc_manager', async () => {
+        const { body } = await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        await socManager
+          .post(
+            `${EXCEPTION_LIST_URL}/_export?id=${body.id}&list_id=${body.list_id}&namespace_type=single&include_expired_exceptions=true`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('import exception list', () => {
+      it('should return 200 for soc_manager', async () => {
+        await socManager
+          .post(`${EXCEPTION_LIST_URL}/_import?overwrite=true`)
+          .set('kbn-xsrf', 'true')
+          .attach(
+            'file',
+            Buffer.from(
+              toNdJsonString([
+                getImportExceptionsListSchemaMock('test_list_id'),
+                getImportExceptionsListItemSchemaMock('test_item_id', 'test_list_id'),
+              ])
+            ),
+            'exceptions.ndjson'
+          )
+          .expect('Content-Type', 'application/json; charset=utf-8')
+          .expect(200);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/threat_intel_analyst.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/threat_intel_analyst.ts
new file mode 100644
index 0000000000000..6c4d6b4118950
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/threat_intel_analyst.ts
@@ -0,0 +1,113 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import TestAgent from 'supertest/lib/agent';
+import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import {
+  getCreateExceptionListDetectionSchemaMock,
+  getCreateExceptionListMinimalSchemaMock,
+} from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import {
+  getImportExceptionsListItemSchemaMock,
+  getImportExceptionsListSchemaMock,
+  toNdJsonString,
+} from '@kbn/lists-plugin/common/schemas/request/import_exceptions_schema.mock';
+import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+import { deleteAllExceptions } from '../../../../utils';
+
+export default ({ getService }: FtrProviderContext): void => {
+  const log = getService('log');
+  const utils = getService('securitySolutionUtils');
+
+  let admin: TestAgent;
+  let threatIntelAnalyst: TestAgent;
+
+  describe('@serverless @serverlessQA threat_intelligence_analyst exception list and item API behaviors', () => {
+    before(async () => {
+      admin = await utils.createSuperTest('admin');
+      threatIntelAnalyst = await utils.createSuperTest('threat_intelligence_analyst');
+      await deleteAllExceptions(admin, log);
+    });
+
+    afterEach(async () => {
+      await deleteAllExceptions(admin, log);
+    });
+
+    describe('duplicate exception list', () => {
+      it('should return 200 for threat_intelligence_analyst', async () => {
+        // create an exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListDetectionSchemaMock())
+          .expect(200);
+
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send({
+            ...getCreateExceptionListItemMinimalSchemaMock(),
+            list_id: getCreateExceptionListDetectionSchemaMock().list_id,
+          })
+          .expect(200);
+
+        await threatIntelAnalyst
+          .post(
+            `${EXCEPTION_LIST_URL}/_duplicate?list_id=${
+              getCreateExceptionListDetectionSchemaMock().list_id
+            }&namespace_type=single&include_expired_exceptions=true`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('export exception list', () => {
+      it('should return 200 for threat_intelligence_analyst', async () => {
+        const { body } = await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        await threatIntelAnalyst
+          .post(
+            `${EXCEPTION_LIST_URL}/_export?id=${body.id}&list_id=${body.list_id}&namespace_type=single&include_expired_exceptions=true`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('import exception list', () => {
+      it('should return 200 for threat_intelligence_analyst', async () => {
+        await threatIntelAnalyst
+          .post(`${EXCEPTION_LIST_URL}/_import?overwrite=true`)
+          .set('kbn-xsrf', 'true')
+          .attach(
+            'file',
+            Buffer.from(
+              toNdJsonString([
+                getImportExceptionsListSchemaMock('test_list_id'),
+                getImportExceptionsListItemSchemaMock('test_item_id', 'test_list_id'),
+              ])
+            ),
+            'exceptions.ndjson'
+          )
+          .expect('Content-Type', 'application/json; charset=utf-8')
+          .expect(200);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/tier_1_analyst.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/tier_1_analyst.ts
new file mode 100644
index 0000000000000..f319b7a05ce5d
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/tier_1_analyst.ts
@@ -0,0 +1,113 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import TestAgent from 'supertest/lib/agent';
+import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import {
+  getCreateExceptionListDetectionSchemaMock,
+  getCreateExceptionListMinimalSchemaMock,
+} from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import {
+  getImportExceptionsListItemSchemaMock,
+  getImportExceptionsListSchemaMock,
+  toNdJsonString,
+} from '@kbn/lists-plugin/common/schemas/request/import_exceptions_schema.mock';
+import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+import { deleteAllExceptions } from '../../../../utils';
+
+export default ({ getService }: FtrProviderContext): void => {
+  const log = getService('log');
+  const utils = getService('securitySolutionUtils');
+
+  let admin: TestAgent;
+  let t1Analyst: TestAgent;
+
+  describe('@serverless @serverlessQA t1_analyst exception list and item API behaviors', () => {
+    before(async () => {
+      admin = await utils.createSuperTest('admin');
+      t1Analyst = await utils.createSuperTest('t1_analyst');
+      await deleteAllExceptions(admin, log);
+    });
+
+    afterEach(async () => {
+      await deleteAllExceptions(admin, log);
+    });
+
+    describe('duplicate exception list', () => {
+      it('should return 403 for t1_analyst', async () => {
+        // create an exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListDetectionSchemaMock())
+          .expect(200);
+
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send({
+            ...getCreateExceptionListItemMinimalSchemaMock(),
+            list_id: getCreateExceptionListDetectionSchemaMock().list_id,
+          })
+          .expect(200);
+
+        await t1Analyst
+          .post(
+            `${EXCEPTION_LIST_URL}/_duplicate?list_id=${
+              getCreateExceptionListDetectionSchemaMock().list_id
+            }&namespace_type=single&include_expired_exceptions=true`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(403);
+      });
+    });
+
+    describe('export exception list', () => {
+      it('should return 200 for t1_analyst', async () => {
+        const { body } = await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        await t1Analyst
+          .post(
+            `${EXCEPTION_LIST_URL}/_export?id=${body.id}&list_id=${body.list_id}&namespace_type=single&include_expired_exceptions=true`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('import exception list', () => {
+      it('should return 403 for t1_analyst', async () => {
+        await t1Analyst
+          .post(`${EXCEPTION_LIST_URL}/_import?overwrite=true`)
+          .set('kbn-xsrf', 'true')
+          .attach(
+            'file',
+            Buffer.from(
+              toNdJsonString([
+                getImportExceptionsListSchemaMock('test_list_id'),
+                getImportExceptionsListItemSchemaMock('test_item_id', 'test_list_id'),
+              ])
+            ),
+            'exceptions.ndjson'
+          )
+          .expect('Content-Type', 'application/json; charset=utf-8')
+          .expect(403);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/tier_2_analyst.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/tier_2_analyst.ts
new file mode 100644
index 0000000000000..5a2fdda17c018
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/tier_2_analyst.ts
@@ -0,0 +1,113 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import TestAgent from 'supertest/lib/agent';
+import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import {
+  getCreateExceptionListDetectionSchemaMock,
+  getCreateExceptionListMinimalSchemaMock,
+} from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import {
+  getImportExceptionsListItemSchemaMock,
+  getImportExceptionsListSchemaMock,
+  toNdJsonString,
+} from '@kbn/lists-plugin/common/schemas/request/import_exceptions_schema.mock';
+import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+import { deleteAllExceptions } from '../../../../utils';
+
+export default ({ getService }: FtrProviderContext): void => {
+  const log = getService('log');
+  const utils = getService('securitySolutionUtils');
+
+  let admin: TestAgent;
+  let t2Analyst: TestAgent;
+
+  describe('@serverless @serverlessQA t2_analyst exception list and item API behaviors', () => {
+    before(async () => {
+      admin = await utils.createSuperTest('admin');
+      t2Analyst = await utils.createSuperTest('t2_analyst');
+      await deleteAllExceptions(admin, log);
+    });
+
+    afterEach(async () => {
+      await deleteAllExceptions(admin, log);
+    });
+
+    describe('duplicate exception list', () => {
+      it('should return 403 for t2_analyst', async () => {
+        // create an exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListDetectionSchemaMock())
+          .expect(200);
+
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send({
+            ...getCreateExceptionListItemMinimalSchemaMock(),
+            list_id: getCreateExceptionListDetectionSchemaMock().list_id,
+          })
+          .expect(200);
+
+        await t2Analyst
+          .post(
+            `${EXCEPTION_LIST_URL}/_duplicate?list_id=${
+              getCreateExceptionListDetectionSchemaMock().list_id
+            }&namespace_type=single&include_expired_exceptions=true`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(403);
+      });
+    });
+
+    describe('export exception list', () => {
+      it('should return 200 for t2_analyst', async () => {
+        const { body } = await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        await t2Analyst
+          .post(
+            `${EXCEPTION_LIST_URL}/_export?id=${body.id}&list_id=${body.list_id}&namespace_type=single&include_expired_exceptions=true`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('import exception list', () => {
+      it('should return 403 for t2_analyst', async () => {
+        await t2Analyst
+          .post(`${EXCEPTION_LIST_URL}/_import?overwrite=true`)
+          .set('kbn-xsrf', 'true')
+          .attach(
+            'file',
+            Buffer.from(
+              toNdJsonString([
+                getImportExceptionsListSchemaMock('test_list_id'),
+                getImportExceptionsListItemSchemaMock('test_item_id', 'test_list_id'),
+              ])
+            ),
+            'exceptions.ndjson'
+          )
+          .expect('Content-Type', 'application/json; charset=utf-8')
+          .expect(403);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/tier_3_analyst.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/tier_3_analyst.ts
new file mode 100644
index 0000000000000..16c043239effb
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/tier_3_analyst.ts
@@ -0,0 +1,113 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import TestAgent from 'supertest/lib/agent';
+import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import {
+  getCreateExceptionListDetectionSchemaMock,
+  getCreateExceptionListMinimalSchemaMock,
+} from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import {
+  getImportExceptionsListItemSchemaMock,
+  getImportExceptionsListSchemaMock,
+  toNdJsonString,
+} from '@kbn/lists-plugin/common/schemas/request/import_exceptions_schema.mock';
+import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+import { deleteAllExceptions } from '../../../../utils';
+
+export default ({ getService }: FtrProviderContext): void => {
+  const log = getService('log');
+  const utils = getService('securitySolutionUtils');
+
+  let admin: TestAgent;
+  let t3Analyst: TestAgent;
+
+  describe('@serverless @serverlessQA t3_analyst exception list and item API behaviors', () => {
+    before(async () => {
+      admin = await utils.createSuperTest('admin');
+      t3Analyst = await utils.createSuperTest('t3_analyst');
+      await deleteAllExceptions(admin, log);
+    });
+
+    afterEach(async () => {
+      await deleteAllExceptions(admin, log);
+    });
+
+    describe('duplicate exception list', () => {
+      it('should return 200 for t3_analyst', async () => {
+        // create an exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListDetectionSchemaMock())
+          .expect(200);
+
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send({
+            ...getCreateExceptionListItemMinimalSchemaMock(),
+            list_id: getCreateExceptionListDetectionSchemaMock().list_id,
+          })
+          .expect(200);
+
+        await t3Analyst
+          .post(
+            `${EXCEPTION_LIST_URL}/_duplicate?list_id=${
+              getCreateExceptionListDetectionSchemaMock().list_id
+            }&namespace_type=single&include_expired_exceptions=true`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('export exception list', () => {
+      it('should return 200 for t3_analyst', async () => {
+        const { body } = await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        await t3Analyst
+          .post(
+            `${EXCEPTION_LIST_URL}/_export?id=${body.id}&list_id=${body.list_id}&namespace_type=single&include_expired_exceptions=true`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('import exception list', () => {
+      it('should return 200 for t3_analyst', async () => {
+        await t3Analyst
+          .post(`${EXCEPTION_LIST_URL}/_import?overwrite=true`)
+          .set('kbn-xsrf', 'true')
+          .attach(
+            'file',
+            Buffer.from(
+              toNdJsonString([
+                getImportExceptionsListSchemaMock('test_list_id'),
+                getImportExceptionsListItemSchemaMock('test_item_id', 'test_list_id'),
+              ])
+            ),
+            'exceptions.ndjson'
+          )
+          .expect('Content-Type', 'application/json; charset=utf-8')
+          .expect(200);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/viewer.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/viewer.ts
new file mode 100644
index 0000000000000..ec37e7ae59fb4
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/common/essentials_tier/viewer.ts
@@ -0,0 +1,113 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import TestAgent from 'supertest/lib/agent';
+import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import {
+  getCreateExceptionListDetectionSchemaMock,
+  getCreateExceptionListMinimalSchemaMock,
+} from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import {
+  getImportExceptionsListItemSchemaMock,
+  getImportExceptionsListSchemaMock,
+  toNdJsonString,
+} from '@kbn/lists-plugin/common/schemas/request/import_exceptions_schema.mock';
+import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+import { deleteAllExceptions } from '../../../../utils';
+
+export default ({ getService }: FtrProviderContext): void => {
+  const log = getService('log');
+  const utils = getService('securitySolutionUtils');
+
+  let admin: TestAgent;
+  let viewer: TestAgent;
+
+  describe('@serverless @serverlessQA viewer exception list and item API behaviors', () => {
+    before(async () => {
+      admin = await utils.createSuperTest('admin');
+      viewer = await utils.createSuperTest('viewer');
+      await deleteAllExceptions(admin, log);
+    });
+
+    afterEach(async () => {
+      await deleteAllExceptions(admin, log);
+    });
+
+    describe('duplicate exception list', () => {
+      it('should return 403 for viewer', async () => {
+        // create an exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListDetectionSchemaMock())
+          .expect(200);
+
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send({
+            ...getCreateExceptionListItemMinimalSchemaMock(),
+            list_id: getCreateExceptionListDetectionSchemaMock().list_id,
+          })
+          .expect(200);
+
+        await viewer
+          .post(
+            `${EXCEPTION_LIST_URL}/_duplicate?list_id=${
+              getCreateExceptionListDetectionSchemaMock().list_id
+            }&namespace_type=single&include_expired_exceptions=true`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(403);
+      });
+    });
+
+    describe('export exception list', () => {
+      it('should return 200 for viewer', async () => {
+        const { body } = await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        await viewer
+          .post(
+            `${EXCEPTION_LIST_URL}/_export?id=${body.id}&list_id=${body.list_id}&namespace_type=single&include_expired_exceptions=true`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('import exception list', () => {
+      it('should return 403 for viewer', async () => {
+        await viewer
+          .post(`${EXCEPTION_LIST_URL}/_import?overwrite=true`)
+          .set('kbn-xsrf', 'true')
+          .attach(
+            'file',
+            Buffer.from(
+              toNdJsonString([
+                getImportExceptionsListSchemaMock('test_list_id'),
+                getImportExceptionsListItemSchemaMock('test_item_id', 'test_list_id'),
+              ])
+            ),
+            'exceptions.ndjson'
+          )
+          .expect('Content-Type', 'application/json; charset=utf-8')
+          .expect(403);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/admin.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/admin.ts
new file mode 100644
index 0000000000000..52ab99388341b
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/admin.ts
@@ -0,0 +1,150 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import TestAgent from 'supertest/lib/agent';
+import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import { UpdateExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
+import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { getUpdateMinimalExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/request/update_exception_list_item_schema.mock';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+import { deleteAllExceptions } from '../../../../utils';
+
+export default ({ getService }: FtrProviderContext): void => {
+  const log = getService('log');
+  const utils = getService('securitySolutionUtils');
+
+  let admin: TestAgent;
+
+  describe('@serverless @serverlessQA admin exception items API behaviors', () => {
+    before(async () => {
+      admin = await utils.createSuperTest('admin');
+      await deleteAllExceptions(admin, log);
+    });
+
+    afterEach(async () => {
+      await deleteAllExceptions(admin, log);
+    });
+
+    describe('create exception item', () => {
+      it('should return 200 for admin', async () => {
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+      });
+    });
+
+    describe('delete exception item', () => {
+      it('should return 200 for admin', async () => {
+        // create an exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // create an exception list item
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        // delete the exception list item by its item_id
+        await admin
+          .delete(
+            `${EXCEPTION_LIST_ITEM_URL}?item_id=${
+              getCreateExceptionListItemMinimalSchemaMock().item_id
+            }`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('find exception item', () => {
+      it('should return 200 for admin', async () => {
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await admin
+          .get(
+            `${EXCEPTION_LIST_ITEM_URL}/_find?list_id=${
+              getCreateExceptionListMinimalSchemaMock().list_id
+            }`
+          )
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+      });
+    });
+
+    describe('read exception item', () => {
+      it('should return 200 for admin', async () => {
+        // create a simple exception list to read
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // create a simple exception list item to read
+        const { body: createListBody } = await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        await admin
+          .get(`${EXCEPTION_LIST_ITEM_URL}?id=${createListBody.id}`)
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('update exception item', () => {
+      it('should return 200 for admin', async () => {
+        // create a simple exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // create a simple exception list item
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        // update a exception list item's name
+        const updatedList: UpdateExceptionListItemSchema = {
+          ...getUpdateMinimalExceptionListItemSchemaMock(),
+          name: 'some other name',
+        };
+
+        await admin
+          .put(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(updatedList)
+          .expect(200);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/configs/serverless.config.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/configs/serverless.config.ts
new file mode 100644
index 0000000000000..113162887d138
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/configs/serverless.config.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { createTestConfig } from '../../../../../../../config/serverless/config.base.essentials';
+
+export default createTestConfig({
+  testFiles: [require.resolve('..')],
+  junit: {
+    reportName:
+      'Detection Engine - Exception Items Authentication Tests - Serverless Env - Essentials Tier',
+  },
+});
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/editor.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/editor.ts
new file mode 100644
index 0000000000000..57e611a6a30bb
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/editor.ts
@@ -0,0 +1,152 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import TestAgent from 'supertest/lib/agent';
+import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import { UpdateExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
+import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { getUpdateMinimalExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/request/update_exception_list_item_schema.mock';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+import { deleteAllExceptions } from '../../../../utils';
+
+export default ({ getService }: FtrProviderContext): void => {
+  const log = getService('log');
+  const utils = getService('securitySolutionUtils');
+
+  let admin: TestAgent;
+  let editor: TestAgent;
+
+  describe('@serverless @serverlessQA editor exception items API behaviors', () => {
+    before(async () => {
+      admin = await utils.createSuperTest('admin');
+      editor = await utils.createSuperTest('editor');
+      await deleteAllExceptions(admin, log);
+    });
+
+    afterEach(async () => {
+      await deleteAllExceptions(admin, log);
+    });
+
+    describe('create exception item', () => {
+      it('should return 200 for editor', async () => {
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await editor
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+      });
+    });
+
+    describe('delete exception item', () => {
+      it('should return 200 for editor', async () => {
+        // create an exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // create an exception list item
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        // delete the exception list item by its item_id
+        await editor
+          .delete(
+            `${EXCEPTION_LIST_ITEM_URL}?item_id=${
+              getCreateExceptionListItemMinimalSchemaMock().item_id
+            }`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('find exception item', () => {
+      it('should return 200 for editor', async () => {
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await editor
+          .get(
+            `${EXCEPTION_LIST_ITEM_URL}/_find?list_id=${
+              getCreateExceptionListMinimalSchemaMock().list_id
+            }`
+          )
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+      });
+    });
+
+    describe('read exception item', () => {
+      it('should return 200 for editor', async () => {
+        // create a simple exception list to read
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // create a simple exception list item to read
+        const { body: createListBody } = await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        await editor
+          .get(`${EXCEPTION_LIST_ITEM_URL}?id=${createListBody.id}`)
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('update exception item', () => {
+      it('should return 200 for editor', async () => {
+        // create a simple exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // create a simple exception list item
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        // update a exception list item's name
+        const updatedList: UpdateExceptionListItemSchema = {
+          ...getUpdateMinimalExceptionListItemSchemaMock(),
+          name: 'some other name',
+        };
+
+        await editor
+          .put(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(updatedList)
+          .expect(200);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/endpoint_operations_analyst.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/endpoint_operations_analyst.ts
new file mode 100644
index 0000000000000..330e830a44462
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/endpoint_operations_analyst.ts
@@ -0,0 +1,152 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import TestAgent from 'supertest/lib/agent';
+import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import { UpdateExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
+import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { getUpdateMinimalExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/request/update_exception_list_item_schema.mock';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+import { deleteAllExceptions } from '../../../../utils';
+
+export default ({ getService }: FtrProviderContext): void => {
+  const log = getService('log');
+  const utils = getService('securitySolutionUtils');
+
+  let admin: TestAgent;
+  let endpointOperationsAnalyst: TestAgent;
+
+  describe('@serverless @serverlessQA endpoint_operations_analyst exception items API behaviors', () => {
+    before(async () => {
+      admin = await utils.createSuperTest('admin');
+      endpointOperationsAnalyst = await utils.createSuperTest('endpoint_operations_analyst');
+      await deleteAllExceptions(admin, log);
+    });
+
+    afterEach(async () => {
+      await deleteAllExceptions(admin, log);
+    });
+
+    describe('create exception item', () => {
+      it('should return 200 for endpoint_operations_analyst', async () => {
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await endpointOperationsAnalyst
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+      });
+    });
+
+    describe('delete exception item', () => {
+      it('should return 200 for endpoint_operations_analyst', async () => {
+        // create an exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // create an exception list item
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        // delete the exception list item by its item_id
+        await endpointOperationsAnalyst
+          .delete(
+            `${EXCEPTION_LIST_ITEM_URL}?item_id=${
+              getCreateExceptionListItemMinimalSchemaMock().item_id
+            }`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('find exception item', () => {
+      it('should return 200 for endpoint_operations_analyst', async () => {
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await endpointOperationsAnalyst
+          .get(
+            `${EXCEPTION_LIST_ITEM_URL}/_find?list_id=${
+              getCreateExceptionListMinimalSchemaMock().list_id
+            }`
+          )
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+      });
+    });
+
+    describe('read exception item', () => {
+      it('should return 200 for endpoint_operations_analyst', async () => {
+        // create a simple exception list to read
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // create a simple exception list item to read
+        const { body: createListBody } = await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        await endpointOperationsAnalyst
+          .get(`${EXCEPTION_LIST_ITEM_URL}?id=${createListBody.id}`)
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('update exception item', () => {
+      it('should return 200 for endpoint_operations_analyst', async () => {
+        // create a simple exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // create a simple exception list item
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        // update a exception list item's name
+        const updatedList: UpdateExceptionListItemSchema = {
+          ...getUpdateMinimalExceptionListItemSchemaMock(),
+          name: 'some other name',
+        };
+
+        await endpointOperationsAnalyst
+          .put(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(updatedList)
+          .expect(200);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/endpoint_policy_manager.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/endpoint_policy_manager.ts
new file mode 100644
index 0000000000000..dfd12c24f6aeb
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/endpoint_policy_manager.ts
@@ -0,0 +1,152 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import TestAgent from 'supertest/lib/agent';
+import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import { UpdateExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
+import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { getUpdateMinimalExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/request/update_exception_list_item_schema.mock';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+import { deleteAllExceptions } from '../../../../utils';
+
+export default ({ getService }: FtrProviderContext): void => {
+  const log = getService('log');
+  const utils = getService('securitySolutionUtils');
+
+  let admin: TestAgent;
+  let endpointPolicyManager: TestAgent;
+
+  describe('@serverless @serverlessQA endpoint_policy_manager exception items API behaviors', () => {
+    before(async () => {
+      admin = await utils.createSuperTest('admin');
+      endpointPolicyManager = await utils.createSuperTest('endpoint_policy_manager');
+      await deleteAllExceptions(admin, log);
+    });
+
+    afterEach(async () => {
+      await deleteAllExceptions(admin, log);
+    });
+
+    describe('create exception item', () => {
+      it('should return 200 for endpoint_policy_manager', async () => {
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await endpointPolicyManager
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+      });
+    });
+
+    describe('delete exception item', () => {
+      it('should return 200 for endpoint_policy_manager', async () => {
+        // create an exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // create an exception list item
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        // delete the exception list item by its item_id
+        await endpointPolicyManager
+          .delete(
+            `${EXCEPTION_LIST_ITEM_URL}?item_id=${
+              getCreateExceptionListItemMinimalSchemaMock().item_id
+            }`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('find exception item', () => {
+      it('should return 200 for endpoint_policy_manager', async () => {
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await endpointPolicyManager
+          .get(
+            `${EXCEPTION_LIST_ITEM_URL}/_find?list_id=${
+              getCreateExceptionListMinimalSchemaMock().list_id
+            }`
+          )
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+      });
+    });
+
+    describe('read exception item', () => {
+      it('should return 200 for endpoint_policy_manager', async () => {
+        // create a simple exception list to read
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // create a simple exception list item to read
+        const { body: createListBody } = await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        await endpointPolicyManager
+          .get(`${EXCEPTION_LIST_ITEM_URL}?id=${createListBody.id}`)
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('update exception item', () => {
+      it('should return 200 for endpoint_policy_manager', async () => {
+        // create a simple exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // create a simple exception list item
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        // update a exception list item's name
+        const updatedList: UpdateExceptionListItemSchema = {
+          ...getUpdateMinimalExceptionListItemSchemaMock(),
+          name: 'some other name',
+        };
+
+        await endpointPolicyManager
+          .put(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(updatedList)
+          .expect(200);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/index.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/index.ts
new file mode 100644
index 0000000000000..35f627cd8dede
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/index.ts
@@ -0,0 +1,24 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+
+export default function ({ loadTestFile }: FtrProviderContext) {
+  describe('Exception items APIs Authentication - Complete Tier', function () {
+    loadTestFile(require.resolve('./tier_1_analyst'));
+    loadTestFile(require.resolve('./tier_2_analyst'));
+    loadTestFile(require.resolve('./threat_intel_analyst'));
+    loadTestFile(require.resolve('./tier_3_analyst'));
+    loadTestFile(require.resolve('./viewer'));
+    loadTestFile(require.resolve('./rule_author'));
+    loadTestFile(require.resolve('./soc_manager'));
+    loadTestFile(require.resolve('./endpoint_operations_analyst'));
+    loadTestFile(require.resolve('./endpoint_policy_manager'));
+    loadTestFile(require.resolve('./platform_engineer'));
+    loadTestFile(require.resolve('./editor'));
+    loadTestFile(require.resolve('./admin'));
+  });
+}
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/platform_engineer.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/platform_engineer.ts
new file mode 100644
index 0000000000000..2bd5b39a056d0
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/platform_engineer.ts
@@ -0,0 +1,152 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import TestAgent from 'supertest/lib/agent';
+import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import { UpdateExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
+import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { getUpdateMinimalExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/request/update_exception_list_item_schema.mock';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+import { deleteAllExceptions } from '../../../../utils';
+
+export default ({ getService }: FtrProviderContext): void => {
+  const log = getService('log');
+  const utils = getService('securitySolutionUtils');
+
+  let admin: TestAgent;
+  let platformEngineer: TestAgent;
+
+  describe('@serverless @serverlessQA platform_engineer exception items API behaviors', () => {
+    before(async () => {
+      admin = await utils.createSuperTest('admin');
+      platformEngineer = await utils.createSuperTest('platform_engineer');
+      await deleteAllExceptions(admin, log);
+    });
+
+    afterEach(async () => {
+      await deleteAllExceptions(admin, log);
+    });
+
+    describe('create exception item', () => {
+      it('should return 200 for platform_engineer', async () => {
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await platformEngineer
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+      });
+    });
+
+    describe('delete exception item', () => {
+      it('should return 200 for platform_engineer', async () => {
+        // create an exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // create an exception list item
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        // delete the exception list item by its item_id
+        await platformEngineer
+          .delete(
+            `${EXCEPTION_LIST_ITEM_URL}?item_id=${
+              getCreateExceptionListItemMinimalSchemaMock().item_id
+            }`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('find exception item', () => {
+      it('should return 200 for platform_engineer', async () => {
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await platformEngineer
+          .get(
+            `${EXCEPTION_LIST_ITEM_URL}/_find?list_id=${
+              getCreateExceptionListMinimalSchemaMock().list_id
+            }`
+          )
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+      });
+    });
+
+    describe('read exception item', () => {
+      it('should return 200 for platform_engineer', async () => {
+        // create a simple exception list to read
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // create a simple exception list item to read
+        const { body: createListBody } = await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        await platformEngineer
+          .get(`${EXCEPTION_LIST_ITEM_URL}?id=${createListBody.id}`)
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('update exception item', () => {
+      it('should return 200 for platform_engineer', async () => {
+        // create a simple exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // create a simple exception list item
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        // update a exception list item's name
+        const updatedList: UpdateExceptionListItemSchema = {
+          ...getUpdateMinimalExceptionListItemSchemaMock(),
+          name: 'some other name',
+        };
+
+        await platformEngineer
+          .put(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(updatedList)
+          .expect(200);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/rule_author.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/rule_author.ts
new file mode 100644
index 0000000000000..529d4854adf14
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/rule_author.ts
@@ -0,0 +1,152 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import TestAgent from 'supertest/lib/agent';
+import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import { UpdateExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
+import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { getUpdateMinimalExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/request/update_exception_list_item_schema.mock';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+import { deleteAllExceptions } from '../../../../utils';
+
+export default ({ getService }: FtrProviderContext): void => {
+  const log = getService('log');
+  const utils = getService('securitySolutionUtils');
+
+  let admin: TestAgent;
+  let ruleAuthor: TestAgent;
+
+  describe('@serverless @serverlessQA rule_author exception items API behaviors', () => {
+    before(async () => {
+      admin = await utils.createSuperTest('admin');
+      ruleAuthor = await utils.createSuperTest('rule_author');
+      await deleteAllExceptions(admin, log);
+    });
+
+    afterEach(async () => {
+      await deleteAllExceptions(admin, log);
+    });
+
+    describe('create exception item', () => {
+      it('should return 200 for rule_author', async () => {
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await ruleAuthor
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+      });
+    });
+
+    describe('delete exception item', () => {
+      it('should return 200 for rule_author', async () => {
+        // create an exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // create an exception list item
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        // delete the exception list item by its item_id
+        await ruleAuthor
+          .delete(
+            `${EXCEPTION_LIST_ITEM_URL}?item_id=${
+              getCreateExceptionListItemMinimalSchemaMock().item_id
+            }`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('find exception item', () => {
+      it('should return 200 for rule_author', async () => {
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await ruleAuthor
+          .get(
+            `${EXCEPTION_LIST_ITEM_URL}/_find?list_id=${
+              getCreateExceptionListMinimalSchemaMock().list_id
+            }`
+          )
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+      });
+    });
+
+    describe('read exception item', () => {
+      it('should return 200 for rule_author', async () => {
+        // create a simple exception list to read
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // create a simple exception list item to read
+        const { body: createListBody } = await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        await ruleAuthor
+          .get(`${EXCEPTION_LIST_ITEM_URL}?id=${createListBody.id}`)
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('update exception item', () => {
+      it('should return 200 for rule_author', async () => {
+        // create a simple exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // create a simple exception list item
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        // update a exception list item's name
+        const updatedList: UpdateExceptionListItemSchema = {
+          ...getUpdateMinimalExceptionListItemSchemaMock(),
+          name: 'some other name',
+        };
+
+        await ruleAuthor
+          .put(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(updatedList)
+          .expect(200);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/soc_manager.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/soc_manager.ts
new file mode 100644
index 0000000000000..97826150c64a6
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/soc_manager.ts
@@ -0,0 +1,152 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import TestAgent from 'supertest/lib/agent';
+import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import { UpdateExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
+import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { getUpdateMinimalExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/request/update_exception_list_item_schema.mock';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+import { deleteAllExceptions } from '../../../../utils';
+
+export default ({ getService }: FtrProviderContext): void => {
+  const log = getService('log');
+  const utils = getService('securitySolutionUtils');
+
+  let admin: TestAgent;
+  let socManager: TestAgent;
+
+  describe('@serverless @serverlessQA soc_manager exception items API behaviors', () => {
+    before(async () => {
+      admin = await utils.createSuperTest('admin');
+      socManager = await utils.createSuperTest('soc_manager');
+      await deleteAllExceptions(admin, log);
+    });
+
+    afterEach(async () => {
+      await deleteAllExceptions(admin, log);
+    });
+
+    describe('create exception item', () => {
+      it('should return 200 for soc_manager', async () => {
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await socManager
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+      });
+    });
+
+    describe('delete exception item', () => {
+      it('should return 200 for soc_manager', async () => {
+        // create an exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // create an exception list item
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        // delete the exception list item by its item_id
+        await socManager
+          .delete(
+            `${EXCEPTION_LIST_ITEM_URL}?item_id=${
+              getCreateExceptionListItemMinimalSchemaMock().item_id
+            }`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('find exception item', () => {
+      it('should return 200 for soc_manager', async () => {
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await socManager
+          .get(
+            `${EXCEPTION_LIST_ITEM_URL}/_find?list_id=${
+              getCreateExceptionListMinimalSchemaMock().list_id
+            }`
+          )
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+      });
+    });
+
+    describe('read exception item', () => {
+      it('should return 200 for soc_manager', async () => {
+        // create a simple exception list to read
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // create a simple exception list item to read
+        const { body: createListBody } = await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        await socManager
+          .get(`${EXCEPTION_LIST_ITEM_URL}?id=${createListBody.id}`)
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('update exception item', () => {
+      it('should return 200 for soc_manager', async () => {
+        // create a simple exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // create a simple exception list item
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        // update a exception list item's name
+        const updatedList: UpdateExceptionListItemSchema = {
+          ...getUpdateMinimalExceptionListItemSchemaMock(),
+          name: 'some other name',
+        };
+
+        await socManager
+          .put(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(updatedList)
+          .expect(200);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/threat_intel_analyst.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/threat_intel_analyst.ts
new file mode 100644
index 0000000000000..ebd642dfdbd15
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/threat_intel_analyst.ts
@@ -0,0 +1,152 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import TestAgent from 'supertest/lib/agent';
+import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import { UpdateExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
+import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { getUpdateMinimalExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/request/update_exception_list_item_schema.mock';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+import { deleteAllExceptions } from '../../../../utils';
+
+export default ({ getService }: FtrProviderContext): void => {
+  const log = getService('log');
+  const utils = getService('securitySolutionUtils');
+
+  let admin: TestAgent;
+  let threatIntelAnalyst: TestAgent;
+
+  describe('@serverless @serverlessQA threat_intelligence_analyst exception items API behaviors', () => {
+    before(async () => {
+      admin = await utils.createSuperTest('admin');
+      threatIntelAnalyst = await utils.createSuperTest('threat_intelligence_analyst');
+      await deleteAllExceptions(admin, log);
+    });
+
+    afterEach(async () => {
+      await deleteAllExceptions(admin, log);
+    });
+
+    describe('create exception item', () => {
+      it('should return 200 for threat_intelligence_analyst', async () => {
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await threatIntelAnalyst
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+      });
+    });
+
+    describe('delete exception item', () => {
+      it('should return 200 for threat_intelligence_analyst', async () => {
+        // create an exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // create an exception list item
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        // delete the exception list item by its item_id
+        await threatIntelAnalyst
+          .delete(
+            `${EXCEPTION_LIST_ITEM_URL}?item_id=${
+              getCreateExceptionListItemMinimalSchemaMock().item_id
+            }`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('find exception item', () => {
+      it('should return 200 for threat_intelligence_analyst', async () => {
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await threatIntelAnalyst
+          .get(
+            `${EXCEPTION_LIST_ITEM_URL}/_find?list_id=${
+              getCreateExceptionListMinimalSchemaMock().list_id
+            }`
+          )
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+      });
+    });
+
+    describe('read exception item', () => {
+      it('should return 200 for threat_intelligence_analyst', async () => {
+        // create a simple exception list to read
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // create a simple exception list item to read
+        const { body: createListBody } = await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        await threatIntelAnalyst
+          .get(`${EXCEPTION_LIST_ITEM_URL}?id=${createListBody.id}`)
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('update exception item', () => {
+      it('should return 200 for threat_intelligence_analyst', async () => {
+        // create a simple exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // create a simple exception list item
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        // update a exception list item's name
+        const updatedList: UpdateExceptionListItemSchema = {
+          ...getUpdateMinimalExceptionListItemSchemaMock(),
+          name: 'some other name',
+        };
+
+        await threatIntelAnalyst
+          .put(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(updatedList)
+          .expect(200);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/tier_1_analyst.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/tier_1_analyst.ts
new file mode 100644
index 0000000000000..9030ed349c2e8
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/tier_1_analyst.ts
@@ -0,0 +1,152 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import TestAgent from 'supertest/lib/agent';
+import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import { UpdateExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
+import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { getUpdateMinimalExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/request/update_exception_list_item_schema.mock';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+import { deleteAllExceptions } from '../../../../utils';
+
+export default ({ getService }: FtrProviderContext): void => {
+  const log = getService('log');
+  const utils = getService('securitySolutionUtils');
+
+  let admin: TestAgent;
+  let t1Analyst: TestAgent;
+
+  describe('@serverless @serverlessQA t1_analyst exception items API behaviors', () => {
+    before(async () => {
+      admin = await utils.createSuperTest('admin');
+      t1Analyst = await utils.createSuperTest('t1_analyst');
+      await deleteAllExceptions(admin, log);
+    });
+
+    afterEach(async () => {
+      await deleteAllExceptions(admin, log);
+    });
+
+    describe('create exception item', () => {
+      it('should return 403 for t1_analyst', async () => {
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await t1Analyst
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(403);
+      });
+    });
+
+    describe('delete exception item', () => {
+      it('should return 403 for t1_analyst', async () => {
+        // create an exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // create an exception list item
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        // delete the exception list item by its item_id
+        await t1Analyst
+          .delete(
+            `${EXCEPTION_LIST_ITEM_URL}?item_id=${
+              getCreateExceptionListItemMinimalSchemaMock().item_id
+            }`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(403);
+      });
+    });
+
+    describe('find exception item', () => {
+      it('should return 200 for t1_analyst', async () => {
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await t1Analyst
+          .get(
+            `${EXCEPTION_LIST_ITEM_URL}/_find?list_id=${
+              getCreateExceptionListMinimalSchemaMock().list_id
+            }`
+          )
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+      });
+    });
+
+    describe('read exception item', () => {
+      it('should return 200 for t1_analyst', async () => {
+        // create a simple exception list to read
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // create a simple exception list item to read
+        const { body: createListBody } = await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        await t1Analyst
+          .get(`${EXCEPTION_LIST_ITEM_URL}?id=${createListBody.id}`)
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('update exception item', () => {
+      it('should return 403 for t1_analyst', async () => {
+        // create a simple exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // create a simple exception list item
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        // update a exception list item's name
+        const updatedList: UpdateExceptionListItemSchema = {
+          ...getUpdateMinimalExceptionListItemSchemaMock(),
+          name: 'some other name',
+        };
+
+        await t1Analyst
+          .put(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(updatedList)
+          .expect(403);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/tier_2_analyst.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/tier_2_analyst.ts
new file mode 100644
index 0000000000000..75fa6347953ef
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/tier_2_analyst.ts
@@ -0,0 +1,152 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import TestAgent from 'supertest/lib/agent';
+import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import { UpdateExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
+import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { getUpdateMinimalExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/request/update_exception_list_item_schema.mock';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+import { deleteAllExceptions } from '../../../../utils';
+
+export default ({ getService }: FtrProviderContext): void => {
+  const log = getService('log');
+  const utils = getService('securitySolutionUtils');
+
+  let admin: TestAgent;
+  let t2Analyst: TestAgent;
+
+  describe('@serverless @serverlessQA t2_analyst exception items API behaviors', () => {
+    before(async () => {
+      admin = await utils.createSuperTest('admin');
+      t2Analyst = await utils.createSuperTest('t2_analyst');
+      await deleteAllExceptions(admin, log);
+    });
+
+    afterEach(async () => {
+      await deleteAllExceptions(admin, log);
+    });
+
+    describe('create exception item', () => {
+      it('should return 403 for t2_analyst', async () => {
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await t2Analyst
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(403);
+      });
+    });
+
+    describe('delete exception item', () => {
+      it('should return 403 for t2_analyst', async () => {
+        // create an exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // create an exception list item
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        // delete the exception list item by its item_id
+        await t2Analyst
+          .delete(
+            `${EXCEPTION_LIST_ITEM_URL}?item_id=${
+              getCreateExceptionListItemMinimalSchemaMock().item_id
+            }`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(403);
+      });
+    });
+
+    describe('find exception item', () => {
+      it('should return 200 for t2_analyst', async () => {
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await t2Analyst
+          .get(
+            `${EXCEPTION_LIST_ITEM_URL}/_find?list_id=${
+              getCreateExceptionListMinimalSchemaMock().list_id
+            }`
+          )
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+      });
+    });
+
+    describe('read exception item', () => {
+      it('should return 200 for t2_analyst', async () => {
+        // create a simple exception list to read
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // create a simple exception list item to read
+        const { body: createListBody } = await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        await t2Analyst
+          .get(`${EXCEPTION_LIST_ITEM_URL}?id=${createListBody.id}`)
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('update exception item', () => {
+      it('should return 403 for t2_analyst', async () => {
+        // create a simple exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // create a simple exception list item
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        // update a exception list item's name
+        const updatedList: UpdateExceptionListItemSchema = {
+          ...getUpdateMinimalExceptionListItemSchemaMock(),
+          name: 'some other name',
+        };
+
+        await t2Analyst
+          .put(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(updatedList)
+          .expect(403);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/tier_3_analyst.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/tier_3_analyst.ts
new file mode 100644
index 0000000000000..8a55f46965df5
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/tier_3_analyst.ts
@@ -0,0 +1,152 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import TestAgent from 'supertest/lib/agent';
+import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import { UpdateExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
+import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { getUpdateMinimalExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/request/update_exception_list_item_schema.mock';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+import { deleteAllExceptions } from '../../../../utils';
+
+export default ({ getService }: FtrProviderContext): void => {
+  const log = getService('log');
+  const utils = getService('securitySolutionUtils');
+
+  let admin: TestAgent;
+  let t3Analyst: TestAgent;
+
+  describe('@serverless @serverlessQA t3_analyst exception items API behaviors', () => {
+    before(async () => {
+      admin = await utils.createSuperTest('admin');
+      t3Analyst = await utils.createSuperTest('t3_analyst');
+      await deleteAllExceptions(admin, log);
+    });
+
+    afterEach(async () => {
+      await deleteAllExceptions(admin, log);
+    });
+
+    describe('create exception item', () => {
+      it('should return 200 for t3_analyst', async () => {
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await t3Analyst
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+      });
+    });
+
+    describe('delete exception item', () => {
+      it('should return 200 for t3_analyst', async () => {
+        // create an exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // create an exception list item
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        // delete the exception list item by its item_id
+        await t3Analyst
+          .delete(
+            `${EXCEPTION_LIST_ITEM_URL}?item_id=${
+              getCreateExceptionListItemMinimalSchemaMock().item_id
+            }`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('find exception item', () => {
+      it('should return 200 for t3_analyst', async () => {
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await t3Analyst
+          .get(
+            `${EXCEPTION_LIST_ITEM_URL}/_find?list_id=${
+              getCreateExceptionListMinimalSchemaMock().list_id
+            }`
+          )
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+      });
+    });
+
+    describe('read exception item', () => {
+      it('should return 200 for t3_analyst', async () => {
+        // create a simple exception list to read
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // create a simple exception list item to read
+        const { body: createListBody } = await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        await t3Analyst
+          .get(`${EXCEPTION_LIST_ITEM_URL}?id=${createListBody.id}`)
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('update exception item', () => {
+      it('should return 200 for t3_analyst', async () => {
+        // create a simple exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // create a simple exception list item
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        // update a exception list item's name
+        const updatedList: UpdateExceptionListItemSchema = {
+          ...getUpdateMinimalExceptionListItemSchemaMock(),
+          name: 'some other name',
+        };
+
+        await t3Analyst
+          .put(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(updatedList)
+          .expect(200);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/viewer.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/viewer.ts
new file mode 100644
index 0000000000000..c03446a04a95d
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/items/essentials_tier/viewer.ts
@@ -0,0 +1,152 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import TestAgent from 'supertest/lib/agent';
+import { EXCEPTION_LIST_ITEM_URL, EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import { UpdateExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
+import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
+import { getUpdateMinimalExceptionListItemSchemaMock } from '@kbn/lists-plugin/common/schemas/request/update_exception_list_item_schema.mock';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+import { deleteAllExceptions } from '../../../../utils';
+
+export default ({ getService }: FtrProviderContext): void => {
+  const log = getService('log');
+  const utils = getService('securitySolutionUtils');
+
+  let admin: TestAgent;
+  let viewer: TestAgent;
+
+  describe('@serverless @serverlessQA viewer exception items API behaviors', () => {
+    before(async () => {
+      admin = await utils.createSuperTest('admin');
+      viewer = await utils.createSuperTest('viewer');
+      await deleteAllExceptions(admin, log);
+    });
+
+    afterEach(async () => {
+      await deleteAllExceptions(admin, log);
+    });
+
+    describe('create exception item', () => {
+      it('should return 403 for viewer', async () => {
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await viewer
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(403);
+      });
+    });
+
+    describe('delete exception item', () => {
+      it('should return 403 for viewer', async () => {
+        // create an exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // create an exception list item
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        // delete the exception list item by its item_id
+        await viewer
+          .delete(
+            `${EXCEPTION_LIST_ITEM_URL}?item_id=${
+              getCreateExceptionListItemMinimalSchemaMock().item_id
+            }`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(403);
+      });
+    });
+
+    describe('find exception item', () => {
+      it('should return 200 for viewer', async () => {
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await viewer
+          .get(
+            `${EXCEPTION_LIST_ITEM_URL}/_find?list_id=${
+              getCreateExceptionListMinimalSchemaMock().list_id
+            }`
+          )
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+      });
+    });
+
+    describe('read exception item', () => {
+      it('should return 200 for viewer', async () => {
+        // create a simple exception list to read
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // create a simple exception list item to read
+        const { body: createListBody } = await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        await viewer
+          .get(`${EXCEPTION_LIST_ITEM_URL}?id=${createListBody.id}`)
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('update exception item', () => {
+      it('should return 403 for viewer', async () => {
+        // create a simple exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // create a simple exception list item
+        await admin
+          .post(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListItemMinimalSchemaMock())
+          .expect(200);
+
+        // update a exception list item's name
+        const updatedList: UpdateExceptionListItemSchema = {
+          ...getUpdateMinimalExceptionListItemSchemaMock(),
+          name: 'some other name',
+        };
+
+        await viewer
+          .put(EXCEPTION_LIST_ITEM_URL)
+          .set('kbn-xsrf', 'true')
+          .send(updatedList)
+          .expect(403);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/admin.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/admin.ts
new file mode 100644
index 0000000000000..fdee68f7ce566
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/admin.ts
@@ -0,0 +1,116 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from 'expect';
+import TestAgent from 'supertest/lib/agent';
+import { EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import { getUpdateMinimalExceptionListSchemaMock } from '@kbn/lists-plugin/common/schemas/request/update_exception_list_schema.mock';
+import { UpdateExceptionListSchema } from '@kbn/securitysolution-io-ts-list-types';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+import { deleteAllExceptions } from '../../../../utils';
+
+export default ({ getService }: FtrProviderContext): void => {
+  const log = getService('log');
+  const utils = getService('securitySolutionUtils');
+
+  let admin: TestAgent;
+
+  describe('@serverless @serverlessQA admin exception list API behaviors', () => {
+    before(async () => {
+      admin = await utils.createSuperTest('admin');
+      await deleteAllExceptions(admin, log);
+    });
+
+    afterEach(async () => {
+      await deleteAllExceptions(admin, log);
+    });
+
+    describe('create exception list', () => {
+      it('should return 200 for admin', async () => {
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+      });
+    });
+
+    describe('delete exception list', () => {
+      it('should return 200 for admin', async () => {
+        // create an exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await admin
+          .delete(
+            `${EXCEPTION_LIST_URL}?list_id=${getCreateExceptionListMinimalSchemaMock().list_id}`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('find exception list', () => {
+      it('should return 200 for admin', async () => {
+        // add a single exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // query the single exception list from _find
+        const { body } = await admin
+          .get(`${EXCEPTION_LIST_URL}/_find`)
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+
+        expect(body.total).toEqual(1);
+      });
+    });
+
+    describe('read exception list', () => {
+      it('should return 200 for admin', async () => {
+        // create a simple exception list to read
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await admin
+          .get(`${EXCEPTION_LIST_URL}?list_id=${getCreateExceptionListMinimalSchemaMock().list_id}`)
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('update exception list', () => {
+      it('should return 200 for admin', async () => {
+        // create a simple exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // update a exception list's name
+        const updatedList: UpdateExceptionListSchema = {
+          ...getUpdateMinimalExceptionListSchemaMock(),
+          name: 'some other name',
+        };
+
+        await admin.put(EXCEPTION_LIST_URL).set('kbn-xsrf', 'true').send(updatedList).expect(200);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/configs/serverless.config.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/configs/serverless.config.ts
new file mode 100644
index 0000000000000..9e8e6663f6305
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/configs/serverless.config.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { createTestConfig } from '../../../../../../../config/serverless/config.base.essentials';
+
+export default createTestConfig({
+  testFiles: [require.resolve('..')],
+  junit: {
+    reportName:
+      'Detection Engine - Exception List Authentication Tests - Serverless Env - Essentials Tier',
+  },
+});
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/editor.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/editor.ts
new file mode 100644
index 0000000000000..7cda40dbb5e13
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/editor.ts
@@ -0,0 +1,118 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from 'expect';
+import TestAgent from 'supertest/lib/agent';
+import { EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import { getUpdateMinimalExceptionListSchemaMock } from '@kbn/lists-plugin/common/schemas/request/update_exception_list_schema.mock';
+import { UpdateExceptionListSchema } from '@kbn/securitysolution-io-ts-list-types';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+import { deleteAllExceptions } from '../../../../utils';
+
+export default ({ getService }: FtrProviderContext): void => {
+  const log = getService('log');
+  const utils = getService('securitySolutionUtils');
+
+  let admin: TestAgent;
+  let editor: TestAgent;
+
+  describe('@serverless @serverlessQA editor exception list API behaviors', () => {
+    before(async () => {
+      admin = await utils.createSuperTest('admin');
+      editor = await utils.createSuperTest('editor');
+      await deleteAllExceptions(admin, log);
+    });
+
+    afterEach(async () => {
+      await deleteAllExceptions(admin, log);
+    });
+
+    describe('create exception list', () => {
+      it('should return 200 for editor', async () => {
+        await editor
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+      });
+    });
+
+    describe('delete exception list', () => {
+      it('should return 200 for editor', async () => {
+        // create an exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await editor
+          .delete(
+            `${EXCEPTION_LIST_URL}?list_id=${getCreateExceptionListMinimalSchemaMock().list_id}`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('find exception list', () => {
+      it('should return 200 for editor', async () => {
+        // add a single exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // query the single exception list from _find
+        const { body } = await editor
+          .get(`${EXCEPTION_LIST_URL}/_find`)
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+
+        expect(body.total).toEqual(1);
+      });
+    });
+
+    describe('read exception list', () => {
+      it('should return 200 for editor', async () => {
+        // create a simple exception list to read
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await editor
+          .get(`${EXCEPTION_LIST_URL}?list_id=${getCreateExceptionListMinimalSchemaMock().list_id}`)
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('update exception list', () => {
+      it('should return 200 for editor', async () => {
+        // create a simple exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // update a exception list's name
+        const updatedList: UpdateExceptionListSchema = {
+          ...getUpdateMinimalExceptionListSchemaMock(),
+          name: 'some other name',
+        };
+
+        await editor.put(EXCEPTION_LIST_URL).set('kbn-xsrf', 'true').send(updatedList).expect(200);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/endpoint_operations_analyst.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/endpoint_operations_analyst.ts
new file mode 100644
index 0000000000000..19b4da0b5870b
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/endpoint_operations_analyst.ts
@@ -0,0 +1,122 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from 'expect';
+import TestAgent from 'supertest/lib/agent';
+import { EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import { getUpdateMinimalExceptionListSchemaMock } from '@kbn/lists-plugin/common/schemas/request/update_exception_list_schema.mock';
+import { UpdateExceptionListSchema } from '@kbn/securitysolution-io-ts-list-types';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+import { deleteAllExceptions } from '../../../../utils';
+
+export default ({ getService }: FtrProviderContext): void => {
+  const log = getService('log');
+  const utils = getService('securitySolutionUtils');
+
+  let admin: TestAgent;
+  let endpointOperationsAnalyst: TestAgent;
+
+  describe('@serverless @serverlessQA endpoint_operations_analyst exception list API behaviors', () => {
+    before(async () => {
+      admin = await utils.createSuperTest('admin');
+      endpointOperationsAnalyst = await utils.createSuperTest('endpoint_operations_analyst');
+      await deleteAllExceptions(admin, log);
+    });
+
+    afterEach(async () => {
+      await deleteAllExceptions(admin, log);
+    });
+
+    describe('create exception list', () => {
+      it('should return 200 for endpoint_operations_analyst', async () => {
+        await endpointOperationsAnalyst
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+      });
+    });
+
+    describe('delete exception list', () => {
+      it('should return 200 for endpoint_operations_analyst', async () => {
+        // create an exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await endpointOperationsAnalyst
+          .delete(
+            `${EXCEPTION_LIST_URL}?list_id=${getCreateExceptionListMinimalSchemaMock().list_id}`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('find exception list', () => {
+      it('should return 200 for endpoint_operations_analyst', async () => {
+        // add a single exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // query the single exception list from _find
+        const { body } = await endpointOperationsAnalyst
+          .get(`${EXCEPTION_LIST_URL}/_find`)
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+
+        expect(body.total).toEqual(1);
+      });
+    });
+
+    describe('read exception list', () => {
+      it('should return 200 for endpoint_operations_analyst', async () => {
+        // create a simple exception list to read
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await endpointOperationsAnalyst
+          .get(`${EXCEPTION_LIST_URL}?list_id=${getCreateExceptionListMinimalSchemaMock().list_id}`)
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('update exception list', () => {
+      it('should return 200 for endpoint_operations_analyst', async () => {
+        // create a simple exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // update a exception list's name
+        const updatedList: UpdateExceptionListSchema = {
+          ...getUpdateMinimalExceptionListSchemaMock(),
+          name: 'some other name',
+        };
+
+        await endpointOperationsAnalyst
+          .put(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(updatedList)
+          .expect(200);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/endpoint_policy_manager.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/endpoint_policy_manager.ts
new file mode 100644
index 0000000000000..8b0735d21ab38
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/endpoint_policy_manager.ts
@@ -0,0 +1,122 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from 'expect';
+import TestAgent from 'supertest/lib/agent';
+import { EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import { getUpdateMinimalExceptionListSchemaMock } from '@kbn/lists-plugin/common/schemas/request/update_exception_list_schema.mock';
+import { UpdateExceptionListSchema } from '@kbn/securitysolution-io-ts-list-types';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+import { deleteAllExceptions } from '../../../../utils';
+
+export default ({ getService }: FtrProviderContext): void => {
+  const log = getService('log');
+  const utils = getService('securitySolutionUtils');
+
+  let admin: TestAgent;
+  let endpointPolicyManager: TestAgent;
+
+  describe('@serverless @serverlessQA endpoint_policy_manager exception list API behaviors', () => {
+    before(async () => {
+      admin = await utils.createSuperTest('admin');
+      endpointPolicyManager = await utils.createSuperTest('endpoint_policy_manager');
+      await deleteAllExceptions(admin, log);
+    });
+
+    afterEach(async () => {
+      await deleteAllExceptions(admin, log);
+    });
+
+    describe('create exception list', () => {
+      it('should return 200 for endpoint_policy_manager', async () => {
+        await endpointPolicyManager
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+      });
+    });
+
+    describe('delete exception list', () => {
+      it('should return 200 for endpoint_policy_manager', async () => {
+        // create an exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await endpointPolicyManager
+          .delete(
+            `${EXCEPTION_LIST_URL}?list_id=${getCreateExceptionListMinimalSchemaMock().list_id}`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('find exception list', () => {
+      it('should return 200 for endpoint_policy_manager', async () => {
+        // add a single exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // query the single exception list from _find
+        const { body } = await endpointPolicyManager
+          .get(`${EXCEPTION_LIST_URL}/_find`)
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+
+        expect(body.total).toEqual(1);
+      });
+    });
+
+    describe('read exception list', () => {
+      it('should return 200 for endpoint_policy_manager', async () => {
+        // create a simple exception list to read
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await endpointPolicyManager
+          .get(`${EXCEPTION_LIST_URL}?list_id=${getCreateExceptionListMinimalSchemaMock().list_id}`)
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('update exception list', () => {
+      it('should return 200 for endpoint_policy_manager', async () => {
+        // create a simple exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // update a exception list's name
+        const updatedList: UpdateExceptionListSchema = {
+          ...getUpdateMinimalExceptionListSchemaMock(),
+          name: 'some other name',
+        };
+
+        await endpointPolicyManager
+          .put(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(updatedList)
+          .expect(200);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/index.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/index.ts
new file mode 100644
index 0000000000000..d3295ee8457c1
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/index.ts
@@ -0,0 +1,24 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+
+export default function ({ loadTestFile }: FtrProviderContext) {
+  describe('Exception list APIs Authentication - Complete Tier', function () {
+    loadTestFile(require.resolve('./tier_1_analyst'));
+    loadTestFile(require.resolve('./tier_2_analyst'));
+    loadTestFile(require.resolve('./threat_intel_analyst'));
+    loadTestFile(require.resolve('./tier_3_analyst'));
+    loadTestFile(require.resolve('./viewer'));
+    loadTestFile(require.resolve('./rule_author'));
+    loadTestFile(require.resolve('./soc_manager'));
+    loadTestFile(require.resolve('./endpoint_operations_analyst'));
+    loadTestFile(require.resolve('./endpoint_policy_manager'));
+    loadTestFile(require.resolve('./platform_engineer'));
+    loadTestFile(require.resolve('./editor'));
+    loadTestFile(require.resolve('./admin'));
+  });
+}
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/platform_engineer.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/platform_engineer.ts
new file mode 100644
index 0000000000000..a0d11f61368b7
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/platform_engineer.ts
@@ -0,0 +1,122 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from 'expect';
+import TestAgent from 'supertest/lib/agent';
+import { EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import { getUpdateMinimalExceptionListSchemaMock } from '@kbn/lists-plugin/common/schemas/request/update_exception_list_schema.mock';
+import { UpdateExceptionListSchema } from '@kbn/securitysolution-io-ts-list-types';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+import { deleteAllExceptions } from '../../../../utils';
+
+export default ({ getService }: FtrProviderContext): void => {
+  const log = getService('log');
+  const utils = getService('securitySolutionUtils');
+
+  let admin: TestAgent;
+  let platformEngineer: TestAgent;
+
+  describe('@serverless @serverlessQA platform_engineer exception list API behaviors', () => {
+    before(async () => {
+      admin = await utils.createSuperTest('admin');
+      platformEngineer = await utils.createSuperTest('platform_engineer');
+      await deleteAllExceptions(admin, log);
+    });
+
+    afterEach(async () => {
+      await deleteAllExceptions(admin, log);
+    });
+
+    describe('create exception list', () => {
+      it('should return 200 for platform_engineer', async () => {
+        await platformEngineer
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+      });
+    });
+
+    describe('delete exception list', () => {
+      it('should return 200 for platform_engineer', async () => {
+        // create an exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await platformEngineer
+          .delete(
+            `${EXCEPTION_LIST_URL}?list_id=${getCreateExceptionListMinimalSchemaMock().list_id}`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('find exception list', () => {
+      it('should return 200 for platform_engineer', async () => {
+        // add a single exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // query the single exception list from _find
+        const { body } = await platformEngineer
+          .get(`${EXCEPTION_LIST_URL}/_find`)
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+
+        expect(body.total).toEqual(1);
+      });
+    });
+
+    describe('read exception list', () => {
+      it('should return 200 for platform_engineer', async () => {
+        // create a simple exception list to read
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await platformEngineer
+          .get(`${EXCEPTION_LIST_URL}?list_id=${getCreateExceptionListMinimalSchemaMock().list_id}`)
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('update exception list', () => {
+      it('should return 200 for platform_engineer', async () => {
+        // create a simple exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // update a exception list's name
+        const updatedList: UpdateExceptionListSchema = {
+          ...getUpdateMinimalExceptionListSchemaMock(),
+          name: 'some other name',
+        };
+
+        await platformEngineer
+          .put(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(updatedList)
+          .expect(200);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/rule_author.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/rule_author.ts
new file mode 100644
index 0000000000000..2da3ea687ef6c
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/rule_author.ts
@@ -0,0 +1,122 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from 'expect';
+import TestAgent from 'supertest/lib/agent';
+import { EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import { getUpdateMinimalExceptionListSchemaMock } from '@kbn/lists-plugin/common/schemas/request/update_exception_list_schema.mock';
+import { UpdateExceptionListSchema } from '@kbn/securitysolution-io-ts-list-types';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+import { deleteAllExceptions } from '../../../../utils';
+
+export default ({ getService }: FtrProviderContext): void => {
+  const log = getService('log');
+  const utils = getService('securitySolutionUtils');
+
+  let admin: TestAgent;
+  let ruleAuthor: TestAgent;
+
+  describe('@serverless @serverlessQA rule_author exception list API behaviors', () => {
+    before(async () => {
+      admin = await utils.createSuperTest('admin');
+      ruleAuthor = await utils.createSuperTest('rule_author');
+      await deleteAllExceptions(admin, log);
+    });
+
+    afterEach(async () => {
+      await deleteAllExceptions(admin, log);
+    });
+
+    describe('create exception list', () => {
+      it('should return 200 for rule_author', async () => {
+        await ruleAuthor
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+      });
+    });
+
+    describe('delete exception list', () => {
+      it('should return 200 for rule_author', async () => {
+        // create an exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await ruleAuthor
+          .delete(
+            `${EXCEPTION_LIST_URL}?list_id=${getCreateExceptionListMinimalSchemaMock().list_id}`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('find exception list', () => {
+      it('should return 200 for rule_author', async () => {
+        // add a single exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // query the single exception list from _find
+        const { body } = await ruleAuthor
+          .get(`${EXCEPTION_LIST_URL}/_find`)
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+
+        expect(body.total).toEqual(1);
+      });
+    });
+
+    describe('read exception list', () => {
+      it('should return 200 for rule_author', async () => {
+        // create a simple exception list to read
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await ruleAuthor
+          .get(`${EXCEPTION_LIST_URL}?list_id=${getCreateExceptionListMinimalSchemaMock().list_id}`)
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('update exception list', () => {
+      it('should return 200 for rule_author', async () => {
+        // create a simple exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // update a exception list's name
+        const updatedList: UpdateExceptionListSchema = {
+          ...getUpdateMinimalExceptionListSchemaMock(),
+          name: 'some other name',
+        };
+
+        await ruleAuthor
+          .put(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(updatedList)
+          .expect(200);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/soc_manager.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/soc_manager.ts
new file mode 100644
index 0000000000000..6b9e6b9234157
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/soc_manager.ts
@@ -0,0 +1,122 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from 'expect';
+import TestAgent from 'supertest/lib/agent';
+import { EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import { getUpdateMinimalExceptionListSchemaMock } from '@kbn/lists-plugin/common/schemas/request/update_exception_list_schema.mock';
+import { UpdateExceptionListSchema } from '@kbn/securitysolution-io-ts-list-types';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+import { deleteAllExceptions } from '../../../../utils';
+
+export default ({ getService }: FtrProviderContext): void => {
+  const log = getService('log');
+  const utils = getService('securitySolutionUtils');
+
+  let admin: TestAgent;
+  let socManager: TestAgent;
+
+  describe('@serverless @serverlessQA soc_manager exception list API behaviors', () => {
+    before(async () => {
+      admin = await utils.createSuperTest('admin');
+      socManager = await utils.createSuperTest('soc_manager');
+      await deleteAllExceptions(admin, log);
+    });
+
+    afterEach(async () => {
+      await deleteAllExceptions(admin, log);
+    });
+
+    describe('create exception list', () => {
+      it('should return 200 for soc_manager', async () => {
+        await socManager
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+      });
+    });
+
+    describe('delete exception list', () => {
+      it('should return 200 for soc_manager', async () => {
+        // create an exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await socManager
+          .delete(
+            `${EXCEPTION_LIST_URL}?list_id=${getCreateExceptionListMinimalSchemaMock().list_id}`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('find exception list', () => {
+      it('should return 200 for soc_manager', async () => {
+        // add a single exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // query the single exception list from _find
+        const { body } = await socManager
+          .get(`${EXCEPTION_LIST_URL}/_find`)
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+
+        expect(body.total).toEqual(1);
+      });
+    });
+
+    describe('read exception list', () => {
+      it('should return 200 for soc_manager', async () => {
+        // create a simple exception list to read
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await socManager
+          .get(`${EXCEPTION_LIST_URL}?list_id=${getCreateExceptionListMinimalSchemaMock().list_id}`)
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('update exception list', () => {
+      it('should return 200 for soc_manager', async () => {
+        // create a simple exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // update a exception list's name
+        const updatedList: UpdateExceptionListSchema = {
+          ...getUpdateMinimalExceptionListSchemaMock(),
+          name: 'some other name',
+        };
+
+        await socManager
+          .put(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(updatedList)
+          .expect(200);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/threat_intel_analyst.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/threat_intel_analyst.ts
new file mode 100644
index 0000000000000..a25d98252782f
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/threat_intel_analyst.ts
@@ -0,0 +1,122 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from 'expect';
+import TestAgent from 'supertest/lib/agent';
+import { EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import { getUpdateMinimalExceptionListSchemaMock } from '@kbn/lists-plugin/common/schemas/request/update_exception_list_schema.mock';
+import { UpdateExceptionListSchema } from '@kbn/securitysolution-io-ts-list-types';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+import { deleteAllExceptions } from '../../../../utils';
+
+export default ({ getService }: FtrProviderContext): void => {
+  const log = getService('log');
+  const utils = getService('securitySolutionUtils');
+
+  let admin: TestAgent;
+  let threatIntelAnalyst: TestAgent;
+
+  describe('@serverless @serverlessQA threat_intelligence_analyst exception list API behaviors', () => {
+    before(async () => {
+      admin = await utils.createSuperTest('admin');
+      threatIntelAnalyst = await utils.createSuperTest('threat_intelligence_analyst');
+      await deleteAllExceptions(admin, log);
+    });
+
+    afterEach(async () => {
+      await deleteAllExceptions(admin, log);
+    });
+
+    describe('create exception list', () => {
+      it('should return 200 for threat_intelligence_analyst', async () => {
+        await threatIntelAnalyst
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+      });
+    });
+
+    describe('delete exception list', () => {
+      it('should return 200 for threat_intelligence_analyst', async () => {
+        // create an exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await threatIntelAnalyst
+          .delete(
+            `${EXCEPTION_LIST_URL}?list_id=${getCreateExceptionListMinimalSchemaMock().list_id}`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('find exception list', () => {
+      it('should return 200 for threat_intelligence_analyst', async () => {
+        // add a single exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // query the single exception list from _find
+        const { body } = await threatIntelAnalyst
+          .get(`${EXCEPTION_LIST_URL}/_find`)
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+
+        expect(body.total).toEqual(1);
+      });
+    });
+
+    describe('read exception list', () => {
+      it('should return 200 for threat_intelligence_analyst', async () => {
+        // create a simple exception list to read
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await threatIntelAnalyst
+          .get(`${EXCEPTION_LIST_URL}?list_id=${getCreateExceptionListMinimalSchemaMock().list_id}`)
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('update exception list', () => {
+      it('should return 200 for threat_intelligence_analyst', async () => {
+        // create a simple exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // update a exception list's name
+        const updatedList: UpdateExceptionListSchema = {
+          ...getUpdateMinimalExceptionListSchemaMock(),
+          name: 'some other name',
+        };
+
+        await threatIntelAnalyst
+          .put(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(updatedList)
+          .expect(200);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/tier_1_analyst.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/tier_1_analyst.ts
new file mode 100644
index 0000000000000..60f9be5afcb87
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/tier_1_analyst.ts
@@ -0,0 +1,122 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from 'expect';
+import TestAgent from 'supertest/lib/agent';
+import { EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import { getUpdateMinimalExceptionListSchemaMock } from '@kbn/lists-plugin/common/schemas/request/update_exception_list_schema.mock';
+import { UpdateExceptionListSchema } from '@kbn/securitysolution-io-ts-list-types';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+import { deleteAllExceptions } from '../../../../utils';
+
+export default ({ getService }: FtrProviderContext): void => {
+  const log = getService('log');
+  const utils = getService('securitySolutionUtils');
+
+  let admin: TestAgent;
+  let t1Analyst: TestAgent;
+
+  describe('@serverless @serverlessQA t1_analyst exception list API behaviors', () => {
+    before(async () => {
+      admin = await utils.createSuperTest('admin');
+      t1Analyst = await utils.createSuperTest('t1_analyst');
+      await deleteAllExceptions(admin, log);
+    });
+
+    afterEach(async () => {
+      await deleteAllExceptions(admin, log);
+    });
+
+    describe('create exception list', () => {
+      it('should return 403 for t1_analyst', async () => {
+        await t1Analyst
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(403);
+      });
+    });
+
+    describe('delete exception list', () => {
+      it('should return 403 for t1_analyst', async () => {
+        // create an exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await t1Analyst
+          .delete(
+            `${EXCEPTION_LIST_URL}?list_id=${getCreateExceptionListMinimalSchemaMock().list_id}`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(403);
+      });
+    });
+
+    describe('find exception list', () => {
+      it('should return 200 for t1_analyst', async () => {
+        // add a single exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // query the single exception list from _find
+        const { body } = await t1Analyst
+          .get(`${EXCEPTION_LIST_URL}/_find`)
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+
+        expect(body.total).toEqual(1);
+      });
+    });
+
+    describe('read exception list', () => {
+      it('should return 200 for t1_analyst', async () => {
+        // create a simple exception list to read
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await t1Analyst
+          .get(`${EXCEPTION_LIST_URL}?list_id=${getCreateExceptionListMinimalSchemaMock().list_id}`)
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('update exception list', () => {
+      it('should return 403 for t1_analyst', async () => {
+        // create a simple exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // update a exception list's name
+        const updatedList: UpdateExceptionListSchema = {
+          ...getUpdateMinimalExceptionListSchemaMock(),
+          name: 'some other name',
+        };
+
+        await t1Analyst
+          .put(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(updatedList)
+          .expect(403);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/tier_2_analyst.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/tier_2_analyst.ts
new file mode 100644
index 0000000000000..5e501e1a83512
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/tier_2_analyst.ts
@@ -0,0 +1,122 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from 'expect';
+import TestAgent from 'supertest/lib/agent';
+import { EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import { getUpdateMinimalExceptionListSchemaMock } from '@kbn/lists-plugin/common/schemas/request/update_exception_list_schema.mock';
+import { UpdateExceptionListSchema } from '@kbn/securitysolution-io-ts-list-types';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+import { deleteAllExceptions } from '../../../../utils';
+
+export default ({ getService }: FtrProviderContext): void => {
+  const log = getService('log');
+  const utils = getService('securitySolutionUtils');
+
+  let admin: TestAgent;
+  let t2Analyst: TestAgent;
+
+  describe('@serverless @serverlessQA t2_analyst exception list API behaviors', () => {
+    before(async () => {
+      admin = await utils.createSuperTest('admin');
+      t2Analyst = await utils.createSuperTest('t2_analyst');
+      await deleteAllExceptions(admin, log);
+    });
+
+    afterEach(async () => {
+      await deleteAllExceptions(admin, log);
+    });
+
+    describe('create exception list', () => {
+      it('should return 403 for t2_analyst', async () => {
+        await t2Analyst
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(403);
+      });
+    });
+
+    describe('delete exception list', () => {
+      it('should return 403 for t2_analyst', async () => {
+        // create an exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await t2Analyst
+          .delete(
+            `${EXCEPTION_LIST_URL}?list_id=${getCreateExceptionListMinimalSchemaMock().list_id}`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(403);
+      });
+    });
+
+    describe('find exception list', () => {
+      it('should return 200 for t2_analyst', async () => {
+        // add a single exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // query the single exception list from _find
+        const { body } = await t2Analyst
+          .get(`${EXCEPTION_LIST_URL}/_find`)
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+
+        expect(body.total).toEqual(1);
+      });
+    });
+
+    describe('read exception list', () => {
+      it('should return 200 for t2_analyst', async () => {
+        // create a simple exception list to read
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await t2Analyst
+          .get(`${EXCEPTION_LIST_URL}?list_id=${getCreateExceptionListMinimalSchemaMock().list_id}`)
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('update exception list', () => {
+      it('should return 403 for t2_analyst', async () => {
+        // create a simple exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // update a exception list's name
+        const updatedList: UpdateExceptionListSchema = {
+          ...getUpdateMinimalExceptionListSchemaMock(),
+          name: 'some other name',
+        };
+
+        await t2Analyst
+          .put(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(updatedList)
+          .expect(403);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/tier_3_analyst.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/tier_3_analyst.ts
new file mode 100644
index 0000000000000..3c12223d089b7
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/tier_3_analyst.ts
@@ -0,0 +1,122 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from 'expect';
+import TestAgent from 'supertest/lib/agent';
+import { EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import { getUpdateMinimalExceptionListSchemaMock } from '@kbn/lists-plugin/common/schemas/request/update_exception_list_schema.mock';
+import { UpdateExceptionListSchema } from '@kbn/securitysolution-io-ts-list-types';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+import { deleteAllExceptions } from '../../../../utils';
+
+export default ({ getService }: FtrProviderContext): void => {
+  const log = getService('log');
+  const utils = getService('securitySolutionUtils');
+
+  let admin: TestAgent;
+  let t3Analyst: TestAgent;
+
+  describe('@serverless @serverlessQA t3_analyst exception list API behaviors', () => {
+    before(async () => {
+      admin = await utils.createSuperTest('admin');
+      t3Analyst = await utils.createSuperTest('t3_analyst');
+      await deleteAllExceptions(admin, log);
+    });
+
+    afterEach(async () => {
+      await deleteAllExceptions(admin, log);
+    });
+
+    describe('create exception list', () => {
+      it('should return 200 for t3_analyst', async () => {
+        await t3Analyst
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+      });
+    });
+
+    describe('delete exception list', () => {
+      it('should return 200 for t3_analyst', async () => {
+        // create an exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await t3Analyst
+          .delete(
+            `${EXCEPTION_LIST_URL}?list_id=${getCreateExceptionListMinimalSchemaMock().list_id}`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('find exception list', () => {
+      it('should return 200 for t3_analyst', async () => {
+        // add a single exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // query the single exception list from _find
+        const { body } = await t3Analyst
+          .get(`${EXCEPTION_LIST_URL}/_find`)
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+
+        expect(body.total).toEqual(1);
+      });
+    });
+
+    describe('read exception list', () => {
+      it('should return 200 for t3_analyst', async () => {
+        // create a simple exception list to read
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await t3Analyst
+          .get(`${EXCEPTION_LIST_URL}?list_id=${getCreateExceptionListMinimalSchemaMock().list_id}`)
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('update exception list', () => {
+      it('should return 200 for t3_analyst', async () => {
+        // create a simple exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // update a exception list's name
+        const updatedList: UpdateExceptionListSchema = {
+          ...getUpdateMinimalExceptionListSchemaMock(),
+          name: 'some other name',
+        };
+
+        await t3Analyst
+          .put(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(updatedList)
+          .expect(200);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/viewer.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/viewer.ts
new file mode 100644
index 0000000000000..e4bc47ea1b840
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/authorization/exceptions/lists/essentials_tier/viewer.ts
@@ -0,0 +1,118 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from 'expect';
+import TestAgent from 'supertest/lib/agent';
+import { EXCEPTION_LIST_URL } from '@kbn/securitysolution-list-constants';
+import { getCreateExceptionListMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import { getUpdateMinimalExceptionListSchemaMock } from '@kbn/lists-plugin/common/schemas/request/update_exception_list_schema.mock';
+import { UpdateExceptionListSchema } from '@kbn/securitysolution-io-ts-list-types';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+import { deleteAllExceptions } from '../../../../utils';
+
+export default ({ getService }: FtrProviderContext): void => {
+  const log = getService('log');
+  const utils = getService('securitySolutionUtils');
+
+  let admin: TestAgent;
+  let viewer: TestAgent;
+
+  describe('@serverless @serverlessQA viewer exception list API behaviors', () => {
+    before(async () => {
+      admin = await utils.createSuperTest('admin');
+      viewer = await utils.createSuperTest('viewer');
+      await deleteAllExceptions(admin, log);
+    });
+
+    afterEach(async () => {
+      await deleteAllExceptions(admin, log);
+    });
+
+    describe('create exception list', () => {
+      it('should return 403 for viewer', async () => {
+        await viewer
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(403);
+      });
+    });
+
+    describe('delete exception list', () => {
+      it('should return 403 for viewer', async () => {
+        // create an exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await viewer
+          .delete(
+            `${EXCEPTION_LIST_URL}?list_id=${getCreateExceptionListMinimalSchemaMock().list_id}`
+          )
+          .set('kbn-xsrf', 'true')
+          .expect(403);
+      });
+    });
+
+    describe('find exception list', () => {
+      it('should return 200 for viewer', async () => {
+        // add a single exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // query the single exception list from _find
+        const { body } = await viewer
+          .get(`${EXCEPTION_LIST_URL}/_find`)
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+
+        expect(body.total).toEqual(1);
+      });
+    });
+
+    describe('read exception list', () => {
+      it('should return 200 for viewer', async () => {
+        // create a simple exception list to read
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        await viewer
+          .get(`${EXCEPTION_LIST_URL}?list_id=${getCreateExceptionListMinimalSchemaMock().list_id}`)
+          .set('kbn-xsrf', 'true')
+          .expect(200);
+      });
+    });
+
+    describe('update exception list', () => {
+      it('should return 403 for viewer', async () => {
+        // create a simple exception list
+        await admin
+          .post(EXCEPTION_LIST_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getCreateExceptionListMinimalSchemaMock())
+          .expect(200);
+
+        // update a exception list's name
+        const updatedList: UpdateExceptionListSchema = {
+          ...getUpdateMinimalExceptionListSchemaMock(),
+          name: 'some other name',
+        };
+
+        await viewer.put(EXCEPTION_LIST_URL).set('kbn-xsrf', 'true').send(updatedList).expect(403);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/exception_lists_items/trial_license_complete_tier/lists/duplicate_exception_list.ts b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/exception_lists_items/trial_license_complete_tier/lists/duplicate_exception_list.ts
index 6501ac284b7ff..a9c861dfcc74a 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/exception_lists_items/trial_license_complete_tier/lists/duplicate_exception_list.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/lists_and_exception_lists/exception_lists_items/trial_license_complete_tier/lists/duplicate_exception_list.ts
@@ -13,7 +13,10 @@ import {
   EXCEPTION_LIST_URL,
 } from '@kbn/securitysolution-list-constants';
 import { getExceptionResponseMockWithoutAutoGeneratedValues } from '@kbn/lists-plugin/common/schemas/response/exception_list_schema.mock';
-import { getCreateExceptionListDetectionSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
+import {
+  getCreateExceptionListDetectionSchemaMock,
+  getCreateExceptionListMinimalSchemaMock,
+} from '@kbn/lists-plugin/common/schemas/request/create_exception_list_schema.mock';
 import { getCreateExceptionListItemMinimalSchemaMock } from '@kbn/lists-plugin/common/schemas/request/create_exception_list_item_schema.mock';
 
 import { deleteAllExceptions, removeExceptionListServerGeneratedProperties } from '../../../utils';
@@ -76,7 +79,7 @@ export default ({ getService }: FtrProviderContext) => {
       const { body: listBody } = await supertest
         .post(
           `${EXCEPTION_LIST_URL}/_duplicate?list_id=${
-            getCreateExceptionListDetectionSchemaMock().list_id
+            getCreateExceptionListMinimalSchemaMock().list_id
           }&namespace_type=single&include_expired_exceptions=true`
         )
         .set('kbn-xsrf', 'true')
diff --git a/x-pack/test/security_solution_cypress/cypress/e2e/detection_response/rule_management/prebuilt_rules/update_workflow_with_prebuilt_rule_customization.cy.ts b/x-pack/test/security_solution_cypress/cypress/e2e/detection_response/rule_management/prebuilt_rules/update_workflow_with_prebuilt_rule_customization.cy.ts
new file mode 100644
index 0000000000000..52b050f46c06e
--- /dev/null
+++ b/x-pack/test/security_solution_cypress/cypress/e2e/detection_response/rule_management/prebuilt_rules/update_workflow_with_prebuilt_rule_customization.cy.ts
@@ -0,0 +1,110 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { patchRule } from '../../../../tasks/api_calls/rules';
+import { createRuleAssetSavedObject } from '../../../../helpers/rules';
+import {
+  MODIFIED_RULE_BADGE,
+  RULES_UPDATES_TABLE,
+} from '../../../../screens/alerts_detection_rules';
+import { deleteAlertsAndRules } from '../../../../tasks/api_calls/common';
+import {
+  installPrebuiltRuleAssets,
+  createAndInstallMockedPrebuiltRules,
+} from '../../../../tasks/api_calls/prebuilt_rules';
+import { resetRulesTableState } from '../../../../tasks/common';
+import { login } from '../../../../tasks/login';
+import {
+  assertRulesNotPresentInRuleUpdatesTable,
+  assertRulesPresentInRuleUpdatesTable,
+  clickRuleUpdatesTab,
+  filterPrebuiltRulesUpdateTableByRuleCustomization,
+} from '../../../../tasks/prebuilt_rules';
+import { visitRulesManagementTable } from '../../../../tasks/rules_management';
+
+describe(
+  'Detection rules, Prebuilt Rules Installation and Update workflow - With Rule Customization',
+  {
+    tags: ['@ess', '@serverless', '@skipInServerlessMKI'],
+    env: {
+      ftrConfig: {
+        kbnServerArgs: [
+          `--xpack.securitySolution.enableExperimental=${JSON.stringify([
+            'prebuiltRulesCustomizationEnabled',
+          ])}`,
+        ],
+      },
+    },
+  },
+
+  () => {
+    describe('Upgrade of prebuilt rules with conflicts', () => {
+      const RULE_1_ID = 'rule_1';
+      const RULE_2_ID = 'rule_2';
+      const OUTDATED_RULE_1 = createRuleAssetSavedObject({
+        name: 'Outdated rule 1',
+        rule_id: RULE_1_ID,
+        version: 1,
+      });
+      const UPDATED_RULE_1 = createRuleAssetSavedObject({
+        name: 'Updated rule 1',
+        rule_id: RULE_1_ID,
+        version: 2,
+      });
+      const OUTDATED_RULE_2 = createRuleAssetSavedObject({
+        name: 'Outdated rule 2',
+        rule_id: RULE_2_ID,
+        version: 1,
+      });
+      const UPDATED_RULE_2 = createRuleAssetSavedObject({
+        name: 'Updated rule 2',
+        rule_id: RULE_2_ID,
+        version: 2,
+      });
+      const patchedName = 'A new name that creates a conflict';
+      beforeEach(() => {
+        login();
+        resetRulesTableState();
+        deleteAlertsAndRules();
+        cy.intercept('POST', '/internal/detection_engine/prebuilt_rules/upgrade/_perform').as(
+          'updatePrebuiltRules'
+        );
+        /* Create a new rule and install it */
+        createAndInstallMockedPrebuiltRules([OUTDATED_RULE_1, OUTDATED_RULE_2]);
+        /* Modify one of the rule's name to cause a conflict */
+        patchRule(OUTDATED_RULE_1['security-rule'].rule_id, {
+          name: patchedName,
+        });
+        /* Create a second version of the rule, making it available for update */
+        installPrebuiltRuleAssets([UPDATED_RULE_1, UPDATED_RULE_2]);
+
+        visitRulesManagementTable();
+        clickRuleUpdatesTab();
+      });
+
+      it('should filter by customized prebuilt rules', () => {
+        // Filter table to show modified rules only
+        filterPrebuiltRulesUpdateTableByRuleCustomization('Modified');
+        cy.get(MODIFIED_RULE_BADGE).should('exist');
+
+        // Verify only rules with customized rule sources are displayed
+        cy.get(RULES_UPDATES_TABLE).contains(patchedName);
+        assertRulesNotPresentInRuleUpdatesTable([OUTDATED_RULE_2]);
+      });
+
+      it('should filter by customized prebuilt rules', () => {
+        // Filter table to show unmodified rules only
+        filterPrebuiltRulesUpdateTableByRuleCustomization('Unmodified');
+        cy.get(MODIFIED_RULE_BADGE).should('not.exist');
+
+        // Verify only rules with non-customized rule sources are displayed
+        assertRulesPresentInRuleUpdatesTable([OUTDATED_RULE_2]);
+        cy.get(patchedName).should('not.exist');
+      });
+    });
+  }
+);
diff --git a/x-pack/test/security_solution_cypress/cypress/e2e/investigations/sourcerer/sourcerer_timeline.cy.ts b/x-pack/test/security_solution_cypress/cypress/e2e/investigations/sourcerer/sourcerer_timeline.cy.ts
index 1fb3b3c936f4f..9d2e1ac2e11a5 100644
--- a/x-pack/test/security_solution_cypress/cypress/e2e/investigations/sourcerer/sourcerer_timeline.cy.ts
+++ b/x-pack/test/security_solution_cypress/cypress/e2e/investigations/sourcerer/sourcerer_timeline.cy.ts
@@ -40,8 +40,7 @@ import { closeTimeline, openTimelineById } from '../../../tasks/timeline';
 const siemDataViewTitle = 'Security Default Data View';
 const dataViews = ['logs-*', 'metrics-*', '.kibana-event-log-*'];
 
-// Failing: See https://github.com/elastic/kibana/issues/198943
-describe.skip('Timeline scope', { tags: ['@ess', '@serverless', '@skipInServerless'] }, () => {
+describe('Timeline scope', { tags: ['@ess', '@serverless', '@skipInServerless'] }, () => {
   before(() => {
     waitForRulesBootstrap();
   });
@@ -64,8 +63,7 @@ describe.skip('Timeline scope', { tags: ['@ess', '@serverless', '@skipInServerle
   });
 
   describe('Modified badge', () => {
-    // failing on main multiple times https://github.com/elastic/kibana/issues/198944#issuecomment-2457665138 and https://github.com/elastic/kibana/issues/198943#issuecomment-2457665072
-    it.skip('Selecting new data view does not add a modified badge', () => {
+    it('Selecting new data view does not add a modified badge', () => {
       openTimelineUsingToggle();
       cy.get(SOURCERER.badgeModified).should(`not.exist`);
       openSourcerer('timeline');
@@ -135,8 +133,7 @@ describe.skip('Timeline scope', { tags: ['@ess', '@serverless', '@skipInServerle
     });
 
     const defaultPatterns = [`auditbeat-*`, `${DEFAULT_ALERTS_INDEX}-default`];
-    // failing on main multiple times https://github.com/elastic/kibana/issues/198944#issuecomment-2457665138 and https://github.com/elastic/kibana/issues/198943#issuecomment-2457665072
-    it.skip('alerts checkbox behaves as expected', () => {
+    it('alerts checkbox behaves as expected', () => {
       isDataViewSelection(siemDataViewTitle);
       defaultPatterns.forEach((pattern) => isSourcererSelection(pattern));
       openDataViewSelection();
diff --git a/x-pack/test/security_solution_cypress/cypress/screens/alerts_detection_rules.ts b/x-pack/test/security_solution_cypress/cypress/screens/alerts_detection_rules.ts
index bbc7a346b252f..e2ce41dee2847 100644
--- a/x-pack/test/security_solution_cypress/cypress/screens/alerts_detection_rules.ts
+++ b/x-pack/test/security_solution_cypress/cypress/screens/alerts_detection_rules.ts
@@ -349,3 +349,5 @@ export const ESQL_QUERY_VALUE = '[data-test-subj="esqlQueryPropertyValue"]';
 
 export const PER_FIELD_DIFF_WRAPPER = '[data-test-subj="ruleUpgradePerFieldDiffWrapper"]';
 export const PER_FIELD_DIFF_DEFINITION_SECTION = '[data-test-subj="perFieldDiffDefinitionSection"]';
+
+export const MODIFIED_RULE_BADGE = '[data-test-subj="upgradeRulesTableModifiedColumnBadge"]';
diff --git a/x-pack/test/security_solution_cypress/cypress/screens/rule_updates.ts b/x-pack/test/security_solution_cypress/cypress/screens/rule_updates.ts
new file mode 100644
index 0000000000000..4b11a4624c3e2
--- /dev/null
+++ b/x-pack/test/security_solution_cypress/cypress/screens/rule_updates.ts
@@ -0,0 +1,12 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export const RULE_UPGRADE_TABLE_MODIFICATION_FILTER_BUTTON =
+  '[data-test-subj="rule-customization-filter-popover-button"]';
+
+export const RULE_UPGRADE_TABLE_MODIFICATION_FILTER_PANEL =
+  '[data-test-subj="rule-customization-filter-popover"]';
diff --git a/x-pack/test/security_solution_cypress/cypress/tasks/api_calls/rules.ts b/x-pack/test/security_solution_cypress/cypress/tasks/api_calls/rules.ts
index 008fc92bd0224..c0ef625f52e35 100644
--- a/x-pack/test/security_solution_cypress/cypress/tasks/api_calls/rules.ts
+++ b/x-pack/test/security_solution_cypress/cypress/tasks/api_calls/rules.ts
@@ -39,6 +39,23 @@ export const createRule = (
   );
 };
 
+export const patchRule = (
+  ruleId: string,
+  updateData: Partial<RuleCreateProps>
+): Cypress.Chainable<Cypress.Response<RuleResponse>> => {
+  return cy.currentSpace().then((spaceId) =>
+    rootRequest<RuleResponse>({
+      method: 'PATCH',
+      url: spaceId ? getSpaceUrl(spaceId, DETECTION_ENGINE_RULES_URL) : DETECTION_ENGINE_RULES_URL,
+      body: {
+        rule_id: ruleId,
+        ...updateData,
+      },
+      failOnStatusCode: false,
+    })
+  );
+};
+
 /**
  * Snoozes a rule via API
  *
diff --git a/x-pack/test/security_solution_cypress/cypress/tasks/prebuilt_rules.ts b/x-pack/test/security_solution_cypress/cypress/tasks/prebuilt_rules.ts
index b4f68dba976c3..d4148d5e632a1 100644
--- a/x-pack/test/security_solution_cypress/cypress/tasks/prebuilt_rules.ts
+++ b/x-pack/test/security_solution_cypress/cypress/tasks/prebuilt_rules.ts
@@ -17,6 +17,10 @@ import {
   TOASTER,
 } from '../screens/alerts_detection_rules';
 import type { SAMPLE_PREBUILT_RULE } from './api_calls/prebuilt_rules';
+import {
+  RULE_UPGRADE_TABLE_MODIFICATION_FILTER_BUTTON,
+  RULE_UPGRADE_TABLE_MODIFICATION_FILTER_PANEL,
+} from '../screens/rule_updates';
 
 export const clickAddElasticRulesButton = () => {
   cy.get(ADD_ELASTIC_RULES_BTN).click();
@@ -150,3 +154,9 @@ export const assertRulesNotPresentInRuleUpdatesTable = (
     cy.get(rule['security-rule'].name).should('not.exist');
   }
 };
+
+export const filterPrebuiltRulesUpdateTableByRuleCustomization = (text: string) => {
+  cy.get(RULE_UPGRADE_TABLE_MODIFICATION_FILTER_BUTTON).click();
+  cy.get(RULE_UPGRADE_TABLE_MODIFICATION_FILTER_PANEL).contains(text).click();
+  cy.get(RULE_UPGRADE_TABLE_MODIFICATION_FILTER_BUTTON).click();
+};
diff --git a/x-pack/test/tsconfig.json b/x-pack/test/tsconfig.json
index 2ba14ceb1218c..9db41aecbb612 100644
--- a/x-pack/test/tsconfig.json
+++ b/x-pack/test/tsconfig.json
@@ -187,6 +187,6 @@
     "@kbn/alerting-types",
     "@kbn/ai-assistant-common",
     "@kbn/core-deprecations-common",
-    "@kbn/usage-collection-plugin"
+    "@kbn/usage-collection-plugin",
   ]
 }
diff --git a/x-pack/test/ui_capabilities/common/config.ts b/x-pack/test/ui_capabilities/common/config.ts
index ba40e613c0d69..18a96b8e26274 100644
--- a/x-pack/test/ui_capabilities/common/config.ts
+++ b/x-pack/test/ui_capabilities/common/config.ts
@@ -46,6 +46,10 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
             .filter((k) => k !== 'security')
             .map((key) => `--xpack.${key}.enabled=false`),
           `--plugin-path=${path.resolve(__dirname, 'plugins/foo_plugin')}`,
+          `--plugin-path=${path.resolve(
+            __dirname,
+            '../../security_api_integration/plugins/features_provider'
+          )}`,
         ],
       },
     };
diff --git a/x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/index.ts b/x-pack/test_serverless/api_integration/test_suites/common/data_usage/index.ts
similarity index 53%
rename from x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/index.ts
rename to x-pack/test_serverless/api_integration/test_suites/common/data_usage/index.ts
index 01e91f1d5840b..cf31e1885d1d5 100644
--- a/x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/index.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/common/data_usage/index.ts
@@ -8,11 +8,10 @@
 import { FtrProviderContext } from '../../../ftr_provider_context';
 
 export default function ({ loadTestFile }: FtrProviderContext) {
-  describe('Custom Threshold Rule', function () {
-    loadTestFile(require.resolve('./avg_pct_no_data'));
-    loadTestFile(require.resolve('./documents_count_fired'));
-    loadTestFile(require.resolve('./custom_eq_avg_bytes_fired'));
-    loadTestFile(require.resolve('./group_by_fired'));
-    loadTestFile(require.resolve('./p99_pct_fired'));
+  describe('Serverless Data Usage APIs', function () {
+    this.tags(['esGate']);
+
+    loadTestFile(require.resolve('./tests/data_streams'));
+    loadTestFile(require.resolve('./tests/metrics'));
   });
 }
diff --git a/x-pack/test_serverless/api_integration/test_suites/common/data_usage/mock_api.ts b/x-pack/test_serverless/api_integration/test_suites/common/data_usage/mock_api.ts
new file mode 100644
index 0000000000000..0a9438e826ef3
--- /dev/null
+++ b/x-pack/test_serverless/api_integration/test_suites/common/data_usage/mock_api.ts
@@ -0,0 +1,23 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { createServer } from '@mswjs/http-middleware';
+import { UsageMetricsAutoOpsResponseSchemaBody } from '@kbn/data-usage-plugin/common/rest_types';
+import { http, HttpResponse, StrictResponse } from 'msw';
+import { mockAutoOpsResponse } from './mock_data';
+
+export const setupMockServer = () => {
+  const server = createServer(autoOpsHandler);
+  return server;
+};
+
+const autoOpsHandler = http.post(
+  '/',
+  async ({ request }): Promise<StrictResponse<UsageMetricsAutoOpsResponseSchemaBody>> => {
+    return HttpResponse.json(mockAutoOpsResponse);
+  }
+);
diff --git a/x-pack/test_serverless/api_integration/test_suites/common/data_usage/mock_data.ts b/x-pack/test_serverless/api_integration/test_suites/common/data_usage/mock_data.ts
new file mode 100644
index 0000000000000..c38cc57d2b546
--- /dev/null
+++ b/x-pack/test_serverless/api_integration/test_suites/common/data_usage/mock_data.ts
@@ -0,0 +1,43 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export const mockAutoOpsResponse = {
+  metrics: {
+    ingest_rate: [
+      {
+        name: 'metrics-system.cpu-default',
+        data: [
+          [1726858530000, 13756849],
+          [1726862130000, 14657904],
+        ],
+      },
+      {
+        name: 'logs-nginx.access-default',
+        data: [
+          [1726858530000, 12894623],
+          [1726862130000, 14436905],
+        ],
+      },
+    ],
+    storage_retained: [
+      {
+        name: 'metrics-system.cpu-default',
+        data: [
+          [1726858530000, 12576413],
+          [1726862130000, 13956423],
+        ],
+      },
+      {
+        name: 'logs-nginx.access-default',
+        data: [
+          [1726858530000, 12894623],
+          [1726862130000, 14436905],
+        ],
+      },
+    ],
+  },
+};
diff --git a/x-pack/test_serverless/api_integration/test_suites/common/data_usage/tests/data_streams.ts b/x-pack/test_serverless/api_integration/test_suites/common/data_usage/tests/data_streams.ts
new file mode 100644
index 0000000000000..d805b8ccff6fe
--- /dev/null
+++ b/x-pack/test_serverless/api_integration/test_suites/common/data_usage/tests/data_streams.ts
@@ -0,0 +1,56 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from '@kbn/expect';
+import { SupertestWithRoleScope } from '@kbn/test-suites-xpack/api_integration/deployment_agnostic/services/role_scoped_supertest';
+import { DataStreamsResponseBodySchemaBody } from '@kbn/data-usage-plugin/common/rest_types';
+import { DATA_USAGE_DATA_STREAMS_API_ROUTE } from '@kbn/data-usage-plugin/common';
+import { FtrProviderContext } from '../../../../ftr_provider_context';
+
+export default function ({ getService }: FtrProviderContext) {
+  const svlDatastreamsHelpers = getService('svlDatastreamsHelpers');
+  const roleScopedSupertest = getService('roleScopedSupertest');
+  let supertestAdminWithCookieCredentials: SupertestWithRoleScope;
+  const testDataStreamName = 'test-data-stream';
+  describe(`GET ${DATA_USAGE_DATA_STREAMS_API_ROUTE}`, function () {
+    // due to the plugin depending on yml config (xpack.dataUsage.enabled), we cannot test in MKI until it is on by default
+    this.tags(['skipMKI']);
+    before(async () => {
+      await svlDatastreamsHelpers.createDataStream(testDataStreamName);
+      supertestAdminWithCookieCredentials = await roleScopedSupertest.getSupertestWithRoleScope(
+        'admin',
+        {
+          useCookieHeader: true,
+          withInternalHeaders: true,
+        }
+      );
+    });
+    after(async () => {
+      await svlDatastreamsHelpers.deleteDataStream(testDataStreamName);
+    });
+
+    it('returns created data streams', async () => {
+      const res = await supertestAdminWithCookieCredentials
+        .get(DATA_USAGE_DATA_STREAMS_API_ROUTE)
+        .set('elastic-api-version', '1');
+      const dataStreams: DataStreamsResponseBodySchemaBody = res.body;
+      const foundStream = dataStreams.find((stream) => stream.name === testDataStreamName);
+      expect(foundStream?.name).to.be(testDataStreamName);
+      expect(foundStream?.storageSizeBytes).to.be(0);
+      expect(res.statusCode).to.be(200);
+    });
+    it('returns system indices', async () => {
+      const res = await supertestAdminWithCookieCredentials
+        .get(DATA_USAGE_DATA_STREAMS_API_ROUTE)
+        .set('elastic-api-version', '1');
+      const dataStreams: DataStreamsResponseBodySchemaBody = res.body;
+      const systemDataStreams = dataStreams.filter((stream) => stream.name.startsWith('.'));
+      expect(systemDataStreams.length).to.be.greaterThan(0);
+      expect(res.statusCode).to.be(200);
+    });
+  });
+}
diff --git a/x-pack/test_serverless/api_integration/test_suites/common/data_usage/tests/metrics.ts b/x-pack/test_serverless/api_integration/test_suites/common/data_usage/tests/metrics.ts
new file mode 100644
index 0000000000000..8985757ab1cab
--- /dev/null
+++ b/x-pack/test_serverless/api_integration/test_suites/common/data_usage/tests/metrics.ts
@@ -0,0 +1,110 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from '@kbn/expect';
+import http from 'http';
+
+import { SupertestWithRoleScope } from '@kbn/test-suites-xpack/api_integration/deployment_agnostic/services/role_scoped_supertest';
+import { UsageMetricsRequestBody } from '@kbn/data-usage-plugin/common/rest_types';
+import { DATA_USAGE_METRICS_API_ROUTE } from '@kbn/data-usage-plugin/common';
+import { transformMetricsData } from '@kbn/data-usage-plugin/server/routes/internal/usage_metrics_handler';
+import { FtrProviderContext } from '../../../../ftr_provider_context';
+import { setupMockServer } from '../mock_api';
+import { mockAutoOpsResponse } from '../mock_data';
+
+export default function ({ getService }: FtrProviderContext) {
+  const svlDatastreamsHelpers = getService('svlDatastreamsHelpers');
+  const roleScopedSupertest = getService('roleScopedSupertest');
+  let supertestAdminWithCookieCredentials: SupertestWithRoleScope;
+  const mockAutoopsApiService = setupMockServer();
+  describe('Metrics', function () {
+    let mockApiServer: http.Server;
+    // due to the plugin depending on yml config (xpack.dataUsage.enabled), we cannot test in MKI until it is on by default
+    this.tags(['skipMKI']);
+
+    before(async () => {
+      mockApiServer = mockAutoopsApiService.listen(9000);
+      supertestAdminWithCookieCredentials = await roleScopedSupertest.getSupertestWithRoleScope(
+        'admin',
+        {
+          useCookieHeader: true,
+          withInternalHeaders: true,
+        }
+      );
+    });
+
+    after(() => {
+      mockApiServer.close();
+    });
+    describe(`POST ${DATA_USAGE_METRICS_API_ROUTE}`, () => {
+      const testDataStreamName = 'test-data-stream';
+      before(async () => await svlDatastreamsHelpers.createDataStream(testDataStreamName));
+      after(async () => await svlDatastreamsHelpers.deleteDataStream(testDataStreamName));
+      it('returns 400 with non-existent data streams', async () => {
+        const requestBody: UsageMetricsRequestBody = {
+          from: 'now-24h/h',
+          to: 'now',
+          metricTypes: ['ingest_rate', 'storage_retained'],
+          dataStreams: ['invalid-data-stream'],
+        };
+        const res = await supertestAdminWithCookieCredentials
+          .post(DATA_USAGE_METRICS_API_ROUTE)
+          .set('elastic-api-version', '1')
+          .send(requestBody);
+        expect(res.statusCode).to.be(400);
+        expect(res.body.message).to.be('Failed to retrieve data streams');
+      });
+
+      it('returns 400 when requesting no data streams', async () => {
+        const requestBody = {
+          from: 'now-24h/h',
+          to: 'now',
+          metricTypes: ['ingest_rate'],
+          dataStreams: [],
+        };
+        const res = await supertestAdminWithCookieCredentials
+          .post(DATA_USAGE_METRICS_API_ROUTE)
+          .set('elastic-api-version', '1')
+          .send(requestBody);
+        expect(res.statusCode).to.be(400);
+        expect(res.body.message).to.be('[request body.dataStreams]: no data streams selected');
+      });
+
+      it('returns 400 when requesting an invalid metric type', async () => {
+        const requestBody = {
+          from: 'now-24h/h',
+          to: 'now',
+          metricTypes: [testDataStreamName],
+          dataStreams: ['datastream'],
+        };
+        const res = await supertestAdminWithCookieCredentials
+          .post(DATA_USAGE_METRICS_API_ROUTE)
+          .set('elastic-api-version', '1')
+          .send(requestBody);
+        expect(res.statusCode).to.be(400);
+        expect(res.body.message).to.be(
+          '[request body.metricTypes]: must be one of ingest_rate, storage_retained, search_vcu, ingest_vcu, ml_vcu, index_latency, index_rate, search_latency, search_rate'
+        );
+      });
+
+      it('returns 200 with valid request', async () => {
+        const requestBody: UsageMetricsRequestBody = {
+          from: 'now-24h/h',
+          to: 'now',
+          metricTypes: ['ingest_rate', 'storage_retained'],
+          dataStreams: [testDataStreamName],
+        };
+        const res = await supertestAdminWithCookieCredentials
+          .post(DATA_USAGE_METRICS_API_ROUTE)
+          .set('elastic-api-version', '1')
+          .send(requestBody);
+        expect(res.statusCode).to.be(200);
+        expect(res.body).to.eql(transformMetricsData(mockAutoOpsResponse));
+      });
+    });
+  });
+}
diff --git a/x-pack/test_serverless/api_integration/test_suites/common/reporting/datastream.ts b/x-pack/test_serverless/api_integration/test_suites/common/reporting/datastream.ts
index a4eb181e6bc2b..325f053134a67 100644
--- a/x-pack/test_serverless/api_integration/test_suites/common/reporting/datastream.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/common/reporting/datastream.ts
@@ -33,12 +33,12 @@ export default function ({ getService }: FtrProviderContext) {
   };
 
   describe('Data Stream', function () {
-    // see details: https://github.com/elastic/kibana/issues/198811
-    this.tags(['failsOnMKI']);
     const generatedReports = new Set<string>();
     before(async () => {
       roleAuthc = await svlUserManager.createM2mApiKeyWithRoleScope('admin');
-      cookieCredentials = await samlAuth.getM2MApiCookieCredentialsWithRoleScope('admin');
+      cookieCredentials = await samlAuth.getM2MApiCookieCredentialsWithRoleScope('admin', {
+        forceNewSession: true,
+      });
       internalReqHeader = svlCommonApi.getInternalRequestHeader();
 
       await esArchiver.load(archives.ecommerce.data);
diff --git a/x-pack/test_serverless/api_integration/test_suites/common/reporting/generate_csv_discover.ts b/x-pack/test_serverless/api_integration/test_suites/common/reporting/generate_csv_discover.ts
index c654e5e307f86..3ab3037bdb359 100644
--- a/x-pack/test_serverless/api_integration/test_suites/common/reporting/generate_csv_discover.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/common/reporting/generate_csv_discover.ts
@@ -79,7 +79,9 @@ export default function ({ getService }: FtrProviderContext) {
     this.timeout(12 * 60 * 1000);
 
     before(async () => {
-      cookieCredentials = await samlAuth.getM2MApiCookieCredentialsWithRoleScope('admin');
+      cookieCredentials = await samlAuth.getM2MApiCookieCredentialsWithRoleScope('admin', {
+        forceNewSession: true,
+      });
       internalReqHeader = svlCommonApi.getInternalRequestHeader();
     });
 
diff --git a/x-pack/test_serverless/api_integration/test_suites/observability/ai_assistant/tests/knowledge_base/knowledge_base.spec.ts b/x-pack/test_serverless/api_integration/test_suites/observability/ai_assistant/tests/knowledge_base/knowledge_base.spec.ts
index b540ee5829e59..ce46939c365be 100644
--- a/x-pack/test_serverless/api_integration/test_suites/observability/ai_assistant/tests/knowledge_base/knowledge_base.spec.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/observability/ai_assistant/tests/knowledge_base/knowledge_base.spec.ts
@@ -52,6 +52,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
     describe('when managing a single entry', () => {
       const knowledgeBaseEntry = {
         id: 'my-doc-id-1',
+        title: 'My title',
         text: 'My content',
       };
       it('returns 200 on create', async () => {
@@ -156,14 +157,17 @@ export default function ApiTest({ getService }: FtrProviderContext) {
       const knowledgeBaseEntries = [
         {
           id: 'my_doc_a',
+          title: 'My title a',
           text: 'My content a',
         },
         {
           id: 'my_doc_b',
+          title: 'My title b',
           text: 'My content b',
         },
         {
           id: 'my_doc_c',
+          title: 'My title c',
           text: 'My content c',
         },
       ];
diff --git a/x-pack/test_serverless/api_integration/test_suites/observability/common_configs/config.group1.ts b/x-pack/test_serverless/api_integration/test_suites/observability/common_configs/config.group1.ts
index 4d58d43ea7667..68202b5adf3ad 100644
--- a/x-pack/test_serverless/api_integration/test_suites/observability/common_configs/config.group1.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/observability/common_configs/config.group1.ts
@@ -32,6 +32,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
       require.resolve('../../common/console'),
       require.resolve('../../common/saved_objects_management'),
       require.resolve('../../common/telemetry'),
+      require.resolve('../../common/data_usage'),
     ],
     junit: {
       reportName: 'Serverless Observability API Integration Tests - Common Group 1',
diff --git a/x-pack/test_serverless/api_integration/test_suites/observability/config.ts b/x-pack/test_serverless/api_integration/test_suites/observability/config.ts
index 111686fd95d26..97a30d0f340f9 100644
--- a/x-pack/test_serverless/api_integration/test_suites/observability/config.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/observability/config.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-
+import { CA_CERT_PATH, KBN_CERT_PATH, KBN_KEY_PATH } from '@kbn/dev-utils';
 import { createTestConfig } from '../../config.base';
 import { services as apmServices } from './apm_api_integration/common/services';
 import { services as datasetQualityServices } from './dataset_quality_api_integration/common/services';
@@ -26,5 +26,12 @@ export default createTestConfig({
     '--xpack.uptime.service.manifestUrl=mockDevUrl',
     // useful for testing (also enabled in MKI QA)
     '--coreApp.allowDynamicConfigOverrides=true',
+    '--xpack.dataUsage.enabled=true',
+    // dataUsage.autoops* config is set in kibana controller
+    '--xpack.dataUsage.autoops.enabled=true',
+    '--xpack.dataUsage.autoops.api.url=http://localhost:9000',
+    `--xpack.dataUsage.autoops.api.tls.certificate=${KBN_CERT_PATH}`,
+    `--xpack.dataUsage.autoops.api.tls.key=${KBN_KEY_PATH}`,
+    `--xpack.dataUsage.autoops.api.tls.ca=${CA_CERT_PATH}`,
   ],
 });
diff --git a/x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/typings.ts b/x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/typings.ts
deleted file mode 100644
index 9002e9991292f..0000000000000
--- a/x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/typings.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { Query, TimeRange } from '@kbn/es-query';
-import { SerializableRecord } from '@kbn/utility-types';
-
-export interface ActionDocument {
-  ruleType: string;
-  alertDetailsUrl: string;
-  reason: string;
-  value: string;
-  viewInAppUrl: string;
-  host?: string;
-  group?: string;
-}
-
-export interface LogsExplorerLocatorParsedParams extends SerializableRecord {
-  dataset: string;
-  timeRange: TimeRange;
-  query: Query;
-}
diff --git a/x-pack/test_serverless/api_integration/test_suites/observability/index.feature_flags.ts b/x-pack/test_serverless/api_integration/test_suites/observability/index.feature_flags.ts
index 7ed6ca9517ac4..632335cd1c885 100644
--- a/x-pack/test_serverless/api_integration/test_suites/observability/index.feature_flags.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/observability/index.feature_flags.ts
@@ -9,7 +9,6 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ loadTestFile }: FtrProviderContext) {
   describe('Serverless observability API - feature flags', function () {
-    loadTestFile(require.resolve('./custom_threshold_rule'));
     loadTestFile(require.resolve('./platform_security'));
   });
 }
diff --git a/x-pack/test_serverless/api_integration/test_suites/search/common_configs/config.group1.ts b/x-pack/test_serverless/api_integration/test_suites/search/common_configs/config.group1.ts
index 4167364e44793..36249651d5167 100644
--- a/x-pack/test_serverless/api_integration/test_suites/search/common_configs/config.group1.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/search/common_configs/config.group1.ts
@@ -30,6 +30,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
       require.resolve('../../common/console'),
       require.resolve('../../common/saved_objects_management'),
       require.resolve('../../common/telemetry'),
+      require.resolve('../../common/data_usage'),
     ],
     junit: {
       reportName: 'Serverless Search API Integration Tests - Common Group 1',
diff --git a/x-pack/test_serverless/api_integration/test_suites/search/config.ts b/x-pack/test_serverless/api_integration/test_suites/search/config.ts
index 94d7ea67c594a..9f02dc98b88c3 100644
--- a/x-pack/test_serverless/api_integration/test_suites/search/config.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/search/config.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { CA_CERT_PATH, KBN_CERT_PATH, KBN_KEY_PATH } from '@kbn/dev-utils';
 import { createTestConfig } from '../../config.base';
 
 export default createTestConfig({
@@ -21,5 +22,12 @@ export default createTestConfig({
   kbnServerArgs: [
     // useful for testing (also enabled in MKI QA)
     '--coreApp.allowDynamicConfigOverrides=true',
+    '--xpack.dataUsage.enabled=true',
+    // dataUsage.autoops* config is set in kibana controller
+    '--xpack.dataUsage.autoops.enabled=true',
+    '--xpack.dataUsage.autoops.api.url=http://localhost:9000',
+    `--xpack.dataUsage.autoops.api.tls.certificate=${KBN_CERT_PATH}`,
+    `--xpack.dataUsage.autoops.api.tls.key=${KBN_KEY_PATH}`,
+    `--xpack.dataUsage.autoops.api.tls.ca=${CA_CERT_PATH}`,
   ],
 });
diff --git a/x-pack/test_serverless/api_integration/test_suites/security/common_configs/config.group1.ts b/x-pack/test_serverless/api_integration/test_suites/security/common_configs/config.group1.ts
index 406de533a909d..577b4f8ba4ee0 100644
--- a/x-pack/test_serverless/api_integration/test_suites/security/common_configs/config.group1.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/security/common_configs/config.group1.ts
@@ -32,6 +32,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
       require.resolve('../../common/console'),
       require.resolve('../../common/saved_objects_management'),
       require.resolve('../../common/telemetry'),
+      require.resolve('../../common/data_usage'),
     ],
     junit: {
       reportName: 'Serverless Security API Integration Tests - Common Group 1',
diff --git a/x-pack/test_serverless/api_integration/test_suites/security/config.ts b/x-pack/test_serverless/api_integration/test_suites/security/config.ts
index 0b24438b81591..52b933a22b086 100644
--- a/x-pack/test_serverless/api_integration/test_suites/security/config.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/security/config.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { CA_CERT_PATH, KBN_CERT_PATH, KBN_KEY_PATH } from '@kbn/dev-utils';
 import { createTestConfig } from '../../config.base';
 
 export default createTestConfig({
@@ -25,5 +26,12 @@ export default createTestConfig({
     '--coreApp.allowDynamicConfigOverrides=true',
     `--xpack.securitySolutionServerless.cloudSecurityUsageReportingTaskInterval=5s`,
     `--xpack.securitySolutionServerless.usageApi.url=http://localhost:8081`,
+    '--xpack.dataUsage.enabled=true',
+    // dataUsage.autoops* config is set in kibana controller
+    '--xpack.dataUsage.autoops.enabled=true',
+    '--xpack.dataUsage.autoops.api.url=http://localhost:9000',
+    `--xpack.dataUsage.autoops.api.tls.certificate=${KBN_CERT_PATH}`,
+    `--xpack.dataUsage.autoops.api.tls.key=${KBN_KEY_PATH}`,
+    `--xpack.dataUsage.autoops.api.tls.ca=${CA_CERT_PATH}`,
   ],
 });
diff --git a/x-pack/test_serverless/functional/page_objects/svl_management_page.ts b/x-pack/test_serverless/functional/page_objects/svl_management_page.ts
index e77e77c4fa76c..5676975a89c08 100644
--- a/x-pack/test_serverless/functional/page_objects/svl_management_page.ts
+++ b/x-pack/test_serverless/functional/page_objects/svl_management_page.ts
@@ -59,5 +59,13 @@ export function SvlManagementPageProvider({ getService }: FtrProviderContext) {
     async clickSpacesManagementCard() {
       await testSubjects.click('app-card-spaces');
     },
+
+    // Data Usage card
+    async assertDataUsageManagementCardExists() {
+      await testSubjects.existOrFail('app-card-data_usage');
+    },
+    async clickDataUsageManagementCard() {
+      await testSubjects.click('app-card-data_usage');
+    },
   };
 }
diff --git a/x-pack/test_serverless/functional/test_suites/common/data_usage/index.ts b/x-pack/test_serverless/functional/test_suites/common/data_usage/index.ts
new file mode 100644
index 0000000000000..dcdd23b13605f
--- /dev/null
+++ b/x-pack/test_serverless/functional/test_suites/common/data_usage/index.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { FtrProviderContext } from '../../../ftr_provider_context';
+
+export default ({ loadTestFile }: FtrProviderContext) => {
+  describe('Data Usage', function () {
+    loadTestFile(require.resolve('./main'));
+  });
+};
diff --git a/x-pack/test_serverless/functional/test_suites/common/data_usage/main.ts b/x-pack/test_serverless/functional/test_suites/common/data_usage/main.ts
new file mode 100644
index 0000000000000..fa6e4199bdc09
--- /dev/null
+++ b/x-pack/test_serverless/functional/test_suites/common/data_usage/main.ts
@@ -0,0 +1,35 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { FtrProviderContext } from '../../../ftr_provider_context';
+
+export default ({ getPageObjects, getService }: FtrProviderContext) => {
+  const pageObjects = getPageObjects(['svlCommonPage', 'svlManagementPage', 'common']);
+  const testSubjects = getService('testSubjects');
+  const retry = getService('retry');
+
+  describe('Main page', function () {
+    this.tags(['skipMKI']);
+    before(async () => {
+      await pageObjects.svlCommonPage.loginAsAdmin();
+      await pageObjects.common.navigateToApp('management');
+      await retry.waitFor('page to be visible', async () => {
+        return await testSubjects.exists('cards-navigation-page');
+      });
+      await pageObjects.svlManagementPage.assertDataUsageManagementCardExists();
+      await pageObjects.svlManagementPage.clickDataUsageManagementCard();
+    });
+
+    after(async () => {});
+
+    it('renders data usage page', async () => {
+      await retry.waitFor('page to be visible', async () => {
+        return await testSubjects.exists('DataUsagePage');
+      });
+    });
+  });
+};
diff --git a/x-pack/test_serverless/functional/test_suites/common/discover/context_awareness/_data_source_profile.ts b/x-pack/test_serverless/functional/test_suites/common/discover/context_awareness/_data_source_profile.ts
index e03a6d2e081a4..960a79d4bba5d 100644
--- a/x-pack/test_serverless/functional/test_suites/common/discover/context_awareness/_data_source_profile.ts
+++ b/x-pack/test_serverless/functional/test_suites/common/discover/context_awareness/_data_source_profile.ts
@@ -20,6 +20,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
   const dataViews = getService('dataViews');
   const dataGrid = getService('dataGrid');
+  const retry = getService('retry');
 
   describe('data source profile', () => {
     before(async () => {
@@ -98,6 +99,41 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
           expect(await testSubjects.getVisibleText('docViewerRowDetailsTitle')).to.be('Record #0');
         });
       });
+
+      describe('custom context', () => {
+        it('should render formatted record in doc viewer using formatter from custom context', async () => {
+          const state = kbnRison.encode({
+            dataSource: { type: 'esql' },
+            query: { esql: 'from my-example-logs | sort @timestamp desc' },
+          });
+          await PageObjects.common.navigateToActualUrl('discover', `?_a=${state}`, {
+            ensureCurrentUrl: false,
+          });
+          await PageObjects.discover.waitUntilSearchingHasFinished();
+          await dataGrid.clickRowToggle({ rowIndex: 0, defaultTabId: 'doc_view_example' });
+          await retry.try(async () => {
+            const formattedRecord = await testSubjects.find(
+              'exampleDataSourceProfileDocViewRecord'
+            );
+            expect(await formattedRecord.getVisibleText()).to.be(
+              JSON.stringify(
+                {
+                  '@timestamp': '2024-06-10T16:00:00.000Z',
+                  'agent.name': 'java',
+                  'agent.name.text': 'java',
+                  'data_stream.type': 'logs',
+                  'log.level': 'debug',
+                  message: 'This is a debug log',
+                  'service.name': 'product',
+                  'service.name.text': 'product',
+                },
+                null,
+                2
+              )
+            );
+          });
+        });
+      });
     });
 
     describe('data view mode', () => {
@@ -162,6 +198,41 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
           );
         });
       });
+
+      describe('custom context', () => {
+        it('should render formatted record in doc viewer using formatter from custom context', async () => {
+          await PageObjects.common.navigateToActualUrl('discover', undefined, {
+            ensureCurrentUrl: false,
+          });
+          await dataViews.switchTo('my-example-logs');
+          await PageObjects.discover.waitUntilSearchingHasFinished();
+          await dataGrid.clickRowToggle({ rowIndex: 0, defaultTabId: 'doc_view_example' });
+          await retry.try(async () => {
+            const formattedRecord = await testSubjects.find(
+              'exampleDataSourceProfileDocViewRecord'
+            );
+            expect(await formattedRecord.getVisibleText()).to.be(
+              JSON.stringify(
+                {
+                  '@timestamp': ['2024-06-10T16:00:00.000Z'],
+                  'agent.name': ['java'],
+                  'agent.name.text': ['java'],
+                  'data_stream.type': ['logs'],
+                  'log.level': ['debug'],
+                  message: ['This is a debug log'],
+                  'service.name': ['product'],
+                  'service.name.text': ['product'],
+                  _id: 'XdQFDpABfGznVC1bCHLo',
+                  _index: 'my-example-logs',
+                  _score: null,
+                },
+                null,
+                2
+              )
+            );
+          });
+        });
+      });
     });
   });
 }
diff --git a/x-pack/test_serverless/functional/test_suites/common/discover/esql/_esql_view.ts b/x-pack/test_serverless/functional/test_suites/common/discover/esql/_esql_view.ts
index c82882623b177..0df0676c1f246 100644
--- a/x-pack/test_serverless/functional/test_suites/common/discover/esql/_esql_view.ts
+++ b/x-pack/test_serverless/functional/test_suites/common/discover/esql/_esql_view.ts
@@ -21,6 +21,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const find = getService('find');
   const esql = getService('esql');
   const dashboardAddPanel = getService('dashboardAddPanel');
+  const dataViews = getService('dataViews');
   const PageObjects = getPageObjects([
     'svlCommonPage',
     'common',
@@ -29,6 +30,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     'header',
     'timePicker',
     'unifiedFieldList',
+    'unifiedSearch',
   ]);
 
   const defaultSettings = {
@@ -311,6 +313,24 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
           await testSubjects.existOrFail('discover-esql-to-dataview-modal');
         });
       });
+
+      it('should show available data views after switching to classic mode', async () => {
+        await PageObjects.discover.selectTextBaseLang();
+        await PageObjects.header.waitUntilLoadingHasFinished();
+        await PageObjects.discover.waitUntilSearchingHasFinished();
+
+        await browser.refresh();
+        await PageObjects.header.waitUntilLoadingHasFinished();
+        await PageObjects.discover.waitUntilSearchingHasFinished();
+        await PageObjects.unifiedSearch.switchToDataViewMode();
+        await PageObjects.header.waitUntilLoadingHasFinished();
+        await PageObjects.discover.waitUntilSearchingHasFinished();
+        const availableDataViews = await PageObjects.unifiedSearch.getDataViewList(
+          'discover-dataView-switch-link'
+        );
+        expect(availableDataViews).to.eql(['kibana_sample_data_flights', 'logstash-*']);
+        await dataViews.switchToAndValidate('kibana_sample_data_flights');
+      });
     });
 
     describe('inspector', () => {
diff --git a/x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group1.ts b/x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group1.ts
index c75e2aa19be75..80f2313cf28a7 100644
--- a/x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group1.ts
+++ b/x-pack/test_serverless/functional/test_suites/observability/common_configs/config.group1.ts
@@ -22,6 +22,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
       require.resolve('../../common/console'),
       require.resolve('../../common/painless_lab'),
       require.resolve('../../common/spaces'),
+      require.resolve('../../common/data_usage'),
     ],
     junit: {
       reportName: 'Serverless Observability Functional Tests - Common Group 1',
diff --git a/x-pack/test_serverless/functional/test_suites/observability/config.ts b/x-pack/test_serverless/functional/test_suites/observability/config.ts
index 2610af2a26149..9fffd5623f0a3 100644
--- a/x-pack/test_serverless/functional/test_suites/observability/config.ts
+++ b/x-pack/test_serverless/functional/test_suites/observability/config.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-
+import { CA_CERT_PATH, KBN_CERT_PATH, KBN_KEY_PATH } from '@kbn/dev-utils';
 import { createTestConfig } from '../../config.base';
 
 export default createTestConfig({
@@ -18,5 +18,13 @@ export default createTestConfig({
   // include settings from project controller
   // https://github.com/elastic/project-controller/blob/main/internal/project/observability/config/elasticsearch.yml
   esServerArgs: ['xpack.ml.dfa.enabled=false'],
-  kbnServerArgs: [],
+  kbnServerArgs: [
+    '--xpack.dataUsage.enabled=true',
+    // dataUsage.autoops* config is set in kibana controller
+    '--xpack.dataUsage.autoops.enabled=true',
+    '--xpack.dataUsage.autoops.api.url=http://localhost:9000',
+    `--xpack.dataUsage.autoops.api.tls.certificate=${KBN_CERT_PATH}`,
+    `--xpack.dataUsage.autoops.api.tls.key=${KBN_KEY_PATH}`,
+    `--xpack.dataUsage.autoops.api.tls.ca=${CA_CERT_PATH}`,
+  ],
 });
diff --git a/x-pack/test_serverless/functional/test_suites/search/common_configs/config.group1.ts b/x-pack/test_serverless/functional/test_suites/search/common_configs/config.group1.ts
index 3b0991b3b1fe9..11e36186609ec 100644
--- a/x-pack/test_serverless/functional/test_suites/search/common_configs/config.group1.ts
+++ b/x-pack/test_serverless/functional/test_suites/search/common_configs/config.group1.ts
@@ -20,6 +20,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
       require.resolve('../../common/reporting'),
       require.resolve('../../common/console'),
       require.resolve('../../common/spaces'),
+      require.resolve('../../common/data_usage'),
     ],
     junit: {
       reportName: 'Serverless Search Functional Tests - Common Group 1',
diff --git a/x-pack/test_serverless/functional/test_suites/search/config.ts b/x-pack/test_serverless/functional/test_suites/search/config.ts
index f330546373525..aef26951908d0 100644
--- a/x-pack/test_serverless/functional/test_suites/search/config.ts
+++ b/x-pack/test_serverless/functional/test_suites/search/config.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-
+import { CA_CERT_PATH, KBN_CERT_PATH, KBN_KEY_PATH } from '@kbn/dev-utils';
 import { createTestConfig } from '../../config.base';
 
 export default createTestConfig({
@@ -22,6 +22,13 @@ export default createTestConfig({
     `--xpack.cloud.id=ES3_FTR_TESTS:ZmFrZS1kb21haW4uY2xkLmVsc3RjLmNvJGZha2Vwcm9qZWN0aWQuZXMkZmFrZXByb2plY3RpZC5rYg==`,
     `--xpack.cloud.serverless.project_name=ES3_FTR_TESTS`,
     `--xpack.cloud.deployment_url=/projects/elasticsearch/fakeprojectid`,
+    '--xpack.dataUsage.enabled=true',
+    // dataUsage.autoops* config is set in kibana controller
+    '--xpack.dataUsage.autoops.enabled=true',
+    '--xpack.dataUsage.autoops.api.url=http://localhost:9000',
+    `--xpack.dataUsage.autoops.api.tls.certificate=${KBN_CERT_PATH}`,
+    `--xpack.dataUsage.autoops.api.tls.key=${KBN_KEY_PATH}`,
+    `--xpack.dataUsage.autoops.api.tls.ca=${CA_CERT_PATH}`,
   ],
   apps: {
     serverlessElasticsearch: {
diff --git a/x-pack/test_serverless/functional/test_suites/security/common_configs/config.group1.ts b/x-pack/test_serverless/functional/test_suites/security/common_configs/config.group1.ts
index 8adac3b9c4a6e..fc95c26547c0d 100644
--- a/x-pack/test_serverless/functional/test_suites/security/common_configs/config.group1.ts
+++ b/x-pack/test_serverless/functional/test_suites/security/common_configs/config.group1.ts
@@ -22,6 +22,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
       require.resolve('../../common/console'),
       require.resolve('../../common/painless_lab'),
       require.resolve('../../common/spaces'),
+      require.resolve('../../common/data_usage'),
     ],
     junit: {
       reportName: 'Serverless Security Functional Tests - Common Group 1',
diff --git a/x-pack/test_serverless/functional/test_suites/security/config.ts b/x-pack/test_serverless/functional/test_suites/security/config.ts
index 2f6a4b4920a25..1693a07b0e844 100644
--- a/x-pack/test_serverless/functional/test_suites/security/config.ts
+++ b/x-pack/test_serverless/functional/test_suites/security/config.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-
+import { CA_CERT_PATH, KBN_CERT_PATH, KBN_KEY_PATH } from '@kbn/dev-utils';
 import { createTestConfig } from '../../config.base';
 
 export default createTestConfig({
@@ -18,4 +18,13 @@ export default createTestConfig({
   // include settings from project controller
   // https://github.com/elastic/project-controller/blob/main/internal/project/security/config/elasticsearch.yml
   esServerArgs: ['xpack.ml.nlp.enabled=true'],
+  kbnServerArgs: [
+    '--xpack.dataUsage.enabled=true',
+    // dataUsage.autoops* config is set in kibana controller
+    '--xpack.dataUsage.autoops.enabled=true',
+    '--xpack.dataUsage.autoops.api.url=http://localhost:9000',
+    `--xpack.dataUsage.autoops.api.tls.certificate=${KBN_CERT_PATH}`,
+    `--xpack.dataUsage.autoops.api.tls.key=${KBN_KEY_PATH}`,
+    `--xpack.dataUsage.autoops.api.tls.ca=${CA_CERT_PATH}`,
+  ],
 });
diff --git a/x-pack/test_serverless/tsconfig.json b/x-pack/test_serverless/tsconfig.json
index 1263efc17cf38..f54ffc1bb4c28 100644
--- a/x-pack/test_serverless/tsconfig.json
+++ b/x-pack/test_serverless/tsconfig.json
@@ -32,8 +32,6 @@
     "@kbn/telemetry-plugin",
     "@kbn/telemetry-collection-xpack-plugin",
     "@kbn/telemetry-tools",
-    "@kbn/observability-plugin",
-    "@kbn/data-forge",
     "@kbn/ftr-common-functional-services",
     "@kbn/apm-plugin",
     "@kbn/server-route-repository",
@@ -80,12 +78,9 @@
     "@kbn/reporting-common",
     "@kbn/es-query",
     "@kbn/slo-plugin",
-    "@kbn/share-plugin",
     "@kbn/es-query",
-    "@kbn/utility-types",
     "@kbn/synthetics-plugin",
     "@kbn/dataset-quality-plugin",
-    "@kbn/alerting-comparators",
     "@kbn/search-types",
     "@kbn/config-schema",
     "@kbn/features-plugin",
@@ -97,5 +92,6 @@
     "@kbn/core-saved-objects-import-export-server-internal",
     "@kbn/security-plugin-types-common",
     "@kbn/ai-assistant-common",
+    "@kbn/data-usage-plugin",
   ]
 }