Move all Observability plugins into /x-pack/observability_solution

.buildkite/ftr_configs.yml

@@ -34,9 +34,9 @@ disabled:
   - x-pack/test/defend_workflows_cypress/cli_config.ts
   - x-pack/test/defend_workflows_cypress/config.ts
   - x-pack/test/defend_workflows_cypress/serverless_config.ts
-  - x-pack/plugins/observability_onboarding/e2e/ftr_config_open.ts
-  - x-pack/plugins/observability_onboarding/e2e/ftr_config_runner.ts
-  - x-pack/plugins/observability_onboarding/e2e/ftr_config.ts
+  - 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/test/osquery_cypress/cli_config.ts
   - x-pack/test/osquery_cypress/serverless_cli_config.ts
   - x-pack/test/osquery_cypress/config.ts
@@ -48,22 +48,22 @@ disabled:
   - x-pack/test/functional_enterprise_search/visual_config.ts
   - x-pack/test/functional_enterprise_search/cli_config.ts
   - x-pack/test_serverless/functional/test_suites/security/cypress/security_config.ts
-  - x-pack/plugins/apm/ftr_e2e/ftr_config_open.ts
-  - x-pack/plugins/apm/ftr_e2e/ftr_config_run.ts
-  - x-pack/plugins/apm/ftr_e2e/ftr_config.ts
+  - x-pack/plugins/observability_solution/apm/ftr_e2e/ftr_config_open.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/test_serverless/functional/test_suites/observability/cypress/config_headless.ts
   - x-pack/test_serverless/functional/test_suites/observability/cypress/config_runner.ts
   - x-pack/test/security_solution_cypress/serverless_config.ts
-  - x-pack/plugins/profiling/e2e/ftr_config_open.ts
-  - x-pack/plugins/profiling/e2e/ftr_config_runner.ts
-  - x-pack/plugins/profiling/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
 
   # Elastic Synthetics configs
-  - x-pack/plugins/synthetics/e2e/config.ts
-  - x-pack/plugins/uptime/e2e/uptime/synthetics_run.ts
-  - x-pack/plugins/synthetics/e2e/synthetics/synthetics_run.ts
-  - x-pack/plugins/ux/e2e/synthetics_run.ts
-  - x-pack/plugins/exploratory_view/e2e/synthetics_run.ts
+  - x-pack/plugins/observability_solution/synthetics/e2e/config.ts
+  - x-pack/plugins/observability_solution/uptime/e2e/uptime/synthetics_run.ts
+  - x-pack/plugins/observability_solution/synthetics/e2e/synthetics/synthetics_run.ts
+  - x-pack/plugins/observability_solution/ux/e2e/synthetics_run.ts
+  - x-pack/plugins/observability_solution/exploratory_view/e2e/synthetics_run.ts
 
   # Configs that exist but weren't running in CI when this file was introduced
   - x-pack/test/alerting_api_integration/security_and_spaces/group2/tests/actions/config.ts

.buildkite/pipelines/on_merge_unsupported_ftrs.yml

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

.buildkite/pipelines/pull_request/exploratory_view_plugin.yml

@@ -6,7 +6,7 @@ steps:
     depends_on: build
     timeout_in_minutes: 60
     artifact_paths:
-      - 'x-pack/plugins/exploratory_view/e2e/.journeys/**/*'
+      - 'x-pack/plugins/observability_solution/exploratory_view/e2e/.journeys/**/*'
     retry:
       automatic:
         - exit_status: '-1'

.buildkite/pipelines/pull_request/synthetics_plugin.yml

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

.buildkite/pipelines/pull_request/uptime_plugin.yml

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

.buildkite/pipelines/pull_request/ux_plugin_e2e.yml

@@ -6,7 +6,7 @@ steps:
     depends_on: build
     timeout_in_minutes: 60
     artifact_paths:
-      - 'x-pack/plugins/ux/e2e/.journeys/**/*'
+      - 'x-pack/plugins/observability_solution/ux/e2e/.journeys/**/*'
     retry:
       automatic:
         - exit_status: '-1'

.buildkite/scripts/steps/functional/apm_cypress.sh

@@ -30,6 +30,6 @@ echo "--- APM Cypress Tests"
 
 cd "$XPACK_DIR"
 
-node plugins/apm/scripts/test/e2e.js \
+node plugins/observability_solution/apm/scripts/test/e2e.js \
   --kibana-install-dir "$KIBANA_BUILD_LOCATION" \
   $CYPRESS_ARGS

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

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

.buildkite/scripts/steps/functional/observability_onboarding_cypress.sh

@@ -13,5 +13,5 @@ echo "--- Observability onboarding Cypress Tests"
 
 cd "$XPACK_DIR"
 
-node plugins/observability_onboarding/scripts/test/e2e.js \
+node plugins/observability_solution/observability_onboarding/scripts/test/e2e.js \
   --kibana-install-dir "$KIBANA_BUILD_LOCATION" \

.buildkite/scripts/steps/functional/profiling_cypress.sh

@@ -13,5 +13,5 @@ echo "--- Profiling Cypress Tests"
 
 cd "$XPACK_DIR"
 
-NODE_OPTIONS=--openssl-legacy-provider node plugins/profiling/scripts/test/e2e.js \
+NODE_OPTIONS=--openssl-legacy-provider node plugins/observability_solution/profiling/scripts/test/e2e.js \
   --kibana-install-dir "$KIBANA_BUILD_LOCATION" \

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

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

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

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

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

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

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

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

.eslintrc.js

@@ -591,7 +591,7 @@ module.exports = {
         '**/*.test.js',
         'x-pack/test/apm_api_integration/**/*.ts',
         'x-pack/test/functional/apps/**/*.js',
-        'x-pack/plugins/apm/**/*.js',
+        'x-pack/plugins/observability_solution/apm/**/*.js',
         'test/*/config.ts',
         'test/*/config_open.ts',
         'test/*/*.config.ts',
@@ -871,10 +871,10 @@ module.exports = {
      */
     {
       files: [
-        'x-pack/plugins/apm/**/*.{js,mjs,ts,tsx}',
+        'x-pack/plugins/observability_solution/apm/**/*.{js,mjs,ts,tsx}',
         'x-pack/plugins/observability/**/*.{js,mjs,ts,tsx}',
-        'x-pack/plugins/exploratory_view/**/*.{js,mjs,ts,tsx}',
-        'x-pack/plugins/ux/**/*.{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}',
       ],
       rules: {
         'no-console': ['warn', { allow: ['error'] }],
@@ -894,9 +894,9 @@ module.exports = {
     },
     {
       files: [
-        'x-pack/plugins/apm/**/*.stories.*',
+        'x-pack/plugins/observability_solution/apm/**/*.stories.*',
         'x-pack/plugins/observability/**/*.stories.*',
-        'x-pack/plugins/exploratory_view/**/*.stories.*',
+        'x-pack/plugins/observability_solution/exploratory_view/**/*.stories.*',
       ],
       rules: {
         'react/function-component-definition': [
@@ -911,33 +911,33 @@ module.exports = {
     {
       files: [
         'x-pack/plugins/aiops/**/*.tsx',
-        'x-pack/plugins/apm/**/*.tsx',
-        'x-pack/plugins/exploratory_view/**/*.tsx',
-        'x-pack/plugins/infra/**/*.tsx',
+        'x-pack/plugins/observability_solution/apm/**/*.tsx',
+        'x-pack/plugins/observability_solution/exploratory_view/**/*.tsx',
+        'x-pack/plugins/observability_solution/infra/**/*.tsx',
         'x-pack/plugins/observability/**/*.tsx',
-        'x-pack/plugins/observability_ai_assistant/**/*.tsx',
-        'x-pack/plugins/observability_onboarding/**/*.tsx',
-        'x-pack/plugins/observability_shared/**/*.tsx',
-        'x-pack/plugins/profiling/**/*.tsx',
-        'x-pack/plugins/synthetics/**/*.tsx',
-        'x-pack/plugins/ux/**/*.tsx',
+        'x-pack/plugins/observability_solution/observability_ai_assistant/**/*.tsx',
+        'x-pack/plugins/observability_solution/observability_onboarding/**/*.tsx',
+        'x-pack/plugins/observability_solution/observability_shared/**/*.tsx',
+        'x-pack/plugins/observability_solution/profiling/**/*.tsx',
+        'x-pack/plugins/observability_solution/synthetics/**/*.tsx',
+        'x-pack/plugins/observability_solution/ux/**/*.tsx',
       ],
       rules: {
         '@kbn/telemetry/event_generating_elements_should_be_instrumented': 'error',
       },
     },
     {
       files: [
-        'x-pack/plugins/apm/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
-        'x-pack/plugins/exploratory_view/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
-        'x-pack/plugins/infra/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
+        'x-pack/plugins/observability_solution/apm/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
+        'x-pack/plugins/observability_solution/exploratory_view/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
+        'x-pack/plugins/observability_solution/infra/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
         'x-pack/plugins/observability/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
-        'x-pack/plugins/observability_ai_assistant/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
-        'x-pack/plugins/observability_onboarding/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
-        'x-pack/plugins/observability_shared/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
-        'x-pack/plugins/profiling/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
-        'x-pack/plugins/synthetics/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
-        'x-pack/plugins/ux/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
+        'x-pack/plugins/observability_solution/observability_ai_assistant/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
+        'x-pack/plugins/observability_solution/observability_onboarding/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
+        'x-pack/plugins/observability_solution/observability_shared/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
+        'x-pack/plugins/observability_solution/profiling/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
+        'x-pack/plugins/observability_solution/synthetics/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
+        'x-pack/plugins/observability_solution/ux/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
       ],
       rules: {
         '@kbn/i18n/strings_should_be_translated_with_i18n': 'warn',
@@ -946,7 +946,7 @@ module.exports = {
     },
     {
       // require explicit return types in route handlers for performance reasons
-      files: ['x-pack/plugins/apm/server/**/route.ts'],
+      files: ['x-pack/plugins/observability_solution/apm/server/**/route.ts'],
       rules: {
         '@typescript-eslint/explicit-function-return-type': [
           'error',
@@ -958,7 +958,7 @@ module.exports = {
     },
     // Profiling
     {
-      files: ['x-pack/plugins/profiling/**/*.{js,mjs,ts,tsx}'],
+      files: ['x-pack/plugins/observability_solution/profiling/**/*.{js,mjs,ts,tsx}'],
       rules: {
         'react-hooks/rules-of-hooks': 'error', // Checks rules of Hooks
         'react-hooks/exhaustive-deps': [
@@ -969,7 +969,9 @@ module.exports = {
     },
     {
       // disable imports from legacy uptime plugin
-      files: ['x-pack/plugins/synthetics/public/apps/synthetics/**/*.{js,mjs,ts,tsx}'],
+      files: [
+        'x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/**/*.{js,mjs,ts,tsx}',
+      ],
       rules: {
         'no-restricted-imports': [
           'error',