Merge branch '8.x' into backport/8.x/pr-202848

.buildkite/ftr_oblt_stateful_configs.yml

@@ -12,14 +12,14 @@ disabled:
   - x-pack/plugins/observability_solution/profiling/e2e/ftr_config.ts
 
   #FTR configs
-  - x-pack/plugins/observability_solution/uptime/e2e/config.ts
+  - x-pack/solutions/observability/plugins/uptime/e2e/config.ts
 
   # Elastic Synthetics configs
-  - x-pack/plugins/observability_solution/uptime/e2e/uptime/synthetics_run.ts
-  - x-pack/plugins/observability_solution/synthetics/e2e/config.ts
-  - x-pack/plugins/observability_solution/synthetics/e2e/synthetics/synthetics_run.ts
-  - x-pack/plugins/observability_solution/exploratory_view/e2e/synthetics_run.ts
-  - x-pack/plugins/observability_solution/ux/e2e/synthetics_run.ts
+  - x-pack/solutions/observability/plugins/uptime/e2e/uptime/synthetics_run.ts
+  - x-pack/solutions/observability/plugins/synthetics/e2e/config.ts
+  - x-pack/solutions/observability/plugins/synthetics/e2e/synthetics/synthetics_run.ts
+  - x-pack/solutions/observability/plugins/exploratory_view/e2e/synthetics_run.ts
+  - x-pack/solutions/observability/plugins/ux/e2e/synthetics_run.ts
   - x-pack/plugins/observability_solution/slo/e2e/synthetics_run.ts
 
 defaultQueue: 'n2-4-spot'

.buildkite/ftr_security_serverless_configs.yml

@@ -82,6 +82,7 @@ disabled:
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_read/trial_license_complete_tier/configs/serverless.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_read/basic_license_essentials_tier/configs/serverless.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/telemetry/trial_license_complete_tier/configs/serverless.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/telemetry/configs/serverless.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/user_roles/trial_license_complete_tier/configs/serverless.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/genai/nlp_cleanup_task/trial_license_complete_tier/configs/serverless.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/genai/nlp_cleanup_task/basic_license_essentials_tier/configs/serverless.config.ts

.buildkite/ftr_security_stateful_configs.yml

@@ -70,6 +70,7 @@ enabled:
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_read/trial_license_complete_tier/configs/ess.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_read/basic_license_essentials_tier/configs/ess.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/telemetry/trial_license_complete_tier/configs/ess.config.ts
+  - x-pack/test/security_solution_api_integration/test_suites/telemetry/configs/ess.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/detections_response/user_roles/trial_license_complete_tier/configs/ess.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/configs/ess.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/basic_license_essentials_tier/configs/ess.config.ts

.buildkite/pipelines/on_merge_unsupported_ftrs.yml

@@ -73,7 +73,7 @@ steps:
     depends_on: build
     timeout_in_minutes: 120
     artifact_paths:
-      - 'x-pack/plugins/observability_solution/synthetics/e2e/.journeys/**/*'
+      - 'x-pack/solutions/observability/plugins/synthetics/e2e/.journeys/**/*'
     retry:
       automatic:
         - exit_status: '-1'

.buildkite/pipelines/pull_request/exploratory_view_plugin.yml

@@ -14,7 +14,7 @@ steps:
       - check_oas_snapshot
     timeout_in_minutes: 60
     artifact_paths:
-      - 'x-pack/plugins/observability_solution/exploratory_view/e2e/.journeys/**/*'
+      - 'x-pack/solutions/observability/plugins/exploratory_view/e2e/.journeys/**/*'
     retry:
       automatic:
         - exit_status: '-1'

.buildkite/pipelines/pull_request/synthetics_plugin.yml

@@ -14,7 +14,7 @@ steps:
       - check_oas_snapshot
     timeout_in_minutes: 60
     artifact_paths:
-      - 'x-pack/plugins/observability_solution/synthetics/e2e/.journeys/**/*'
+      - 'x-pack/solutions/observability/plugins/synthetics/e2e/.journeys/**/*'
     retry:
       automatic:
         - exit_status: '-1'

.buildkite/pipelines/pull_request/uptime_plugin.yml

@@ -14,7 +14,7 @@ steps:
       - check_oas_snapshot
     timeout_in_minutes: 60
     artifact_paths:
-      - 'x-pack/plugins/observability_solution/synthetics/e2e/.journeys/**/*'
+      - 'x-pack/solutions/observability/plugins/synthetics/e2e/.journeys/**/*'
     retry:
       automatic:
         - exit_status: '-1'

.buildkite/pipelines/pull_request/ux_plugin_e2e.yml

@@ -14,7 +14,7 @@ steps:
       - check_oas_snapshot
     timeout_in_minutes: 60
     artifact_paths:
-      - 'x-pack/plugins/observability_solution/ux/e2e/.journeys/**/*'
+      - 'x-pack/solutions/observability/plugins/ux/e2e/.journeys/**/*'
     retry:
       automatic:
         - exit_status: '-1'

.buildkite/scripts/pipelines/pull_request/pipeline.ts

@@ -89,7 +89,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
 
     if (
       (await doAnyChangesMatch([
-        /^x-pack\/plugins\/observability_solution\/observability_onboarding/,
+        /^x-pack\/solutions\/observability\/plugins\/observability_onboarding/,
         /^x-pack\/plugins\/fleet/,
       ])) ||
       GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
@@ -114,16 +114,16 @@ const getPipeline = (filename: string, removeSteps = true) => {
     }
 
     if (
-      (await doAnyChangesMatch([/^x-pack\/plugins\/observability_solution\/exploratory_view/])) ||
+      (await doAnyChangesMatch([/^x-pack\/solutions\/observability\/plugins\/exploratory_view/])) ||
       GITHUB_PR_LABELS.includes('ci:synthetics-runner-suites')
     ) {
       pipeline.push(getPipeline('.buildkite/pipelines/pull_request/exploratory_view_plugin.yml'));
     }
 
     if (
       (await doAnyChangesMatch([
-        /^x-pack\/plugins\/observability_solution\/synthetics/,
-        /^x-pack\/plugins\/observability_solution\/exploratory_view/,
+        /^x-pack\/solutions\/observability\/plugins\/synthetics/,
+        /^x-pack\/solutions\/observability\/plugins\/exploratory_view/,
       ])) ||
       GITHUB_PR_LABELS.includes('ci:synthetics-runner-suites')
     ) {
@@ -133,8 +133,8 @@ const getPipeline = (filename: string, removeSteps = true) => {
 
     if (
       (await doAnyChangesMatch([
-        /^x-pack\/plugins\/observability_solution\/ux/,
-        /^x-pack\/plugins\/observability_solution\/exploratory_view/,
+        /^x-pack\/solutions\/observability\/plugins\/ux/,
+        /^x-pack\/solutions\/observability\/plugins\/exploratory_view/,
       ])) ||
       GITHUB_PR_LABELS.includes('ci:synthetics-runner-suites')
     ) {

.buildkite/scripts/steps/functional/exploratory_view_plugin.sh

@@ -14,4 +14,4 @@ echo "--- Exploratory View plugin @elastic/synthetics Tests"
 
 cd "$XPACK_DIR"
 
-node plugins/observability_solution/exploratory_view/scripts/e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" ${GREP:+--grep \"${GREP}\"}
+node solutions/observability/plugins/exploratory_view/scripts/e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" ${GREP:+--grep \"${GREP}\"}

.buildkite/scripts/steps/functional/synthetics.sh

@@ -14,4 +14,4 @@ echo "--- synthetics @elastic/synthetics Tests"
 
 cd "$XPACK_DIR"
 
-node plugins/observability_solution/synthetics/scripts/e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" --grep "MonitorManagement-monitor*"
+node solutions/observability/plugins/synthetics/scripts/e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" --grep "MonitorManagement-monitor*"

.buildkite/scripts/steps/functional/synthetics_plugin.sh

@@ -14,4 +14,4 @@ echo "--- Synthetics plugin @elastic/synthetics Tests"
 
 cd "$XPACK_DIR"
 
-node plugins/observability_solution/synthetics/scripts/e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" ${GREP:+--grep \"${GREP}\"}
+node solutions/observability/plugins/synthetics/scripts/e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" ${GREP:+--grep \"${GREP}\"}

.buildkite/scripts/steps/functional/uptime_plugin.sh

@@ -14,4 +14,4 @@ echo "--- Uptime plugin @elastic/synthetics Tests"
 
 cd "$XPACK_DIR"
 
-node plugins/observability_solution/uptime/scripts/uptime_e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" ${GREP:+--grep \"${GREP}\"}
+node solutions/observability/plugins/uptime/scripts/uptime_e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" ${GREP:+--grep \"${GREP}\"}

.buildkite/scripts/steps/functional/ux_synthetics_e2e.sh

@@ -14,4 +14,4 @@ echo "--- User Experience @elastic/synthetics Tests"
 
 cd "$XPACK_DIR"
 
-node plugins/observability_solution/ux/scripts/e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" ${GREP:+--grep \"${GREP}\"}
+node solutions/observability/plugins/ux/scripts/e2e.js --kibana-install-dir "$KIBANA_BUILD_LOCATION" ${GREP:+--grep \"${GREP}\"}

.eslintrc.js

@@ -915,9 +915,9 @@ module.exports = {
     {
       files: [
         'x-pack/plugins/observability_solution/apm/**/*.{js,mjs,ts,tsx}',
-        'x-pack/plugins/observability_solution/observability/**/*.{js,mjs,ts,tsx}',
-        'x-pack/plugins/observability_solution/exploratory_view/**/*.{js,mjs,ts,tsx}',
-        'x-pack/plugins/observability_solution/ux/**/*.{js,mjs,ts,tsx}',
+        'x-pack/solutions/observability/plugins/observability/**/*.{js,mjs,ts,tsx}',
+        'x-pack/solutions/observability/plugins/exploratory_view/**/*.{js,mjs,ts,tsx}',
+        'x-pack/solutions/observability/plugins/ux/**/*.{js,mjs,ts,tsx}',
         'x-pack/plugins/observability_solution/slo/**/*.{js,mjs,ts,tsx}',
         'x-pack/packages/observability/**/*.{js,mjs,ts,tsx}',
       ],
@@ -936,8 +936,8 @@ module.exports = {
     {
       files: [
         'x-pack/plugins/observability_solution/apm/**/*.stories.*',
-        'x-pack/plugins/observability_solution/observability/**/*.stories.*',
-        'x-pack/plugins/observability_solution/exploratory_view/**/*.stories.*',
+        'x-pack/solutions/observability/plugins/observability/**/*.stories.*',
+        'x-pack/solutions/observability/plugins/exploratory_view/**/*.stories.*',
         'x-pack/plugins/observability_solution/slo/**/*.stories.*',
         'x-pack/packages/observability/**/*.{js,mjs,ts,tsx}',
       ],
@@ -1013,7 +1013,7 @@ module.exports = {
     {
       // disable imports from legacy uptime plugin
       files: [
-        'x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/**/*.{js,mjs,ts,tsx}',
+        'x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/**/*.{js,mjs,ts,tsx}',
       ],
       rules: {
         'no-restricted-imports': [

.github/CODEOWNERS

@@ -353,7 +353,7 @@ 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
+x-pack/platform/packages/shared/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
@@ -374,7 +374,7 @@ src/platform/packages/shared/deeplinks/devtools @elastic/kibana-management
 packages/deeplinks/fleet @elastic/fleet
 src/platform/packages/shared/deeplinks/management @elastic/kibana-management
 src/platform/packages/shared/deeplinks/ml @elastic/ml-ui
-packages/deeplinks/observability @elastic/obs-ux-management-team
+src/platform/packages/shared/deeplinks/observability @elastic/obs-ux-management-team
 packages/deeplinks/search @elastic/search-kibana
 packages/deeplinks/security @elastic/security-solution
 packages/deeplinks/shared @elastic/appex-sharedux
@@ -451,7 +451,7 @@ x-pack/plugins/event_log @elastic/response-ops
 x-pack/solutions/security/packages/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
+x-pack/solutions/observability/plugins/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
@@ -535,7 +535,7 @@ test/plugin_functional/plugins/index_patterns @elastic/kibana-data-discovery
 x-pack/platform/packages/private/ml/inference_integration_flyout @elastic/ml-ui
 x-pack/platform/packages/shared/ai-infra/inference-common @elastic/appex-ai-infra
 x-pack/platform/plugins/shared/inference @elastic/appex-ai-infra
-x-pack/packages/kbn-infra-forge @elastic/obs-ux-management-team
+x-pack/platform/packages/private/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
@@ -546,9 +546,9 @@ test/interactive_setup_api_integration/plugins/test_endpoints @elastic/kibana-se
 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
+x-pack/solutions/observability/plugins/investigate_app @elastic/obs-ux-management-team
+x-pack/solutions/observability/plugins/investigate @elastic/obs-ux-management-team
+x-pack/solutions/observability/packages/kbn-investigation-shared @elastic/obs-ux-management-team
 src/platform/packages/shared/kbn-io-ts-utils @elastic/obs-knowledge-team
 packages/kbn-ipynb @elastic/search-kibana
 packages/kbn-jest-serializers @elastic/kibana-operations
@@ -664,18 +664,18 @@ x-pack/solutions/observability/plugins/observability_ai_assistant_management @el
 x-pack/platform/plugins/shared/observability_solution/observability_ai_assistant @elastic/obs-ai-assistant
 x-pack/solutions/observability/packages/observability_ai/observability_ai_common @elastic/obs-ai-assistant
 x-pack/solutions/observability/packages/observability_ai/observability_ai_server @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/solutions/observability/packages/alert_details @elastic/obs-ux-management-team
+x-pack/platform/packages/shared/observability/alerting_rule_utils @elastic/obs-ux-management-team
+x-pack/solutions/observability/packages/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/solutions/observability/packages/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/solutions/observability/plugins/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/solutions/observability/packages/synthetics_test_data @elastic/obs-ux-management-team
 x-pack/packages/observability/observability_utils/observability_utils_browser @elastic/observability-ui
 x-pack/packages/observability/observability_utils/observability_utils_common @elastic/observability-ui
 x-pack/packages/observability/observability_utils/observability_utils_server @elastic/observability-ui
@@ -849,7 +849,7 @@ src/platform/packages/shared/kbn-server-route-repository-client @elastic/obs-kno
 src/platform/packages/shared/kbn-server-route-repository-utils @elastic/obs-knowledge-team
 x-pack/plugins/serverless @elastic/appex-sharedux
 packages/serverless/settings/common @elastic/appex-sharedux @elastic/kibana-management
-x-pack/plugins/serverless_observability @elastic/obs-ux-management-team
+x-pack/solutions/observability/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
@@ -914,7 +914,7 @@ 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/platform/packages/shared/kbn-slo-schema @elastic/obs-ux-management-team
 x-pack/platform/plugins/private/snapshot_restore @elastic/kibana-management
 packages/kbn-some-dev-log @elastic/kibana-operations
 packages/kbn-sort-package-json @elastic/kibana-operations
@@ -936,8 +936,8 @@ packages/kbn-stdio-dev-helpers @elastic/kibana-operations
 packages/kbn-storybook @elastic/kibana-operations
 x-pack/solutions/observability/plugins/streams_app @simianhacker @flash1293 @dgieselaar
 x-pack/solutions/observability/plugins/streams @simianhacker @flash1293 @dgieselaar
-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/solutions/observability/plugins/synthetics/e2e @elastic/obs-ux-management-team
+x-pack/solutions/observability/plugins/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
@@ -997,7 +997,7 @@ src/plugins/unified_search @elastic/kibana-visualizations
 packages/kbn-unsaved-changes-badge @elastic/kibana-data-discovery
 src/platform/packages/shared/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/solutions/observability/plugins/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
@@ -1009,7 +1009,7 @@ x-pack/test/security_api_integration/plugins/user_profiles_consumer @elastic/kib
 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
+x-pack/solutions/observability/plugins/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