[8.x] Sustainable Kibana Architecture: Move modules owned by @elastic/obs-ux-management-team (#202832) (#204256)

# Backport This will backport the following commits from `main` to `8.x`: - [Sustainable Kibana Architecture: Move modules owned by `@elastic/obs-ux-management-team` (#202832)](https://github.com/elastic/kibana/pull/202832)  ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport)  --------- Co-authored-by: Gerard Soldevila <gerard.soldevila@elastic.co> Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com> Co-authored-by: Justin Kambic <jk@elastic.co>
2025-04-23 17:28:26 -04:00 · 2024-12-16 17:49:47 +01:00 · 2024-12-16 17:49:47 +01:00 · 87f9d773fd
commit 87f9d773fd
parent 5abc8a3f2e
3470 changed files with 940 additions and 1174 deletions
--- a/.buildkite/ftr_oblt_stateful_configs.yml
+++ b/.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'
--- a/.buildkite/pipelines/on_merge_unsupported_ftrs.yml
+++ b/.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'
--- a/.buildkite/pipelines/pull_request/exploratory_view_plugin.yml
+++ b/.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'
--- a/.buildkite/pipelines/pull_request/synthetics_plugin.yml
+++ b/.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'
--- a/.buildkite/pipelines/pull_request/uptime_plugin.yml
+++ b/.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'
--- a/.buildkite/pipelines/pull_request/ux_plugin_e2e.yml
+++ b/.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'
--- a/.buildkite/scripts/pipelines/pull_request/pipeline.ts
+++ b/.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,7 +114,7 @@ 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'));
@ -122,8 +122,8 @@ const getPipeline = (filename: string, removeSteps = true) => {

    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')
    ) {
--- a/.buildkite/scripts/steps/functional/exploratory_view_plugin.sh
+++ b/.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}\"}
--- a/.buildkite/scripts/steps/functional/synthetics.sh
+++ b/.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*"
--- a/.buildkite/scripts/steps/functional/synthetics_plugin.sh
+++ b/.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}\"}
--- a/.buildkite/scripts/steps/functional/uptime_plugin.sh
+++ b/.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}\"}
--- a/.buildkite/scripts/steps/functional/ux_synthetics_e2e.sh
+++ b/.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}\"}
--- a/.eslintrc.js
+++ b/.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': [
--- a/.github/CODEOWNERS
+++ b/.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
--- a/.github/paths-labeller.yml
+++ b/.github/paths-labeller.yml
@ -14,15 +14,15 @@
    - 'packages/kbn-apm-synthtrace/**/*.*'
    - 'packages/kbn-apm-synthtrace-client/**/*.*'
    - 'packages/kbn-apm-utils/**/*.*'
-    - 'x-pack/plugins/observability_solution/ux/**/*.*'
+    - 'x-pack/solutions/observability/plugins/ux/**/*.*'
 - 'Team:Fleet':
    - 'x-pack/plugins/fleet/**/*.*'
    - 'x-pack/test/fleet_api_integration/**/*.*'
 - 'Team:obs-ux-management':
-    - 'x-pack/plugins/observability_solution/observability/**/*.*'
+    - 'x-pack/solutions/observability/plugins/observability/**/*.*'
    - 'x-pack/plugins/observability_solution/slo/**/*.*'
-    - '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/**/*.*'
 - 'Team:Obs AI Assistant':
    - 'x-pack/platform/plugins/shared/observability_solution/observability_ai_assistant/**/*.*'
    - 'x-pack/plugins/observability_solution/observability_ai_assistant_*/**/*.*'
@ -31,6 +31,6 @@
 - 'ci:project-deploy-observability':
    - 'packages/kbn-apm-*/**/*.*'
    - 'x-pack/plugins/observability_solution/**/*.*'
-    - 'x-pack/plugins/serverless_observability/**/*.*'
+    - 'x-pack/solutions/observability/plugins/serverless_observability/**/*.*'
    - 'x-pack/test/apm_api_integration/**/*.*'
    - 'x-pack/test/observability_*/**/*.*'
--- a/.i18nrc.json
+++ b/.i18nrc.json
@ -23,7 +23,7 @@
    "domDragDrop": "packages/kbn-dom-drag-drop",
    "controls": "src/plugins/controls",
    "data": "src/plugins/data",
-    "observabilityAlertDetails": "x-pack/packages/observability/alert_details",
+    "observabilityAlertDetails": "x-pack/solutions/observability/packages/alert_details",
    "dataViews": "src/plugins/data_views",
    "defaultNavigation": [
      "packages/default-nav",
--- a/docs/developer/plugin-list.asciidoc
+++ b/docs/developer/plugin-list.asciidoc
@ -592,7 +592,7 @@ security and spaces filtering.
 activities.


-|{kib-repo}blob/{branch}/x-pack/plugins/observability_solution/exploratory_view/README.md[exploratoryView]
+|{kib-repo}blob/{branch}/x-pack/solutions/observability/plugins/exploratory_view/README.md[exploratoryView]
 |A shared component for visualizing observability data types via lens embeddable. For further details.


@ -665,11 +665,11 @@ the infrastructure monitoring use-case within Kibana.
 |Home of the Inventory plugin, which renders the... inventory.


-|{kib-repo}blob/{branch}/x-pack/plugins/observability_solution/investigate/README.md[investigate]
+|{kib-repo}blob/{branch}/x-pack/solutions/observability/plugins/investigate/README.md[investigate]
 |undefined


-|{kib-repo}blob/{branch}/x-pack/plugins/observability_solution/investigate_app/README.md[investigateApp]
+|{kib-repo}blob/{branch}/x-pack/solutions/observability/plugins/investigate_app/README.md[investigateApp]
 |undefined


@ -743,7 +743,7 @@ Elastic.
 |The Notifications plugin provides a set of services to help Solutions and plugins send notifications to users.


-|{kib-repo}blob/{branch}/x-pack/plugins/observability_solution/observability/README.md[observability]
+|{kib-repo}blob/{branch}/x-pack/solutions/observability/plugins/observability/README.md[observability]
 |This plugin provides shared components and services for use across observability solutions, as well as the observability landing page UI.


@ -882,7 +882,7 @@ This plugin is only enabled when the application is built for serverless project
 |


-|{kib-repo}blob/{branch}/x-pack/plugins/serverless_observability/README.mdx[serverlessObservability]
+|{kib-repo}blob/{branch}/x-pack/solutions/observability/plugins/serverless_observability/README.mdx[serverlessObservability]
 |This plugin contains configuration and code used to create a Serverless Observability project.  It leverages universal configuration and other APIs in the serverless plugin to configure Kibana.


@ -925,7 +925,7 @@ routes, etc.
 |Home of the Streams app plugin, which allows users to manage Streams via the UI.


-|{kib-repo}blob/{branch}/x-pack/plugins/observability_solution/synthetics/README.md[synthetics]
+|{kib-repo}blob/{branch}/x-pack/solutions/observability/plugins/synthetics/README.md[synthetics]
 |The purpose of this plugin is to provide users of Heartbeat more visibility of what's happening
 in their infrastructure.

@ -964,7 +964,7 @@ As a developer you can reuse and extend built-in alerts and actions UI functiona
 |Upgrade Assistant helps users prepare their Stack for being upgraded to the next version of the Elastic stack.


-|{kib-repo}blob/{branch}/x-pack/plugins/observability_solution/uptime/README.md[uptime]
+|{kib-repo}blob/{branch}/x-pack/solutions/observability/plugins/uptime/README.md[uptime]
 |The purpose of this plugin is to provide users of Heartbeat more visibility of what's happening
 in their infrastructure.

@ -973,7 +973,7 @@ in their infrastructure.
 |NOTE: This plugin contains implementation of URL drilldown. For drilldowns infrastructure code refer to ui_actions_enhanced plugin.


-|{kib-repo}blob/{branch}/x-pack/plugins/observability_solution/ux/readme.md[ux]
+|{kib-repo}blob/{branch}/x-pack/solutions/observability/plugins/ux/readme.md[ux]
 |https://docs.elastic.dev/kibana-dev-docs/welcome


--- a/oas_docs/overlays/alerting.overlays.yaml
+++ b/oas_docs/overlays/alerting.overlays.yaml
@ -113,9 +113,9 @@ actions:
                    # SLO burn rate (slo.rules.burnRate)
                    - $ref:  '../../x-pack/plugins/observability_solution/slo/server/lib/rules/slo_burn_rate/docs/params_property_slo_burn_rate.yaml'
                    # Synthetics uptime TLS rule (xpack.uptime.alerts.tls)
-                    - $ref: '../../x-pack/plugins/observability_solution/uptime/server/legacy_uptime/lib/alerts/docs/params_property_synthetics_uptime_tls.yaml'
+                    - $ref: '../../x-pack/solutions/observability/plugins/uptime/server/legacy_uptime/lib/alerts/docs/params_property_synthetics_uptime_tls.yaml'
                    # Uptime monitor status rule (xpack.uptime.alerts.monitorStatus)
-                    - $ref: '../../x-pack/plugins/observability_solution/uptime/server/legacy_uptime/lib/alerts/docs/params_property_synthetics_monitor_status.yaml'
+                    - $ref: '../../x-pack/solutions/observability/plugins/uptime/server/legacy_uptime/lib/alerts/docs/params_property_synthetics_monitor_status.yaml'
                  # TBD
                    # Anomaly detection alert rule (xpack.ml.anomaly_detection_alert)
                    # Anomaly detection jobs health rule (xpack.ml.anomaly_detection_jobs_health)
--- a/package.json
+++ b/package.json
@ -422,7 +422,7 @@
    "@kbn/custom-integrations-plugin": "link:src/plugins/custom_integrations",
    "@kbn/dashboard-enhanced-plugin": "link:x-pack/plugins/dashboard_enhanced",
    "@kbn/dashboard-plugin": "link:src/plugins/dashboard",
-    "@kbn/data-forge": "link:x-pack/packages/kbn-data-forge",
+    "@kbn/data-forge": "link:x-pack/platform/packages/shared/kbn-data-forge",
    "@kbn/data-plugin": "link:src/plugins/data",
    "@kbn/data-quality-plugin": "link:x-pack/plugins/data_quality",
    "@kbn/data-search-plugin": "link:test/plugin_functional/plugins/data_search",
@ -443,7 +443,7 @@
    "@kbn/deeplinks-fleet": "link:packages/deeplinks/fleet",
    "@kbn/deeplinks-management": "link:src/platform/packages/shared/deeplinks/management",
    "@kbn/deeplinks-ml": "link:src/platform/packages/shared/deeplinks/ml",
-    "@kbn/deeplinks-observability": "link:packages/deeplinks/observability",
+    "@kbn/deeplinks-observability": "link:src/platform/packages/shared/deeplinks/observability",
    "@kbn/deeplinks-search": "link:packages/deeplinks/search",
    "@kbn/deeplinks-security": "link:packages/deeplinks/security",
    "@kbn/deeplinks-shared": "link:packages/deeplinks/shared",
@ -505,7 +505,7 @@
    "@kbn/event-log-plugin": "link:x-pack/plugins/event_log",
    "@kbn/expandable-flyout": "link:x-pack/solutions/security/packages/expandable-flyout",
    "@kbn/exploratory-view-example-plugin": "link:x-pack/examples/exploratory_view_example",
-    "@kbn/exploratory-view-plugin": "link:x-pack/plugins/observability_solution/exploratory_view",
+    "@kbn/exploratory-view-plugin": "link:x-pack/solutions/observability/plugins/exploratory_view",
    "@kbn/expression-error-plugin": "link:src/plugins/expression_error",
    "@kbn/expression-gauge-plugin": "link:src/plugins/chart_expressions/expression_gauge",
    "@kbn/expression-heatmap-plugin": "link:src/plugins/chart_expressions/expression_heatmap",
@ -579,7 +579,7 @@
    "@kbn/inference-common": "link:x-pack/platform/packages/shared/ai-infra/inference-common",
    "@kbn/inference-plugin": "link:x-pack/platform/plugins/shared/inference",
    "@kbn/inference_integration_flyout": "link:x-pack/platform/packages/private/ml/inference_integration_flyout",
-    "@kbn/infra-forge": "link:x-pack/packages/kbn-infra-forge",
+    "@kbn/infra-forge": "link:x-pack/platform/packages/private/kbn-infra-forge",
    "@kbn/infra-plugin": "link:x-pack/plugins/observability_solution/infra",
    "@kbn/ingest-pipelines-plugin": "link:x-pack/plugins/ingest_pipelines",
    "@kbn/input-control-vis-plugin": "link:src/plugins/input_control_vis",
@ -589,9 +589,9 @@
    "@kbn/interactive-setup-test-endpoints-plugin": "link:test/interactive_setup_api_integration/plugins/test_endpoints",
    "@kbn/interpreter": "link:packages/kbn-interpreter",
    "@kbn/inventory-plugin": "link:x-pack/plugins/observability_solution/inventory",
-    "@kbn/investigate-app-plugin": "link:x-pack/plugins/observability_solution/investigate_app",
-    "@kbn/investigate-plugin": "link:x-pack/plugins/observability_solution/investigate",
-    "@kbn/investigation-shared": "link:packages/kbn-investigation-shared",
+    "@kbn/investigate-app-plugin": "link:x-pack/solutions/observability/plugins/investigate_app",
+    "@kbn/investigate-plugin": "link:x-pack/solutions/observability/plugins/investigate",
+    "@kbn/investigation-shared": "link:x-pack/solutions/observability/packages/kbn-investigation-shared",
    "@kbn/io-ts-utils": "link:src/platform/packages/shared/kbn-io-ts-utils",
    "@kbn/ipynb": "link:packages/kbn-ipynb",
    "@kbn/json-schemas": "link:x-pack/platform/packages/private/ml/json_schemas",
@ -695,17 +695,17 @@
    "@kbn/observability-ai-assistant-plugin": "link:x-pack/platform/plugins/shared/observability_solution/observability_ai_assistant",
    "@kbn/observability-ai-common": "link:x-pack/solutions/observability/packages/observability_ai/observability_ai_common",
    "@kbn/observability-ai-server": "link:x-pack/solutions/observability/packages/observability_ai/observability_ai_server",
-    "@kbn/observability-alert-details": "link:x-pack/packages/observability/alert_details",
-    "@kbn/observability-alerting-rule-utils": "link:x-pack/packages/observability/alerting_rule_utils",
-    "@kbn/observability-alerting-test-data": "link:x-pack/packages/observability/alerting_test_data",
+    "@kbn/observability-alert-details": "link:x-pack/solutions/observability/packages/alert_details",
+    "@kbn/observability-alerting-rule-utils": "link:x-pack/platform/packages/shared/observability/alerting_rule_utils",
+    "@kbn/observability-alerting-test-data": "link:x-pack/solutions/observability/packages/alerting_test_data",
    "@kbn/observability-fixtures-plugin": "link:x-pack/test/cases_api_integration/common/plugins/observability",
-    "@kbn/observability-get-padded-alert-time-range-util": "link:x-pack/packages/observability/get_padded_alert_time_range_util",
+    "@kbn/observability-get-padded-alert-time-range-util": "link:x-pack/solutions/observability/packages/get_padded_alert_time_range_util",
    "@kbn/observability-logs-explorer-plugin": "link:x-pack/plugins/observability_solution/observability_logs_explorer",
    "@kbn/observability-logs-overview": "link:x-pack/packages/observability/logs_overview",
    "@kbn/observability-onboarding-plugin": "link:x-pack/plugins/observability_solution/observability_onboarding",
-    "@kbn/observability-plugin": "link:x-pack/plugins/observability_solution/observability",
+    "@kbn/observability-plugin": "link:x-pack/solutions/observability/plugins/observability",
    "@kbn/observability-shared-plugin": "link:x-pack/plugins/observability_solution/observability_shared",
-    "@kbn/observability-synthetics-test-data": "link:x-pack/packages/observability/synthetics_test_data",
+    "@kbn/observability-synthetics-test-data": "link:x-pack/solutions/observability/packages/synthetics_test_data",
    "@kbn/observability-utils-browser": "link:x-pack/packages/observability/observability_utils/observability_utils_browser",
    "@kbn/observability-utils-common": "link:x-pack/packages/observability/observability_utils/observability_utils_common",
    "@kbn/observability-utils-server": "link:x-pack/packages/observability/observability_utils/observability_utils_server",
@ -862,7 +862,7 @@
    "@kbn/server-route-repository-utils": "link:src/platform/packages/shared/kbn-server-route-repository-utils",
    "@kbn/serverless": "link:x-pack/plugins/serverless",
    "@kbn/serverless-common-settings": "link:packages/serverless/settings/common",
-    "@kbn/serverless-observability": "link:x-pack/plugins/serverless_observability",
+    "@kbn/serverless-observability": "link:x-pack/solutions/observability/plugins/serverless_observability",
    "@kbn/serverless-observability-settings": "link:packages/serverless/settings/observability_project",
    "@kbn/serverless-project-switcher": "link:packages/serverless/project_switcher",
    "@kbn/serverless-search": "link:x-pack/plugins/serverless_search",
@ -926,7 +926,7 @@
    "@kbn/shared-ux-table-persist": "link:packages/shared-ux/table_persist",
    "@kbn/shared-ux-utility": "link:packages/kbn-shared-ux-utility",
    "@kbn/slo-plugin": "link:x-pack/plugins/observability_solution/slo",
-    "@kbn/slo-schema": "link:x-pack/packages/kbn-slo-schema",
+    "@kbn/slo-schema": "link:x-pack/platform/packages/shared/kbn-slo-schema",
    "@kbn/snapshot-restore-plugin": "link:x-pack/platform/plugins/private/snapshot_restore",
    "@kbn/sort-predicates": "link:packages/kbn-sort-predicates",
    "@kbn/spaces-plugin": "link:x-pack/plugins/spaces",
@ -943,7 +943,7 @@
    "@kbn/std": "link:packages/kbn-std",
    "@kbn/streams-app-plugin": "link:x-pack/solutions/observability/plugins/streams_app",
    "@kbn/streams-plugin": "link:x-pack/solutions/observability/plugins/streams",
-    "@kbn/synthetics-plugin": "link:x-pack/plugins/observability_solution/synthetics",
+    "@kbn/synthetics-plugin": "link:x-pack/solutions/observability/plugins/synthetics",
    "@kbn/synthetics-private-location": "link:x-pack/packages/kbn-synthetics-private-location",
    "@kbn/task-manager-fixture-plugin": "link:x-pack/test/alerting_api_integration/common/plugins/task_manager_fixture",
    "@kbn/task-manager-performance-plugin": "link:x-pack/test/plugin_api_perf/plugins/task_manager_performance",
@ -991,7 +991,7 @@
    "@kbn/unsaved-changes-badge": "link:packages/kbn-unsaved-changes-badge",
    "@kbn/unsaved-changes-prompt": "link:src/platform/packages/shared/kbn-unsaved-changes-prompt",
    "@kbn/upgrade-assistant-plugin": "link:x-pack/plugins/upgrade_assistant",
-    "@kbn/uptime-plugin": "link:x-pack/plugins/observability_solution/uptime",
+    "@kbn/uptime-plugin": "link:x-pack/solutions/observability/plugins/uptime",
    "@kbn/url-drilldown-plugin": "link:x-pack/plugins/drilldowns/url_drilldown",
    "@kbn/url-forwarding-plugin": "link:src/plugins/url_forwarding",
    "@kbn/usage-collection-plugin": "link:src/plugins/usage_collection",
@ -1003,7 +1003,7 @@
    "@kbn/utility-types": "link:packages/kbn-utility-types",
    "@kbn/utility-types-jest": "link:packages/kbn-utility-types-jest",
    "@kbn/utils": "link:packages/kbn-utils",
-    "@kbn/ux-plugin": "link:x-pack/plugins/observability_solution/ux",
+    "@kbn/ux-plugin": "link:x-pack/solutions/observability/plugins/ux",
    "@kbn/v8-profiler-examples-plugin": "link:examples/v8_profiler_examples",
    "@kbn/vis-default-editor-plugin": "link:src/plugins/vis_default_editor",
    "@kbn/vis-type-gauge-plugin": "link:src/plugins/vis_types/gauge",
@ -1500,7 +1500,7 @@
    "@kbn/spec-to-console": "link:packages/kbn-spec-to-console",
    "@kbn/stdio-dev-helpers": "link:packages/kbn-stdio-dev-helpers",
    "@kbn/storybook": "link:packages/kbn-storybook",
-    "@kbn/synthetics-e2e": "link:x-pack/plugins/observability_solution/synthetics/e2e",
+    "@kbn/synthetics-e2e": "link:x-pack/solutions/observability/plugins/synthetics/e2e",
    "@kbn/telemetry-tools": "link:packages/kbn-telemetry-tools",
    "@kbn/test": "link:packages/kbn-test",
    "@kbn/test-eui-helpers": "link:packages/kbn-test-eui-helpers",
--- a/packages/kbn-babel-preset/styled_components_files.js
+++ b/packages/kbn-babel-preset/styled_components_files.js
@ -15,6 +15,7 @@ module.exports = {
  USES_STYLED_COMPONENTS: [
    /packages[\/\\]kbn-ui-shared-deps-(npm|src)[\/\\]/,
    /src[\/\\]plugins[\/\\](kibana_react)[\/\\]/,
+    /x-pack[\/\\]solutions[\/\\]observability[\/\\]plugins[\/\\]/,
    /x-pack[\/\\]plugins[\/\\](observability_solution\/apm|beats_management|fleet|observability_solution\/infra|lists|observability_solution\/observability|observability_solution\/observability_shared|observability_solution\/exploratory_view|security_solution|timelines|observability_solution\/synthetics|observability_solution\/ux|observability_solution\/uptime)[\/\\]/,
    /x-pack[\/\\]solutions[\/\\]security[\/\\]plugins[\/\\](observability_solution\/apm|beats_management|fleet|observability_solution\/infra|lists|observability_solution\/observability|observability_solution\/observability_shared|observability_solution\/exploratory_view|security_solution|timelines|observability_solution\/synthetics|observability_solution\/ux|observability_solution\/uptime)[\/\\]/,
    /x-pack[\/\\]test[\/\\]plugin_functional[\/\\]plugins[\/\\]resolver_test[\/\\]/,
--- a/packages/kbn-eslint-plugin-i18n/helpers/get_i18n_identifier_from_file_path.test.ts
+++ b/packages/kbn-eslint-plugin-i18n/helpers/get_i18n_identifier_from_file_path.test.ts
@ -13,7 +13,7 @@ const SYSTEMPATH = 'systemPath';

 const testMap = [
  [
-    'x-pack/plugins/observability_solution/observability/public/header_actions.tsx',
+    'x-pack/solutions/observability/plugins/observability/public/header_actions.tsx',
    'xpack.observability',
  ],
  [
@ -22,7 +22,7 @@ const testMap = [
  ],
  ['x-pack/plugins/cases/server/components/foo.tsx', 'xpack.cases'],
  [
-    'x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/components/alerts/toggle_alert_flyout_button.tsx',
+    'x-pack/solutions/observability/plugins/synthetics/public/apps/synthetics/components/alerts/toggle_alert_flyout_button.tsx',
    'xpack.synthetics',
  ],
  ['src/plugins/vis_types/gauge/public/editor/collections.ts', 'visTypeGauge'],
--- a/packages/kbn-eslint-plugin-i18n/rules/formatted_message_should_start_with_the_right_id.test.ts
+++ b/packages/kbn-eslint-plugin-i18n/rules/formatted_message_should_start_with_the_right_id.test.ts
@ -52,13 +52,13 @@ for (const [name, tester] of [tsTester, babelTester]) {
          {
            name: 'When a string literal is passed to FormattedMessage the ID attribute should start with the correct i18n identifier, and if no existing defaultMessage is passed, it should add an empty default.',
            filename:
-              '/x-pack/plugins/observability_solution/observability/public/test_component.tsx',
+              '/x-pack/solutions/observability/plugins/observability/public/test_component.tsx',
            code: `<FormattedMessage id="xpack.observability." defaultMessage="" />`,
          },
          {
            name: 'When a string literal is passed to FormattedMessage the ID attribute should start with the correct i18n identifier, and if an existing id and defaultMessage is passed, it should leave them alone.',
            filename:
-              '/x-pack/plugins/observability_solution/observability/public/test_component.tsx',
+              '/x-pack/solutions/observability/plugins/observability/public/test_component.tsx',
            code: `<FormattedMessage id="xpack.observability.testComponent" defaultMessage="foo" />`,
          },
        ],
@ -66,7 +66,7 @@ for (const [name, tester] of [tsTester, babelTester]) {
          {
            name: 'When a string literal is passed to FormattedMessage the ID attribute should start with the correct i18n identifier, and if no existing defaultMessage is passed, it should add an empty default.',
            filename:
-              '/x-pack/plugins/observability_solution/observability/public/test_component.tsx',
+              '/x-pack/solutions/observability/plugins/observability/public/test_component.tsx',
            code: `
  import { FormattedMessage } from '@kbn/i18n-react';

@ -89,7 +89,7 @@ for (const [name, tester] of [tsTester, babelTester]) {
          {
            name: 'When a string literal is passed to the ID attribute of <FormattedMessage /> and the root of the i18n identifier is not correct, it should keep the existing identifier but only update the right base app, and keep the default message if available.',
            filename:
-              '/x-pack/plugins/observability_solution/observability/public/test_component.tsx',
+              '/x-pack/solutions/observability/plugins/observability/public/test_component.tsx',
            code: `
  import { FormattedMessage } from '@kbn/i18n-react';

@ -112,7 +112,7 @@ for (const [name, tester] of [tsTester, babelTester]) {
          {
            name: 'When no string literal is passed to the ID attribute of <FormattedMessage /> it should start with the correct i18n identifier.',
            filename:
-              '/x-pack/plugins/observability_solution/observability/public/test_component.tsx',
+              '/x-pack/solutions/observability/plugins/observability/public/test_component.tsx',
            code: `
  import { FormattedMessage } from '@kbn/i18n-react';

@ -135,7 +135,7 @@ for (const [name, tester] of [tsTester, babelTester]) {
          {
            name: 'When i18n is not imported yet, the rule should add it.',
            filename:
-              '/x-pack/plugins/observability_solution/observability/public/test_component.tsx',
+              '/x-pack/solutions/observability/plugins/observability/public/test_component.tsx',
            code: `
  function TestComponent() {
    return <FormattedMessage />;
--- a/packages/kbn-eslint-plugin-i18n/rules/i18n_translate_should_start_with_the_right_id.test.ts
+++ b/packages/kbn-eslint-plugin-i18n/rules/i18n_translate_should_start_with_the_right_id.test.ts
@ -45,7 +45,7 @@ const babelTester = [
 const invalid: RuleTester.InvalidTestCase[] = [
  {
    name: 'When a string literal is passed to i18n.translate, it should start with the correct i18n identifier, and if no existing defaultMessage is passed, it should add an empty default.',
-    filename: '/x-pack/plugins/observability_solution/observability/public/test_component.ts',
+    filename: '/x-pack/solutions/observability/plugins/observability/public/test_component.ts',
    code: `
 import { i18n } from '@kbn/i18n';

@ -67,7 +67,7 @@ function TestComponent() {
  },
  {
    name: 'When a string literal is passed to i18n.translate, and the root of the i18n identifier is not correct, it should keep the existing identifier but only update the right base app.',
-    filename: '/x-pack/plugins/observability_solution/observability/public/test_component.ts',
+    filename: '/x-pack/solutions/observability/plugins/observability/public/test_component.ts',
    code: `
 import { i18n } from '@kbn/i18n';

@ -89,7 +89,7 @@ function TestComponent() {
  },
  {
    name: 'When a string literal is passed to i18n.translate, and the root of the i18n identifier is not correct, it should keep the existing identifier but only update the right base app, and keep the default message if available.',
-    filename: '/x-pack/plugins/observability_solution/observability/public/test_component.ts',
+    filename: '/x-pack/solutions/observability/plugins/observability/public/test_component.ts',
    code: `
 import { i18n } from '@kbn/i18n';

@ -111,7 +111,7 @@ function TestComponent() {
  },
  {
    name: 'When no string literal is passed to i18n.translate, it should start with the correct i18n identifier.',
-    filename: '/x-pack/plugins/observability_solution/observability/public/test_component.ts',
+    filename: '/x-pack/solutions/observability/plugins/observability/public/test_component.ts',
    code: `
 import { i18n } from '@kbn/i18n';

@ -133,7 +133,7 @@ function TestComponent() {
  },
  {
    name: 'When i18n is not imported yet, the rule should add it.',
-    filename: '/x-pack/plugins/observability_solution/observability/public/test_component.ts',
+    filename: '/x-pack/solutions/observability/plugins/observability/public/test_component.ts',
    code: `
 function TestComponent() {
  const foo = i18n.translate();
--- a/packages/kbn-eslint-plugin-i18n/rules/strings_should_be_translated_with_formatted_message.test.ts
+++ b/packages/kbn-eslint-plugin-i18n/rules/strings_should_be_translated_with_formatted_message.test.ts
@ -45,7 +45,7 @@ const babelTester = [
 const invalid: RuleTester.InvalidTestCase[] = [
  {
    name: 'A JSX element with a string literal should be translated with i18n',
-    filename: '/x-pack/plugins/observability_solution/observability/public/test_component.tsx',
+    filename: '/x-pack/solutions/observability/plugins/observability/public/test_component.tsx',
    code: `
 import React from 'react';

@ -76,7 +76,7 @@ function TestComponent() {
  },
  {
    name: 'A JSX element with a string literal that are inside an Eui component should take the component name of the parent into account',
-    filename: '/x-pack/plugins/observability_solution/observability/public/another_component.tsx',
+    filename: '/x-pack/solutions/observability/plugins/observability/public/another_component.tsx',
    code: `
 import React from 'react';

@ -120,7 +120,7 @@ function AnotherComponent() {
  {
    name: 'When no import of the translation module is present, the import line should be added',
    filename:
-      '/x-pack/plugins/observability_solution/observability/public/yet_another_component.tsx',
+      '/x-pack/solutions/observability/plugins/observability/public/yet_another_component.tsx',
    code: `
 import React from 'react';

@ -155,7 +155,7 @@ function YetAnotherComponent() {
  },
  {
    name: 'Import lines without the necessary translation module should be updated to include i18n',
-    filename: '/x-pack/plugins/observability_solution/observability/public/test_component.tsx',
+    filename: '/x-pack/solutions/observability/plugins/observability/public/test_component.tsx',
    code: `
 import React from 'react';
 import { SomeOtherModule } from '@kbn/i18n-react';
@ -183,7 +183,7 @@ function TestComponent() {
  },
  {
    name: 'JSX elements that have a label, aria-label or title prop with a string value should be translated with FormattedMessage',
-    filename: '/x-pack/plugins/observability_solution/observability/public/test_component.tsx',
+    filename: '/x-pack/solutions/observability/plugins/observability/public/test_component.tsx',
    code: `
 import React from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
@ -239,7 +239,7 @@ function TestComponent3() {
  },
  {
    name: 'JSX elements that have a label, aria-label or title prop with a string value with quotes in it should be correctly translated with FormattedMessage',
-    filename: '/x-pack/plugins/observability_solution/observability/public/test_component.tsx',
+    filename: '/x-pack/solutions/observability/plugins/observability/public/test_component.tsx',
    code: `
 import React from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
@ -295,7 +295,7 @@ function TestComponent3() {
  },
  {
    name: 'JSX elements that have a label, aria-label or title prop with a JSXExpression value that is a string should be translated with FormattedMessage',
-    filename: '/x-pack/plugins/observability_solution/observability/public/test_component.tsx',
+    filename: '/x-pack/solutions/observability/plugins/observability/public/test_component.tsx',
    code: `
  import React from 'react';
  import { FormattedMessage } from '@kbn/i18n-react';
@ -351,7 +351,7 @@ function TestComponent3() {
  },
  {
    name: 'JSX elements that have a label, aria-label or title prop with a JSXExpression value that is a string with quotes in it should be correctly translated with FormattedMessage',
-    filename: '/x-pack/plugins/observability_solution/observability/public/test_component.tsx',
+    filename: '/x-pack/solutions/observability/plugins/observability/public/test_component.tsx',
    code: `
  import React from 'react';
  import { FormattedMessage } from '@kbn/i18n-react';
@ -410,7 +410,7 @@ function TestComponent3() {
 const valid: RuleTester.ValidTestCase[] = [
  {
    name: 'A JSXText element inside a EuiCode component should not be translated',
-    filename: '/x-pack/plugins/observability_solution/observability/public/test_component.tsx',
+    filename: '/x-pack/solutions/observability/plugins/observability/public/test_component.tsx',
    code: `
 import React from 'react';

@ -422,7 +422,7 @@ function TestComponent() {
  },
  {
    name: 'A JSXText element that contains anything other than alpha characters should not be translated',
-    filename: '/x-pack/plugins/observability_solution/observability/public/test_component.tsx',
+    filename: '/x-pack/solutions/observability/plugins/observability/public/test_component.tsx',
    code: `
 import React from 'react';

@ -434,7 +434,7 @@ function TestComponent() {
  },
  {
    name: 'A JSXText element that is wrapped in three backticks (markdown) should not be translated',
-    filename: '/x-pack/plugins/observability_solution/observability/public/test_component.tsx',
+    filename: '/x-pack/solutions/observability/plugins/observability/public/test_component.tsx',
    code: `
 import React from 'react';

--- a/packages/kbn-eslint-plugin-i18n/rules/strings_should_be_translated_with_i18n.test.ts
+++ b/packages/kbn-eslint-plugin-i18n/rules/strings_should_be_translated_with_i18n.test.ts
@ -45,7 +45,7 @@ const babelTester = [
 const invalid: RuleTester.InvalidTestCase[] = [
  {
    name: 'A JSX element with a string literal should be translated with i18n',
-    filename: '/x-pack/plugins/observability_solution/observability/public/test_component.tsx',
+    filename: '/x-pack/solutions/observability/plugins/observability/public/test_component.tsx',
    code: `
 import React from 'react';

@ -72,7 +72,7 @@ function TestComponent() {
  },
  {
    name: 'A JSX element with a string literal that are inside an Eui component should take the component name of the parent into account',
-    filename: '/x-pack/plugins/observability_solution/observability/public/another_component.tsx',
+    filename: '/x-pack/solutions/observability/plugins/observability/public/another_component.tsx',
    code: `
 import React from 'react';

@ -112,7 +112,7 @@ function AnotherComponent() {
  {
    name: 'When no import of the translation module is present, the import line should be added',
    filename:
-      '/x-pack/plugins/observability_solution/observability/public/yet_another_component.tsx',
+      '/x-pack/solutions/observability/plugins/observability/public/yet_another_component.tsx',
    code: `
 import React from 'react';

@ -143,7 +143,7 @@ function YetAnotherComponent() {
  },
  {
    name: 'Import lines without the necessary translation module should be updated to include i18n',
-    filename: '/x-pack/plugins/observability_solution/observability/public/test_component.tsx',
+    filename: '/x-pack/solutions/observability/plugins/observability/public/test_component.tsx',
    code: `
 import React from 'react';
 import { SomeOtherModule } from '@kbn/i18n';
@ -171,7 +171,7 @@ function TestComponent() {
  },
  {
    name: 'JSX elements that have a label, aria-label or title prop with a string value should be translated with i18n',
-    filename: '/x-pack/plugins/observability_solution/observability/public/test_component.tsx',
+    filename: '/x-pack/solutions/observability/plugins/observability/public/test_component.tsx',
    code: `
 import React from 'react';
 import { i18n } from '@kbn/i18n';
@ -227,7 +227,7 @@ function TestComponent3() {
  },
  {
    name: 'JSX elements that have a label, aria-label or title prop with a string value with quotes should be correctly translated with i18n',
-    filename: '/x-pack/plugins/observability_solution/observability/public/test_component.tsx',
+    filename: '/x-pack/solutions/observability/plugins/observability/public/test_component.tsx',
    code: `
 import React from 'react';
 import { i18n } from '@kbn/i18n';
@ -283,7 +283,7 @@ function TestComponent3() {
  },
  {
    name: 'JSX elements that have a label, aria-label or title prop with a JSXExpression value that is a string should be translated with i18n',
-    filename: '/x-pack/plugins/observability_solution/observability/public/test_component.tsx',
+    filename: '/x-pack/solutions/observability/plugins/observability/public/test_component.tsx',
    code: `
 import React from 'react';
 import { i18n } from '@kbn/i18n';
@ -339,7 +339,7 @@ function TestComponent3() {
  },
  {
    name: 'JSX elements that have a label, aria-label or title prop with a JSXExpression value that is a string with quotes in it should be correctly translated with i18n',
-    filename: '/x-pack/plugins/observability_solution/observability/public/test_component.tsx',
+    filename: '/x-pack/solutions/observability/plugins/observability/public/test_component.tsx',
    code: `
 import React from 'react';
 import { i18n } from '@kbn/i18n';
@ -398,7 +398,7 @@ function TestComponent3() {
 const valid: RuleTester.ValidTestCase[] = [
  {
    name: 'A JSXText element inside a EuiCode component should not be translated',
-    filename: '/x-pack/plugins/observability_solution/observability/public/test_component.tsx',
+    filename: '/x-pack/solutions/observability/plugins/observability/public/test_component.tsx',
    code: `
 import React from 'react';

@ -410,7 +410,7 @@ function TestComponent() {
  },
  {
    name: 'A JSXText element that contains anything other than alpha characters should not be translated',
-    filename: '/x-pack/plugins/observability_solution/observability/public/test_component.tsx',
+    filename: '/x-pack/solutions/observability/plugins/observability/public/test_component.tsx',
    code: `
 import React from 'react';

@ -422,7 +422,7 @@ function TestComponent() {
  },
  {
    name: 'A JSXText element that is wrapped in three backticks (markdown) should not be translated',
-    filename: '/x-pack/plugins/observability_solution/observability/public/test_component.tsx',
+    filename: '/x-pack/solutions/observability/plugins/observability/public/test_component.tsx',
    code: `
 import React from 'react';

--- a/packages/kbn-eslint-plugin-telemetry/helpers/get_app_name.test.ts
+++ b/packages/kbn-eslint-plugin-telemetry/helpers/get_app_name.test.ts
@ -12,7 +12,7 @@ import { getAppName } from './get_app_name';
 const SYSTEMPATH = 'systemPath';

 const testMap = [
-  ['x-pack/plugins/observability_solution/observability/foo/bar/baz/header_actions.tsx', 'o11y'],
+  ['x-pack/solutions/observability/plugins/observability/foo/bar/baz/header_actions.tsx', 'o11y'],
  ['x-pack/plugins/observability_solution/apm/baz/header_actions.tsx', 'apm'],
  ['x-pack/plugins/apm/public/components/app/correlations/correlations_table.tsx', 'apm'],
  ['x-pack/plugins/observability/foo/bar/baz/header_actions.tsx', 'o11y'],
--- a/packages/kbn-investigation-shared/index.ts
+++ b/packages/kbn-investigation-shared/index.ts
@ -1,10 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the "Elastic License
- * 2.0", 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 './src';
--- a/packages/kbn-investigation-shared/jest.config.js
+++ b/packages/kbn-investigation-shared/jest.config.js
@ -1,14 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the "Elastic License
- * 2.0", 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".
- */
-
-module.exports = {
-  preset: '@kbn/test/jest_node',
-  rootDir: '../..',
-  roots: ['<rootDir>/packages/kbn-investigation-shared'],
-};
--- a/packages/kbn-investigation-shared/src/index.ts
+++ b/packages/kbn-investigation-shared/src/index.ts
@ -1,11 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the "Elastic License
- * 2.0", 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 './rest_specs';
-export * from './schema';
--- a/packages/kbn-investigation-shared/src/schema/index.ts
+++ b/packages/kbn-investigation-shared/src/schema/index.ts
@ -1,16 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the "Elastic License
- * 2.0", 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 './investigation';
-export * from './investigation_item';
-export * from './investigation_note';
-export * from './origin';
-export * from './event';
-
-export type * from './investigation';
--- a/packages/kbn-investigation-shared/src/schema/investigation_note.ts
+++ b/packages/kbn-investigation-shared/src/schema/investigation_note.ts
@ -1,20 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the "Elastic License
- * 2.0", 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 { z } from '@kbn/zod';
-
-const investigationNoteSchema = z.object({
-  id: z.string(),
-  content: z.string(),
-  createdAt: z.number(),
-  updatedAt: z.number(),
-  createdBy: z.string(),
-});
-
-export { investigationNoteSchema };
--- a/packages/kbn-investigation-shared/src/schema/origin.ts
+++ b/packages/kbn-investigation-shared/src/schema/origin.ts
@ -1,15 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the "Elastic License
- * 2.0", 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 { z } from '@kbn/zod';
-
-const blankOriginSchema = z.object({ type: z.literal('blank') });
-const alertOriginSchema = z.object({ type: z.literal('alert'), id: z.string() });
-
-export { alertOriginSchema, blankOriginSchema };
--- a/src/dev/storybook/aliases.ts
+++ b/src/dev/storybook/aliases.ts
@ -46,12 +46,12 @@ export const storybookAliases = {
  home: 'src/plugins/home/.storybook',
  infra: 'x-pack/plugins/observability_solution/infra/.storybook',
  inventory: 'x-pack/plugins/observability_solution/inventory/.storybook',
-  investigate: 'x-pack/plugins/observability_solution/investigate_app/.storybook',
+  investigate: 'x-pack/solutions/observability/plugins/investigate_app/.storybook',
  kibana_react: 'src/plugins/kibana_react/.storybook',
  lists: 'x-pack/plugins/lists/.storybook',
  logs_explorer: 'x-pack/plugins/observability_solution/logs_explorer/.storybook',
  management: 'packages/kbn-management/storybook/config',
-  observability: 'x-pack/plugins/observability_solution/observability/.storybook',
+  observability: 'x-pack/solutions/observability/plugins/observability/.storybook',
  observability_ai_assistant:
    'x-pack/platform/plugins/shared/observability_solution/observability_ai_assistant/.storybook',
  observability_ai_assistant_app:
--- a/src/platform/packages/shared/deeplinks/observability/README.md
+++ b/src/platform/packages/shared/deeplinks/observability/README.md
--- a/src/platform/packages/shared/deeplinks/observability/constants.ts
+++ b/src/platform/packages/shared/deeplinks/observability/constants.ts
--- a/src/platform/packages/shared/deeplinks/observability/deep_links.ts
+++ b/src/platform/packages/shared/deeplinks/observability/deep_links.ts
--- a/src/platform/packages/shared/deeplinks/observability/index.ts
+++ b/src/platform/packages/shared/deeplinks/observability/index.ts
--- a/src/platform/packages/shared/deeplinks/observability/jest.config.js
+++ b/src/platform/packages/shared/deeplinks/observability/jest.config.js
@ -9,6 +9,6 @@

 module.exports = {
  preset: '@kbn/test',
-  rootDir: '../../..',
-  roots: ['<rootDir>/packages/deeplinks/observability'],
+  rootDir: '../../../../../..',
+  roots: ['<rootDir>/src/platform/packages/shared/deeplinks/observability'],
 };
--- a/src/platform/packages/shared/deeplinks/observability/kibana.jsonc
+++ b/src/platform/packages/shared/deeplinks/observability/kibana.jsonc
--- a/src/platform/packages/shared/deeplinks/observability/locators/dataset_quality.ts
+++ b/src/platform/packages/shared/deeplinks/observability/locators/dataset_quality.ts
--- a/src/platform/packages/shared/deeplinks/observability/locators/dataset_quality_details.ts
+++ b/src/platform/packages/shared/deeplinks/observability/locators/dataset_quality_details.ts
--- a/src/platform/packages/shared/deeplinks/observability/locators/index.ts
+++ b/src/platform/packages/shared/deeplinks/observability/locators/index.ts
--- a/src/platform/packages/shared/deeplinks/observability/locators/logs_explorer.ts
+++ b/src/platform/packages/shared/deeplinks/observability/locators/logs_explorer.ts
--- a/src/platform/packages/shared/deeplinks/observability/locators/observability_logs_explorer.ts
+++ b/src/platform/packages/shared/deeplinks/observability/locators/observability_logs_explorer.ts
--- a/src/platform/packages/shared/deeplinks/observability/locators/observability_onboarding.ts
+++ b/src/platform/packages/shared/deeplinks/observability/locators/observability_onboarding.ts
--- a/src/platform/packages/shared/deeplinks/observability/locators/uptime.ts
+++ b/src/platform/packages/shared/deeplinks/observability/locators/uptime.ts
--- a/src/platform/packages/shared/deeplinks/observability/package.json
+++ b/src/platform/packages/shared/deeplinks/observability/package.json
--- a/src/platform/packages/shared/deeplinks/observability/tsconfig.json
+++ b/src/platform/packages/shared/deeplinks/observability/tsconfig.json
@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../../../../tsconfig.base.json",
  "compilerOptions": {
    "outDir": "target/types",
    "types": [
--- a/src/plugins/guided_onboarding/README.md
+++ b/src/plugins/guided_onboarding/README.md
@ -125,7 +125,7 @@ To use the API service, you need to know a guide ID (currently one of `appSearch
 The guided onboarding exposes a function `registerGuideConfig(guideId: GuideId, guideConfig: GuideConfig)` function in its setup contract. This function allows consumers to register a guide config for a specified guide ID. The function throws an error if a config already exists for the guide ID. See code examples in following plugins:

 - enterprise search: `x-pack/plugins/enterprise_search/server/plugin.ts`
- observability: `x-pack/plugins/observability_solution/observability/server/plugin.ts`
+- observability: `x-pack/solutions/observability/plugins/observability/server/plugin.ts`
 - security solution: `x-pack/plugins/security_solution/server/plugin.ts`

 ## Adding a new guide
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@ -700,8 +700,8 @@
      "@kbn/dashboard-enhanced-plugin/*": ["x-pack/plugins/dashboard_enhanced/*"],
      "@kbn/dashboard-plugin": ["src/plugins/dashboard"],
      "@kbn/dashboard-plugin/*": ["src/plugins/dashboard/*"],
-      "@kbn/data-forge": ["x-pack/packages/kbn-data-forge"],
-      "@kbn/data-forge/*": ["x-pack/packages/kbn-data-forge/*"],
+      "@kbn/data-forge": ["x-pack/platform/packages/shared/kbn-data-forge"],
+      "@kbn/data-forge/*": ["x-pack/platform/packages/shared/kbn-data-forge/*"],
      "@kbn/data-plugin": ["src/plugins/data"],
      "@kbn/data-plugin/*": ["src/plugins/data/*"],
      "@kbn/data-quality-plugin": ["x-pack/plugins/data_quality"],
@ -742,8 +742,8 @@
      "@kbn/deeplinks-management/*": ["src/platform/packages/shared/deeplinks/management/*"],
      "@kbn/deeplinks-ml": ["src/platform/packages/shared/deeplinks/ml"],
      "@kbn/deeplinks-ml/*": ["src/platform/packages/shared/deeplinks/ml/*"],
-      "@kbn/deeplinks-observability": ["packages/deeplinks/observability"],
-      "@kbn/deeplinks-observability/*": ["packages/deeplinks/observability/*"],
+      "@kbn/deeplinks-observability": ["src/platform/packages/shared/deeplinks/observability"],
+      "@kbn/deeplinks-observability/*": ["src/platform/packages/shared/deeplinks/observability/*"],
      "@kbn/deeplinks-search": ["packages/deeplinks/search"],
      "@kbn/deeplinks-search/*": ["packages/deeplinks/search/*"],
      "@kbn/deeplinks-security": ["packages/deeplinks/security"],
@ -896,8 +896,8 @@
      "@kbn/expect/*": ["packages/kbn-expect/*"],
      "@kbn/exploratory-view-example-plugin": ["x-pack/examples/exploratory_view_example"],
      "@kbn/exploratory-view-example-plugin/*": ["x-pack/examples/exploratory_view_example/*"],
-      "@kbn/exploratory-view-plugin": ["x-pack/plugins/observability_solution/exploratory_view"],
-      "@kbn/exploratory-view-plugin/*": ["x-pack/plugins/observability_solution/exploratory_view/*"],
+      "@kbn/exploratory-view-plugin": ["x-pack/solutions/observability/plugins/exploratory_view"],
+      "@kbn/exploratory-view-plugin/*": ["x-pack/solutions/observability/plugins/exploratory_view/*"],
      "@kbn/expression-error-plugin": ["src/plugins/expression_error"],
      "@kbn/expression-error-plugin/*": ["src/plugins/expression_error/*"],
      "@kbn/expression-gauge-plugin": ["src/plugins/chart_expressions/expression_gauge"],
@ -1064,8 +1064,8 @@
      "@kbn/inference-common/*": ["x-pack/platform/packages/shared/ai-infra/inference-common/*"],
      "@kbn/inference-plugin": ["x-pack/platform/plugins/shared/inference"],
      "@kbn/inference-plugin/*": ["x-pack/platform/plugins/shared/inference/*"],
-      "@kbn/infra-forge": ["x-pack/packages/kbn-infra-forge"],
-      "@kbn/infra-forge/*": ["x-pack/packages/kbn-infra-forge/*"],
+      "@kbn/infra-forge": ["x-pack/platform/packages/private/kbn-infra-forge"],
+      "@kbn/infra-forge/*": ["x-pack/platform/packages/private/kbn-infra-forge/*"],
      "@kbn/infra-plugin": ["x-pack/plugins/observability_solution/infra"],
      "@kbn/infra-plugin/*": ["x-pack/plugins/observability_solution/infra/*"],
      "@kbn/ingest-pipelines-plugin": ["x-pack/plugins/ingest_pipelines"],
@ -1086,12 +1086,12 @@
      "@kbn/inventory-e2e/*": ["x-pack/plugins/observability_solution/inventory/e2e/*"],
      "@kbn/inventory-plugin": ["x-pack/plugins/observability_solution/inventory"],
      "@kbn/inventory-plugin/*": ["x-pack/plugins/observability_solution/inventory/*"],
-      "@kbn/investigate-app-plugin": ["x-pack/plugins/observability_solution/investigate_app"],
-      "@kbn/investigate-app-plugin/*": ["x-pack/plugins/observability_solution/investigate_app/*"],
-      "@kbn/investigate-plugin": ["x-pack/plugins/observability_solution/investigate"],
-      "@kbn/investigate-plugin/*": ["x-pack/plugins/observability_solution/investigate/*"],
-      "@kbn/investigation-shared": ["packages/kbn-investigation-shared"],
-      "@kbn/investigation-shared/*": ["packages/kbn-investigation-shared/*"],
+      "@kbn/investigate-app-plugin": ["x-pack/solutions/observability/plugins/investigate_app"],
+      "@kbn/investigate-app-plugin/*": ["x-pack/solutions/observability/plugins/investigate_app/*"],
+      "@kbn/investigate-plugin": ["x-pack/solutions/observability/plugins/investigate"],
+      "@kbn/investigate-plugin/*": ["x-pack/solutions/observability/plugins/investigate/*"],
+      "@kbn/investigation-shared": ["x-pack/solutions/observability/packages/kbn-investigation-shared"],
+      "@kbn/investigation-shared/*": ["x-pack/solutions/observability/packages/kbn-investigation-shared/*"],
      "@kbn/io-ts-utils": ["src/platform/packages/shared/kbn-io-ts-utils"],
      "@kbn/io-ts-utils/*": ["src/platform/packages/shared/kbn-io-ts-utils/*"],
      "@kbn/ipynb": ["packages/kbn-ipynb"],
@ -1322,16 +1322,16 @@
      "@kbn/observability-ai-common/*": ["x-pack/solutions/observability/packages/observability_ai/observability_ai_common/*"],
      "@kbn/observability-ai-server": ["x-pack/solutions/observability/packages/observability_ai/observability_ai_server"],
      "@kbn/observability-ai-server/*": ["x-pack/solutions/observability/packages/observability_ai/observability_ai_server/*"],
-      "@kbn/observability-alert-details": ["x-pack/packages/observability/alert_details"],
-      "@kbn/observability-alert-details/*": ["x-pack/packages/observability/alert_details/*"],
-      "@kbn/observability-alerting-rule-utils": ["x-pack/packages/observability/alerting_rule_utils"],
-      "@kbn/observability-alerting-rule-utils/*": ["x-pack/packages/observability/alerting_rule_utils/*"],
-      "@kbn/observability-alerting-test-data": ["x-pack/packages/observability/alerting_test_data"],
-      "@kbn/observability-alerting-test-data/*": ["x-pack/packages/observability/alerting_test_data/*"],
+      "@kbn/observability-alert-details": ["x-pack/solutions/observability/packages/alert_details"],
+      "@kbn/observability-alert-details/*": ["x-pack/solutions/observability/packages/alert_details/*"],
+      "@kbn/observability-alerting-rule-utils": ["x-pack/platform/packages/shared/observability/alerting_rule_utils"],
+      "@kbn/observability-alerting-rule-utils/*": ["x-pack/platform/packages/shared/observability/alerting_rule_utils/*"],
+      "@kbn/observability-alerting-test-data": ["x-pack/solutions/observability/packages/alerting_test_data"],
+      "@kbn/observability-alerting-test-data/*": ["x-pack/solutions/observability/packages/alerting_test_data/*"],
      "@kbn/observability-fixtures-plugin": ["x-pack/test/cases_api_integration/common/plugins/observability"],
      "@kbn/observability-fixtures-plugin/*": ["x-pack/test/cases_api_integration/common/plugins/observability/*"],
-      "@kbn/observability-get-padded-alert-time-range-util": ["x-pack/packages/observability/get_padded_alert_time_range_util"],
-      "@kbn/observability-get-padded-alert-time-range-util/*": ["x-pack/packages/observability/get_padded_alert_time_range_util/*"],
+      "@kbn/observability-get-padded-alert-time-range-util": ["x-pack/solutions/observability/packages/get_padded_alert_time_range_util"],
+      "@kbn/observability-get-padded-alert-time-range-util/*": ["x-pack/solutions/observability/packages/get_padded_alert_time_range_util/*"],
      "@kbn/observability-logs-explorer-plugin": ["x-pack/plugins/observability_solution/observability_logs_explorer"],
      "@kbn/observability-logs-explorer-plugin/*": ["x-pack/plugins/observability_solution/observability_logs_explorer/*"],
      "@kbn/observability-logs-overview": ["x-pack/packages/observability/logs_overview"],
@ -1340,12 +1340,12 @@
      "@kbn/observability-onboarding-e2e/*": ["x-pack/plugins/observability_solution/observability_onboarding/e2e/*"],
      "@kbn/observability-onboarding-plugin": ["x-pack/plugins/observability_solution/observability_onboarding"],
      "@kbn/observability-onboarding-plugin/*": ["x-pack/plugins/observability_solution/observability_onboarding/*"],
-      "@kbn/observability-plugin": ["x-pack/plugins/observability_solution/observability"],
-      "@kbn/observability-plugin/*": ["x-pack/plugins/observability_solution/observability/*"],
+      "@kbn/observability-plugin": ["x-pack/solutions/observability/plugins/observability"],
+      "@kbn/observability-plugin/*": ["x-pack/solutions/observability/plugins/observability/*"],
      "@kbn/observability-shared-plugin": ["x-pack/plugins/observability_solution/observability_shared"],
      "@kbn/observability-shared-plugin/*": ["x-pack/plugins/observability_solution/observability_shared/*"],
-      "@kbn/observability-synthetics-test-data": ["x-pack/packages/observability/synthetics_test_data"],
-      "@kbn/observability-synthetics-test-data/*": ["x-pack/packages/observability/synthetics_test_data/*"],
+      "@kbn/observability-synthetics-test-data": ["x-pack/solutions/observability/packages/synthetics_test_data"],
+      "@kbn/observability-synthetics-test-data/*": ["x-pack/solutions/observability/packages/synthetics_test_data/*"],
      "@kbn/observability-utils-browser": ["x-pack/packages/observability/observability_utils/observability_utils_browser"],
      "@kbn/observability-utils-browser/*": ["x-pack/packages/observability/observability_utils/observability_utils_browser/*"],
      "@kbn/observability-utils-common": ["x-pack/packages/observability/observability_utils/observability_utils_common"],
@ -1692,8 +1692,8 @@
      "@kbn/serverless/*": ["x-pack/plugins/serverless/*"],
      "@kbn/serverless-common-settings": ["packages/serverless/settings/common"],
      "@kbn/serverless-common-settings/*": ["packages/serverless/settings/common/*"],
-      "@kbn/serverless-observability": ["x-pack/plugins/serverless_observability"],
-      "@kbn/serverless-observability/*": ["x-pack/plugins/serverless_observability/*"],
+      "@kbn/serverless-observability": ["x-pack/solutions/observability/plugins/serverless_observability"],
+      "@kbn/serverless-observability/*": ["x-pack/solutions/observability/plugins/serverless_observability/*"],
      "@kbn/serverless-observability-settings": ["packages/serverless/settings/observability_project"],
      "@kbn/serverless-observability-settings/*": ["packages/serverless/settings/observability_project/*"],
      "@kbn/serverless-project-switcher": ["packages/serverless/project_switcher"],
@ -1822,8 +1822,8 @@
      "@kbn/shared-ux-utility/*": ["packages/kbn-shared-ux-utility/*"],
      "@kbn/slo-plugin": ["x-pack/plugins/observability_solution/slo"],
      "@kbn/slo-plugin/*": ["x-pack/plugins/observability_solution/slo/*"],
-      "@kbn/slo-schema": ["x-pack/packages/kbn-slo-schema"],
-      "@kbn/slo-schema/*": ["x-pack/packages/kbn-slo-schema/*"],
+      "@kbn/slo-schema": ["x-pack/platform/packages/shared/kbn-slo-schema"],
+      "@kbn/slo-schema/*": ["x-pack/platform/packages/shared/kbn-slo-schema/*"],
      "@kbn/snapshot-restore-plugin": ["x-pack/platform/plugins/private/snapshot_restore"],
      "@kbn/snapshot-restore-plugin/*": ["x-pack/platform/plugins/private/snapshot_restore/*"],
      "@kbn/some-dev-log": ["packages/kbn-some-dev-log"],
@ -1866,10 +1866,10 @@
      "@kbn/streams-app-plugin/*": ["x-pack/solutions/observability/plugins/streams_app/*"],
      "@kbn/streams-plugin": ["x-pack/solutions/observability/plugins/streams"],
      "@kbn/streams-plugin/*": ["x-pack/solutions/observability/plugins/streams/*"],
-      "@kbn/synthetics-e2e": ["x-pack/plugins/observability_solution/synthetics/e2e"],
-      "@kbn/synthetics-e2e/*": ["x-pack/plugins/observability_solution/synthetics/e2e/*"],
-      "@kbn/synthetics-plugin": ["x-pack/plugins/observability_solution/synthetics"],
-      "@kbn/synthetics-plugin/*": ["x-pack/plugins/observability_solution/synthetics/*"],
+      "@kbn/synthetics-e2e": ["x-pack/solutions/observability/plugins/synthetics/e2e"],
+      "@kbn/synthetics-e2e/*": ["x-pack/solutions/observability/plugins/synthetics/e2e/*"],
+      "@kbn/synthetics-plugin": ["x-pack/solutions/observability/plugins/synthetics"],
+      "@kbn/synthetics-plugin/*": ["x-pack/solutions/observability/plugins/synthetics/*"],
      "@kbn/synthetics-private-location": ["x-pack/packages/kbn-synthetics-private-location"],
      "@kbn/synthetics-private-location/*": ["x-pack/packages/kbn-synthetics-private-location/*"],
      "@kbn/task-manager-fixture-plugin": ["x-pack/test/alerting_api_integration/common/plugins/task_manager_fixture"],
@ -1988,8 +1988,8 @@
      "@kbn/unsaved-changes-prompt/*": ["src/platform/packages/shared/kbn-unsaved-changes-prompt/*"],
      "@kbn/upgrade-assistant-plugin": ["x-pack/plugins/upgrade_assistant"],
      "@kbn/upgrade-assistant-plugin/*": ["x-pack/plugins/upgrade_assistant/*"],
-      "@kbn/uptime-plugin": ["x-pack/plugins/observability_solution/uptime"],
-      "@kbn/uptime-plugin/*": ["x-pack/plugins/observability_solution/uptime/*"],
+      "@kbn/uptime-plugin": ["x-pack/solutions/observability/plugins/uptime"],
+      "@kbn/uptime-plugin/*": ["x-pack/solutions/observability/plugins/uptime/*"],
      "@kbn/url-drilldown-plugin": ["x-pack/plugins/drilldowns/url_drilldown"],
      "@kbn/url-drilldown-plugin/*": ["x-pack/plugins/drilldowns/url_drilldown/*"],
      "@kbn/url-forwarding-plugin": ["src/plugins/url_forwarding"],
@ -2012,8 +2012,8 @@
      "@kbn/utility-types-jest/*": ["packages/kbn-utility-types-jest/*"],
      "@kbn/utils": ["packages/kbn-utils"],
      "@kbn/utils/*": ["packages/kbn-utils/*"],
-      "@kbn/ux-plugin": ["x-pack/plugins/observability_solution/ux"],
-      "@kbn/ux-plugin/*": ["x-pack/plugins/observability_solution/ux/*"],
+      "@kbn/ux-plugin": ["x-pack/solutions/observability/plugins/ux"],
+      "@kbn/ux-plugin/*": ["x-pack/solutions/observability/plugins/ux/*"],
      "@kbn/v8-profiler-examples-plugin": ["examples/v8_profiler_examples"],
      "@kbn/v8-profiler-examples-plugin/*": ["examples/v8_profiler_examples/*"],
      "@kbn/validate-next-docs-cli": ["packages/kbn-validate-next-docs-cli"],
--- a/x-pack/.i18nrc.json
+++ b/x-pack/.i18nrc.json
@ -44,7 +44,7 @@
    "xpack.enterpriseSearch": "plugins/enterprise_search",
    "xpack.features": "plugins/features",
    "xpack.dataVisualizer": "platform/plugins/private/data_visualizer",
-    "xpack.exploratoryView": "plugins/observability_solution/exploratory_view",
+    "xpack.exploratoryView": "solutions/observability/plugins/exploratory_view",
    "xpack.fileUpload": "plugins/file_upload",
    "xpack.globalSearch": [
      "plugins/global_search"
@ -68,8 +68,8 @@
    "xpack.integrationAssistant": "platform/plugins/shared/integration_assistant",
    "xpack.inference": "platform/plugins/shared/inference",
    "xpack.inventory": "plugins/observability_solution/inventory",
-    "xpack.investigate": "plugins/observability_solution/investigate",
-    "xpack.investigateApp": "plugins/observability_solution/investigate_app",
+    "xpack.investigate": "solutions/observability/plugins/investigate",
+    "xpack.investigateApp": "solutions/observability/plugins/investigate_app",
    "xpack.kubernetesSecurity": "plugins/kubernetes_security",
    "xpack.lens": "plugins/lens",
    "xpack.licenseApiGuard": "platform/plugins/private/license_api_guard",
@ -100,7 +100,7 @@
    "xpack.monitoring": [
      "plugins/monitoring"
    ],
-    "xpack.observability": "plugins/observability_solution/observability",
+    "xpack.observability": "solutions/observability/plugins/observability",
    "xpack.observabilityAiAssistant": [
      "platform/plugins/shared/observability_solution/observability_ai_assistant",
      "solutions/observability/plugins/observability_ai_assistant_app"
@ -145,7 +145,7 @@
    "xpack.server": "legacy/server",
    "xpack.serverless": "plugins/serverless",
    "xpack.serverlessSearch": "plugins/serverless_search",
-    "xpack.serverlessObservability": "plugins/serverless_observability",
+    "xpack.serverlessObservability": "solutions/observability/plugins/serverless_observability",
    "xpack.securitySolution": "plugins/security_solution",
    "xpack.securitySolutionEss": "plugins/security_solution_ess",
    "xpack.securitySolutionServerless": "plugins/security_solution_serverless",
@ -166,13 +166,13 @@
    "xpack.triggersActionsUI": "plugins/triggers_actions_ui",
    "xpack.upgradeAssistant": "plugins/upgrade_assistant",
    "xpack.uptime": [
-      "plugins/observability_solution/uptime"
+      "solutions/observability/plugins/uptime"
    ],
    "xpack.synthetics": [
-      "plugins/observability_solution/synthetics"
+      "solutions/observability/plugins/synthetics"
    ],
    "xpack.ux": [
-      "plugins/observability_solution/ux"
+      "solutions/observability/plugins/ux"
    ],
    "xpack.urlDrilldown": "plugins/drilldowns/url_drilldown",
    "xpack.watcher": "platform/plugins/private/watcher"
--- a/x-pack/packages/observability/alerting_test_data/jest.config.js
+++ b/x-pack/packages/observability/alerting_test_data/jest.config.js
@ -1,12 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-module.exports = {
-  preset: '@kbn/test',
-  rootDir: '../../../..',
-  roots: ['<rootDir>/x-pack/packages/observability/alerting_test_data'],
-};
--- a/x-pack/packages/observability/get_padded_alert_time_range_util/jest.config.js
+++ b/x-pack/packages/observability/get_padded_alert_time_range_util/jest.config.js
@ -1,12 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-module.exports = {
-  preset: '@kbn/test',
-  rootDir: '../../../..',
-  roots: ['<rootDir>/x-pack/packages/observability/get_padded_alert_time_range_util'],
-};
--- a/x-pack/packages/observability/synthetics_test_data/jest.config.js
+++ b/x-pack/packages/observability/synthetics_test_data/jest.config.js
@ -1,12 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-module.exports = {
-  preset: '@kbn/test',
-  rootDir: '../../../..',
-  roots: ['<rootDir>/x-pack/packages/observability/synthetics_test_data'],
-};
--- a/x-pack/platform/packages/private/kbn-infra-forge/README.md
+++ b/x-pack/platform/packages/private/kbn-infra-forge/README.md
--- a/x-pack/platform/packages/private/kbn-infra-forge/index.ts
+++ b/x-pack/platform/packages/private/kbn-infra-forge/index.ts
--- a/x-pack/platform/packages/private/kbn-infra-forge/jest.config.js
+++ b/x-pack/platform/packages/private/kbn-infra-forge/jest.config.js
@ -7,6 +7,6 @@

 module.exports = {
  preset: '@kbn/test/jest_node',
-  rootDir: '../../..',
-  roots: ['<rootDir>/x-pack/packages/kbn-infra-forge'],
+  rootDir: '../../../../..',
+  roots: ['<rootDir>/x-pack/platform/packages/private/kbn-infra-forge'],
 };
--- a/x-pack/platform/packages/private/kbn-infra-forge/kibana.jsonc
+++ b/x-pack/platform/packages/private/kbn-infra-forge/kibana.jsonc
--- a/x-pack/platform/packages/private/kbn-infra-forge/package.json
+++ b/x-pack/platform/packages/private/kbn-infra-forge/package.json
--- a/x-pack/packages/kbn-data-forge/src/data_sources/fake_hosts/ecs/generated/elasticsearch/composable/component/base.json
+++ b/x-pack/packages/kbn-data-forge/src/data_sources/fake_hosts/ecs/generated/elasticsearch/composable/component/base.json
--- a/x-pack/packages/kbn-data-forge/src/data_sources/fake_hosts/ecs/generated/elasticsearch/composable/component/event.json
+++ b/x-pack/packages/kbn-data-forge/src/data_sources/fake_hosts/ecs/generated/elasticsearch/composable/component/event.json
--- a/x-pack/packages/kbn-data-forge/src/data_sources/fake_hosts/ecs/generated/elasticsearch/composable/component/host.json
+++ b/x-pack/packages/kbn-data-forge/src/data_sources/fake_hosts/ecs/generated/elasticsearch/composable/component/host.json
--- a/x-pack/packages/kbn-data-forge/src/data_sources/fake_hosts/ecs/generated/elasticsearch/composable/component/metricset.json
+++ b/x-pack/packages/kbn-data-forge/src/data_sources/fake_hosts/ecs/generated/elasticsearch/composable/component/metricset.json
--- a/x-pack/platform/packages/private/kbn-infra-forge/src/data_sources/composable/component/system.json
+++ b/x-pack/platform/packages/private/kbn-infra-forge/src/data_sources/composable/component/system.json
--- a/x-pack/platform/packages/private/kbn-infra-forge/src/data_sources/composable/template.json
+++ b/x-pack/platform/packages/private/kbn-infra-forge/src/data_sources/composable/template.json
--- a/x-pack/platform/packages/private/kbn-infra-forge/src/data_sources/fake_hosts/index.ts
+++ b/x-pack/platform/packages/private/kbn-infra-forge/src/data_sources/fake_hosts/index.ts
--- a/x-pack/platform/packages/private/kbn-infra-forge/src/data_sources/fake_hosts/index_template_def.ts
+++ b/x-pack/platform/packages/private/kbn-infra-forge/src/data_sources/fake_hosts/index_template_def.ts
--- a/x-pack/platform/packages/private/kbn-infra-forge/src/lib/manage_template.ts
+++ b/x-pack/platform/packages/private/kbn-infra-forge/src/lib/manage_template.ts
--- a/x-pack/platform/packages/private/kbn-infra-forge/src/lib/queue.ts
+++ b/x-pack/platform/packages/private/kbn-infra-forge/src/lib/queue.ts
--- a/x-pack/platform/packages/private/kbn-infra-forge/src/run.ts
+++ b/x-pack/platform/packages/private/kbn-infra-forge/src/run.ts
--- a/x-pack/platform/packages/private/kbn-infra-forge/tsconfig.json
+++ b/x-pack/platform/packages/private/kbn-infra-forge/tsconfig.json
@ -1,5 +1,5 @@
 {
-  "extends": "../../../tsconfig.base.json",
+  "extends": "../../../../../tsconfig.base.json",
  "compilerOptions": {
    "outDir": "target/types",
    "types": [
--- a/x-pack/platform/packages/shared/kbn-data-forge/README.md
+++ b/x-pack/platform/packages/shared/kbn-data-forge/README.md
--- a/x-pack/platform/packages/shared/kbn-data-forge/example_config/anomalies_by_type/change_point_detection.yaml
+++ b/x-pack/platform/packages/shared/kbn-data-forge/example_config/anomalies_by_type/change_point_detection.yaml
--- a/x-pack/platform/packages/shared/kbn-data-forge/example_config/anomalies_by_type/concept_drift.yaml
+++ b/x-pack/platform/packages/shared/kbn-data-forge/example_config/anomalies_by_type/concept_drift.yaml
--- a/x-pack/platform/packages/shared/kbn-data-forge/example_config/anomalies_by_type/contextual_anomaly.yaml
+++ b/x-pack/platform/packages/shared/kbn-data-forge/example_config/anomalies_by_type/contextual_anomaly.yaml
--- a/x-pack/platform/packages/shared/kbn-data-forge/example_config/anomalies_by_type/point_anomaly.yaml
+++ b/x-pack/platform/packages/shared/kbn-data-forge/example_config/anomalies_by_type/point_anomaly.yaml
--- a/x-pack/platform/packages/shared/kbn-data-forge/example_config/changing_log_volume_example.yaml
+++ b/x-pack/platform/packages/shared/kbn-data-forge/example_config/changing_log_volume_example.yaml
--- a/x-pack/platform/packages/shared/kbn-data-forge/example_config/fake_logs_sine.yaml
+++ b/x-pack/platform/packages/shared/kbn-data-forge/example_config/fake_logs_sine.yaml
--- a/x-pack/platform/packages/shared/kbn-data-forge/example_config/fake_stack.yaml
+++ b/x-pack/platform/packages/shared/kbn-data-forge/example_config/fake_stack.yaml
--- a/x-pack/platform/packages/shared/kbn-data-forge/example_config/full_example.yaml
+++ b/x-pack/platform/packages/shared/kbn-data-forge/example_config/full_example.yaml
--- a/x-pack/platform/packages/shared/kbn-data-forge/example_config/future_example.yaml
+++ b/x-pack/platform/packages/shared/kbn-data-forge/example_config/future_example.yaml
--- a/x-pack/platform/packages/shared/kbn-data-forge/example_config/good_to_bad_to_good.yaml
+++ b/x-pack/platform/packages/shared/kbn-data-forge/example_config/good_to_bad_to_good.yaml
--- a/x-pack/platform/packages/shared/kbn-data-forge/example_config/log_drop.yml
+++ b/x-pack/platform/packages/shared/kbn-data-forge/example_config/log_drop.yml
--- a/x-pack/platform/packages/shared/kbn-data-forge/example_config/log_spike_scenarios/scenario0_logs.yaml
+++ b/x-pack/platform/packages/shared/kbn-data-forge/example_config/log_spike_scenarios/scenario0_logs.yaml
--- a/x-pack/platform/packages/shared/kbn-data-forge/example_config/log_spike_scenarios/scenario1_spike_logs.yaml
+++ b/x-pack/platform/packages/shared/kbn-data-forge/example_config/log_spike_scenarios/scenario1_spike_logs.yaml
--- a/x-pack/platform/packages/shared/kbn-data-forge/example_config/log_spike_scenarios/scenario2_spike_logs_host.yaml
+++ b/x-pack/platform/packages/shared/kbn-data-forge/example_config/log_spike_scenarios/scenario2_spike_logs_host.yaml
--- a/x-pack/platform/packages/shared/kbn-data-forge/example_config/log_spike_scenarios/scenario3_spike_errors.yaml
+++ b/x-pack/platform/packages/shared/kbn-data-forge/example_config/log_spike_scenarios/scenario3_spike_errors.yaml
--- a/x-pack/platform/packages/shared/kbn-data-forge/example_config/log_spike_scenarios/scenario4_spike_errors_with_recovery.yaml
+++ b/x-pack/platform/packages/shared/kbn-data-forge/example_config/log_spike_scenarios/scenario4_spike_errors_with_recovery.yaml
--- a/x-pack/platform/packages/shared/kbn-data-forge/example_config/log_spike_scenarios/scenario5_spike_logs_linear.yaml
+++ b/x-pack/platform/packages/shared/kbn-data-forge/example_config/log_spike_scenarios/scenario5_spike_logs_linear.yaml
--- a/x-pack/platform/packages/shared/kbn-data-forge/example_config/metric_example.yaml
+++ b/x-pack/platform/packages/shared/kbn-data-forge/example_config/metric_example.yaml
--- a/x-pack/platform/packages/shared/kbn-data-forge/example_config/ramp_up_then_down.yaml
+++ b/x-pack/platform/packages/shared/kbn-data-forge/example_config/ramp_up_then_down.yaml
--- a/x-pack/platform/packages/shared/kbn-data-forge/example_config/related_events_metrics/scenario0_paralell_metrics_drop_step_change.yaml
+++ b/x-pack/platform/packages/shared/kbn-data-forge/example_config/related_events_metrics/scenario0_paralell_metrics_drop_step_change.yaml
--- a/x-pack/platform/packages/shared/kbn-data-forge/example_config/related_events_metrics/scenario1_paralell_metrics_increase_step_change.yaml
+++ b/x-pack/platform/packages/shared/kbn-data-forge/example_config/related_events_metrics/scenario1_paralell_metrics_increase_step_change.yaml
--- a/x-pack/platform/packages/shared/kbn-data-forge/example_config/related_events_metrics/scenario2_divergent_metrics.yaml
+++ b/x-pack/platform/packages/shared/kbn-data-forge/example_config/related_events_metrics/scenario2_divergent_metrics.yaml
--- a/x-pack/platform/packages/shared/kbn-data-forge/example_config/related_events_metrics/scenario3_chained_metrics_change.yaml
+++ b/x-pack/platform/packages/shared/kbn-data-forge/example_config/related_events_metrics/scenario3_chained_metrics_change.yaml
--- a/x-pack/platform/packages/shared/kbn-data-forge/example_config/rule_tests/custom_threshold_log_count.yaml
+++ b/x-pack/platform/packages/shared/kbn-data-forge/example_config/rule_tests/custom_threshold_log_count.yaml
--- a/x-pack/platform/packages/shared/kbn-data-forge/example_config/rule_tests/custom_threshold_log_count_groupby.yaml
+++ b/x-pack/platform/packages/shared/kbn-data-forge/example_config/rule_tests/custom_threshold_log_count_groupby.yaml
--- a/x-pack/platform/packages/shared/kbn-data-forge/example_config/rule_tests/custom_threshold_log_count_nodata.yaml
+++ b/x-pack/platform/packages/shared/kbn-data-forge/example_config/rule_tests/custom_threshold_log_count_nodata.yaml
--- a/x-pack/platform/packages/shared/kbn-data-forge/example_config/rule_tests/custom_threshold_metric_avg.yaml
+++ b/x-pack/platform/packages/shared/kbn-data-forge/example_config/rule_tests/custom_threshold_metric_avg.yaml
--- a/x-pack/platform/packages/shared/kbn-data-forge/example_config/rule_tests/custom_threshold_metric_avg_groupby.yaml
+++ b/x-pack/platform/packages/shared/kbn-data-forge/example_config/rule_tests/custom_threshold_metric_avg_groupby.yaml
--- a/Show more
+++ b/Show more