Sustainable Kibana Architecture: Move modules owned by `@elastic/obs-…

…ux-infra_services-team` (#202830) ## Summary This PR aims at relocating some of the Kibana modules (plugins and packages) into a new folder structure, according to the _Sustainable Kibana Architecture_ initiative. > [!IMPORTANT] > * We kindly ask you to: > * Manually fix the errors in the error section below (if there are any). > * Search for the `packages[\/\\]` and `plugins[\/\\]` patterns in the source code (Babel and Eslint config files), and update them appropriately. > * Manually review `.buildkite/scripts/pipelines/pull_request/pipeline.ts` to ensure that any CI pipeline customizations continue to be correctly applied after the changed path names > * Review all of the updated files, specially the `.ts` and `.js` files listed in the sections below, as some of them contain relative paths that have been updated. > * Think of potential impact of the move, including tooling and configuration files that can be pointing to the relocated modules. E.g.: > * customised eslint rules > * docs pointing to source code > [!NOTE] > * This PR has been auto-generated. > * Any manual contributions will be lost if the 'relocate' script is re-run. > * Try to obtain the missing reviews / approvals before applying manual fixes, and/or keep your changes in a .patch / git stash. > * Please use [#sustainable_kibana_architecture](https://elastic.slack.com/archives/C07TCKTA22E) Slack channel for feedback. Are you trying to rebase this PR to solve merge conflicts? Please follow the steps describe [here](https://elastic.slack.com/archives/C07TCKTA22E/p1734019532879269?thread_ts=1734019339.935419&cid=C07TCKTA22E). #### 6 plugin(s) are going to be relocated: | Id | Target folder | | -- | ------------- | | `@kbn/apm-data-access-plugin` | `x-pack/solutions/observability/plugins/apm_data_access` | | `@kbn/apm-plugin` | `x-pack/solutions/observability/plugins/apm` | | `@kbn/inventory-plugin` | `x-pack/solutions/observability/plugins/inventory` | | `@kbn/metrics-data-access-plugin` | `x-pack/solutions/observability/plugins/metrics_data_access` | | `@kbn/profiling-data-access-plugin` | `x-pack/solutions/observability/plugins/profiling_data_access` | | `@kbn/profiling-plugin` | `x-pack/solutions/observability/plugins/profiling` | #### 6 packages(s) are going to be relocated: | Id | Target folder | | -- | ------------- | | `@kbn/apm-data-view` | `src/platform/packages/shared/kbn-apm-data-view` | | `@kbn/apm-types` | `x-pack/solutions/observability/packages/kbn-apm-types` | | `@kbn/apm-utils` | `src/platform/packages/shared/kbn-apm-utils` | | `@kbn/lens-embeddable-utils` | `src/platform/packages/shared/kbn-lens-embeddable-utils` | | `@kbn/profiling-utils` | `src/platform/packages/shared/kbn-profiling-utils` | | `@kbn/shared-svg` | `src/platform/packages/shared/kbn-shared-svg` | <details > <summary>Updated references</summary> ``` ./.buildkite/ftr_oblt_stateful_configs.yml ./.buildkite/scripts/steps/functional/apm_cypress.sh ./.buildkite/scripts/steps/functional/inventory_cypress.sh ./.buildkite/scripts/steps/functional/profiling_cypress.sh ./.eslintrc.js ./.github/paths-labeller.yml ./.gitignore ./docs/developer/plugin-list.asciidoc ./oas_docs/overlays/alerting.overlays.yaml ./oas_docs/scripts/merge_ess_oas.js ./oas_docs/scripts/merge_serverless_oas.js ./package.json ./packages/kbn-eslint-plugin-i18n/helpers/get_i18n_identifier_from_file_path.test.ts ./packages/kbn-eslint-plugin-telemetry/helpers/get_app_name.test.ts ./packages/kbn-repo-packages/package-map.json ./packages/kbn-ts-projects/config-paths.json ./src/dev/precommit_hook/casing_check_config.js ./src/dev/storybook/aliases.ts ./src/platform/packages/shared/kbn-lens-embeddable-utils/jest.config.js ./src/platform/packages/shared/kbn-profiling-utils/jest.config.js ./src/platform/packages/shared/kbn-shared-svg/jest.config.js ./tsconfig.base.json ./x-pack/.i18nrc.json ./x-pack/platform/packages/shared/ml/aiops_log_rate_analysis/queries/fetch_index_info.ts ./x-pack/platform/packages/shared/ml/aiops_log_rate_analysis/queries/fetch_significant_term_p_values.ts ./x-pack/platform/packages/shared/ml/aiops_log_rate_analysis/queries/fetch_top_terms.ts ./x-pack/platform/plugins/private/data_visualizer/public/application/index_data_visualizer/utils/saved_search_utils.ts ./x-pack/solutions/observability/plugins/apm/common/rules/apm_rule_types.ts ./x-pack/solutions/observability/plugins/apm/dev_docs/apm_queries.md ./x-pack/solutions/observability/plugins/apm/dev_docs/linting.md ./x-pack/solutions/observability/plugins/apm/dev_docs/local_setup.md ./x-pack/solutions/observability/plugins/apm/dev_docs/telemetry.md ./x-pack/solutions/observability/plugins/apm/dev_docs/testing.md ./x-pack/solutions/observability/plugins/apm/dev_docs/updating_functional_tests_archives.md ./x-pack/solutions/observability/plugins/apm/dev_docs/vscode_setup.md ./x-pack/solutions/observability/plugins/apm/ftr_e2e/README.md ./x-pack/solutions/observability/plugins/apm/jest.config.js ./x-pack/solutions/observability/plugins/apm/scripts/infer_route_return_types/index.ts ./x-pack/solutions/observability/plugins/apm/scripts/precommit.js ./x-pack/solutions/observability/plugins/apm/scripts/telemetry/main.ts ./x-pack/solutions/observability/plugins/apm_data_access/jest.config.js ./x-pack/solutions/observability/plugins/exploratory_view/common/annotations.ts ./x-pack/solutions/observability/plugins/inventory/README.md ./x-pack/solutions/observability/plugins/inventory/jest.config.js ./x-pack/solutions/observability/plugins/metrics_data_access/jest.config.js ./x-pack/solutions/observability/plugins/observability/common/annotations.ts ./x-pack/solutions/observability/plugins/profiling/README.md ./x-pack/solutions/observability/plugins/profiling/e2e/README.md ./x-pack/solutions/observability/plugins/profiling/jest.config.js ./x-pack/solutions/observability/plugins/profiling_data_access/jest.config.js ./x-pack/solutions/security/plugins/security_solution/server/utils/build_query/calculate_timeseries_interval.ts ./yarn.lock .github/CODEOWNERS ``` </details><details > <summary>Updated relative paths</summary> ``` src/platform/packages/shared/kbn-apm-data-view/tsconfig.json:2 src/platform/packages/shared/kbn-apm-utils/tsconfig.json:2 src/platform/packages/shared/kbn-lens-embeddable-utils/jest.config.js:12 src/platform/packages/shared/kbn-lens-embeddable-utils/tsconfig.json:2 src/platform/packages/shared/kbn-profiling-utils/jest.config.js:12 src/platform/packages/shared/kbn-profiling-utils/tsconfig.json:2 src/platform/packages/shared/kbn-shared-svg/jest.config.js:12 src/platform/packages/shared/kbn-shared-svg/tsconfig.json:2 x-pack/solutions/observability/packages/kbn-apm-types/tsconfig.json:2 x-pack/solutions/observability/plugins/apm/dev_docs/telemetry.md:17 x-pack/solutions/observability/plugins/apm/dev_docs/telemetry.md:22 x-pack/solutions/observability/plugins/apm/dev_docs/testing.md:130 x-pack/solutions/observability/plugins/apm/dev_docs/testing.md:222 x-pack/solutions/observability/plugins/apm/dev_docs/testing.md:78 x-pack/solutions/observability/plugins/apm/dev_docs/testing.md:96 x-pack/solutions/observability/plugins/apm/dev_docs/vscode_setup.md:42 x-pack/solutions/observability/plugins/apm/ftr_e2e/README.md:3 x-pack/solutions/observability/plugins/apm/ftr_e2e/tsconfig.json:2 x-pack/solutions/observability/plugins/apm/jest.config.js:12 x-pack/solutions/observability/plugins/apm/scripts/infer_route_return_types/index.ts:125 x-pack/solutions/observability/plugins/apm/scripts/precommit.js:15 x-pack/solutions/observability/plugins/apm/scripts/precommit.js:33 x-pack/solutions/observability/plugins/apm/scripts/precommit.js:38 x-pack/solutions/observability/plugins/apm/scripts/precommit.js:50 x-pack/solutions/observability/plugins/apm/scripts/shared/read_kibana_config.ts:16 x-pack/solutions/observability/plugins/apm/tsconfig.json:2 x-pack/solutions/observability/plugins/apm/tsconfig.json:7 x-pack/solutions/observability/plugins/apm_data_access/jest.config.js:12 x-pack/solutions/observability/plugins/apm_data_access/tsconfig.json:2 x-pack/solutions/observability/plugins/apm_data_access/tsconfig.json:6 x-pack/solutions/observability/plugins/inventory/e2e/tsconfig.json:2 x-pack/solutions/observability/plugins/inventory/jest.config.js:10 x-pack/solutions/observability/plugins/inventory/tsconfig.json:2 x-pack/solutions/observability/plugins/inventory/tsconfig.json:7 x-pack/solutions/observability/plugins/metrics_data_access/jest.config.js:10 x-pack/solutions/observability/plugins/metrics_data_access/tsconfig.json:2 x-pack/solutions/observability/plugins/metrics_data_access/tsconfig.json:6 x-pack/solutions/observability/plugins/profiling/README.md:52 x-pack/solutions/observability/plugins/profiling/e2e/README.md:3 x-pack/solutions/observability/plugins/profiling/e2e/tsconfig.json:11 x-pack/solutions/observability/plugins/profiling/e2e/tsconfig.json:2 x-pack/solutions/observability/plugins/profiling/jest.config.js:10 x-pack/solutions/observability/plugins/profiling/tsconfig.json:2 x-pack/solutions/observability/plugins/profiling_data_access/jest.config.js:12 x-pack/solutions/observability/plugins/profiling_data_access/tsconfig.json:2 ``` </details> --------- Co-authored-by: kibanamachine <[email protected]> (cherry picked from commit 8899fb8) # Conflicts: # .buildkite/ftr_oblt_stateful_configs.yml # .github/CODEOWNERS # oas_docs/scripts/merge_serverless_oas.js # package.json # src/dev/storybook/aliases.ts # tsconfig.base.json # x-pack/.i18nrc.json # x-pack/plugins/observability_solution/apm/public/components/app/mobile/service_overview/geo_map/map_layers/style_color_params.ts # x-pack/plugins/observability_solution/apm/server/lib/deprecations/types.ts # x-pack/plugins/telemetry_collection_xpack/schema/xpack_observability.json # x-pack/solutions/observability/plugins/apm/ftr_e2e/README.md # x-pack/solutions/observability/plugins/apm/ftr_e2e/cypress/e2e/service_overview/otel_service_overview_and_transactions.cy.ts # x-pack/solutions/observability/plugins/apm/ftr_e2e/cypress/fixtures/synthtrace/sendotlp.ts # x-pack/solutions/observability/plugins/apm/public/components/app/mobile/service_overview/geo_map/map_layers/style_color_params.ts # x-pack/solutions/observability/plugins/apm/public/hooks/use_theme.tsx # x-pack/solutions/observability/plugins/apm/server/deprecations/__snapshots__/apm_user_role.test.ts.snap # x-pack/solutions/observability/plugins/apm/server/deprecations/apm_user_role.test.ts # x-pack/solutions/observability/plugins/apm/server/deprecations/apm_user_role.ts # x-pack/solutions/observability/plugins/apm/server/deprecations/deprecations.test.ts # x-pack/solutions/observability/plugins/apm/server/lib/deprecations/index.ts # x-pack/solutions/observability/plugins/apm/server/lib/deprecations/types.ts # x-pack/solutions/search/plugins/enterprise_search/public/applications/shared/version_mismatch/index.ts # x-pack/solutions/security/plugins/security_solution_serverless/server/common/services/index.ts
elastic · Dec 29, 2024 · 8cd7fd8 · 8cd7fd8
1 parent 2b68eda
commit 8cd7fd8
Show file tree

Hide file tree

Showing 2,814 changed files with 628 additions and 7,797 deletions.
diff --git a/.buildkite/ftr_oblt_stateful_configs.yml b/.buildkite/ftr_oblt_stateful_configs.yml
@@ -3,13 +3,13 @@ disabled:
   - x-pack/plugins/observability_solution/observability_onboarding/e2e/ftr_config_open.ts
   - x-pack/plugins/observability_solution/observability_onboarding/e2e/ftr_config_runner.ts
   - x-pack/plugins/observability_solution/observability_onboarding/e2e/ftr_config.ts
-  - x-pack/plugins/observability_solution/apm/ftr_e2e/ftr_config_run.ts
-  - x-pack/plugins/observability_solution/apm/ftr_e2e/ftr_config.ts
-  - x-pack/plugins/observability_solution/inventory/e2e/ftr_config_run.ts
-  - x-pack/plugins/observability_solution/inventory/e2e/ftr_config.ts
-  - x-pack/plugins/observability_solution/profiling/e2e/ftr_config_open.ts
-  - x-pack/plugins/observability_solution/profiling/e2e/ftr_config_runner.ts
-  - x-pack/plugins/observability_solution/profiling/e2e/ftr_config.ts
+  - x-pack/solutions/observability/plugins/apm/ftr_e2e/ftr_config_run.ts
+  - x-pack/solutions/observability/plugins/apm/ftr_e2e/ftr_config.ts
+  - x-pack/solutions/observability/plugins/inventory/e2e/ftr_config_run.ts
+  - x-pack/solutions/observability/plugins/inventory/e2e/ftr_config.ts
+  - x-pack/solutions/observability/plugins/profiling/e2e/ftr_config_open.ts
+  - x-pack/solutions/observability/plugins/profiling/e2e/ftr_config_runner.ts
+  - x-pack/solutions/observability/plugins/profiling/e2e/ftr_config.ts
 
   #FTR configs
   - x-pack/solutions/observability/plugins/uptime/e2e/config.ts

diff --git a/.buildkite/scripts/pipelines/pull_request/pipeline.ts b/.buildkite/scripts/pipelines/pull_request/pipeline.ts
@@ -78,7 +78,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
 
     if (
       (await doAnyChangesMatch([
-        /^x-pack\/plugins\/observability_solution\/apm/,
+        /^x-pack\/solutions\/observability\/plugins\/apm/,
         /^packages\/kbn-apm-synthtrace/,
       ])) ||
       GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
@@ -88,7 +88,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
 
     if (
       (await doAnyChangesMatch([
-        /^x-pack\/plugins\/observability_solution\/inventory/,
+        /^x-pack\/solutions\/observability\/plugins\/inventory/,
         /^packages\/kbn-apm-synthtrace/,
       ])) ||
       GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
@@ -109,7 +109,7 @@ const getPipeline = (filename: string, removeSteps = true) => {
     }
 
     if (
-      (await doAnyChangesMatch([/^x-pack\/plugins\/observability_solution\/profiling/])) ||
+      (await doAnyChangesMatch([/^x-pack\/solutions\/observability\/plugins\/profiling/])) ||
       GITHUB_PR_LABELS.includes('ci:all-cypress-suites')
     ) {
       pipeline.push(getPipeline('.buildkite/pipelines/pull_request/profiling_cypress.yml'));

diff --git a/.buildkite/scripts/steps/functional/apm_cypress.sh b/.buildkite/scripts/steps/functional/apm_cypress.sh
@@ -31,6 +31,6 @@ echo "--- APM Cypress Tests"
 
 cd "$XPACK_DIR"
 
-node plugins/observability_solution/apm/scripts/test/e2e.js \
+node solutions/observability/plugins/apm/scripts/test/e2e.js \
   --kibana-install-dir "$KIBANA_BUILD_LOCATION" \
   $CYPRESS_ARGS
diff --git a/.buildkite/scripts/steps/functional/inventory_cypress.sh b/.buildkite/scripts/steps/functional/inventory_cypress.sh
@@ -14,5 +14,5 @@ echo "--- Observability Inventory Cypress Tests"
 
 cd "$XPACK_DIR"
 
-node plugins/observability_solution/inventory/scripts/test/e2e.js \
+node solutions/observability/plugins/inventory/scripts/test/e2e.js \
   --kibana-install-dir "$KIBANA_BUILD_LOCATION" \
diff --git a/.buildkite/scripts/steps/functional/profiling_cypress.sh b/.buildkite/scripts/steps/functional/profiling_cypress.sh
@@ -14,5 +14,5 @@ echo "--- Profiling Cypress Tests"
 
 cd "$XPACK_DIR"
 
-NODE_OPTIONS=--openssl-legacy-provider node plugins/observability_solution/profiling/scripts/test/e2e.js \
+NODE_OPTIONS=--openssl-legacy-provider node solutions/observability/plugins/profiling/scripts/test/e2e.js \
   --kibana-install-dir "$KIBANA_BUILD_LOCATION" \
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -633,7 +633,7 @@ module.exports = {
         '**/*.test.js',
         'x-pack/test/apm_api_integration/**/*.ts',
         'x-pack/test/functional/apps/**/*.js',
-        'x-pack/plugins/observability_solution/apm/**/*.js',
+        'x-pack/solutions/observability/plugins/apm/**/*.js',
         'test/*/config.ts',
         'test/*/config_open.ts',
         'test/*/*.config.ts',
@@ -913,7 +913,7 @@ module.exports = {
      */
     {
       files: [
-        'x-pack/plugins/observability_solution/apm/**/*.{js,mjs,ts,tsx}',
+        'x-pack/solutions/observability/plugins/apm/**/*.{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}',
@@ -934,7 +934,7 @@ module.exports = {
     },
     {
       files: [
-        'x-pack/plugins/observability_solution/apm/**/*.stories.*',
+        'x-pack/solutions/observability/plugins/apm/**/*.stories.*',
         'x-pack/solutions/observability/plugins/observability/**/*.stories.*',
         'x-pack/solutions/observability/plugins/exploratory_view/**/*.stories.*',
         'x-pack/solutions/observability/plugins/slo/**/*.stories.*',
@@ -999,7 +999,7 @@ module.exports = {
     },
     {
       // require explicit return types in route handlers for performance reasons
-      files: ['x-pack/plugins/observability_solution/apm/server/**/route.ts'],
+      files: ['x-pack/solutions/observability/plugins/apm/server/**/route.ts'],
       rules: {
         '@typescript-eslint/explicit-function-return-type': [
           'error',

diff --git a/.github/paths-labeller.yml b/.github/paths-labeller.yml
@@ -9,11 +9,11 @@
     - 'src/plugins/expressions/**/*.*'
     - 'src/plugins/bfetch/**/*.*'
 - 'Team:obs-ux-infra_services':
-    - 'x-pack/plugins/observability_solution/apm/**/*.*'
+    - 'x-pack/solutions/observability/plugins/apm/**/*.*'
     - 'x-pack/test/apm_api_integration/**/*.*'
     - 'packages/kbn-apm-synthtrace/**/*.*'
     - 'packages/kbn-apm-synthtrace-client/**/*.*'
-    - 'packages/kbn-apm-utils/**/*.*'
+    - 'src/platform/packages/shared/kbn-apm-utils/**/*.*'
     - 'x-pack/solutions/observability/plugins/ux/**/*.*'
 - 'Team:Fleet':
     - 'x-pack/platform/plugins/shared/fleet/**/*.*'

diff --git a/.gitignore b/.gitignore
@@ -92,8 +92,8 @@ npm-debug.log*
 ## @cypress/snapshot from apm plugin
 /snapshots.js
 /apm-diagnostics*.json
-/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_map/snapshots/*.actual.png
-/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_map/snapshots/*.diff.png
+/x-pack/solutions/observability/plugins/apm/ftr_e2e/cypress/e2e/service_map/snapshots/*.actual.png
+/x-pack/solutions/observability/plugins/apm/ftr_e2e/cypress/e2e/service_map/snapshots/*.diff.png
 
 # transpiled cypress config
 x-pack/platform/plugins/shared/fleet/cypress.config.d.ts

diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc
@@ -463,11 +463,11 @@ The plugin exposes the static DefaultEditorController class to consume.
 |The Kibana Alerting plugin provides a common place to set up rules. You can:
 
 
-|{kib-repo}blob/{branch}/x-pack/plugins/observability_solution/apm/readme.md[apm]
+|{kib-repo}blob/{branch}/x-pack/solutions/observability/plugins/apm/readme.md[apm]
 |This plugin provides access to App Monitoring features provided by Elastic. It allows you to monitor your software services and applications in real-time; visualize detailed performance information on your services, identify and analyze errors, and monitor host-level and APM agent-specific metrics like JVM and Go runtime metrics.
 
 
-|{kib-repo}blob/{branch}/x-pack/plugins/observability_solution/apm_data_access[apmDataAccess]
+|{kib-repo}blob/{branch}/x-pack/solutions/observability/plugins/apm_data_access[apmDataAccess]
 |WARNING: Missing README.
 
 
@@ -658,7 +658,7 @@ the infrastructure monitoring use-case within Kibana.
 |Team owner: Security Integrations Scalability
 
 
-|{kib-repo}blob/{branch}/x-pack/plugins/observability_solution/inventory/README.md[inventory]
+|{kib-repo}blob/{branch}/x-pack/solutions/observability/plugins/inventory/README.md[inventory]
 |Home of the Inventory plugin, which renders the... inventory.
 
 
@@ -719,7 +719,7 @@ using the CURL scripts in the scripts folder.
 |Visualize geo data from Elasticsearch or 3rd party geo-services.
 
 
-|{kib-repo}blob/{branch}/x-pack/plugins/observability_solution/metrics_data_access/README.md[metricsDataAccess]
+|{kib-repo}blob/{branch}/x-pack/solutions/observability/plugins/metrics_data_access/README.md[metricsDataAccess]
 |Exposes utilities to access metrics data.
 
 
@@ -780,11 +780,11 @@ Elastic.
 |This plugin contains the product documentation base service.
 
 
-|{kib-repo}blob/{branch}/x-pack/plugins/observability_solution/profiling/README.md[profiling]
+|{kib-repo}blob/{branch}/x-pack/solutions/observability/plugins/profiling/README.md[profiling]
 |Universal Profiling provides fleet-wide, whole-system, continuous profiling with zero instrumentation. Get a comprehensive understanding of what lines of code are consuming compute resources throughout your entire fleet by visualizing your data in Kibana using the flamegraph, stacktraces, and top functions views.
 
 
-|{kib-repo}blob/{branch}/x-pack/plugins/observability_solution/profiling_data_access[profilingDataAccess]
+|{kib-repo}blob/{branch}/x-pack/solutions/observability/plugins/profiling_data_access[profilingDataAccess]
 |WARNING: Missing README.
 
 

diff --git a/oas_docs/overlays/alerting.overlays.yaml b/oas_docs/overlays/alerting.overlays.yaml
@@ -89,13 +89,13 @@ actions:
                   description: The parameters for the rule.
                   anyOf:
                     # APM anomaly rule (apm.anomaly)
-                    - $ref: '../../x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/docs/params_property_apm_anomaly.yaml'
+                    - $ref: '../../x-pack/solutions/observability/plugins/apm/server/routes/alerts/rule_types/docs/params_property_apm_anomaly.yaml'
                     # APM error count rule (apm.error_rate)
-                    - $ref: '../../x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/docs/params_property_apm_error_count.yaml'
+                    - $ref: '../../x-pack/solutions/observability/plugins/apm/server/routes/alerts/rule_types/docs/params_property_apm_error_count.yaml'
                     # APM transaction duration rule (apm.transaction_duration)
-                    - $ref: '../../x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/docs/params_property_apm_transaction_duration.yaml'
+                    - $ref: '../../x-pack/solutions/observability/plugins/apm/server/routes/alerts/rule_types/docs/params_property_apm_transaction_duration.yaml'
                     # APM transaction error rate rule (apm.transaction_error_rate)
-                    - $ref: '../../x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/docs/params_property_apm_transaction_error_rate.yaml'
+                    - $ref: '../../x-pack/solutions/observability/plugins/apm/server/routes/alerts/rule_types/docs/params_property_apm_transaction_error_rate.yaml'
                     # Elasticsearch DSL query rule (.es-query)
                     - $ref: '../../x-pack/platform/plugins/shared/alerting/docs/openapi/components/schemas/params_es_query_dsl_rule.yaml'
                     # Elasticsearch ES|QL query rule (.es-query)

diff --git a/oas_docs/scripts/merge_ess_oas.js b/oas_docs/scripts/merge_ess_oas.js
@@ -23,7 +23,7 @@ const { REPO_ROOT } = require('@kbn/repo-info');
       `${REPO_ROOT}/x-pack/plugins/fleet/common/openapi/bundled.yaml`,
 
       // Observability Solution
-      `${REPO_ROOT}/x-pack/plugins/observability_solution/apm/docs/openapi/apm/bundled.yaml`,
+      `${REPO_ROOT}/x-pack/solutions/observability/plugins/apm/docs/openapi/apm/bundled.yaml`,
       `${REPO_ROOT}/x-pack/solutions/observability/plugins/slo/docs/openapi/slo/bundled.yaml`,
 
       // Security solution

diff --git a/package.json b/package.json
@@ -184,11 +184,11 @@
     "@kbn/analytics-ftr-helpers-plugin": "link:test/analytics/plugins/analytics_ftr_helpers",
     "@kbn/analytics-plugin-a-plugin": "link:test/analytics/plugins/analytics_plugin_a",
     "@kbn/apm-config-loader": "link:packages/kbn-apm-config-loader",
-    "@kbn/apm-data-access-plugin": "link:x-pack/plugins/observability_solution/apm_data_access",
-    "@kbn/apm-data-view": "link:packages/kbn-apm-data-view",
-    "@kbn/apm-plugin": "link:x-pack/plugins/observability_solution/apm",
-    "@kbn/apm-types": "link:packages/kbn-apm-types",
-    "@kbn/apm-utils": "link:packages/kbn-apm-utils",
+    "@kbn/apm-data-access-plugin": "link:x-pack/solutions/observability/plugins/apm_data_access",
+    "@kbn/apm-data-view": "link:src/platform/packages/shared/kbn-apm-data-view",
+    "@kbn/apm-plugin": "link:x-pack/solutions/observability/plugins/apm",
+    "@kbn/apm-types": "link:x-pack/solutions/observability/packages/kbn-apm-types",
+    "@kbn/apm-utils": "link:src/platform/packages/shared/kbn-apm-utils",
     "@kbn/app-link-test-plugin": "link:test/plugin_functional/plugins/app_link_test",
     "@kbn/application-usage-test-plugin": "link:x-pack/test/usage_collection/plugins/application_usage_test",
     "@kbn/audit-log-plugin": "link:x-pack/test/security_api_integration/plugins/audit_log",
@@ -589,7 +589,7 @@
     "@kbn/interactive-setup-plugin": "link:src/plugins/interactive_setup",
     "@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/inventory-plugin": "link:x-pack/solutions/observability/plugins/inventory",
     "@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",
@@ -610,7 +610,7 @@
     "@kbn/langchain": "link:x-pack/platform/packages/shared/kbn-langchain",
     "@kbn/language-documentation": "link:src/platform/packages/private/kbn-language-documentation",
     "@kbn/lens-config-builder-example-plugin": "link:x-pack/examples/lens_config_builder_example",
-    "@kbn/lens-embeddable-utils": "link:packages/kbn-lens-embeddable-utils",
+    "@kbn/lens-embeddable-utils": "link:src/platform/packages/shared/kbn-lens-embeddable-utils",
     "@kbn/lens-formula-docs": "link:packages/kbn-lens-formula-docs",
     "@kbn/lens-inline-editing-example-plugin": "link:x-pack/examples/lens_embeddable_inline_editing_example",
     "@kbn/lens-plugin": "link:x-pack/plugins/lens",
@@ -647,7 +647,7 @@
     "@kbn/maps-ems-plugin": "link:src/platform/plugins/private/maps_ems",
     "@kbn/maps-plugin": "link:x-pack/platform/plugins/shared/maps",
     "@kbn/maps-vector-tile-utils": "link:x-pack/packages/maps/vector_tile_utils",
-    "@kbn/metrics-data-access-plugin": "link:x-pack/plugins/observability_solution/metrics_data_access",
+    "@kbn/metrics-data-access-plugin": "link:x-pack/solutions/observability/plugins/metrics_data_access",
     "@kbn/ml-agg-utils": "link:x-pack/platform/packages/private/ml/agg_utils",
     "@kbn/ml-anomaly-utils": "link:x-pack/platform/packages/shared/ml/anomaly_utils",
     "@kbn/ml-cancellable-search": "link:x-pack/platform/packages/private/ml/cancellable_search",
@@ -727,9 +727,9 @@
     "@kbn/presentation-util-plugin": "link:src/platform/plugins/shared/presentation_util",
     "@kbn/product-doc-base-plugin": "link:x-pack/platform/plugins/shared/ai_infra/product_doc_base",
     "@kbn/product-doc-common": "link:x-pack/platform/packages/shared/ai-infra/product-doc-common",
-    "@kbn/profiling-data-access-plugin": "link:x-pack/plugins/observability_solution/profiling_data_access",
-    "@kbn/profiling-plugin": "link:x-pack/plugins/observability_solution/profiling",
-    "@kbn/profiling-utils": "link:packages/kbn-profiling-utils",
+    "@kbn/profiling-data-access-plugin": "link:x-pack/solutions/observability/plugins/profiling_data_access",
+    "@kbn/profiling-plugin": "link:x-pack/solutions/observability/plugins/profiling",
+    "@kbn/profiling-utils": "link:src/platform/packages/shared/kbn-profiling-utils",
     "@kbn/random-sampling": "link:x-pack/packages/kbn-random-sampling",
     "@kbn/react-field": "link:packages/kbn-react-field",
     "@kbn/react-hooks": "link:packages/kbn-react-hooks",
@@ -875,7 +875,7 @@
     "@kbn/set-map": "link:packages/kbn-set-map",
     "@kbn/share-examples-plugin": "link:examples/share_examples",
     "@kbn/share-plugin": "link:src/plugins/share",
-    "@kbn/shared-svg": "link:packages/kbn-shared-svg",
+    "@kbn/shared-svg": "link:src/platform/packages/shared/kbn-shared-svg",
     "@kbn/shared-ux-avatar-solution": "link:packages/shared-ux/avatar/solution",
     "@kbn/shared-ux-button-exit-full-screen": "link:packages/shared-ux/button/exit_full_screen",
     "@kbn/shared-ux-button-toolbar": "link:packages/shared-ux/button_toolbar",
@@ -1367,7 +1367,7 @@
     "@kbn/ambient-ftr-types": "link:packages/kbn-ambient-ftr-types",
     "@kbn/ambient-storybook-types": "link:packages/kbn-ambient-storybook-types",
     "@kbn/ambient-ui-types": "link:packages/kbn-ambient-ui-types",
-    "@kbn/apm-ftr-e2e": "link:x-pack/plugins/observability_solution/apm/ftr_e2e",
+    "@kbn/apm-ftr-e2e": "link:x-pack/solutions/observability/plugins/apm/ftr_e2e",
     "@kbn/apm-synthtrace": "link:packages/kbn-apm-synthtrace",
     "@kbn/apm-synthtrace-client": "link:packages/kbn-apm-synthtrace-client",
     "@kbn/axe-config": "link:packages/kbn-axe-config",
@@ -1466,7 +1466,7 @@
     "@kbn/get-repo-files": "link:packages/kbn-get-repo-files",
     "@kbn/import-locator": "link:packages/kbn-import-locator",
     "@kbn/import-resolver": "link:packages/kbn-import-resolver",
-    "@kbn/inventory-e2e": "link:x-pack/plugins/observability_solution/inventory/e2e",
+    "@kbn/inventory-e2e": "link:x-pack/solutions/observability/plugins/inventory/e2e",
     "@kbn/jest-serializers": "link:packages/kbn-jest-serializers",
     "@kbn/journeys": "link:packages/kbn-journeys",
     "@kbn/json-ast": "link:packages/kbn-json-ast",

diff --git a/packages/kbn-apm-types/es_fields.ts b/packages/kbn-apm-types/es_fields.ts
diff --git a/packages/kbn-apm-types/es_schemas_raw.ts b/packages/kbn-apm-types/es_schemas_raw.ts
diff --git a/packages/kbn-apm-types/es_schemas_ui.ts b/packages/kbn-apm-types/es_schemas_ui.ts
diff --git a/packages/kbn-apm-types/index.ts b/packages/kbn-apm-types/index.ts