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/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-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/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/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..f530e870665f8 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: $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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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_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/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/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..a77f24790f9d3 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,31 @@ 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\/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 3d968c00e1e1f..2bf0737b5436c 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/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/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/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/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/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/rules/api/create.ts b/x-pack/plugins/security_solution/server/lib/siem_migrations/rules/api/create.ts
index e2cf97dd094a9..f4c52e9b444b8 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
@@ -25,7 +25,11 @@ export const registerSiemRuleMigrationsCreateRoute = (
     .post({
       path: SIEM_RULE_MIGRATIONS_PATH,
       access: 'internal',
-      options: { tags: ['access:securitySolution'] },
+      security: {
+        authz: {
+          requiredPrivileges: ['securitySolution'],
+        },
+      },
     })
     .addVersion(
       {
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/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/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..8dc935b4cc8c9 100644
--- a/x-pack/plugins/translations/translations/fr-FR.json
+++ b/x-pack/plugins/translations/translations/fr-FR.json
@@ -6393,11 +6393,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 +6457,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 +6848,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 +15289,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 :",
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index e10155c086e64..731d9f556947b 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -6148,11 +6148,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 +6212,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 +6603,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 +15035,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：",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 0ed330ec41630..2b912cc30c673 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -6161,11 +6161,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 +6225,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 +6616,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 +15063,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：",
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/constants.ts b/x-pack/test/alerting_api_integration/observability/custom_threshold_rule/constants.ts
deleted file mode 100644
index 5cf1e0b4d6614..0000000000000
--- a/x-pack/test/alerting_api_integration/observability/custom_threshold_rule/constants.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-export const ISO_DATE_REGEX = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/;
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/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/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/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/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/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/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/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/custom_threshold_rule/constants.ts b/x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/constants.ts
deleted file mode 100644
index 5cf1e0b4d6614..0000000000000
--- a/x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/constants.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-export const ISO_DATE_REGEX = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/;
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/observability/custom_threshold_rule/index.ts
deleted file mode 100644
index 01e91f1d5840b..0000000000000
--- a/x-pack/test_serverless/api_integration/test_suites/observability/custom_threshold_rule/index.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-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'));
-  });
-}
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/functional/test_suites/security/ftr/cloud_security_posture/agentless_api/create_agent.ts b/x-pack/test_serverless/functional/test_suites/security/ftr/cloud_security_posture/agentless_api/create_agent.ts
index b26581fb46dfd..6d0686e189572 100644
--- a/x-pack/test_serverless/functional/test_suites/security/ftr/cloud_security_posture/agentless_api/create_agent.ts
+++ b/x-pack/test_serverless/functional/test_suites/security/ftr/cloud_security_posture/agentless_api/create_agent.ts
@@ -25,6 +25,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
   const AWS_SINGLE_ACCOUNT_TEST_ID = 'awsSingleTestId';
 
   describe('Agentless API Serverless', function () {
+    // see details: https://github.com/elastic/kibana/issues/199091
+    this.tags(['failsOnMKI']);
     let mockApiServer: http.Server;
     let cisIntegration: typeof pageObjects.cisAddIntegration;
 
diff --git a/x-pack/test_serverless/tsconfig.json b/x-pack/test_serverless/tsconfig.json
index 1263efc17cf38..f963f295cd17d 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",