diff --git a/.buildkite/ftr_configs.yml b/.buildkite/ftr_configs.yml index c57e480db74de..f3af92d9e934b 100644 --- a/.buildkite/ftr_configs.yml +++ b/.buildkite/ftr_configs.yml @@ -47,9 +47,9 @@ 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 diff --git a/.eslintrc.js b/.eslintrc.js index dba4cf3f925dd..4f8b827511352 100644 --- a/.eslintrc.js +++ b/.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,7 +871,7 @@ 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/observability_solution/exploratory_view/**/*.{js,mjs,ts,tsx}', 'x-pack/plugins/observability_solution/ux/**/*.{js,mjs,ts,tsx}', @@ -894,7 +894,7 @@ module.exports = { }, { files: [ - 'x-pack/plugins/apm/**/*.stories.*', + 'x-pack/plugins/observability_solution/apm/**/*.stories.*', 'x-pack/plugins/observability/**/*.stories.*', 'x-pack/plugins/observability_solution/exploratory_view/**/*.stories.*', ], @@ -911,16 +911,17 @@ module.exports = { { files: [ 'x-pack/plugins/aiops/**/*.tsx', - 'x-pack/plugins/apm/**/*.tsx', - 'x-pack/plugins/observability_solution/exploratory_view/**/*.tsx', 'x-pack/plugins/infra/**/*.tsx', 'x-pack/plugins/observability/**/*.tsx', - 'x-pack/plugins/observability_solution/observability_onboarding/**/*.tsx', + 'x-pack/plugins/observability_solution/apm/**/*.tsx', + 'x-pack/plugins/observability_solution/dataset_quality/**/*.tsx', + 'x-pack/plugins/observability_solution/exploratory_view/**/*.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/uptime/**/*.tsx', 'x-pack/plugins/observability_solution/ux/**/*.tsx', 'src/plugins/ai_assistant_management/**/*.tsx', ], @@ -930,11 +931,10 @@ module.exports = { }, { files: [ - 'x-pack/plugins/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/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_solution/observability_onboarding/**/!(*.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/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)', @@ -950,7 +950,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', diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 48211d6f11b2b..9def2e6ecb28c 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -40,8 +40,8 @@ packages/analytics/shippers/elastic_v3/common @elastic/kibana-core packages/analytics/shippers/elastic_v3/server @elastic/kibana-core packages/analytics/shippers/fullstory @elastic/kibana-core packages/kbn-apm-config-loader @elastic/kibana-core @vigneshshanmugam -x-pack/plugins/apm_data_access @elastic/obs-knowledge-team @elastic/obs-ux-infra_services-team -x-pack/plugins/apm @elastic/obs-ux-infra_services-team +x-pack/plugins/observability_solution/apm_data_access @elastic/obs-knowledge-team @elastic/obs-ux-infra_services-team +x-pack/plugins/observability_solution/apm @elastic/obs-ux-infra_services-team packages/kbn-apm-synthtrace @elastic/obs-ux-infra_services-team @elastic/obs-ux-logs-team packages/kbn-apm-synthtrace-client @elastic/obs-ux-infra_services-team @elastic/obs-ux-logs-team packages/kbn-apm-utils @elastic/obs-ux-infra_services-team @@ -1542,7 +1542,7 @@ x-pack/plugins/security_solution/server/lib/security_integrations @elastic/secur **/*.scss @elastic/kibana-design # Observability design -/x-pack/plugins/apm/**/*.scss @elastic/observability-design +/x-pack/plugins/observability_solution/apm/**/*.scss @elastic/observability-design /x-pack/plugins/infra/**/*.scss @elastic/observability-design /x-pack/plugins/fleet/**/*.scss @elastic/observability-design /x-pack/plugins/monitoring/**/*.scss @elastic/observability-design diff --git a/.github/paths-labeller.yml b/.github/paths-labeller.yml index 0ed5bfd6004bf..296830871ba16 100644 --- a/.github/paths-labeller.yml +++ b/.github/paths-labeller.yml @@ -9,7 +9,7 @@ - 'src/plugins/expressions/**/*.*' - 'src/plugins/bfetch/**/*.*' - 'Team:obs-ux-infra_services': - - 'x-pack/plugins/apm/**/*.*' + - 'x-pack/plugins/observability_solution/apm/**/*.*' - 'x-pack/test/apm_api_integration/**/*.*' - 'packages/kbn-apm-synthtrace/**/*.*' - 'packages/kbn-apm-synthtrace-client/**/*.*' diff --git a/.gitignore b/.gitignore index dbfb30c92ff31..cb94ba7ef2d3f 100644 --- a/.gitignore +++ b/.gitignore @@ -91,8 +91,8 @@ npm-debug.log* ## @cypress/snapshot from apm plugin /snapshots.js /apm-diagnostics*.json -/x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_map/snapshots/*.actual.png -/x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_map/snapshots/*.diff.png +/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 # transpiled cypress config x-pack/plugins/fleet/cypress.config.d.ts @@ -141,4 +141,3 @@ x-pack/test/security_api_integration/plugins/audit_log/audit.log # ignore FTR temp directory .ftr role_users.json - diff --git a/api_docs/apm.devdocs.json b/api_docs/apm.devdocs.json index 54636bb51d365..6497780df9538 100644 --- a/api_docs/apm.devdocs.json +++ b/api_docs/apm.devdocs.json @@ -11,7 +11,7 @@ "tags": [], "label": "ConfigSchema", "description": [], - "path": "x-pack/plugins/apm/public/index.ts", + "path": "x-pack/plugins/observability_solution/apm/public/index.ts", "deprecated": false, "trackAdoption": false, "children": [ @@ -22,7 +22,7 @@ "tags": [], "label": "serviceMapEnabled", "description": [], - "path": "x-pack/plugins/apm/public/index.ts", + "path": "x-pack/plugins/observability_solution/apm/public/index.ts", "deprecated": false, "trackAdoption": false }, @@ -33,10 +33,8 @@ "tags": [], "label": "ui", "description": [], - "signature": [ - "{ enabled: boolean; }" - ], - "path": "x-pack/plugins/apm/public/index.ts", + "signature": ["{ enabled: boolean; }"], + "path": "x-pack/plugins/observability_solution/apm/public/index.ts", "deprecated": false, "trackAdoption": false }, @@ -47,7 +45,7 @@ "tags": [], "label": "latestAgentVersionsUrl", "description": [], - "path": "x-pack/plugins/apm/public/index.ts", + "path": "x-pack/plugins/observability_solution/apm/public/index.ts", "deprecated": false, "trackAdoption": false }, @@ -58,7 +56,7 @@ "tags": [], "label": "serverlessOnboarding", "description": [], - "path": "x-pack/plugins/apm/public/index.ts", + "path": "x-pack/plugins/observability_solution/apm/public/index.ts", "deprecated": false, "trackAdoption": false }, @@ -69,7 +67,7 @@ "tags": [], "label": "managedServiceUrl", "description": [], - "path": "x-pack/plugins/apm/public/index.ts", + "path": "x-pack/plugins/observability_solution/apm/public/index.ts", "deprecated": false, "trackAdoption": false }, @@ -83,7 +81,7 @@ "signature": [ "{ agentConfigurationAvailable: boolean; configurableIndicesAvailable: boolean; infrastructureTabAvailable: boolean; infraUiAvailable: boolean; migrationToFleetAvailable: boolean; sourcemapApiAvailable: boolean; storageExplorerAvailable: boolean; profilingIntegrationAvailable: boolean; }" ], - "path": "x-pack/plugins/apm/public/index.ts", + "path": "x-pack/plugins/observability_solution/apm/public/index.ts", "deprecated": false, "trackAdoption": false }, @@ -94,10 +92,8 @@ "tags": [], "label": "serverless", "description": [], - "signature": [ - "{ enabled: boolean; }" - ], - "path": "x-pack/plugins/apm/public/index.ts", + "signature": ["{ enabled: boolean; }"], + "path": "x-pack/plugins/observability_solution/apm/public/index.ts", "deprecated": false, "trackAdoption": false } @@ -146,7 +142,7 @@ }, ">; }; })>; }" ], - "path": "x-pack/plugins/apm/public/plugin.ts", + "path": "x-pack/plugins/observability_solution/apm/public/plugin.ts", "deprecated": false, "trackAdoption": false, "lifecycle": "setup", @@ -159,10 +155,8 @@ "tags": [], "label": "ApmPluginStart", "description": [], - "signature": [ - "void" - ], - "path": "x-pack/plugins/apm/public/plugin.ts", + "signature": ["void"], + "path": "x-pack/plugins/observability_solution/apm/public/plugin.ts", "deprecated": false, "trackAdoption": false, "lifecycle": "start", @@ -208,7 +202,7 @@ "APMPluginStartDependencies", ">" ], - "path": "x-pack/plugins/apm/server/plugin.ts", + "path": "x-pack/plugins/observability_solution/apm/server/plugin.ts", "deprecated": false, "trackAdoption": false, "children": [ @@ -219,10 +213,8 @@ "tags": [], "label": "Constructor", "description": [], - "signature": [ - "any" - ], - "path": "x-pack/plugins/apm/server/plugin.ts", + "signature": ["any"], + "path": "x-pack/plugins/observability_solution/apm/server/plugin.ts", "deprecated": false, "trackAdoption": false, "children": [ @@ -243,7 +235,7 @@ }, "" ], - "path": "x-pack/plugins/apm/server/plugin.ts", + "path": "x-pack/plugins/observability_solution/apm/server/plugin.ts", "deprecated": false, "trackAdoption": false, "isRequired": true @@ -277,7 +269,7 @@ "SearchAggregatedTransactionSetting", "; telemetryCollectionEnabled: boolean; metricsInterval: number; agent: Readonly<{} & { migrations: Readonly<{} & { enabled: boolean; }>; }>; forceSyntheticSource: boolean; latestAgentVersionsUrl: string; serverless: Readonly<{} & { enabled: true; }>; serverlessOnboarding: boolean; managedServiceUrl: string; featureFlags: Readonly<{} & { agentConfigurationAvailable: boolean; configurableIndicesAvailable: boolean; infrastructureTabAvailable: boolean; infraUiAvailable: boolean; migrationToFleetAvailable: boolean; sourcemapApiAvailable: boolean; storageExplorerAvailable: boolean; profilingIntegrationAvailable: boolean; }>; }>>; }" ], - "path": "x-pack/plugins/apm/server/plugin.ts", + "path": "x-pack/plugins/observability_solution/apm/server/plugin.ts", "deprecated": false, "trackAdoption": false, "children": [ @@ -300,7 +292,7 @@ "APMPluginStartDependencies", ", unknown>" ], - "path": "x-pack/plugins/apm/server/plugin.ts", + "path": "x-pack/plugins/observability_solution/apm/server/plugin.ts", "deprecated": false, "trackAdoption": false, "isRequired": true @@ -312,10 +304,8 @@ "tags": [], "label": "plugins", "description": [], - "signature": [ - "APMPluginSetupDependencies" - ], - "path": "x-pack/plugins/apm/server/plugin.ts", + "signature": ["APMPluginSetupDependencies"], + "path": "x-pack/plugins/observability_solution/apm/server/plugin.ts", "deprecated": false, "trackAdoption": false, "isRequired": true @@ -343,7 +333,7 @@ "APMPluginStartDependencies", ") => void" ], - "path": "x-pack/plugins/apm/server/plugin.ts", + "path": "x-pack/plugins/observability_solution/apm/server/plugin.ts", "deprecated": false, "trackAdoption": false, "children": [ @@ -363,7 +353,7 @@ "text": "CoreStart" } ], - "path": "x-pack/plugins/apm/server/plugin.ts", + "path": "x-pack/plugins/observability_solution/apm/server/plugin.ts", "deprecated": false, "trackAdoption": false, "isRequired": true @@ -375,10 +365,8 @@ "tags": [], "label": "plugins", "description": [], - "signature": [ - "APMPluginStartDependencies" - ], - "path": "x-pack/plugins/apm/server/plugin.ts", + "signature": ["APMPluginStartDependencies"], + "path": "x-pack/plugins/observability_solution/apm/server/plugin.ts", "deprecated": false, "trackAdoption": false, "isRequired": true @@ -393,10 +381,8 @@ "tags": [], "label": "stop", "description": [], - "signature": [ - "() => void" - ], - "path": "x-pack/plugins/apm/server/plugin.ts", + "signature": ["() => void"], + "path": "x-pack/plugins/observability_solution/apm/server/plugin.ts", "deprecated": false, "trackAdoption": false, "children": [], @@ -420,7 +406,7 @@ "signature": [ "\"POST /internal/apm/data_view/static\" | \"GET /internal/apm/data_view/index_pattern\" | \"GET /internal/apm/environments\" | \"GET /internal/apm/services/{serviceName}/errors/groups/main_statistics\" | \"GET /internal/apm/services/{serviceName}/errors/groups/main_statistics_by_transaction_name\" | \"POST /internal/apm/services/{serviceName}/errors/groups/detailed_statistics\" | \"GET /internal/apm/services/{serviceName}/errors/{groupId}/samples\" | \"GET /internal/apm/services/{serviceName}/errors/{groupId}/error/{errorId}\" | \"GET /internal/apm/services/{serviceName}/errors/distribution\" | \"GET /internal/apm/services/{serviceName}/errors/{groupId}/top_erroneous_transactions\" | \"POST /internal/apm/latency/overall_distribution/transactions\" | \"GET /internal/apm/services/{serviceName}/metrics/charts\" | \"GET /internal/apm/services/{serviceName}/metrics/nodes\" | \"GET /internal/apm/services/{serviceName}/metrics/serverless/charts\" | \"GET /internal/apm/services/{serviceName}/metrics/serverless/summary\" | \"GET /internal/apm/services/{serviceName}/metrics/serverless/functions_overview\" | \"GET /internal/apm/services/{serviceName}/metrics/serverless/active_instances\" | \"GET /internal/apm/observability_overview\" | \"GET /internal/apm/observability_overview/has_data\" | \"GET /internal/apm/service-map\" | \"GET /internal/apm/service-map/service/{serviceName}\" | \"GET /internal/apm/service-map/dependency\" | \"GET /internal/apm/services\" | \"POST /internal/apm/services/detailed_statistics\" | \"GET /internal/apm/services/{serviceName}/metadata/details\" | \"GET /internal/apm/services/{serviceName}/metadata/icons\" | \"GET /internal/apm/services/{serviceName}/agent\" | \"GET /internal/apm/services/{serviceName}/transaction_types\" | \"GET /internal/apm/services/{serviceName}/node/{serviceNodeName}/metadata\" | \"GET /api/apm/services/{serviceName}/annotation/search 2023-10-31\" | \"POST /api/apm/services/{serviceName}/annotation 2023-10-31\" | \"GET /internal/apm/services/{serviceName}/service_overview_instances/details/{serviceNodeName}\" | \"GET /internal/apm/services/{serviceName}/throughput\" | \"GET /internal/apm/services/{serviceName}/service_overview_instances/main_statistics\" | \"GET /internal/apm/services/{serviceName}/service_overview_instances/detailed_statistics\" | \"GET /internal/apm/services/{serviceName}/dependencies\" | \"GET /internal/apm/services/{serviceName}/dependencies/breakdown\" | \"GET /internal/apm/services/{serviceName}/anomaly_charts\" | \"GET /internal/apm/services/{serviceName}/alerts_count\" | \"GET /internal/apm/service-groups\" | \"GET /internal/apm/service-group\" | \"POST /internal/apm/service-group\" | \"DELETE /internal/apm/service-group\" | \"GET /internal/apm/service-group/services\" | \"GET /internal/apm/service-group/counts\" | \"GET /internal/apm/suggestions\" | \"GET /internal/apm/traces/{traceId}\" | \"GET /internal/apm/traces\" | \"GET /internal/apm/traces/{traceId}/root_transaction\" | \"GET /internal/apm/transactions/{transactionId}\" | \"GET /internal/apm/traces/find\" | \"POST /internal/apm/traces/aggregated_critical_path\" | \"GET /internal/apm/traces/{traceId}/transactions/{transactionId}\" | \"GET /internal/apm/traces/{traceId}/spans/{spanId}\" | \"GET /internal/apm/services/{serviceName}/transactions/groups/main_statistics\" | \"GET /internal/apm/services/{serviceName}/transactions/groups/detailed_statistics\" | \"GET /internal/apm/services/{serviceName}/transactions/charts/latency\" | \"GET /internal/apm/services/{serviceName}/transactions/traces/samples\" | \"GET /internal/apm/services/{serviceName}/transaction/charts/breakdown\" | \"GET /internal/apm/services/{serviceName}/transactions/charts/error_rate\" | \"GET /internal/apm/services/{serviceName}/transactions/charts/coldstart_rate\" | \"GET /internal/apm/services/{serviceName}/transactions/charts/coldstart_rate_by_transaction_name\" | \"GET /internal/apm/rule_types/transaction_error_rate/chart_preview\" | \"GET /internal/apm/rule_types/error_count/chart_preview\" | \"GET /internal/apm/rule_types/transaction_duration/chart_preview\" | \"GET /api/apm/settings/agent-configuration 2023-10-31\" | \"GET /api/apm/settings/agent-configuration/view 2023-10-31\" | \"DELETE /api/apm/settings/agent-configuration 2023-10-31\" | \"PUT /api/apm/settings/agent-configuration 2023-10-31\" | \"POST /api/apm/settings/agent-configuration/search 2023-10-31\" | \"GET /api/apm/settings/agent-configuration/environments 2023-10-31\" | \"GET /api/apm/settings/agent-configuration/agent_name 2023-10-31\" | \"GET /internal/apm/settings/anomaly-detection/jobs\" | \"POST /internal/apm/settings/anomaly-detection/jobs\" | \"GET /internal/apm/settings/anomaly-detection/environments\" | \"POST /internal/apm/settings/anomaly-detection/update_to_v3\" | \"GET /internal/apm/settings/apm-index-settings\" | \"GET /internal/apm/settings/apm-indices\" | \"POST /internal/apm/settings/apm-indices/save\" | \"GET /internal/apm/settings/custom_links/transaction\" | \"GET /internal/apm/settings/custom_links\" | \"POST /internal/apm/settings/custom_links\" | \"PUT /internal/apm/settings/custom_links/{id}\" | \"DELETE /internal/apm/settings/custom_links/{id}\" | \"GET /api/apm/sourcemaps 2023-10-31\" | \"POST /api/apm/sourcemaps 2023-10-31\" | \"DELETE /api/apm/sourcemaps/{id} 2023-10-31\" | \"POST /internal/apm/sourcemaps/migrate_fleet_artifacts\" | \"GET /internal/apm/fleet/has_apm_policies\" | \"GET /internal/apm/fleet/agents\" | \"POST /api/apm/fleet/apm_server_schema 2023-10-31\" | \"GET /internal/apm/fleet/apm_server_schema/unsupported\" | \"GET /internal/apm/fleet/migration_check\" | \"POST /internal/apm/fleet/cloud_apm_package_policy\" | \"GET /internal/apm/fleet/java_agent_versions\" | \"GET /internal/apm/dependencies/top_dependencies\" | \"GET /internal/apm/dependencies/upstream_services\" | \"GET /internal/apm/dependencies/metadata\" | \"GET /internal/apm/dependencies/charts/latency\" | \"GET /internal/apm/dependencies/charts/throughput\" | \"GET /internal/apm/dependencies/charts/error_rate\" | \"GET /internal/apm/dependencies/operations\" | \"GET /internal/apm/dependencies/charts/distribution\" | \"GET /internal/apm/dependencies/operations/spans\" | \"GET /internal/apm/correlations/field_candidates/transactions\" | \"GET /internal/apm/correlations/field_value_stats/transactions\" | \"POST /internal/apm/correlations/field_value_pairs/transactions\" | \"POST /internal/apm/correlations/significant_correlations/transactions\" | \"POST /internal/apm/correlations/p_values/transactions\" | \"GET /internal/apm/fallback_to_transactions\" | \"GET /internal/apm/has_data\" | \"GET /internal/apm/event_metadata/{processorEvent}/{id}\" | \"GET /internal/apm/agent_keys\" | \"GET /internal/apm/agent_keys/privileges\" | \"POST /internal/apm/api_key/invalidate\" | \"POST /api/apm/agent_keys 2023-10-31\" | \"GET /internal/apm/storage_explorer\" | \"GET /internal/apm/services/{serviceName}/storage_details\" | \"GET /internal/apm/storage_chart\" | \"GET /internal/apm/storage_explorer/privileges\" | \"GET /internal/apm/storage_explorer_summary_stats\" | \"GET /internal/apm/storage_explorer/is_cross_cluster_search\" | \"GET /internal/apm/storage_explorer/get_services\" | \"GET /internal/apm/traces/{traceId}/span_links/{spanId}/parents\" | \"GET /internal/apm/traces/{traceId}/span_links/{spanId}/children\" | \"GET /internal/apm/services/{serviceName}/infrastructure_attributes\" | \"GET /internal/apm/debug-telemetry\" | \"GET /internal/apm/time_range_metadata\" | \"GET /internal/apm/settings/labs\" | \"GET /internal/apm/get_agents_per_service\" | \"GET /internal/apm/get_latest_agent_versions\" | \"GET /internal/apm/services/{serviceName}/agent_instances\" | \"GET /internal/apm/mobile-services/{serviceName}/error/http_error_rate\" | \"GET /internal/apm/mobile-services/{serviceName}/errors/groups/main_statistics\" | \"POST /internal/apm/mobile-services/{serviceName}/errors/groups/detailed_statistics\" | \"GET /internal/apm/mobile-services/{serviceName}/error_terms\" | \"POST /internal/apm/mobile-services/{serviceName}/crashes/groups/detailed_statistics\" | \"GET /internal/apm/mobile-services/{serviceName}/crashes/groups/main_statistics\" | \"GET /internal/apm/mobile-services/{serviceName}/crashes/distribution\" | \"GET /internal/apm/services/{serviceName}/mobile/filters\" | \"GET /internal/apm/mobile-services/{serviceName}/most_used_charts\" | \"GET /internal/apm/mobile-services/{serviceName}/transactions/charts/sessions\" | \"GET /internal/apm/mobile-services/{serviceName}/transactions/charts/http_requests\" | \"GET /internal/apm/mobile-services/{serviceName}/stats\" | \"GET /internal/apm/mobile-services/{serviceName}/location/stats\" | \"GET /internal/apm/mobile-services/{serviceName}/terms\" | \"GET /internal/apm/mobile-services/{serviceName}/main_statistics\" | \"GET /internal/apm/mobile-services/{serviceName}/detailed_statistics\" | \"GET /internal/apm/diagnostics\" | \"POST /internal/apm/assistant/get_apm_timeseries\" | \"GET /internal/apm/assistant/get_service_summary\" | \"POST /internal/apm/assistant/get_correlation_values\" | \"GET /internal/apm/assistant/get_downstream_dependencies\" | \"GET /internal/apm/services/{serviceName}/profiling/flamegraph\" | \"GET /internal/apm/profiling/status\" | \"GET /internal/apm/services/{serviceName}/profiling/functions\" | \"GET /internal/apm/services/{serviceName}/transactions/flamegraph\" | \"GET /internal/apm/services/{serviceName}/transactions/functions\" | \"POST /internal/apm/custom-dashboard\" | \"DELETE /internal/apm/custom-dashboard\" | \"GET /internal/apm/services/{serviceName}/dashboards\"" ], - "path": "x-pack/plugins/apm/server/routes/apm_routes/get_global_apm_server_route_repository.ts", + "path": "x-pack/plugins/observability_solution/apm/server/routes/apm_routes/get_global_apm_server_route_repository.ts", "deprecated": false, "trackAdoption": false, "initialIsOpen": false @@ -432,10 +418,8 @@ "tags": [], "label": "APM_SERVER_FEATURE_ID", "description": [], - "signature": [ - "\"apm\"" - ], - "path": "x-pack/plugins/apm/common/rules/apm_rule_types.ts", + "signature": ["\"apm\""], + "path": "x-pack/plugins/observability_solution/apm/common/rules/apm_rule_types.ts", "deprecated": false, "trackAdoption": false, "initialIsOpen": false @@ -452,7 +436,7 @@ "SearchAggregatedTransactionSetting", "; readonly telemetryCollectionEnabled: boolean; readonly metricsInterval: number; readonly agent: Readonly<{} & { migrations: Readonly<{} & { enabled: boolean; }>; }>; readonly forceSyntheticSource: boolean; readonly latestAgentVersionsUrl: string; readonly serverless: Readonly<{} & { enabled: true; }>; readonly serverlessOnboarding: boolean; readonly managedServiceUrl: string; readonly featureFlags: Readonly<{} & { agentConfigurationAvailable: boolean; configurableIndicesAvailable: boolean; infrastructureTabAvailable: boolean; infraUiAvailable: boolean; migrationToFleetAvailable: boolean; sourcemapApiAvailable: boolean; storageExplorerAvailable: boolean; profilingIntegrationAvailable: boolean; }>; }" ], - "path": "x-pack/plugins/apm/server/index.ts", + "path": "x-pack/plugins/observability_solution/apm/server/index.ts", "deprecated": false, "trackAdoption": false, "initialIsOpen": false @@ -7965,7 +7949,7 @@ "APMRouteCreateOptions", "; }" ], - "path": "x-pack/plugins/apm/server/routes/apm_routes/get_global_apm_server_route_repository.ts", + "path": "x-pack/plugins/observability_solution/apm/server/routes/apm_routes/get_global_apm_server_route_repository.ts", "deprecated": false, "trackAdoption": false, "initialIsOpen": false @@ -7979,7 +7963,7 @@ "tags": [], "label": "APMPluginSetup", "description": [], - "path": "x-pack/plugins/apm/server/types.ts", + "path": "x-pack/plugins/observability_solution/apm/server/types.ts", "deprecated": false, "trackAdoption": false, "children": [ @@ -7996,7 +7980,7 @@ "SearchAggregatedTransactionSetting", "; telemetryCollectionEnabled: boolean; metricsInterval: number; agent: Readonly<{} & { migrations: Readonly<{} & { enabled: boolean; }>; }>; forceSyntheticSource: boolean; latestAgentVersionsUrl: string; serverless: Readonly<{} & { enabled: true; }>; serverlessOnboarding: boolean; managedServiceUrl: string; featureFlags: Readonly<{} & { agentConfigurationAvailable: boolean; configurableIndicesAvailable: boolean; infrastructureTabAvailable: boolean; infraUiAvailable: boolean; migrationToFleetAvailable: boolean; sourcemapApiAvailable: boolean; storageExplorerAvailable: boolean; profilingIntegrationAvailable: boolean; }>; }>>" ], - "path": "x-pack/plugins/apm/server/types.ts", + "path": "x-pack/plugins/observability_solution/apm/server/types.ts", "deprecated": false, "trackAdoption": false } @@ -8022,7 +8006,7 @@ "CriticalPathTreeNode", "[]; maxDepth: number; numNodes: number; }" ], - "path": "x-pack/plugins/apm/common/critical_path/get_aggregated_critical_path_root_nodes.ts", + "path": "x-pack/plugins/observability_solution/apm/common/critical_path/get_aggregated_critical_path_root_nodes.ts", "deprecated": false, "trackAdoption": false, "children": [ @@ -8033,7 +8017,7 @@ "tags": [], "label": "params", "description": [], - "path": "x-pack/plugins/apm/common/critical_path/get_aggregated_critical_path_root_nodes.ts", + "path": "x-pack/plugins/observability_solution/apm/common/critical_path/get_aggregated_critical_path_root_nodes.ts", "deprecated": false, "trackAdoption": false, "children": [ @@ -8044,10 +8028,8 @@ "tags": [], "label": "criticalPath", "description": [], - "signature": [ - "CriticalPathResponse" - ], - "path": "x-pack/plugins/apm/common/critical_path/get_aggregated_critical_path_root_nodes.ts", + "signature": ["CriticalPathResponse"], + "path": "x-pack/plugins/observability_solution/apm/common/critical_path/get_aggregated_critical_path_root_nodes.ts", "deprecated": false, "trackAdoption": false } @@ -8063,4 +8045,4 @@ "misc": [], "objects": [] } -} \ No newline at end of file +} diff --git a/api_docs/apm_data_access.devdocs.json b/api_docs/apm_data_access.devdocs.json index e9cf99fb8e272..b07a37aad06af 100644 --- a/api_docs/apm_data_access.devdocs.json +++ b/api_docs/apm_data_access.devdocs.json @@ -24,7 +24,7 @@ "signature": [ "{ readonly indices: Readonly<{} & { error: string; transaction: string; span: string; metric: string; onboarding: string; sourcemap: string; }>; }" ], - "path": "x-pack/plugins/apm_data_access/server/index.ts", + "path": "x-pack/plugins/observability_solution/apm_data_access/server/index.ts", "deprecated": false, "trackAdoption": false, "initialIsOpen": false @@ -39,7 +39,7 @@ "signature": [ "{ readonly error: string; readonly transaction: string; readonly span: string; readonly metric: string; readonly onboarding: string; readonly sourcemap: string; }" ], - "path": "x-pack/plugins/apm_data_access/server/index.ts", + "path": "x-pack/plugins/observability_solution/apm_data_access/server/index.ts", "deprecated": false, "trackAdoption": false, "initialIsOpen": false @@ -53,7 +53,7 @@ "tags": [], "label": "ApmDataAccessPluginSetup", "description": [], - "path": "x-pack/plugins/apm_data_access/server/types.ts", + "path": "x-pack/plugins/observability_solution/apm_data_access/server/types.ts", "deprecated": false, "trackAdoption": false, "children": [ @@ -67,7 +67,7 @@ "signature": [ "{ readonly error: string; readonly transaction: string; readonly span: string; readonly metric: string; readonly onboarding: string; readonly sourcemap: string; }" ], - "path": "x-pack/plugins/apm_data_access/server/types.ts", + "path": "x-pack/plugins/observability_solution/apm_data_access/server/types.ts", "deprecated": false, "trackAdoption": false }, @@ -89,7 +89,7 @@ }, ") => Promise>" ], - "path": "x-pack/plugins/apm_data_access/server/types.ts", + "path": "x-pack/plugins/observability_solution/apm_data_access/server/types.ts", "deprecated": false, "trackAdoption": false, "children": [ @@ -109,7 +109,7 @@ "text": "SavedObjectsClientContract" } ], - "path": "x-pack/plugins/apm_data_access/server/types.ts", + "path": "x-pack/plugins/observability_solution/apm_data_access/server/types.ts", "deprecated": false, "trackAdoption": false, "isRequired": true @@ -128,7 +128,7 @@ "tags": [], "label": "ApmDataAccessPluginStart", "description": [], - "path": "x-pack/plugins/apm_data_access/server/types.ts", + "path": "x-pack/plugins/observability_solution/apm_data_access/server/types.ts", "deprecated": false, "trackAdoption": false, "children": [], @@ -149,10 +149,8 @@ "tags": [], "label": "PLUGIN_ID", "description": [], - "signature": [ - "\"apmDataAccess\"" - ], - "path": "x-pack/plugins/apm_data_access/common/index.ts", + "signature": ["\"apmDataAccess\""], + "path": "x-pack/plugins/observability_solution/apm_data_access/common/index.ts", "deprecated": false, "trackAdoption": false, "initialIsOpen": false @@ -164,10 +162,8 @@ "tags": [], "label": "PLUGIN_NAME", "description": [], - "signature": [ - "\"apmDataAccess\"" - ], - "path": "x-pack/plugins/apm_data_access/common/index.ts", + "signature": ["\"apmDataAccess\""], + "path": "x-pack/plugins/observability_solution/apm_data_access/common/index.ts", "deprecated": false, "trackAdoption": false, "initialIsOpen": false @@ -175,4 +171,4 @@ ], "objects": [] } -} \ No newline at end of file +} diff --git a/api_docs/deprecations_by_plugin.mdx b/api_docs/deprecations_by_plugin.mdx index ec9b18f7b3588..52dcace641063 100644 --- a/api_docs/deprecations_by_plugin.mdx +++ b/api_docs/deprecations_by_plugin.mdx @@ -426,12 +426,12 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana'] | Deprecated API | Reference location(s) | Remove By | | ---------------|-----------|-----------| -| | [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/public/plugin.ts#:~:text=environment) | 8.8.0 | -| | [index.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/public/application/index.tsx#:~:text=KibanaThemeProvider), [index.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/public/application/index.tsx#:~:text=KibanaThemeProvider), [index.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/public/application/index.tsx#:~:text=KibanaThemeProvider) | - | -| | [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/common/license_check.test.ts#:~:text=mode)+ 2 more | 8.8.0 | -| | [license_context.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/public/context/license/license_context.tsx#:~:text=license%24) | 8.8.0 | -| | [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/common/license_check.test.ts#:~:text=mode)+ 2 more | 8.8.0 | -| | [apm_service_groups.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/server/saved_objects/apm_service_groups.ts#:~:text=migrations) | - | +| | [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/public/plugin.ts#:~:text=environment) | 8.8.0 | +| | [index.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/public/application/index.tsx#:~:text=KibanaThemeProvider), [index.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/public/application/index.tsx#:~:text=KibanaThemeProvider), [index.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/public/application/index.tsx#:~:text=KibanaThemeProvider) | - | +| | [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/common/license_check.test.ts#:~:text=mode)+ 2 more | 8.8.0 | +| | [license_context.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/public/context/license/license_context.tsx#:~:text=license%24) | 8.8.0 | +| | [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/common/license_check.test.ts#:~:text=mode)+ 2 more | 8.8.0 | +| | [apm_service_groups.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/server/saved_objects/apm_service_groups.ts#:~:text=migrations) | - | @@ -439,7 +439,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana'] | Deprecated API | Reference location(s) | Remove By | | ---------------|-----------|-----------| -| | [apm_indices.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm_data_access/server/saved_objects/apm_indices.ts#:~:text=migrations) | - | +| | [apm_indices.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm_data_access/server/saved_objects/apm_indices.ts#:~:text=migrations) | - | diff --git a/api_docs/deprecations_by_team.mdx b/api_docs/deprecations_by_team.mdx index 3d168da06ada3..beead4c3af185 100644 --- a/api_docs/deprecations_by_team.mdx +++ b/api_docs/deprecations_by_team.mdx @@ -11,65 +11,52 @@ date: 2024-02-23 tags: ['contributor', 'dev', 'apidocs', 'kibana'] --- - ## @elastic/appex-sharedux -| Plugin | Deprecated API | Reference location(s) | Remove By | -| --------|-------|-----------|-----------| -| kibanaOverview | | [application.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/kibana_overview/public/application.tsx#:~:text=appBasePath) | 8.8.0 | -| savedObjectsTaggingOss | | [api.ts](https://github.com/elastic/kibana/tree/main/src/plugins/saved_objects_tagging_oss/public/api.ts#:~:text=SavedObject), [types.ts](https://github.com/elastic/kibana/tree/main/src/plugins/saved_objects_tagging_oss/public/decorator/types.ts#:~:text=SavedObject), [types.ts](https://github.com/elastic/kibana/tree/main/src/plugins/saved_objects_tagging_oss/public/decorator/types.ts#:~:text=SavedObject), [api.ts](https://github.com/elastic/kibana/tree/main/src/plugins/saved_objects_tagging_oss/public/api.ts#:~:text=SavedObject), [api.ts](https://github.com/elastic/kibana/tree/main/src/plugins/saved_objects_tagging_oss/public/api.ts#:~:text=SavedObject) | 8.8.0 | - - +| Plugin | Deprecated API | Reference location(s) | Remove By | +| ---------------------- | ---------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------- | +| kibanaOverview | | [application.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/kibana_overview/public/application.tsx#:~:text=appBasePath) | 8.8.0 | +| savedObjectsTaggingOss | | [api.ts](https://github.com/elastic/kibana/tree/main/src/plugins/saved_objects_tagging_oss/public/api.ts#:~:text=SavedObject), [types.ts](https://github.com/elastic/kibana/tree/main/src/plugins/saved_objects_tagging_oss/public/decorator/types.ts#:~:text=SavedObject), [types.ts](https://github.com/elastic/kibana/tree/main/src/plugins/saved_objects_tagging_oss/public/decorator/types.ts#:~:text=SavedObject), [api.ts](https://github.com/elastic/kibana/tree/main/src/plugins/saved_objects_tagging_oss/public/api.ts#:~:text=SavedObject), [api.ts](https://github.com/elastic/kibana/tree/main/src/plugins/saved_objects_tagging_oss/public/api.ts#:~:text=SavedObject) | 8.8.0 | ## @elastic/fleet -| Plugin | Deprecated API | Reference location(s) | Remove By | -| --------|-------|-----------|-----------| -| fleet | | [agent_policy_config.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/fleet/common/services/agent_policy_config.test.ts#:~:text=mode), [agent_policy_config.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/fleet/common/services/agent_policy_config.test.ts#:~:text=mode), [agent_policy_watch.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/fleet/server/services/agent_policy_watch.test.ts#:~:text=mode), [agent_policy_watch.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/fleet/server/services/agent_policy_watch.test.ts#:~:text=mode), [agent_policy_watch.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/fleet/server/services/agent_policy_watch.test.ts#:~:text=mode) | 8.8.0 | -| fleet | | [agent_policy_config.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/fleet/common/services/agent_policy_config.test.ts#:~:text=mode), [agent_policy_config.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/fleet/common/services/agent_policy_config.test.ts#:~:text=mode), [agent_policy_watch.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/fleet/server/services/agent_policy_watch.test.ts#:~:text=mode), [agent_policy_watch.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/fleet/server/services/agent_policy_watch.test.ts#:~:text=mode), [agent_policy_watch.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/fleet/server/services/agent_policy_watch.test.ts#:~:text=mode) | 8.8.0 | -| fleet | | [index.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/fleet/public/applications/integrations/index.tsx#:~:text=appBasePath) | 8.8.0 | - - +| Plugin | Deprecated API | Reference location(s) | Remove By | +| ------ | ---------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | --------- | +| fleet | | [agent_policy_config.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/fleet/common/services/agent_policy_config.test.ts#:~:text=mode), [agent_policy_config.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/fleet/common/services/agent_policy_config.test.ts#:~:text=mode), [agent_policy_watch.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/fleet/server/services/agent_policy_watch.test.ts#:~:text=mode), [agent_policy_watch.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/fleet/server/services/agent_policy_watch.test.ts#:~:text=mode), [agent_policy_watch.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/fleet/server/services/agent_policy_watch.test.ts#:~:text=mode) | 8.8.0 | +| fleet | | [agent_policy_config.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/fleet/common/services/agent_policy_config.test.ts#:~:text=mode), [agent_policy_config.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/fleet/common/services/agent_policy_config.test.ts#:~:text=mode), [agent_policy_watch.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/fleet/server/services/agent_policy_watch.test.ts#:~:text=mode), [agent_policy_watch.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/fleet/server/services/agent_policy_watch.test.ts#:~:text=mode), [agent_policy_watch.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/fleet/server/services/agent_policy_watch.test.ts#:~:text=mode) | 8.8.0 | +| fleet | | [index.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/fleet/public/applications/integrations/index.tsx#:~:text=appBasePath) | 8.8.0 | ## @elastic/kibana-core -| Plugin | Deprecated API | Reference location(s) | Remove By | -| --------|-------|-----------|-----------| -| @kbn/core-application-browser-internal | | [app_container.tsx](https://github.com/elastic/kibana/tree/main/packages/core/application/core-application-browser-internal/src/ui/app_container.tsx#:~:text=appBasePath), [application_service.mock.ts](https://github.com/elastic/kibana/tree/main/packages/core/application/core-application-browser-mocks/src/application_service.mock.ts#:~:text=appBasePath), [mocks.ts](https://github.com/elastic/kibana/tree/main/src/core/public/mocks.ts#:~:text=appBasePath) | 8.8.0 | -| @kbn/core | | [index.ts](https://github.com/elastic/kibana/tree/main/src/core/server/index.ts#:~:text=AsyncPlugin), [plugin.ts](https://github.com/elastic/kibana/tree/main/packages/core/plugins/core-plugins-server-internal/src/plugin.ts#:~:text=AsyncPlugin), [plugin.ts](https://github.com/elastic/kibana/tree/main/packages/core/plugins/core-plugins-server-internal/src/plugin.ts#:~:text=AsyncPlugin) | 8.8.0 | - - +| Plugin | Deprecated API | Reference location(s) | Remove By | +| -------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | --------- | +| @kbn/core-application-browser-internal | | [app_container.tsx](https://github.com/elastic/kibana/tree/main/packages/core/application/core-application-browser-internal/src/ui/app_container.tsx#:~:text=appBasePath), [application_service.mock.ts](https://github.com/elastic/kibana/tree/main/packages/core/application/core-application-browser-mocks/src/application_service.mock.ts#:~:text=appBasePath), [mocks.ts](https://github.com/elastic/kibana/tree/main/src/core/public/mocks.ts#:~:text=appBasePath) | 8.8.0 | +| @kbn/core | | [index.ts](https://github.com/elastic/kibana/tree/main/src/core/server/index.ts#:~:text=AsyncPlugin), [plugin.ts](https://github.com/elastic/kibana/tree/main/packages/core/plugins/core-plugins-server-internal/src/plugin.ts#:~:text=AsyncPlugin), [plugin.ts](https://github.com/elastic/kibana/tree/main/packages/core/plugins/core-plugins-server-internal/src/plugin.ts#:~:text=AsyncPlugin) | 8.8.0 | ## @elastic/kibana-data-discovery -| Plugin | Deprecated API | Reference location(s) | Remove By | -| --------|-------|-----------|-----------| -| discover | | [on_save_search.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/discover/public/application/main/components/top_nav/on_save_search.tsx#:~:text=SavedObjectSaveModal), [on_save_search.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/discover/public/application/main/components/top_nav/on_save_search.tsx#:~:text=SavedObjectSaveModal) | 8.8.0 | - - +| Plugin | Deprecated API | Reference location(s) | Remove By | +| -------- | -------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------- | +| discover | | [on_save_search.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/discover/public/application/main/components/top_nav/on_save_search.tsx#:~:text=SavedObjectSaveModal), [on_save_search.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/discover/public/application/main/components/top_nav/on_save_search.tsx#:~:text=SavedObjectSaveModal) | 8.8.0 | ## @elastic/kibana-gis -| Plugin | Deprecated API | Reference location(s) | Remove By | -| --------|-------|-----------|-----------| -| mapsEms | | [plugin.ts](https://github.com/elastic/kibana/tree/main/src/plugins/maps_ems/server/plugin.ts#:~:text=license%24) | 8.8.0 | -| mapsEms | | [plugin.ts](https://github.com/elastic/kibana/tree/main/src/plugins/maps_ems/server/plugin.ts#:~:text=refresh) | 8.8.0 | - - +| Plugin | Deprecated API | Reference location(s) | Remove By | +| ------- | -------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------- | --------- | +| mapsEms | | [plugin.ts](https://github.com/elastic/kibana/tree/main/src/plugins/maps_ems/server/plugin.ts#:~:text=license%24) | 8.8.0 | +| mapsEms | | [plugin.ts](https://github.com/elastic/kibana/tree/main/src/plugins/maps_ems/server/plugin.ts#:~:text=refresh) | 8.8.0 | ## @elastic/kibana-presentation -| Plugin | Deprecated API | Reference location(s) | Remove By | -| --------|-------|-----------|-----------| -| dashboard | | [save_modal.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/dashboard_container/embeddable/api/overlays/save_modal.tsx#:~:text=SavedObjectSaveModal), [save_modal.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/dashboard_container/embeddable/api/overlays/save_modal.tsx#:~:text=SavedObjectSaveModal), [attribute_service.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/embeddable/public/lib/attribute_service/attribute_service.tsx#:~:text=SavedObjectSaveModal), [attribute_service.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/embeddable/public/lib/attribute_service/attribute_service.tsx#:~:text=SavedObjectSaveModal), [saved_object_save_modal_dashboard.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/presentation_util/public/components/saved_object_save_modal_dashboard.tsx#:~:text=SavedObjectSaveModal), [saved_object_save_modal_dashboard.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/presentation_util/public/components/saved_object_save_modal_dashboard.tsx#:~:text=SavedObjectSaveModal), [save_to_library.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/links/public/content_management/save_to_library.tsx#:~:text=SavedObjectSaveModal), [save_to_library.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/links/public/content_management/save_to_library.tsx#:~:text=SavedObjectSaveModal) | 8.8.0 | - - +| Plugin | Deprecated API | Reference location(s) | Remove By | +| --------- | -------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | --------- | +| dashboard | | [save_modal.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/dashboard_container/embeddable/api/overlays/save_modal.tsx#:~:text=SavedObjectSaveModal), [save_modal.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/dashboard_container/embeddable/api/overlays/save_modal.tsx#:~:text=SavedObjectSaveModal), [attribute_service.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/embeddable/public/lib/attribute_service/attribute_service.tsx#:~:text=SavedObjectSaveModal), [attribute_service.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/embeddable/public/lib/attribute_service/attribute_service.tsx#:~:text=SavedObjectSaveModal), [saved_object_save_modal_dashboard.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/presentation_util/public/components/saved_object_save_modal_dashboard.tsx#:~:text=SavedObjectSaveModal), [saved_object_save_modal_dashboard.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/presentation_util/public/components/saved_object_save_modal_dashboard.tsx#:~:text=SavedObjectSaveModal), [save_to_library.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/links/public/content_management/save_to_library.tsx#:~:text=SavedObjectSaveModal), [save_to_library.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/links/public/content_management/save_to_library.tsx#:~:text=SavedObjectSaveModal) | 8.8.0 | ## @elastic/kibana-security -| Plugin | Deprecated API | Reference location(s) | Remove By | -| --------|-------|-----------|-----------| -| security | | [disable_ui_capabilities.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security/server/authorization/disable_ui_capabilities.ts#:~:text=requiredRoles) | 8.8.0 +| Plugin | Deprecated API | Reference location(s) | Remove By | +| -------- | --------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------- | +| security | | [disable_ui_capabilities.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security/server/authorization/disable_ui_capabilities.ts#:~:text=requiredRoles) | 8.8.0 | This is relied on by the reporting feature, and should be removed once reporting migrates to using the Kibana Privilege model: https://github.com/elastic/kibana/issues/19914 | @@ -85,84 +72,66 @@ migrates to using the Kibana Privilege model: https://github.com/elastic/kibana/ | security | | [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security/server/plugin.ts#:~:text=license%24), [spaces_usage_collector.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/spaces/server/usage_collection/spaces_usage_collector.ts#:~:text=license%24), [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/spaces/server/plugin.ts#:~:text=license%24), [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/spaces/server/plugin.ts#:~:text=license%24), [spaces_usage_collector.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/spaces/server/usage_collection/spaces_usage_collector.test.ts#:~:text=license%24) | 8.8.0 | | security | | [logout_app.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security/public/authentication/logout/logout_app.test.ts#:~:text=appBasePath) | 8.8.0 | - - ## @elastic/kibana-visualizations -| Plugin | Deprecated API | Reference location(s) | Remove By | -| --------|-------|-----------|-----------| -| graph | | [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/graph/server/plugin.ts#:~:text=license%24) | 8.8.0 | -| graph | | [save_modal.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/graph/public/components/save_modal.tsx#:~:text=SavedObjectSaveModal), [save_modal.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/graph/public/components/save_modal.tsx#:~:text=SavedObjectSaveModal), [save_action.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/visualizations/xy/annotations/actions/save_action.tsx#:~:text=SavedObjectSaveModal), [save_action.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/visualizations/xy/annotations/actions/save_action.tsx#:~:text=SavedObjectSaveModal) | 8.8.0 | - - +| Plugin | Deprecated API | Reference location(s) | Remove By | +| ------ | -------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------- | +| graph | | [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/graph/server/plugin.ts#:~:text=license%24) | 8.8.0 | +| graph | | [save_modal.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/graph/public/components/save_modal.tsx#:~:text=SavedObjectSaveModal), [save_modal.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/graph/public/components/save_modal.tsx#:~:text=SavedObjectSaveModal), [save_action.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/visualizations/xy/annotations/actions/save_action.tsx#:~:text=SavedObjectSaveModal), [save_action.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/lens/public/visualizations/xy/annotations/actions/save_action.tsx#:~:text=SavedObjectSaveModal) | 8.8.0 | ## @elastic/logstash -| Plugin | Deprecated API | Reference location(s) | Remove By | -| --------|-------|-----------|-----------| -| logstash | | [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/logstash/public/plugin.ts#:~:text=license%24) | 8.8.0 | - - +| Plugin | Deprecated API | Reference location(s) | Remove By | +| -------- | -------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------- | --------- | +| logstash | | [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/logstash/public/plugin.ts#:~:text=license%24) | 8.8.0 | ## @elastic/ml-ui -| Plugin | Deprecated API | Reference location(s) | Remove By | -| --------|-------|-----------|-----------| -| ml | | [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/ml/public/plugin.ts#:~:text=license%24), [plugin.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/aiops/public/plugin.tsx#:~:text=license%24) | 8.8.0 | -| ml | | [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/ml/server/plugin.ts#:~:text=license%24), [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/aiops/server/plugin.ts#:~:text=license%24), [license.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/transform/server/services/license.ts#:~:text=license%24) | 8.8.0 | - - +| Plugin | Deprecated API | Reference location(s) | Remove By | +| ------ | -------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------- | +| ml | | [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/ml/public/plugin.ts#:~:text=license%24), [plugin.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/aiops/public/plugin.tsx#:~:text=license%24) | 8.8.0 | +| ml | | [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/ml/server/plugin.ts#:~:text=license%24), [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/aiops/server/plugin.ts#:~:text=license%24), [license.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/transform/server/services/license.ts#:~:text=license%24) | 8.8.0 | ## @elastic/obs-ux-infra_services-team -| Plugin | Deprecated API | Reference location(s) | Remove By | -| --------|-------|-----------|-----------| -| apm | | [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/public/plugin.ts#:~:text=environment) | 8.8.0 | -| apm | | [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/common/license_check.test.ts#:~:text=mode)+ 2 more | 8.8.0 | -| apm | | [license_context.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/public/context/license/license_context.tsx#:~:text=license%24), [license_context.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/profiling/public/components/contexts/license/license_context.tsx#:~:text=license%24) | 8.8.0 | -| apm | | [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/apm/common/license_check.test.ts#:~:text=mode)+ 2 more | 8.8.0 | - - +| Plugin | Deprecated API | Reference location(s) | Remove By | +| ------ | ---------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------- | +| apm | | [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/public/plugin.ts#:~:text=environment) | 8.8.0 | +| apm | | [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/common/license_check.test.ts#:~:text=mode)+ 2 more | 8.8.0 | +| apm | | [license_context.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/public/context/license/license_context.tsx#:~:text=license%24), [license_context.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/profiling/public/components/contexts/license/license_context.tsx#:~:text=license%24) | 8.8.0 | +| apm | | [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/common/license_check.test.ts#:~:text=mode), [license_check.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/apm/common/license_check.test.ts#:~:text=mode)+ 2 more | 8.8.0 | ## @elastic/obs-ux-management-team -| Plugin | Deprecated API | Reference location(s) | Remove By | -| --------|-------|-----------|-----------| -| observability | | [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability/public/plugin.ts#:~:text=license%24) | 8.8.0 | - - +| Plugin | Deprecated API | Reference location(s) | Remove By | +| ------------- | -------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------- | --------- | +| observability | | [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability/public/plugin.ts#:~:text=license%24) | 8.8.0 | ## @elastic/platform-deployment-management -| Plugin | Deprecated API | Reference location(s) | Remove By | -| --------|-------|-----------|-----------| -| management | | [application.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/management/public/application.tsx#:~:text=appBasePath) | 8.8.0 | -| licenseManagement | | [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/license_management/public/plugin.ts#:~:text=license%24), [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cross_cluster_replication/public/plugin.ts#:~:text=license%24), [plugin.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/painless_lab/public/plugin.tsx#:~:text=license%24), [plugin.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/painless_lab/public/plugin.tsx#:~:text=license%24), [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/searchprofiler/public/plugin.ts#:~:text=license%24), [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/searchprofiler/public/plugin.ts#:~:text=license%24), [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/watcher/public/plugin.ts#:~:text=license%24), [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/watcher/public/plugin.ts#:~:text=license%24) | 8.8.0 | -| indexLifecycleManagement | | [license.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/index_lifecycle_management/server/services/license.ts#:~:text=license%24), [license.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/painless_lab/server/services/license.ts#:~:text=license%24), [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/remote_clusters/server/plugin.ts#:~:text=license%24), [license.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/rollup/server/services/license.ts#:~:text=license%24), [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/searchprofiler/server/plugin.ts#:~:text=license%24), [license.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/snapshot_restore/server/services/license.ts#:~:text=license%24), [reindex_service.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.ts#:~:text=license%24), [reindex_service.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.test.ts#:~:text=license%24), [reindex_service.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.test.ts#:~:text=license%24) | 8.8.0 | - - +| Plugin | Deprecated API | Reference location(s) | Remove By | +| ------------------------ | ---------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------- | +| management | | [application.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/management/public/application.tsx#:~:text=appBasePath) | 8.8.0 | +| licenseManagement | | [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/license_management/public/plugin.ts#:~:text=license%24), [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/cross_cluster_replication/public/plugin.ts#:~:text=license%24), [plugin.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/painless_lab/public/plugin.tsx#:~:text=license%24), [plugin.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/painless_lab/public/plugin.tsx#:~:text=license%24), [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/searchprofiler/public/plugin.ts#:~:text=license%24), [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/searchprofiler/public/plugin.ts#:~:text=license%24), [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/watcher/public/plugin.ts#:~:text=license%24), [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/watcher/public/plugin.ts#:~:text=license%24) | 8.8.0 | +| indexLifecycleManagement | | [license.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/index_lifecycle_management/server/services/license.ts#:~:text=license%24), [license.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/painless_lab/server/services/license.ts#:~:text=license%24), [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/remote_clusters/server/plugin.ts#:~:text=license%24), [license.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/rollup/server/services/license.ts#:~:text=license%24), [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/searchprofiler/server/plugin.ts#:~:text=license%24), [license.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/snapshot_restore/server/services/license.ts#:~:text=license%24), [reindex_service.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.ts#:~:text=license%24), [reindex_service.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.test.ts#:~:text=license%24), [reindex_service.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/upgrade_assistant/server/lib/reindexing/reindex_service.test.ts#:~:text=license%24) | 8.8.0 | ## @elastic/response-ops -| Plugin | Deprecated API | Reference location(s) | Remove By | -| --------|-------|-----------|-----------| -| alerting | | [plugin.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/alerting/server/plugin.test.ts#:~:text=getKibanaFeatures) | 8.8.0 | -| alerting | | [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/alerting/server/plugin.ts#:~:text=license%24), [license_state.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/alerting/server/lib/license_state.test.ts#:~:text=license%24), [license_state.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/alerting/server/lib/license_state.test.ts#:~:text=license%24), [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/actions/server/plugin.ts#:~:text=license%24), [license_state.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/actions/server/lib/license_state.test.ts#:~:text=license%24), [license_state.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/actions/server/lib/license_state.test.ts#:~:text=license%24) | 8.8.0 | - - +| Plugin | Deprecated API | Reference location(s) | Remove By | +| -------- | ------------------------------------------------------------------------------------------------------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------- | +| alerting | | [plugin.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/alerting/server/plugin.test.ts#:~:text=getKibanaFeatures) | 8.8.0 | +| alerting | | [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/alerting/server/plugin.ts#:~:text=license%24), [license_state.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/alerting/server/lib/license_state.test.ts#:~:text=license%24), [license_state.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/alerting/server/lib/license_state.test.ts#:~:text=license%24), [plugin.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/actions/server/plugin.ts#:~:text=license%24), [license_state.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/actions/server/lib/license_state.test.ts#:~:text=license%24), [license_state.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/actions/server/lib/license_state.test.ts#:~:text=license%24) | 8.8.0 | ## @elastic/security-defend-workflows -| Plugin | Deprecated API | Reference location(s) | Remove By | -| --------|-------|-----------|-----------| -| osquery | | [create_action_service.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/osquery/server/handlers/action/create_action_service.ts#:~:text=license%24) | 8.8.0 | - - +| Plugin | Deprecated API | Reference location(s) | Remove By | +| ------- | -------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------- | +| osquery | | [create_action_service.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/osquery/server/handlers/action/create_action_service.ts#:~:text=license%24) | 8.8.0 | ## @elastic/security-solution -| Plugin | Deprecated API | Reference location(s) | Remove By | -| --------|-------|-----------|-----------| -| securitySolution | | [policy_config.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/common/license/policy_config.test.ts#:~:text=mode), [policy_config.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/common/license/policy_config.test.ts#:~:text=mode), [policy_config.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/common/license/policy_config.test.ts#:~:text=mode), [fleet_integration.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts#:~:text=mode), [fleet_integration.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts#:~:text=mode), [create_default_policy.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/fleet_integration/handlers/create_default_policy.test.ts#:~:text=mode), [create_default_policy.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/fleet_integration/handlers/create_default_policy.test.ts#:~:text=mode), [license_watch.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts#:~:text=mode), [license_watch.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts#:~:text=mode), [license_watch.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts#:~:text=mode)+ 7 more | 8.8.0 | -| securitySolution | | [policy_config.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/common/license/policy_config.test.ts#:~:text=mode), [policy_config.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/common/license/policy_config.test.ts#:~:text=mode), [policy_config.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/common/license/policy_config.test.ts#:~:text=mode), [fleet_integration.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts#:~:text=mode), [fleet_integration.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts#:~:text=mode), [create_default_policy.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/fleet_integration/handlers/create_default_policy.test.ts#:~:text=mode), [create_default_policy.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/fleet_integration/handlers/create_default_policy.test.ts#:~:text=mode), [license_watch.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts#:~:text=mode), [license_watch.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts#:~:text=mode), [license_watch.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts#:~:text=mode)+ 7 more | 8.8.0 | -| securitySolution | | [create_threat_signals.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/indicator_match/threat_mapping/create_threat_signals.ts#:~:text=license%24), [query.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/query/query.ts#:~:text=license%24), [threshold.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/threshold/threshold.ts#:~:text=license%24) | 8.8.0 | \ No newline at end of file +| Plugin | Deprecated API | Reference location(s) | Remove By | +| ---------------- | -------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------- | +| securitySolution | | [policy_config.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/common/license/policy_config.test.ts#:~:text=mode), [policy_config.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/common/license/policy_config.test.ts#:~:text=mode), [policy_config.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/common/license/policy_config.test.ts#:~:text=mode), [fleet_integration.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts#:~:text=mode), [fleet_integration.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts#:~:text=mode), [create_default_policy.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/fleet_integration/handlers/create_default_policy.test.ts#:~:text=mode), [create_default_policy.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/fleet_integration/handlers/create_default_policy.test.ts#:~:text=mode), [license_watch.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts#:~:text=mode), [license_watch.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts#:~:text=mode), [license_watch.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts#:~:text=mode)+ 7 more | 8.8.0 | +| securitySolution | | [policy_config.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/common/license/policy_config.test.ts#:~:text=mode), [policy_config.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/common/license/policy_config.test.ts#:~:text=mode), [policy_config.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/common/license/policy_config.test.ts#:~:text=mode), [fleet_integration.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts#:~:text=mode), [fleet_integration.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts#:~:text=mode), [create_default_policy.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/fleet_integration/handlers/create_default_policy.test.ts#:~:text=mode), [create_default_policy.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/fleet_integration/handlers/create_default_policy.test.ts#:~:text=mode), [license_watch.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts#:~:text=mode), [license_watch.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts#:~:text=mode), [license_watch.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts#:~:text=mode)+ 7 more | 8.8.0 | +| securitySolution | | [create_threat_signals.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/indicator_match/threat_mapping/create_threat_signals.ts#:~:text=license%24), [query.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/query/query.ts#:~:text=license%24), [threshold.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/threshold/threshold.ts#:~:text=license%24) | 8.8.0 | diff --git a/api_docs/home.devdocs.json b/api_docs/home.devdocs.json index ebc453f366895..3d4a11f7cfb43 100644 --- a/api_docs/home.devdocs.json +++ b/api_docs/home.devdocs.json @@ -107,9 +107,7 @@ "parentPluginId": "home", "id": "def-public.FeatureCatalogueRegistry.get", "type": "Function", - "tags": [ - "deprecated" - ], + "tags": ["deprecated"], "label": "get", "description": [], "signature": [ @@ -219,9 +217,7 @@ "tags": [], "label": "removeFeature", "description": [], - "signature": [ - "(appId: string) => void" - ], + "signature": ["(appId: string) => void"], "path": "src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.ts", "deprecated": false, "trackAdoption": false, @@ -233,9 +229,7 @@ "tags": [], "label": "appId", "description": [], - "signature": [ - "string" - ], + "signature": ["string"], "path": "src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.ts", "deprecated": false, "trackAdoption": false, @@ -253,14 +247,9 @@ "parentPluginId": "home", "id": "def-public.getDisplayText", "type": "Function", - "tags": [ - "params", - "return" - ], + "tags": ["params", "return"], "label": "getDisplayText", - "description": [ - "\nConvert instruction variant id into display text.\n" - ], + "description": ["\nConvert instruction variant id into display text.\n"], "signature": [ "(id: \"ESC\" | \"OSX\" | \"DEB\" | \"RPM\" | \"DOCKER\" | \"WINDOWS\" | \"NODE\" | \"DJANGO\" | \"FLASK\" | \"RAILS\" | \"RACK\" | \"JS\" | \"GO\" | \"JAVA\" | \"DOTNET\" | \"LINUX\" | \"PHP\" | \"FLEET\" | \"OPEN_TELEMETRY\" | \"OTHER_LINUX\") => string" ], @@ -284,9 +273,7 @@ "isRequired": true } ], - "returnComment": [ - "display name" - ], + "returnComment": ["display name"], "initialIsOpen": false } ], @@ -331,9 +318,7 @@ "tags": [], "label": "component", "description": [], - "signature": [ - "React.FunctionComponent<{}>" - ], + "signature": ["React.FunctionComponent<{}>"], "path": "src/plugins/home/public/services/add_data/add_data_service.ts", "deprecated": false, "trackAdoption": false, @@ -346,9 +331,7 @@ "tags": [], "label": "props", "description": [], - "signature": [ - "P & { children?: React.ReactNode; }" - ], + "signature": ["P & { children?: React.ReactNode; }"], "path": "node_modules/@types/react/index.d.ts", "deprecated": false, "trackAdoption": false @@ -360,9 +343,7 @@ "tags": [], "label": "context", "description": [], - "signature": [ - "any" - ], + "signature": ["any"], "path": "node_modules/@types/react/index.d.ts", "deprecated": false, "trackAdoption": false @@ -389,9 +370,7 @@ "type": "boolean", "tags": [], "label": "cloud", - "description": [ - "\nFlag whether the home app should advertise cloud features" - ], + "description": ["\nFlag whether the home app should advertise cloud features"], "path": "src/plugins/home/public/services/environment/environment.ts", "deprecated": false, "trackAdoption": false @@ -402,9 +381,7 @@ "type": "boolean", "tags": [], "label": "apmUi", - "description": [ - "\nFlag whether the home app should advertise apm features" - ], + "description": ["\nFlag whether the home app should advertise apm features"], "path": "src/plugins/home/public/services/environment/environment.ts", "deprecated": false, "trackAdoption": false @@ -415,9 +392,7 @@ "type": "boolean", "tags": [], "label": "ml", - "description": [ - "\nFlag whether the home app should advertise ml features" - ], + "description": ["\nFlag whether the home app should advertise ml features"], "path": "src/plugins/home/public/services/environment/environment.ts", "deprecated": false, "trackAdoption": false @@ -442,9 +417,7 @@ "type": "string", "tags": [], "label": "id", - "description": [ - "Unique string identifier for this feature." - ], + "description": ["Unique string identifier for this feature."], "path": "src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.ts", "deprecated": false, "trackAdoption": false @@ -455,9 +428,7 @@ "type": "string", "tags": [], "label": "title", - "description": [ - "Title of feature displayed to the user." - ], + "description": ["Title of feature displayed to the user."], "path": "src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.ts", "deprecated": false, "trackAdoption": false @@ -468,12 +439,8 @@ "type": "CompoundType", "tags": [], "label": "category", - "description": [ - "{@link FeatureCatalogueCategory} to display this feature in." - ], - "signature": [ - "\"data\" | \"other\" | \"admin\"" - ], + "description": ["{@link FeatureCatalogueCategory} to display this feature in."], + "signature": ["\"data\" | \"other\" | \"admin\""], "path": "src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.ts", "deprecated": false, "trackAdoption": false @@ -484,12 +451,8 @@ "type": "string", "tags": [], "label": "subtitle", - "description": [ - "A tagline of feature displayed to the user." - ], - "signature": [ - "string | undefined" - ], + "description": ["A tagline of feature displayed to the user."], + "signature": ["string | undefined"], "path": "src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.ts", "deprecated": false, "trackAdoption": false @@ -500,9 +463,7 @@ "type": "string", "tags": [], "label": "description", - "description": [ - "One-line description of feature displayed to the user." - ], + "description": ["One-line description of feature displayed to the user."], "path": "src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.ts", "deprecated": false, "trackAdoption": false @@ -516,9 +477,7 @@ "description": [ "EUI `IconType` for icon to be displayed to the user. EUI supports any known EUI icon, SVG URL, or ReactElement." ], - "signature": [ - "string | React.ComponentType<{}>" - ], + "signature": ["string | React.ComponentType<{}>"], "path": "src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.ts", "deprecated": false, "trackAdoption": false @@ -529,9 +488,7 @@ "type": "string", "tags": [], "label": "path", - "description": [ - "URL path to link to this future. Should not include the basePath." - ], + "description": ["URL path to link to this future. Should not include the basePath."], "path": "src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.ts", "deprecated": false, "trackAdoption": false @@ -558,9 +515,7 @@ "description": [ "An ordinal used to sort features relative to one another for display on the home page" ], - "signature": [ - "number | undefined" - ], + "signature": ["number | undefined"], "path": "src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.ts", "deprecated": false, "trackAdoption": false @@ -571,12 +526,8 @@ "type": "Function", "tags": [], "label": "visible", - "description": [ - "Optional function to control visibility of this feature." - ], - "signature": [ - "(() => boolean) | undefined" - ], + "description": ["Optional function to control visibility of this feature."], + "signature": ["(() => boolean) | undefined"], "path": "src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.ts", "deprecated": false, "trackAdoption": false, @@ -589,12 +540,8 @@ "type": "string", "tags": [], "label": "solutionId", - "description": [ - "Unique string identifier of the solution this feature belongs to" - ], - "signature": [ - "string | undefined" - ], + "description": ["Unique string identifier of the solution this feature belongs to"], + "signature": ["string | undefined"], "path": "src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.ts", "deprecated": false, "trackAdoption": false @@ -619,9 +566,7 @@ "type": "string", "tags": [], "label": "id", - "description": [ - "Unique string identifier for this solution." - ], + "description": ["Unique string identifier for this solution."], "path": "src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.ts", "deprecated": false, "trackAdoption": false @@ -632,9 +577,7 @@ "type": "string", "tags": [], "label": "title", - "description": [ - "Title of solution displayed to the user." - ], + "description": ["Title of solution displayed to the user."], "path": "src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.ts", "deprecated": false, "trackAdoption": false @@ -645,9 +588,7 @@ "type": "string", "tags": [], "label": "description", - "description": [ - "One-line description of the solution displayed to the user." - ], + "description": ["One-line description of the solution displayed to the user."], "path": "src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.ts", "deprecated": false, "trackAdoption": false @@ -661,9 +602,7 @@ "description": [ "EUI `IconType` for icon to be displayed to the user. EUI supports any known EUI icon, SVG URL, or ReactElement." ], - "signature": [ - "string | React.ComponentType<{}>" - ], + "signature": ["string | React.ComponentType<{}>"], "path": "src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.ts", "deprecated": false, "trackAdoption": false @@ -674,9 +613,7 @@ "type": "string", "tags": [], "label": "path", - "description": [ - "URL path to link to this future. Should not include the basePath." - ], + "description": ["URL path to link to this future. Should not include the basePath."], "path": "src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.ts", "deprecated": false, "trackAdoption": false @@ -700,9 +637,7 @@ "type": "Function", "tags": [], "label": "isVisible", - "description": [ - "Optional function to control visibility of this solution." - ], + "description": ["Optional function to control visibility of this solution."], "signature": [ "((capabilities: ", { @@ -765,9 +700,7 @@ "description": [ "\nRegister listeners to be called when the Welcome component is mounted.\nIt can be called multiple times to register multiple listeners." ], - "signature": [ - "(onRendered: () => void) => void" - ], + "signature": ["(onRendered: () => void) => void"], "path": "src/plugins/home/public/services/welcome/welcome_service.ts", "deprecated": false, "trackAdoption": false, @@ -779,9 +712,7 @@ "tags": [], "label": "onRendered", "description": [], - "signature": [ - "() => void" - ], + "signature": ["() => void"], "path": "src/plugins/home/public/services/welcome/welcome_service.ts", "deprecated": false, "trackAdoption": false, @@ -874,9 +805,7 @@ "tags": [], "label": "FeatureCatalogueCategory", "description": [], - "signature": [ - "\"data\" | \"other\" | \"admin\"" - ], + "signature": ["\"data\" | \"other\" | \"admin\""], "path": "src/plugins/home/public/services/feature_catalogue/feature_catalogue_registry.ts", "deprecated": false, "trackAdoption": false, @@ -920,9 +849,7 @@ "tags": [], "label": "TutorialDirectoryHeaderLinkComponent", "description": [], - "signature": [ - "React.FunctionComponent<{}>" - ], + "signature": ["React.FunctionComponent<{}>"], "path": "src/plugins/home/public/services/tutorials/tutorial_service.ts", "deprecated": false, "trackAdoption": false, @@ -935,9 +862,7 @@ "tags": [], "label": "props", "description": [], - "signature": [ - "P & { children?: React.ReactNode; }" - ], + "signature": ["P & { children?: React.ReactNode; }"], "path": "node_modules/@types/react/index.d.ts", "deprecated": false, "trackAdoption": false @@ -949,9 +874,7 @@ "tags": [], "label": "context", "description": [], - "signature": [ - "any" - ], + "signature": ["any"], "path": "node_modules/@types/react/index.d.ts", "deprecated": false, "trackAdoption": false @@ -966,9 +889,7 @@ "tags": [], "label": "TutorialModuleNoticeComponent", "description": [], - "signature": [ - "React.FunctionComponent<{ moduleName: string; }>" - ], + "signature": ["React.FunctionComponent<{ moduleName: string; }>"], "path": "src/plugins/home/public/services/tutorials/tutorial_service.ts", "deprecated": false, "trackAdoption": false, @@ -981,9 +902,7 @@ "tags": [], "label": "props", "description": [], - "signature": [ - "P & { children?: React.ReactNode; }" - ], + "signature": ["P & { children?: React.ReactNode; }"], "path": "node_modules/@types/react/index.d.ts", "deprecated": false, "trackAdoption": false @@ -995,9 +914,7 @@ "tags": [], "label": "context", "description": [], - "signature": [ - "any" - ], + "signature": ["any"], "path": "node_modules/@types/react/index.d.ts", "deprecated": false, "trackAdoption": false @@ -1043,9 +960,7 @@ "tags": [], "label": "TutorialVariables", "description": [], - "signature": [ - "{ [x: string]: unknown; }" - ], + "signature": ["{ [x: string]: unknown; }"], "path": "src/plugins/home/public/services/tutorials/tutorial_service.ts", "deprecated": false, "trackAdoption": false, @@ -1058,9 +973,7 @@ "tags": [], "label": "WelcomeRenderTelemetryNotice", "description": [], - "signature": [ - "() => JSX.Element | null" - ], + "signature": ["() => JSX.Element | null"], "path": "src/plugins/home/public/services/welcome/welcome_service.ts", "deprecated": false, "trackAdoption": false, @@ -1422,9 +1335,7 @@ "parentPluginId": "home", "id": "def-public.HomePublicPluginSetup.environment", "type": "Object", - "tags": [ - "deprecated" - ], + "tags": ["deprecated"], "label": "environment", "description": [ "\nThe environment service is only available for a transition period and will\nbe replaced by display specific extension points." @@ -1447,7 +1358,7 @@ "references": [ { "plugin": "apm", - "path": "x-pack/plugins/apm/public/plugin.ts" + "path": "x-pack/plugins/observability_solution/apm/public/plugin.ts" } ] } @@ -1540,9 +1451,7 @@ "description": [ "\nFunction that returns the path for this app link. Note that the `objectId` can be different than the given `sampleObject.id`, depending\non how the sample data was installed. If the `sampleObject` is null, the `objectId` argument will be an empty string." ], - "signature": [ - "(objectId: string) => string" - ], + "signature": ["(objectId: string) => string"], "path": "src/plugins/home/server/services/sample_data/lib/sample_dataset_registry_types.ts", "deprecated": false, "trackAdoption": false, @@ -1554,9 +1463,7 @@ "tags": [], "label": "objectId", "description": [], - "signature": [ - "string" - ], + "signature": ["string"], "path": "src/plugins/home/server/services/sample_data/lib/sample_dataset_registry_types.ts", "deprecated": false, "trackAdoption": false, @@ -1571,9 +1478,7 @@ "type": "string", "tags": [], "label": "label", - "description": [ - "\nThe label for this app link." - ], + "description": ["\nThe label for this app link."], "path": "src/plugins/home/server/services/sample_data/lib/sample_dataset_registry_types.ts", "deprecated": false, "trackAdoption": false @@ -1584,9 +1489,7 @@ "type": "string", "tags": [], "label": "icon", - "description": [ - "\nThe icon for this app link." - ], + "description": ["\nThe icon for this app link."], "path": "src/plugins/home/server/services/sample_data/lib/sample_dataset_registry_types.ts", "deprecated": false, "trackAdoption": false @@ -1600,9 +1503,7 @@ "description": [ "\nIndex of the links (ascending order, smallest will be displayed first).\nUsed for ordering in the dropdown.\n" ], - "signature": [ - "number | undefined" - ], + "signature": ["number | undefined"], "path": "src/plugins/home/server/services/sample_data/lib/sample_dataset_registry_types.ts", "deprecated": false, "trackAdoption": false @@ -1692,9 +1593,7 @@ "tags": [], "label": "embeddableConfig", "description": [], - "signature": [ - "object" - ], + "signature": ["object"], "path": "src/plugins/home/server/services/sample_data/lib/sample_dataset_registry_types.ts", "deprecated": false, "trackAdoption": false @@ -1708,9 +1607,7 @@ "type": "Interface", "tags": [], "label": "SampleObject", - "description": [ - "This type is used to identify an object in a sample dataset." - ], + "description": ["This type is used to identify an object in a sample dataset."], "path": "src/plugins/home/server/services/sample_data/lib/sample_dataset_registry_types.ts", "deprecated": false, "trackAdoption": false, @@ -1721,9 +1618,7 @@ "type": "string", "tags": [], "label": "type", - "description": [ - "The type of the sample object." - ], + "description": ["The type of the sample object."], "path": "src/plugins/home/server/services/sample_data/lib/sample_dataset_registry_types.ts", "deprecated": false, "trackAdoption": false @@ -1734,9 +1629,7 @@ "type": "string", "tags": [], "label": "id", - "description": [ - "The ID of the sample object." - ], + "description": ["The ID of the sample object."], "path": "src/plugins/home/server/services/sample_data/lib/sample_dataset_registry_types.ts", "deprecated": false, "trackAdoption": false @@ -1793,9 +1686,7 @@ "tags": [], "label": "[key: string]: unknown", "description": [], - "signature": [ - "[key: string]: unknown" - ], + "signature": ["[key: string]: unknown"], "path": "src/plugins/home/server/services/tutorials/lib/tutorials_registry_types.ts", "deprecated": false, "trackAdoption": false @@ -1955,9 +1846,7 @@ "tags": [], "label": "context", "description": [], - "signature": [ - "SampleDatasetProviderContext" - ], + "signature": ["SampleDatasetProviderContext"], "path": "src/plugins/home/server/services/sample_data/lib/sample_dataset_registry_types.ts", "deprecated": false, "trackAdoption": false @@ -1972,9 +1861,7 @@ "tags": [], "label": "ScopedTutorialContextFactory", "description": [], - "signature": [ - "(...args: any[]) => any" - ], + "signature": ["(...args: any[]) => any"], "path": "src/plugins/home/server/services/tutorials/lib/tutorials_registry_types.ts", "deprecated": false, "trackAdoption": false, @@ -1987,9 +1874,7 @@ "tags": [], "label": "args", "description": [], - "signature": [ - "any[]" - ], + "signature": ["any[]"], "path": "src/plugins/home/server/services/tutorials/lib/tutorials_registry_types.ts", "deprecated": false, "trackAdoption": false @@ -2412,9 +2297,7 @@ "tags": [], "label": "tutorials", "description": [], - "signature": [ - "{}" - ], + "signature": ["{}"], "path": "src/plugins/home/server/plugin.ts", "deprecated": false, "trackAdoption": false @@ -2426,9 +2309,7 @@ "tags": [], "label": "sampleData", "description": [], - "signature": [ - "{}" - ], + "signature": ["{}"], "path": "src/plugins/home/server/plugin.ts", "deprecated": false, "trackAdoption": false @@ -2446,4 +2327,4 @@ "misc": [], "objects": [] } -} \ No newline at end of file +} diff --git a/api_docs/kbn_analytics_client.devdocs.json b/api_docs/kbn_analytics_client.devdocs.json index 7aba696c210fe..244362deccafa 100644 --- a/api_docs/kbn_analytics_client.devdocs.json +++ b/api_docs/kbn_analytics_client.devdocs.json @@ -25,9 +25,7 @@ "type": "Function", "tags": [], "label": "createAnalytics", - "description": [ - "\nCreates an {@link AnalyticsClient}." - ], + "description": ["\nCreates an {@link AnalyticsClient}."], "signature": [ "(initContext: ", { @@ -85,9 +83,7 @@ "type": "Interface", "tags": [], "label": "AnalyticsClientInitContext", - "description": [ - "\nGeneral settings of the analytics client" - ], + "description": ["\nGeneral settings of the analytics client"], "path": "packages/analytics/client/src/analytics_client/types.ts", "deprecated": false, "trackAdoption": false, @@ -98,9 +94,7 @@ "type": "boolean", "tags": [], "label": "isDev", - "description": [ - "\nBoolean indicating if it's running in developer mode." - ], + "description": ["\nBoolean indicating if it's running in developer mode."], "path": "packages/analytics/client/src/analytics_client/types.ts", "deprecated": false, "trackAdoption": false @@ -114,9 +108,7 @@ "description": [ "\nSpecify if the shippers should send their data to the production or staging environments." ], - "signature": [ - "\"production\" | \"staging\"" - ], + "signature": ["\"production\" | \"staging\""], "path": "packages/analytics/client/src/analytics_client/types.ts", "deprecated": false, "trackAdoption": false @@ -127,9 +119,7 @@ "type": "Object", "tags": [], "label": "logger", - "description": [ - "\nApplication-provided logger." - ], + "description": ["\nApplication-provided logger."], "signature": [ { "pluginId": "@kbn/logging", @@ -152,9 +142,7 @@ "type": "Interface", "tags": [], "label": "ContextProviderOpts", - "description": [ - "\nDefinition of a context provider" - ], + "description": ["\nDefinition of a context provider"], "signature": [ { "pluginId": "@kbn/analytics-client", @@ -175,9 +163,7 @@ "type": "string", "tags": [], "label": "name", - "description": [ - "\nThe name of the provider." - ], + "description": ["\nThe name of the provider."], "path": "packages/analytics/client/src/analytics_client/types.ts", "deprecated": false, "trackAdoption": false @@ -188,13 +174,8 @@ "type": "Object", "tags": [], "label": "context$", - "description": [ - "\nObservable that emits the custom context." - ], - "signature": [ - "Observable", - "" - ], + "description": ["\nObservable that emits the custom context."], + "signature": ["Observable", ""], "path": "packages/analytics/client/src/analytics_client/types.ts", "deprecated": false, "trackAdoption": false @@ -232,9 +213,7 @@ "type": "Interface", "tags": [], "label": "Event", - "description": [ - "\nDefinition of the full event structure" - ], + "description": ["\nDefinition of the full event structure"], "signature": [ { "pluginId": "@kbn/analytics-client", @@ -255,9 +234,7 @@ "type": "string", "tags": [], "label": "timestamp", - "description": [ - "\nThe time the event was generated in ISO format." - ], + "description": ["\nThe time the event was generated in ISO format."], "path": "packages/analytics/client/src/events/types.ts", "deprecated": false, "trackAdoption": false @@ -268,9 +245,7 @@ "type": "string", "tags": [], "label": "event_type", - "description": [ - "\nThe event type." - ], + "description": ["\nThe event type."], "path": "packages/analytics/client/src/events/types.ts", "deprecated": false, "trackAdoption": false @@ -281,12 +256,8 @@ "type": "Uncategorized", "tags": [], "label": "properties", - "description": [ - "\nThe specific properties of the event type." - ], - "signature": [ - "Properties" - ], + "description": ["\nThe specific properties of the event type."], + "signature": ["Properties"], "path": "packages/analytics/client/src/events/types.ts", "deprecated": false, "trackAdoption": false @@ -297,9 +268,7 @@ "type": "Object", "tags": [], "label": "context", - "description": [ - "\nThe {@link EventContext} enriched during the processing pipeline." - ], + "description": ["\nThe {@link EventContext} enriched during the processing pipeline."], "signature": [ { "pluginId": "@kbn/analytics-client", @@ -335,12 +304,8 @@ "type": "string", "tags": [], "label": "cluster_uuid", - "description": [ - "\nThe UUID of the cluster" - ], - "signature": [ - "string | undefined" - ], + "description": ["\nThe UUID of the cluster"], + "signature": ["string | undefined"], "path": "packages/analytics/client/src/events/types.ts", "deprecated": false, "trackAdoption": false @@ -351,12 +316,8 @@ "type": "string", "tags": [], "label": "cluster_name", - "description": [ - "\nThe name of the cluster." - ], - "signature": [ - "string | undefined" - ], + "description": ["\nThe name of the cluster."], + "signature": ["string | undefined"], "path": "packages/analytics/client/src/events/types.ts", "deprecated": false, "trackAdoption": false @@ -367,12 +328,8 @@ "type": "string", "tags": [], "label": "license_id", - "description": [ - "\nThe license ID." - ], - "signature": [ - "string | undefined" - ], + "description": ["\nThe license ID."], + "signature": ["string | undefined"], "path": "packages/analytics/client/src/events/types.ts", "deprecated": false, "trackAdoption": false @@ -383,12 +340,8 @@ "type": "string", "tags": [], "label": "userId", - "description": [ - "\nThe unique user ID." - ], - "signature": [ - "string | undefined" - ], + "description": ["\nThe unique user ID."], + "signature": ["string | undefined"], "path": "packages/analytics/client/src/events/types.ts", "deprecated": false, "trackAdoption": false @@ -399,12 +352,8 @@ "type": "string", "tags": [], "label": "cloudId", - "description": [ - "\nThe Cloud ID." - ], - "signature": [ - "string | undefined" - ], + "description": ["\nThe Cloud ID."], + "signature": ["string | undefined"], "path": "packages/analytics/client/src/events/types.ts", "deprecated": false, "trackAdoption": false @@ -418,9 +367,7 @@ "description": [ "\n`true` if the user is logged in via the Elastic Cloud authentication provider." ], - "signature": [ - "boolean | undefined" - ], + "signature": ["boolean | undefined"], "path": "packages/analytics/client/src/events/types.ts", "deprecated": false, "trackAdoption": false @@ -431,12 +378,8 @@ "type": "string", "tags": [], "label": "version", - "description": [ - "\nThe product's version." - ], - "signature": [ - "string | undefined" - ], + "description": ["\nThe product's version."], + "signature": ["string | undefined"], "path": "packages/analytics/client/src/events/types.ts", "deprecated": false, "trackAdoption": false @@ -447,12 +390,8 @@ "type": "string", "tags": [], "label": "pageName", - "description": [ - "\nThe name of the current page." - ], - "signature": [ - "string | undefined" - ], + "description": ["\nThe name of the current page."], + "signature": ["string | undefined"], "path": "packages/analytics/client/src/events/types.ts", "deprecated": false, "trackAdoption": false @@ -463,12 +402,8 @@ "type": "string", "tags": [], "label": "applicationId", - "description": [ - "\nThe current application ID." - ], - "signature": [ - "string | undefined" - ], + "description": ["\nThe current application ID."], + "signature": ["string | undefined"], "path": "packages/analytics/client/src/events/types.ts", "deprecated": false, "trackAdoption": false @@ -479,12 +414,8 @@ "type": "string", "tags": [], "label": "entityId", - "description": [ - "\nThe current entity ID (dashboard ID, visualization ID, etc.)." - ], - "signature": [ - "string | undefined" - ], + "description": ["\nThe current entity ID (dashboard ID, visualization ID, etc.)."], + "signature": ["string | undefined"], "path": "packages/analytics/client/src/events/types.ts", "deprecated": false, "trackAdoption": false @@ -495,12 +426,8 @@ "type": "IndexSignature", "tags": [], "label": "[key: string]: unknown", - "description": [ - "\nAdditional keys are allowed." - ], - "signature": [ - "[key: string]: unknown" - ], + "description": ["\nAdditional keys are allowed."], + "signature": ["[key: string]: unknown"], "path": "packages/analytics/client/src/events/types.ts", "deprecated": false, "trackAdoption": false @@ -514,9 +441,7 @@ "type": "Interface", "tags": [], "label": "EventTypeOpts", - "description": [ - "\nDefinition of an Event Type." - ], + "description": ["\nDefinition of an Event Type."], "signature": [ { "pluginId": "@kbn/analytics-client", @@ -537,9 +462,7 @@ "type": "string", "tags": [], "label": "eventType", - "description": [ - "\nThe event type's unique name." - ], + "description": ["\nThe event type's unique name."], "path": "packages/analytics/client/src/analytics_client/types.ts", "deprecated": false, "trackAdoption": false @@ -577,9 +500,7 @@ "type": "Interface", "tags": [], "label": "IAnalyticsClient", - "description": [ - "\nAnalytics client's public APIs" - ], + "description": ["\nAnalytics client's public APIs"], "path": "packages/analytics/client/src/analytics_client/types.ts", "deprecated": false, "trackAdoption": false, @@ -588,13 +509,9 @@ "parentPluginId": "@kbn/analytics-client", "id": "def-common.IAnalyticsClient.reportEvent", "type": "Function", - "tags": [ - "track-adoption" - ], + "tags": ["track-adoption"], "label": "reportEvent", - "description": [ - "\nReports a telemetry event." - ], + "description": ["\nReports a telemetry event."], "signature": [ "(eventType: string, eventData: EventTypeData) => void" ], @@ -740,7 +657,7 @@ }, { "plugin": "apm", - "path": "x-pack/plugins/apm/public/services/telemetry/telemetry_client.ts" + "path": "x-pack/plugins/observability_solution/apm/public/services/telemetry/telemetry_client.ts" }, { "plugin": "elasticAssistant", @@ -988,11 +905,11 @@ }, { "plugin": "apm", - "path": "x-pack/plugins/apm/public/services/telemetry/telemetry_service.test.ts" + "path": "x-pack/plugins/observability_solution/apm/public/services/telemetry/telemetry_service.test.ts" }, { "plugin": "apm", - "path": "x-pack/plugins/apm/public/services/telemetry/telemetry_service.test.ts" + "path": "x-pack/plugins/observability_solution/apm/public/services/telemetry/telemetry_service.test.ts" }, { "plugin": "infra", @@ -1138,12 +1055,8 @@ "type": "string", "tags": [], "label": "eventType", - "description": [ - "The event type registered via the `registerEventType` API." - ], - "signature": [ - "string" - ], + "description": ["The event type registered via the `registerEventType` API."], + "signature": ["string"], "path": "packages/analytics/client/src/analytics_client/types.ts", "deprecated": false, "trackAdoption": false, @@ -1158,9 +1071,7 @@ "description": [ "The properties matching the schema declared in the `registerEventType` API." ], - "signature": [ - "EventTypeData" - ], + "signature": ["EventTypeData"], "path": "packages/analytics/client/src/analytics_client/types.ts", "deprecated": false, "trackAdoption": false, @@ -1199,9 +1110,7 @@ "type": "Object", "tags": [], "label": "eventTypeOps", - "description": [ - "The definition of the event type {@link EventTypeOpts }." - ], + "description": ["The definition of the event type {@link EventTypeOpts }."], "signature": [ { "pluginId": "@kbn/analytics-client", @@ -1266,9 +1175,7 @@ "type": "Object", "tags": [], "label": "Shipper", - "description": [ - "The {@link IShipper } class to instantiate the shipper." - ], + "description": ["The {@link IShipper } class to instantiate the shipper."], "signature": [ { "pluginId": "@kbn/analytics-client", @@ -1290,12 +1197,8 @@ "type": "Uncategorized", "tags": [], "label": "shipperConfig", - "description": [ - "The config specific to the Shipper to instantiate." - ], - "signature": [ - "ShipperConfig" - ], + "description": ["The config specific to the Shipper to instantiate."], + "signature": ["ShipperConfig"], "path": "packages/analytics/client/src/analytics_client/types.ts", "deprecated": false, "trackAdoption": false, @@ -1358,9 +1261,7 @@ "type": "Object", "tags": [], "label": "optInConfig", - "description": [ - "{@link OptInConfig }" - ], + "description": ["{@link OptInConfig }"], "signature": [ { "pluginId": "@kbn/analytics-client", @@ -1382,13 +1283,9 @@ "parentPluginId": "@kbn/analytics-client", "id": "def-common.IAnalyticsClient.registerContextProvider", "type": "Function", - "tags": [ - "track-adoption" - ], + "tags": ["track-adoption"], "label": "registerContextProvider", - "description": [ - "\nRegisters the context provider to enrich any reported events." - ], + "description": ["\nRegisters the context provider to enrich any reported events."], "signature": [ "(contextProviderOpts: ", { @@ -1668,9 +1565,7 @@ "type": "Object", "tags": [], "label": "contextProviderOpts", - "description": [ - "{@link ContextProviderOpts }" - ], + "description": ["{@link ContextProviderOpts }"], "signature": [ { "pluginId": "@kbn/analytics-client", @@ -1698,9 +1593,7 @@ "description": [ "\nRemoves the context provider and stop enriching the events from its context." ], - "signature": [ - "(contextProviderName: string) => void" - ], + "signature": ["(contextProviderName: string) => void"], "path": "packages/analytics/client/src/analytics_client/types.ts", "deprecated": false, "trackAdoption": false, @@ -1711,12 +1604,8 @@ "type": "string", "tags": [], "label": "contextProviderName", - "description": [ - "The name of the context provider to remove." - ], - "signature": [ - "string" - ], + "description": ["The name of the context provider to remove."], + "signature": ["string"], "path": "packages/analytics/client/src/analytics_client/types.ts", "deprecated": false, "trackAdoption": false, @@ -1731,9 +1620,7 @@ "type": "Object", "tags": [], "label": "telemetryCounter$", - "description": [ - "\nObservable to emit the stats of the processed events." - ], + "description": ["\nObservable to emit the stats of the processed events."], "signature": [ "Observable", "<", @@ -1759,9 +1646,7 @@ "description": [ "\nForces all shippers to send all their enqueued events and fulfills the returned promise." ], - "signature": [ - "() => Promise" - ], + "signature": ["() => Promise"], "path": "packages/analytics/client/src/analytics_client/types.ts", "deprecated": false, "trackAdoption": false, @@ -1774,12 +1659,8 @@ "type": "Function", "tags": [], "label": "shutdown", - "description": [ - "\nStops the client. Flushing any pending events in the process." - ], - "signature": [ - "() => Promise" - ], + "description": ["\nStops the client. Flushing any pending events in the process."], + "signature": ["() => Promise"], "path": "packages/analytics/client/src/analytics_client/types.ts", "deprecated": false, "trackAdoption": false, @@ -1795,9 +1676,7 @@ "type": "Interface", "tags": [], "label": "IShipper", - "description": [ - "\nBasic structure of a Shipper" - ], + "description": ["\nBasic structure of a Shipper"], "path": "packages/analytics/client/src/shippers/types.ts", "deprecated": false, "trackAdoption": false, @@ -1808,9 +1687,7 @@ "type": "Function", "tags": [], "label": "reportEvents", - "description": [ - "\nAdapts and ships the event to the persisting/analytics solution." - ], + "description": ["\nAdapts and ships the event to the persisting/analytics solution."], "signature": [ "(events: ", { @@ -1832,9 +1709,7 @@ "type": "Array", "tags": [], "label": "events", - "description": [ - "batched events {@link Event }" - ], + "description": ["batched events {@link Event }"], "signature": [ { "pluginId": "@kbn/analytics-client", @@ -1862,9 +1737,7 @@ "description": [ "\nStops/restarts the shipping mechanism based on the value of isOptedIn" ], - "signature": [ - "(isOptedIn: boolean) => void" - ], + "signature": ["(isOptedIn: boolean) => void"], "path": "packages/analytics/client/src/shippers/types.ts", "deprecated": false, "trackAdoption": false, @@ -1875,12 +1748,8 @@ "type": "boolean", "tags": [], "label": "isOptedIn", - "description": [ - "`true` for resume sending events. `false` to stop." - ], - "signature": [ - "boolean" - ], + "description": ["`true` for resume sending events. `false` to stop."], + "signature": ["boolean"], "path": "packages/analytics/client/src/shippers/types.ts", "deprecated": false, "trackAdoption": false, @@ -1919,9 +1788,7 @@ "type": "Object", "tags": [], "label": "newContext", - "description": [ - "The full new context to set {@link EventContext }" - ], + "description": ["The full new context to set {@link EventContext }"], "signature": [ { "pluginId": "@kbn/analytics-client", @@ -1945,9 +1812,7 @@ "type": "Object", "tags": [], "label": "telemetryCounter$", - "description": [ - "\nObservable to emit the stats of the processed events." - ], + "description": ["\nObservable to emit the stats of the processed events."], "signature": [ "Observable", "<", @@ -1970,12 +1835,8 @@ "type": "Function", "tags": [], "label": "flush", - "description": [ - "\nSends all the enqueued events and fulfills the returned promise." - ], - "signature": [ - "() => Promise" - ], + "description": ["\nSends all the enqueued events and fulfills the returned promise."], + "signature": ["() => Promise"], "path": "packages/analytics/client/src/shippers/types.ts", "deprecated": false, "trackAdoption": false, @@ -1988,12 +1849,8 @@ "type": "Function", "tags": [], "label": "shutdown", - "description": [ - "\nShutdown the shipper." - ], - "signature": [ - "() => void" - ], + "description": ["\nShutdown the shipper."], + "signature": ["() => void"], "path": "packages/analytics/client/src/shippers/types.ts", "deprecated": false, "trackAdoption": false, @@ -2009,9 +1866,7 @@ "type": "Interface", "tags": [], "label": "OptInConfig", - "description": [ - "\n" - ], + "description": ["\n"], "path": "packages/analytics/client/src/analytics_client/types.ts", "deprecated": false, "trackAdoption": false, @@ -2084,9 +1939,7 @@ "type": "boolean", "tags": [], "label": "enabled", - "description": [ - "\nThe event type is globally enabled." - ], + "description": ["\nThe event type is globally enabled."], "path": "packages/analytics/client/src/analytics_client/types.ts", "deprecated": false, "trackAdoption": false @@ -2100,9 +1953,7 @@ "description": [ "\nControls if an event type should be disabled for a specific type of shipper." ], - "signature": [ - "Record | undefined" - ], + "signature": ["Record | undefined"], "path": "packages/analytics/client/src/analytics_client/types.ts", "deprecated": false, "trackAdoption": false @@ -2116,9 +1967,7 @@ "type": "Interface", "tags": [], "label": "RegisterShipperOpts", - "description": [ - "\nOptional options to register a shipper" - ], + "description": ["\nOptional options to register a shipper"], "path": "packages/analytics/client/src/analytics_client/types.ts", "deprecated": false, "trackAdoption": false, @@ -2131,9 +1980,7 @@ "type": "Interface", "tags": [], "label": "SchemaArray", - "description": [ - "\nSchema to represent an array" - ], + "description": ["\nSchema to represent an array"], "signature": [ { "pluginId": "@kbn/analytics-client", @@ -2162,12 +2009,8 @@ "type": "string", "tags": [], "label": "type", - "description": [ - "The type must be an array" - ], - "signature": [ - "\"array\"" - ], + "description": ["The type must be an array"], + "signature": ["\"array\""], "path": "packages/analytics/client/src/schema/types.ts", "deprecated": false, "trackAdoption": false @@ -2261,9 +2104,7 @@ "type": "Interface", "tags": [], "label": "SchemaChildValue", - "description": [ - "\nSchema to define a primitive value" - ], + "description": ["\nSchema to define a primitive value"], "signature": [ { "pluginId": "@kbn/analytics-client", @@ -2284,9 +2125,7 @@ "type": "Uncategorized", "tags": [], "label": "type", - "description": [ - "The type of the value" - ], + "description": ["The type of the value"], "signature": [ "NonNullable extends string | Date ? ", { @@ -2323,9 +2162,7 @@ "type": "CompoundType", "tags": [], "label": "_meta", - "description": [ - "Meta properties of the value: description and is optional" - ], + "description": ["Meta properties of the value: description and is optional"], "signature": [ "{ description: string; } & ", { @@ -2350,9 +2187,7 @@ "type": "Interface", "tags": [], "label": "SchemaMeta", - "description": [ - "\nSchema meta with optional description" - ], + "description": ["\nSchema meta with optional description"], "signature": [ { "pluginId": "@kbn/analytics-client", @@ -2373,9 +2208,7 @@ "type": "CompoundType", "tags": [], "label": "_meta", - "description": [ - "Meta properties of the pass through: description and is optional" - ], + "description": ["Meta properties of the pass through: description and is optional"], "signature": [ "({ description?: string | undefined; } & ", { @@ -2400,9 +2233,7 @@ "type": "Interface", "tags": [], "label": "SchemaObject", - "description": [ - "\nSchema to represent an object" - ], + "description": ["\nSchema to represent an object"], "signature": [ { "pluginId": "@kbn/analytics-client", @@ -2458,9 +2289,7 @@ "type": "Interface", "tags": [], "label": "ShipperClassConstructor", - "description": [ - "\nConstructor of a {@link IShipper}" - ], + "description": ["\nConstructor of a {@link IShipper}"], "signature": [ { "pluginId": "@kbn/analytics-client", @@ -2481,9 +2310,7 @@ "type": "string", "tags": [], "label": "shipperName", - "description": [ - "\nThe shipper's unique name" - ], + "description": ["\nThe shipper's unique name"], "path": "packages/analytics/client/src/analytics_client/types.ts", "deprecated": false, "trackAdoption": false @@ -2494,12 +2321,8 @@ "type": "Function", "tags": [], "label": "new", - "description": [ - "\nThe constructor" - ], - "signature": [ - "any" - ], + "description": ["\nThe constructor"], + "signature": ["any"], "path": "packages/analytics/client/src/analytics_client/types.ts", "deprecated": false, "trackAdoption": false, @@ -2510,12 +2333,8 @@ "type": "Uncategorized", "tags": [], "label": "config", - "description": [ - "The shipper's custom config" - ], - "signature": [ - "Config" - ], + "description": ["The shipper's custom config"], + "signature": ["Config"], "path": "packages/analytics/client/src/analytics_client/types.ts", "deprecated": false, "trackAdoption": false, @@ -2527,9 +2346,7 @@ "type": "Object", "tags": [], "label": "initContext", - "description": [ - "Common context {@link AnalyticsClientInitContext }" - ], + "description": ["Common context {@link AnalyticsClientInitContext }"], "signature": [ { "pluginId": "@kbn/analytics-client", @@ -2556,9 +2373,7 @@ "type": "Interface", "tags": [], "label": "TelemetryCounter", - "description": [ - "\nShape of the events emitted by the telemetryCounter$ observable" - ], + "description": ["\nShape of the events emitted by the telemetryCounter$ observable"], "path": "packages/analytics/client/src/events/types.ts", "deprecated": false, "trackAdoption": false, @@ -2569,9 +2384,7 @@ "type": "CompoundType", "tags": [], "label": "type", - "description": [ - "\n{@link TelemetryCounterType}" - ], + "description": ["\n{@link TelemetryCounterType}"], "signature": [ "\"succeeded\" | \"failed\" | \"enqueued\" | \"sent_to_shipper\" | \"dropped\"" ], @@ -2598,9 +2411,7 @@ "type": "string", "tags": [], "label": "event_type", - "description": [ - "\nThe event type the success/failure/drop event refers to." - ], + "description": ["\nThe event type the success/failure/drop event refers to."], "path": "packages/analytics/client/src/events/types.ts", "deprecated": false, "trackAdoption": false @@ -2624,9 +2435,7 @@ "type": "number", "tags": [], "label": "count", - "description": [ - "\nThe number of events that this counter refers to." - ], + "description": ["\nThe number of events that this counter refers to."], "path": "packages/analytics/client/src/events/types.ts", "deprecated": false, "trackAdoption": false @@ -2643,12 +2452,8 @@ "type": "Type", "tags": [], "label": "AllowedSchemaBooleanTypes", - "description": [ - "Types matching boolean values" - ], - "signature": [ - "\"boolean\"" - ], + "description": ["Types matching boolean values"], + "signature": ["\"boolean\""], "path": "packages/analytics/client/src/schema/types.ts", "deprecated": false, "trackAdoption": false, @@ -2660,9 +2465,7 @@ "type": "Type", "tags": [], "label": "AllowedSchemaNumberTypes", - "description": [ - "Types matching number values" - ], + "description": ["Types matching number values"], "signature": [ "\"date\" | \"integer\" | \"long\" | \"short\" | \"byte\" | \"float\" | \"double\"" ], @@ -2677,12 +2480,8 @@ "type": "Type", "tags": [], "label": "AllowedSchemaStringTypes", - "description": [ - "Types matching string values" - ], - "signature": [ - "\"keyword\" | \"text\" | \"date\"" - ], + "description": ["Types matching string values"], + "signature": ["\"keyword\" | \"text\" | \"date\""], "path": "packages/analytics/client/src/schema/types.ts", "deprecated": false, "trackAdoption": false, @@ -2694,9 +2493,7 @@ "type": "Type", "tags": [], "label": "AllowedSchemaTypes", - "description": [ - "\nPossible type values in the schema" - ], + "description": ["\nPossible type values in the schema"], "signature": [ "\"boolean\" | \"keyword\" | \"text\" | \"date\" | \"integer\" | \"long\" | \"short\" | \"byte\" | \"float\" | \"double\"" ], @@ -2714,9 +2511,7 @@ "description": [ "\nEvent Type used for indexed structures. Only used to improve the readability of the types" ], - "signature": [ - "string" - ], + "signature": ["string"], "path": "packages/analytics/client/src/events/types.ts", "deprecated": false, "trackAdoption": false, @@ -2728,9 +2523,7 @@ "type": "Type", "tags": [], "label": "PossibleSchemaTypes", - "description": [ - "\nHelper to ensure the declared types match the schema types" - ], + "description": ["\nHelper to ensure the declared types match the schema types"], "signature": [ "Value extends string | Date ? ", { @@ -2768,9 +2561,7 @@ "type": "Type", "tags": [], "label": "RootSchema", - "description": [ - "\nSchema definition to match the structure of the properties provided.\n" - ], + "description": ["\nSchema definition to match the structure of the properties provided.\n"], "signature": [ "{ [Key in keyof Required]: ", { @@ -2793,9 +2584,7 @@ "type": "Type", "tags": [], "label": "SchemaMetaOptional", - "description": [ - "\nEnforces { optional: true } if the value can be undefined" - ], + "description": ["\nEnforces { optional: true } if the value can be undefined"], "signature": [ "unknown extends Value ? { optional?: boolean | undefined; } : undefined extends Value ? { optional: true; } : { optional?: false | undefined; }" ], @@ -2894,9 +2683,7 @@ "description": [ "\nShipper Name used for indexed structures. Only used to improve the readability of the types" ], - "signature": [ - "string" - ], + "signature": ["string"], "path": "packages/analytics/client/src/analytics_client/types.ts", "deprecated": false, "trackAdoption": false, @@ -2922,4 +2709,4 @@ ], "objects": [] } -} \ No newline at end of file +} diff --git a/api_docs/kbn_core_http_server.devdocs.json b/api_docs/kbn_core_http_server.devdocs.json index 176ec64529598..7ecc822cd7c03 100644 --- a/api_docs/kbn_core_http_server.devdocs.json +++ b/api_docs/kbn_core_http_server.devdocs.json @@ -4618,7 +4618,7 @@ }, { "plugin": "apm", - "path": "x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.test.ts" + "path": "x-pack/plugins/observability_solution/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.test.ts" }, { "plugin": "console", diff --git a/api_docs/kbn_core_saved_objects_server.devdocs.json b/api_docs/kbn_core_saved_objects_server.devdocs.json index f6c4d72445514..7d041dd8fc147 100644 --- a/api_docs/kbn_core_saved_objects_server.devdocs.json +++ b/api_docs/kbn_core_saved_objects_server.devdocs.json @@ -10571,7 +10571,7 @@ }, { "plugin": "apmDataAccess", - "path": "x-pack/plugins/apm_data_access/server/saved_objects/apm_indices.ts" + "path": "x-pack/plugins/observability_solution/apm_data_access/server/saved_objects/apm_indices.ts" }, { "plugin": "ml", @@ -10611,7 +10611,7 @@ }, { "plugin": "apm", - "path": "x-pack/plugins/apm/server/saved_objects/apm_service_groups.ts" + "path": "x-pack/plugins/observability_solution/apm/server/saved_objects/apm_service_groups.ts" }, { "plugin": "savedSearch", diff --git a/api_docs/kibana_react.devdocs.json b/api_docs/kibana_react.devdocs.json index 35e40c5034b9b..db0678a2a8b9e 100644 --- a/api_docs/kibana_react.devdocs.json +++ b/api_docs/kibana_react.devdocs.json @@ -1353,15 +1353,15 @@ }, { "plugin": "apm", - "path": "x-pack/plugins/apm/public/application/index.tsx" + "path": "x-pack/plugins/observability_solution/apm/public/application/index.tsx" }, { "plugin": "apm", - "path": "x-pack/plugins/apm/public/application/index.tsx" + "path": "x-pack/plugins/observability_solution/apm/public/application/index.tsx" }, { "plugin": "apm", - "path": "x-pack/plugins/apm/public/application/index.tsx" + "path": "x-pack/plugins/observability_solution/apm/public/application/index.tsx" }, { "plugin": "expressionImage", diff --git a/api_docs/licensing.devdocs.json b/api_docs/licensing.devdocs.json index 2bc54835757f2..e866aea5683d3 100644 --- a/api_docs/licensing.devdocs.json +++ b/api_docs/licensing.devdocs.json @@ -496,51 +496,51 @@ "references": [ { "plugin": "apm", - "path": "x-pack/plugins/apm/common/license_check.test.ts" + "path": "x-pack/plugins/observability_solution/apm/common/license_check.test.ts" }, { "plugin": "apm", - "path": "x-pack/plugins/apm/common/license_check.test.ts" + "path": "x-pack/plugins/observability_solution/apm/common/license_check.test.ts" }, { "plugin": "apm", - "path": "x-pack/plugins/apm/common/license_check.test.ts" + "path": "x-pack/plugins/observability_solution/apm/common/license_check.test.ts" }, { "plugin": "apm", - "path": "x-pack/plugins/apm/common/license_check.test.ts" + "path": "x-pack/plugins/observability_solution/apm/common/license_check.test.ts" }, { "plugin": "apm", - "path": "x-pack/plugins/apm/common/license_check.test.ts" + "path": "x-pack/plugins/observability_solution/apm/common/license_check.test.ts" }, { "plugin": "apm", - "path": "x-pack/plugins/apm/common/license_check.test.ts" + "path": "x-pack/plugins/observability_solution/apm/common/license_check.test.ts" }, { "plugin": "apm", - "path": "x-pack/plugins/apm/common/license_check.test.ts" + "path": "x-pack/plugins/observability_solution/apm/common/license_check.test.ts" }, { "plugin": "apm", - "path": "x-pack/plugins/apm/common/license_check.test.ts" + "path": "x-pack/plugins/observability_solution/apm/common/license_check.test.ts" }, { "plugin": "apm", - "path": "x-pack/plugins/apm/common/license_check.test.ts" + "path": "x-pack/plugins/observability_solution/apm/common/license_check.test.ts" }, { "plugin": "apm", - "path": "x-pack/plugins/apm/common/license_check.test.ts" + "path": "x-pack/plugins/observability_solution/apm/common/license_check.test.ts" }, { "plugin": "apm", - "path": "x-pack/plugins/apm/common/license_check.test.ts" + "path": "x-pack/plugins/observability_solution/apm/common/license_check.test.ts" }, { "plugin": "apm", - "path": "x-pack/plugins/apm/common/license_check.test.ts" + "path": "x-pack/plugins/observability_solution/apm/common/license_check.test.ts" }, { "plugin": "fleet", @@ -832,7 +832,7 @@ }, { "plugin": "apm", - "path": "x-pack/plugins/apm/public/context/license/license_context.tsx" + "path": "x-pack/plugins/observability_solution/apm/public/context/license/license_context.tsx" }, { "plugin": "crossClusterReplication", @@ -1809,51 +1809,51 @@ "references": [ { "plugin": "apm", - "path": "x-pack/plugins/apm/common/license_check.test.ts" + "path": "x-pack/plugins/observability_solution/apm/common/license_check.test.ts" }, { "plugin": "apm", - "path": "x-pack/plugins/apm/common/license_check.test.ts" + "path": "x-pack/plugins/observability_solution/apm/common/license_check.test.ts" }, { "plugin": "apm", - "path": "x-pack/plugins/apm/common/license_check.test.ts" + "path": "x-pack/plugins/observability_solution/apm/common/license_check.test.ts" }, { "plugin": "apm", - "path": "x-pack/plugins/apm/common/license_check.test.ts" + "path": "x-pack/plugins/observability_solution/apm/common/license_check.test.ts" }, { "plugin": "apm", - "path": "x-pack/plugins/apm/common/license_check.test.ts" + "path": "x-pack/plugins/observability_solution/apm/common/license_check.test.ts" }, { "plugin": "apm", - "path": "x-pack/plugins/apm/common/license_check.test.ts" + "path": "x-pack/plugins/observability_solution/apm/common/license_check.test.ts" }, { "plugin": "apm", - "path": "x-pack/plugins/apm/common/license_check.test.ts" + "path": "x-pack/plugins/observability_solution/apm/common/license_check.test.ts" }, { "plugin": "apm", - "path": "x-pack/plugins/apm/common/license_check.test.ts" + "path": "x-pack/plugins/observability_solution/apm/common/license_check.test.ts" }, { "plugin": "apm", - "path": "x-pack/plugins/apm/common/license_check.test.ts" + "path": "x-pack/plugins/observability_solution/apm/common/license_check.test.ts" }, { "plugin": "apm", - "path": "x-pack/plugins/apm/common/license_check.test.ts" + "path": "x-pack/plugins/observability_solution/apm/common/license_check.test.ts" }, { "plugin": "apm", - "path": "x-pack/plugins/apm/common/license_check.test.ts" + "path": "x-pack/plugins/observability_solution/apm/common/license_check.test.ts" }, { "plugin": "apm", - "path": "x-pack/plugins/apm/common/license_check.test.ts" + "path": "x-pack/plugins/observability_solution/apm/common/license_check.test.ts" }, { "plugin": "fleet", diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc index b1b61800c8cf4..10f8b65fdec15 100644 --- a/docs/developer/plugin-list.asciidoc +++ b/docs/developer/plugin-list.asciidoc @@ -458,11 +458,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/apm/readme.md[apm] +|{kib-repo}blob/{branch}/x-pack/plugins/observability_solution/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/apm_data_access[apmDataAccess] +|{kib-repo}blob/{branch}/x-pack/plugins/observability_solution/apm_data_access[apmDataAccess] |WARNING: Missing README. diff --git a/package.json b/package.json index d99db23ec5eb5..7f8e32b522eba 100644 --- a/package.json +++ b/package.json @@ -163,8 +163,8 @@ "@kbn/analytics-shippers-elastic-v3-server": "link:packages/analytics/shippers/elastic_v3/server", "@kbn/analytics-shippers-fullstory": "link:packages/analytics/shippers/fullstory", "@kbn/apm-config-loader": "link:packages/kbn-apm-config-loader", - "@kbn/apm-data-access-plugin": "link:x-pack/plugins/apm_data_access", - "@kbn/apm-plugin": "link:x-pack/plugins/apm", + "@kbn/apm-data-access-plugin": "link:x-pack/plugins/observability_solution/apm_data_access", + "@kbn/apm-plugin": "link:x-pack/plugins/observability_solution/apm", "@kbn/apm-utils": "link:packages/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", diff --git a/packages/kbn-babel-preset/styled_components_files.js b/packages/kbn-babel-preset/styled_components_files.js index 8da393ac5fb97..a44fcd7574631 100644 --- a/packages/kbn-babel-preset/styled_components_files.js +++ b/packages/kbn-babel-preset/styled_components_files.js @@ -14,7 +14,7 @@ module.exports = { USES_STYLED_COMPONENTS: [ /packages[\/\\]kbn-ui-shared-deps-(npm|src)[\/\\]/, /src[\/\\]plugins[\/\\](kibana_react)[\/\\]/, - /x-pack[\/\\]plugins[\/\\](apm|beats_management|cases|fleet|infra|lists|observability|observability_solution\/observability_shared|observability_solution\/exploratory_view|security_solution|timelines|observability_solution\/synthetics|observability_solution\/ux|observability_solution\/uptime)[\/\\]/, + /x-pack[\/\\]plugins[\/\\](observability_solution\/apm|beats_management|cases|fleet|infra|lists|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[\/\\]/, /x-pack[\/\\]packages[\/\\]elastic_assistant[\/\\]/, /x-pack[\/\\]packages[\/\\]security-solution[\/\\]ecs_data_quality_dashboard[\/\\]/, diff --git 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 index 8edc5c59b0991..4a7fa3143556f 100644 --- 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 @@ -12,7 +12,10 @@ const SYSTEMPATH = 'systemPath'; const testMap = [ ['x-pack/plugins/observability/public/header_actions.tsx', 'xpack.observability'], - ['x-pack/plugins/apm/common/components/app/correlations/correlations_table.tsx', 'xpack.apm'], + [ + 'x-pack/plugins/observability_solution/apm/common/components/app/correlations/correlations_table.tsx', + 'xpack.apm', + ], ['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', diff --git a/packages/kbn-eslint-plugin-telemetry/helpers/check_node_for_existing_data_test_subj_prop.ts b/packages/kbn-eslint-plugin-telemetry/helpers/check_node_for_existing_data_test_subj_prop.ts index ef0e32c1d2755..46e91f1e6b7bc 100644 --- a/packages/kbn-eslint-plugin-telemetry/helpers/check_node_for_existing_data_test_subj_prop.ts +++ b/packages/kbn-eslint-plugin-telemetry/helpers/check_node_for_existing_data_test_subj_prop.ts @@ -37,7 +37,7 @@ export function checkNodeForExistingDataTestSubjProp( const variable = getScope().variables.find((v) => v.name === name); // the variable definition of the spreaded variable return variable && variable.defs.length > 0 - ? variable.defs[0].node.init?.properties.find((property: TSESTree.Property) => { + ? variable.defs[0].node.init?.properties?.find((property: TSESTree.Property) => { if ('value' in property.key) { return property.key.value === 'data-test-subj'; } diff --git a/packages/kbn-eslint-plugin-telemetry/helpers/get_app_name.test.ts b/packages/kbn-eslint-plugin-telemetry/helpers/get_app_name.test.ts index 36790e883cce1..e86fa78411c5d 100644 --- 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,11 @@ const SYSTEMPATH = 'systemPath'; const testMap = [ ['x-pack/plugins/observability/foo/bar/baz/header_actions.tsx', 'o11y'], - ['x-pack/plugins/apm/public/components/app/correlations/correlations_table.tsx', 'apm'], + [ + 'x-pack/plugins/observability_solution/apm/public/components/app/correlations/correlations_table.tsx', + 'apm', + ], + ['x-pack/plugins/observability_solution/apm/baz/header_actions.tsx', 'apm'], ['x-pack/plugins/cases/public/components/foo.tsx', 'cases'], ['packages/kbn-alerts-ui-shared/src/alert_lifecycle_status_badge/index.tsx', 'kbnAlertsUiShared'], ]; diff --git a/packages/kbn-eslint-plugin-telemetry/helpers/get_app_name.ts b/packages/kbn-eslint-plugin-telemetry/helpers/get_app_name.ts index e483a572be892..1d85e918cf962 100644 --- a/packages/kbn-eslint-plugin-telemetry/helpers/get_app_name.ts +++ b/packages/kbn-eslint-plugin-telemetry/helpers/get_app_name.ts @@ -34,6 +34,9 @@ export function getAppName(fileName: string, cwd: string) { if (!relativePathArray[1]) return ''; if (relativePathArray[1] === 'x-pack') { + if (relativePathArray[3] === 'observability_solution') { + return relativePathArray[4]; + } return relativePathArray[3]; } diff --git a/src/dev/storybook/aliases.ts b/src/dev/storybook/aliases.ts index 208b4c0304b20..6aca0390525f3 100644 --- a/src/dev/storybook/aliases.ts +++ b/src/dev/storybook/aliases.ts @@ -11,7 +11,7 @@ // If you wish for your Storybook to be built and included in CI, also add your // alias to .buildkite/scripts/steps/storybooks/build_and_upload.ts export const storybookAliases = { - apm: 'x-pack/plugins/apm/.storybook', + apm: 'x-pack/plugins/observability_solution/apm/.storybook', canvas: 'x-pack/plugins/canvas/storybook', cases: 'packages/kbn-cases-components/.storybook', cell_actions: 'packages/kbn-cell-actions/.storybook', diff --git a/tsconfig.base.json b/tsconfig.base.json index 13101db4b4b7e..49e2e9d269077 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -74,10 +74,10 @@ "@kbn/analytics-shippers-fullstory/*": ["packages/analytics/shippers/fullstory/*"], "@kbn/apm-config-loader": ["packages/kbn-apm-config-loader"], "@kbn/apm-config-loader/*": ["packages/kbn-apm-config-loader/*"], - "@kbn/apm-data-access-plugin": ["x-pack/plugins/apm_data_access"], - "@kbn/apm-data-access-plugin/*": ["x-pack/plugins/apm_data_access/*"], - "@kbn/apm-plugin": ["x-pack/plugins/apm"], - "@kbn/apm-plugin/*": ["x-pack/plugins/apm/*"], + "@kbn/apm-data-access-plugin": ["x-pack/plugins/observability_solution/apm_data_access"], + "@kbn/apm-data-access-plugin/*": ["x-pack/plugins/observability_solution/apm_data_access/*"], + "@kbn/apm-plugin": ["x-pack/plugins/observability_solution/apm"], + "@kbn/apm-plugin/*": ["x-pack/plugins/observability_solution/apm/*"], "@kbn/apm-synthtrace": ["packages/kbn-apm-synthtrace"], "@kbn/apm-synthtrace/*": ["packages/kbn-apm-synthtrace/*"], "@kbn/apm-synthtrace-client": ["packages/kbn-apm-synthtrace-client"], diff --git a/x-pack/.i18nrc.json b/x-pack/.i18nrc.json index 9698ae5321bcc..4859320c39d0c 100644 --- a/x-pack/.i18nrc.json +++ b/x-pack/.i18nrc.json @@ -7,8 +7,8 @@ "xpack.eventLog": "plugins/event_log", "xpack.stackAlerts": "plugins/stack_alerts", "xpack.stackConnectors": "plugins/stack_connectors", - "xpack.apm": "plugins/apm", - "xpack.apmDataAccess": "plugins/apm_data_access", + "xpack.apm": "plugins/observability_solution/apm", + "xpack.apmDataAccess": "plugins/observability_solution/apm_data_access", "xpack.banners": "plugins/banners", "xpack.canvas": "plugins/canvas", "xpack.cases": "plugins/cases", diff --git a/x-pack/packages/ml/aiops_components/src/progress_controls/progress_controls.tsx b/x-pack/packages/ml/aiops_components/src/progress_controls/progress_controls.tsx index 4a2e38a4f3acf..1dcc35a433eb2 100644 --- a/x-pack/packages/ml/aiops_components/src/progress_controls/progress_controls.tsx +++ b/x-pack/packages/ml/aiops_components/src/progress_controls/progress_controls.tsx @@ -24,7 +24,7 @@ import { FormattedMessage } from '@kbn/i18n-react'; import { useAnimatedProgressBarBackground } from './use_animated_progress_bar_background'; // TODO Consolidate with duplicate component `CorrelationsProgressControls` in -// `x-pack/plugins/apm/public/components/app/correlations/progress_controls.tsx` +// `x-pack/plugins/observability_solution/apm/public/components/app/correlations/progress_controls.tsx` /** * Props for ProgressControlProps diff --git a/x-pack/plugins/aiops/server/routes/log_rate_analysis/queries/fetch_index_info.ts b/x-pack/plugins/aiops/server/routes/log_rate_analysis/queries/fetch_index_info.ts index fd7975aac1b6e..d8601691264f6 100644 --- a/x-pack/plugins/aiops/server/routes/log_rate_analysis/queries/fetch_index_info.ts +++ b/x-pack/plugins/aiops/server/routes/log_rate_analysis/queries/fetch_index_info.ts @@ -16,7 +16,7 @@ import { getRandomDocsRequest } from './get_random_docs_request'; import { getTotalDocCountRequest } from './get_total_doc_count_request'; // TODO Consolidate with duplicate `fetchPValues` in -// `x-pack/plugins/apm/server/routes/correlations/queries/fetch_duration_field_candidates.ts` +// `x-pack/plugins/observability_solution/apm/server/routes/correlations/queries/fetch_duration_field_candidates.ts` const SUPPORTED_ES_FIELD_TYPES = [ ES_FIELD_TYPES.KEYWORD, diff --git a/x-pack/plugins/aiops/server/routes/log_rate_analysis/queries/fetch_significant_term_p_values.ts b/x-pack/plugins/aiops/server/routes/log_rate_analysis/queries/fetch_significant_term_p_values.ts index 6cdf6983d5827..8dec0ed7cf2f9 100644 --- a/x-pack/plugins/aiops/server/routes/log_rate_analysis/queries/fetch_significant_term_p_values.ts +++ b/x-pack/plugins/aiops/server/routes/log_rate_analysis/queries/fetch_significant_term_p_values.ts @@ -25,7 +25,7 @@ import { getQueryWithParams } from './get_query_with_params'; import { getRequestBase } from './get_request_base'; // TODO Consolidate with duplicate `fetchDurationFieldCandidates` in -// `x-pack/plugins/apm/server/routes/correlations/queries/fetch_failed_events_correlation_p_values.ts` +// `x-pack/plugins/observability_solution/apm/server/routes/correlations/queries/fetch_failed_events_correlation_p_values.ts` export const getSignificantTermRequest = ( params: AiopsLogRateAnalysisSchema, diff --git a/x-pack/plugins/aiops/server/routes/log_rate_analysis/queries/fetch_top_terms.ts b/x-pack/plugins/aiops/server/routes/log_rate_analysis/queries/fetch_top_terms.ts index d1b8007249136..4b48bb7ecd232 100644 --- a/x-pack/plugins/aiops/server/routes/log_rate_analysis/queries/fetch_top_terms.ts +++ b/x-pack/plugins/aiops/server/routes/log_rate_analysis/queries/fetch_top_terms.ts @@ -24,7 +24,7 @@ import { getQueryWithParams } from './get_query_with_params'; import { getRequestBase } from './get_request_base'; // TODO Consolidate with duplicate `fetchDurationFieldCandidates` in -// `x-pack/plugins/apm/server/routes/correlations/queries/fetch_failed_events_correlation_p_values.ts` +// `x-pack/plugins/observability_solution/apm/server/routes/correlations/queries/fetch_failed_events_correlation_p_values.ts` export const getTopTermRequest = ( params: AiopsLogRateAnalysisSchema, diff --git a/x-pack/plugins/alerting/server/integration_tests/alert_as_data_fields.test.ts b/x-pack/plugins/alerting/server/integration_tests/alert_as_data_fields.test.ts index f1191fa5aa353..9e08ec5c2b972 100644 --- a/x-pack/plugins/alerting/server/integration_tests/alert_as_data_fields.test.ts +++ b/x-pack/plugins/alerting/server/integration_tests/alert_as_data_fields.test.ts @@ -95,7 +95,7 @@ describe('Alert as data fields checks', () => { * on all the rule types. */ test('ensure rule types list up to date', async () => { - expect(ruleTypes).toEqual(ruleTypeRegistry.getAllTypes()); + expect(ruleTypes.sort()).toEqual(ruleTypeRegistry.getAllTypes().sort()); }); for (const ruleTypeId of ruleTypes) { diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/saved_search_utils.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/saved_search_utils.ts index 3ecc8a3a7a3d8..b1a02dbfe939f 100644 --- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/saved_search_utils.ts +++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/saved_search_utils.ts @@ -6,7 +6,7 @@ */ // TODO Consolidate with duplicate component `CorrelationsProgressControls` in -// `x-pack/plugins/apm/public/components/app/correlations/progress_controls.tsx` +// `x-pack/plugins/observability_solution/apm/public/components/app/correlations/progress_controls.tsx` import { cloneDeep } from 'lodash'; import { IUiSettingsClient } from '@kbn/core/public'; import { buildEsQuery, Query, Filter } from '@kbn/es-query'; diff --git a/x-pack/plugins/observability/common/annotations.ts b/x-pack/plugins/observability/common/annotations.ts index e9b7c6b77b231..b30b563ccd0b0 100644 --- a/x-pack/plugins/observability/common/annotations.ts +++ b/x-pack/plugins/observability/common/annotations.ts @@ -12,7 +12,7 @@ import { either } from 'fp-ts/lib/Either'; * Checks whether a string is a valid ISO timestamp, * but doesn't convert it into a Date object when decoding. * - * Copied from x-pack/plugins/apm/common/runtime_types/date_as_string_rt.ts. + * Copied from x-pack/plugins/observability_solution/apm/common/runtime_types/date_as_string_rt.ts. */ const dateAsStringRt = new t.Type( 'DateAsString', diff --git a/x-pack/plugins/apm/.prettierrc b/x-pack/plugins/observability_solution/apm/.prettierrc similarity index 100% rename from x-pack/plugins/apm/.prettierrc rename to x-pack/plugins/observability_solution/apm/.prettierrc diff --git a/x-pack/plugins/apm/.storybook/jest_setup.js b/x-pack/plugins/observability_solution/apm/.storybook/jest_setup.js similarity index 100% rename from x-pack/plugins/apm/.storybook/jest_setup.js rename to x-pack/plugins/observability_solution/apm/.storybook/jest_setup.js diff --git a/x-pack/plugins/apm/.storybook/main.js b/x-pack/plugins/observability_solution/apm/.storybook/main.js similarity index 100% rename from x-pack/plugins/apm/.storybook/main.js rename to x-pack/plugins/observability_solution/apm/.storybook/main.js diff --git a/x-pack/plugins/apm/.storybook/preview.js b/x-pack/plugins/observability_solution/apm/.storybook/preview.js similarity index 100% rename from x-pack/plugins/apm/.storybook/preview.js rename to x-pack/plugins/observability_solution/apm/.storybook/preview.js diff --git a/x-pack/plugins/apm/CONTRIBUTING.md b/x-pack/plugins/observability_solution/apm/CONTRIBUTING.md similarity index 100% rename from x-pack/plugins/apm/CONTRIBUTING.md rename to x-pack/plugins/observability_solution/apm/CONTRIBUTING.md diff --git a/x-pack/plugins/apm/common/__snapshots__/apm_telemetry.test.ts.snap b/x-pack/plugins/observability_solution/apm/common/__snapshots__/apm_telemetry.test.ts.snap similarity index 100% rename from x-pack/plugins/apm/common/__snapshots__/apm_telemetry.test.ts.snap rename to x-pack/plugins/observability_solution/apm/common/__snapshots__/apm_telemetry.test.ts.snap diff --git a/x-pack/plugins/apm/common/agent_configuration/all_option.ts b/x-pack/plugins/observability_solution/apm/common/agent_configuration/all_option.ts similarity index 100% rename from x-pack/plugins/apm/common/agent_configuration/all_option.ts rename to x-pack/plugins/observability_solution/apm/common/agent_configuration/all_option.ts diff --git a/x-pack/plugins/apm/common/agent_configuration/amount_and_unit.ts b/x-pack/plugins/observability_solution/apm/common/agent_configuration/amount_and_unit.ts similarity index 100% rename from x-pack/plugins/apm/common/agent_configuration/amount_and_unit.ts rename to x-pack/plugins/observability_solution/apm/common/agent_configuration/amount_and_unit.ts diff --git a/x-pack/plugins/apm/common/agent_configuration/configuration_types.d.ts b/x-pack/plugins/observability_solution/apm/common/agent_configuration/configuration_types.d.ts similarity index 100% rename from x-pack/plugins/apm/common/agent_configuration/configuration_types.d.ts rename to x-pack/plugins/observability_solution/apm/common/agent_configuration/configuration_types.d.ts diff --git a/x-pack/plugins/apm/common/agent_configuration/constants.ts b/x-pack/plugins/observability_solution/apm/common/agent_configuration/constants.ts similarity index 100% rename from x-pack/plugins/apm/common/agent_configuration/constants.ts rename to x-pack/plugins/observability_solution/apm/common/agent_configuration/constants.ts diff --git a/x-pack/plugins/apm/common/agent_configuration/runtime_types/agent_configuration_intake_rt.test.ts b/x-pack/plugins/observability_solution/apm/common/agent_configuration/runtime_types/agent_configuration_intake_rt.test.ts similarity index 100% rename from x-pack/plugins/apm/common/agent_configuration/runtime_types/agent_configuration_intake_rt.test.ts rename to x-pack/plugins/observability_solution/apm/common/agent_configuration/runtime_types/agent_configuration_intake_rt.test.ts diff --git a/x-pack/plugins/apm/common/agent_configuration/runtime_types/agent_configuration_intake_rt.ts b/x-pack/plugins/observability_solution/apm/common/agent_configuration/runtime_types/agent_configuration_intake_rt.ts similarity index 100% rename from x-pack/plugins/apm/common/agent_configuration/runtime_types/agent_configuration_intake_rt.ts rename to x-pack/plugins/observability_solution/apm/common/agent_configuration/runtime_types/agent_configuration_intake_rt.ts diff --git a/x-pack/plugins/apm/common/agent_configuration/runtime_types/boolean_rt.test.ts b/x-pack/plugins/observability_solution/apm/common/agent_configuration/runtime_types/boolean_rt.test.ts similarity index 100% rename from x-pack/plugins/apm/common/agent_configuration/runtime_types/boolean_rt.test.ts rename to x-pack/plugins/observability_solution/apm/common/agent_configuration/runtime_types/boolean_rt.test.ts diff --git a/x-pack/plugins/apm/common/agent_configuration/runtime_types/boolean_rt.ts b/x-pack/plugins/observability_solution/apm/common/agent_configuration/runtime_types/boolean_rt.ts similarity index 100% rename from x-pack/plugins/apm/common/agent_configuration/runtime_types/boolean_rt.ts rename to x-pack/plugins/observability_solution/apm/common/agent_configuration/runtime_types/boolean_rt.ts diff --git a/x-pack/plugins/apm/common/agent_configuration/runtime_types/bytes_rt.test.ts b/x-pack/plugins/observability_solution/apm/common/agent_configuration/runtime_types/bytes_rt.test.ts similarity index 100% rename from x-pack/plugins/apm/common/agent_configuration/runtime_types/bytes_rt.test.ts rename to x-pack/plugins/observability_solution/apm/common/agent_configuration/runtime_types/bytes_rt.test.ts diff --git a/x-pack/plugins/apm/common/agent_configuration/runtime_types/bytes_rt.ts b/x-pack/plugins/observability_solution/apm/common/agent_configuration/runtime_types/bytes_rt.ts similarity index 100% rename from x-pack/plugins/apm/common/agent_configuration/runtime_types/bytes_rt.ts rename to x-pack/plugins/observability_solution/apm/common/agent_configuration/runtime_types/bytes_rt.ts diff --git a/x-pack/plugins/apm/common/agent_configuration/runtime_types/capture_body_rt.test.ts b/x-pack/plugins/observability_solution/apm/common/agent_configuration/runtime_types/capture_body_rt.test.ts similarity index 100% rename from x-pack/plugins/apm/common/agent_configuration/runtime_types/capture_body_rt.test.ts rename to x-pack/plugins/observability_solution/apm/common/agent_configuration/runtime_types/capture_body_rt.test.ts diff --git a/x-pack/plugins/apm/common/agent_configuration/runtime_types/capture_body_rt.ts b/x-pack/plugins/observability_solution/apm/common/agent_configuration/runtime_types/capture_body_rt.ts similarity index 100% rename from x-pack/plugins/apm/common/agent_configuration/runtime_types/capture_body_rt.ts rename to x-pack/plugins/observability_solution/apm/common/agent_configuration/runtime_types/capture_body_rt.ts diff --git a/x-pack/plugins/apm/common/agent_configuration/runtime_types/duration_rt.test.ts b/x-pack/plugins/observability_solution/apm/common/agent_configuration/runtime_types/duration_rt.test.ts similarity index 100% rename from x-pack/plugins/apm/common/agent_configuration/runtime_types/duration_rt.test.ts rename to x-pack/plugins/observability_solution/apm/common/agent_configuration/runtime_types/duration_rt.test.ts diff --git a/x-pack/plugins/apm/common/agent_configuration/runtime_types/duration_rt.ts b/x-pack/plugins/observability_solution/apm/common/agent_configuration/runtime_types/duration_rt.ts similarity index 100% rename from x-pack/plugins/apm/common/agent_configuration/runtime_types/duration_rt.ts rename to x-pack/plugins/observability_solution/apm/common/agent_configuration/runtime_types/duration_rt.ts diff --git a/x-pack/plugins/apm/common/agent_configuration/runtime_types/float_rt.test.ts b/x-pack/plugins/observability_solution/apm/common/agent_configuration/runtime_types/float_rt.test.ts similarity index 100% rename from x-pack/plugins/apm/common/agent_configuration/runtime_types/float_rt.test.ts rename to x-pack/plugins/observability_solution/apm/common/agent_configuration/runtime_types/float_rt.test.ts diff --git a/x-pack/plugins/apm/common/agent_configuration/runtime_types/float_rt.ts b/x-pack/plugins/observability_solution/apm/common/agent_configuration/runtime_types/float_rt.ts similarity index 100% rename from x-pack/plugins/apm/common/agent_configuration/runtime_types/float_rt.ts rename to x-pack/plugins/observability_solution/apm/common/agent_configuration/runtime_types/float_rt.ts diff --git a/x-pack/plugins/apm/common/agent_configuration/runtime_types/get_range_type_message.ts b/x-pack/plugins/observability_solution/apm/common/agent_configuration/runtime_types/get_range_type_message.ts similarity index 100% rename from x-pack/plugins/apm/common/agent_configuration/runtime_types/get_range_type_message.ts rename to x-pack/plugins/observability_solution/apm/common/agent_configuration/runtime_types/get_range_type_message.ts diff --git a/x-pack/plugins/apm/common/agent_configuration/runtime_types/integer_rt.test.ts b/x-pack/plugins/observability_solution/apm/common/agent_configuration/runtime_types/integer_rt.test.ts similarity index 100% rename from x-pack/plugins/apm/common/agent_configuration/runtime_types/integer_rt.test.ts rename to x-pack/plugins/observability_solution/apm/common/agent_configuration/runtime_types/integer_rt.test.ts diff --git a/x-pack/plugins/apm/common/agent_configuration/runtime_types/integer_rt.ts b/x-pack/plugins/observability_solution/apm/common/agent_configuration/runtime_types/integer_rt.ts similarity index 100% rename from x-pack/plugins/apm/common/agent_configuration/runtime_types/integer_rt.ts rename to x-pack/plugins/observability_solution/apm/common/agent_configuration/runtime_types/integer_rt.ts diff --git a/x-pack/plugins/apm/common/agent_configuration/runtime_types/log_ecs_reformatting_rt.ts b/x-pack/plugins/observability_solution/apm/common/agent_configuration/runtime_types/log_ecs_reformatting_rt.ts similarity index 100% rename from x-pack/plugins/apm/common/agent_configuration/runtime_types/log_ecs_reformatting_rt.ts rename to x-pack/plugins/observability_solution/apm/common/agent_configuration/runtime_types/log_ecs_reformatting_rt.ts diff --git a/x-pack/plugins/apm/common/agent_configuration/runtime_types/log_level_rt.ts b/x-pack/plugins/observability_solution/apm/common/agent_configuration/runtime_types/log_level_rt.ts similarity index 100% rename from x-pack/plugins/apm/common/agent_configuration/runtime_types/log_level_rt.ts rename to x-pack/plugins/observability_solution/apm/common/agent_configuration/runtime_types/log_level_rt.ts diff --git a/x-pack/plugins/apm/common/agent_configuration/runtime_types/storage_size_rt.test.ts b/x-pack/plugins/observability_solution/apm/common/agent_configuration/runtime_types/storage_size_rt.test.ts similarity index 100% rename from x-pack/plugins/apm/common/agent_configuration/runtime_types/storage_size_rt.test.ts rename to x-pack/plugins/observability_solution/apm/common/agent_configuration/runtime_types/storage_size_rt.test.ts diff --git a/x-pack/plugins/apm/common/agent_configuration/runtime_types/storage_size_rt.ts b/x-pack/plugins/observability_solution/apm/common/agent_configuration/runtime_types/storage_size_rt.ts similarity index 100% rename from x-pack/plugins/apm/common/agent_configuration/runtime_types/storage_size_rt.ts rename to x-pack/plugins/observability_solution/apm/common/agent_configuration/runtime_types/storage_size_rt.ts diff --git a/x-pack/plugins/apm/common/agent_configuration/runtime_types/trace_continuation_strategy_rt.ts b/x-pack/plugins/observability_solution/apm/common/agent_configuration/runtime_types/trace_continuation_strategy_rt.ts similarity index 100% rename from x-pack/plugins/apm/common/agent_configuration/runtime_types/trace_continuation_strategy_rt.ts rename to x-pack/plugins/observability_solution/apm/common/agent_configuration/runtime_types/trace_continuation_strategy_rt.ts diff --git a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/__snapshots__/index.test.ts.snap b/x-pack/plugins/observability_solution/apm/common/agent_configuration/setting_definitions/__snapshots__/index.test.ts.snap similarity index 100% rename from x-pack/plugins/apm/common/agent_configuration/setting_definitions/__snapshots__/index.test.ts.snap rename to x-pack/plugins/observability_solution/apm/common/agent_configuration/setting_definitions/__snapshots__/index.test.ts.snap diff --git a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/general_settings.ts b/x-pack/plugins/observability_solution/apm/common/agent_configuration/setting_definitions/general_settings.ts similarity index 100% rename from x-pack/plugins/apm/common/agent_configuration/setting_definitions/general_settings.ts rename to x-pack/plugins/observability_solution/apm/common/agent_configuration/setting_definitions/general_settings.ts diff --git a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/index.test.ts b/x-pack/plugins/observability_solution/apm/common/agent_configuration/setting_definitions/index.test.ts similarity index 100% rename from x-pack/plugins/apm/common/agent_configuration/setting_definitions/index.test.ts rename to x-pack/plugins/observability_solution/apm/common/agent_configuration/setting_definitions/index.test.ts diff --git a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/index.ts b/x-pack/plugins/observability_solution/apm/common/agent_configuration/setting_definitions/index.ts similarity index 100% rename from x-pack/plugins/apm/common/agent_configuration/setting_definitions/index.ts rename to x-pack/plugins/observability_solution/apm/common/agent_configuration/setting_definitions/index.ts diff --git a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/java_settings.ts b/x-pack/plugins/observability_solution/apm/common/agent_configuration/setting_definitions/java_settings.ts similarity index 100% rename from x-pack/plugins/apm/common/agent_configuration/setting_definitions/java_settings.ts rename to x-pack/plugins/observability_solution/apm/common/agent_configuration/setting_definitions/java_settings.ts diff --git a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/mobile_settings.ts b/x-pack/plugins/observability_solution/apm/common/agent_configuration/setting_definitions/mobile_settings.ts similarity index 100% rename from x-pack/plugins/apm/common/agent_configuration/setting_definitions/mobile_settings.ts rename to x-pack/plugins/observability_solution/apm/common/agent_configuration/setting_definitions/mobile_settings.ts diff --git a/x-pack/plugins/apm/common/agent_configuration/setting_definitions/types.d.ts b/x-pack/plugins/observability_solution/apm/common/agent_configuration/setting_definitions/types.d.ts similarity index 100% rename from x-pack/plugins/apm/common/agent_configuration/setting_definitions/types.d.ts rename to x-pack/plugins/observability_solution/apm/common/agent_configuration/setting_definitions/types.d.ts diff --git a/x-pack/plugins/apm/common/agent_explorer.ts b/x-pack/plugins/observability_solution/apm/common/agent_explorer.ts similarity index 100% rename from x-pack/plugins/apm/common/agent_explorer.ts rename to x-pack/plugins/observability_solution/apm/common/agent_explorer.ts diff --git a/x-pack/plugins/apm/common/agent_key_types.ts b/x-pack/plugins/observability_solution/apm/common/agent_key_types.ts similarity index 100% rename from x-pack/plugins/apm/common/agent_key_types.ts rename to x-pack/plugins/observability_solution/apm/common/agent_key_types.ts diff --git a/x-pack/plugins/apm/common/agent_name.ts b/x-pack/plugins/observability_solution/apm/common/agent_name.ts similarity index 100% rename from x-pack/plugins/apm/common/agent_name.ts rename to x-pack/plugins/observability_solution/apm/common/agent_name.ts diff --git a/x-pack/plugins/apm/common/aggregated_transactions.ts b/x-pack/plugins/observability_solution/apm/common/aggregated_transactions.ts similarity index 100% rename from x-pack/plugins/apm/common/aggregated_transactions.ts rename to x-pack/plugins/observability_solution/apm/common/aggregated_transactions.ts diff --git a/x-pack/plugins/apm/common/annotations.ts b/x-pack/plugins/observability_solution/apm/common/annotations.ts similarity index 100% rename from x-pack/plugins/apm/common/annotations.ts rename to x-pack/plugins/observability_solution/apm/common/annotations.ts diff --git a/x-pack/plugins/apm/common/anomaly_detection/apm_ml_detectors.ts b/x-pack/plugins/observability_solution/apm/common/anomaly_detection/apm_ml_detectors.ts similarity index 100% rename from x-pack/plugins/apm/common/anomaly_detection/apm_ml_detectors.ts rename to x-pack/plugins/observability_solution/apm/common/anomaly_detection/apm_ml_detectors.ts diff --git a/x-pack/plugins/apm/common/anomaly_detection/apm_ml_job.ts b/x-pack/plugins/observability_solution/apm/common/anomaly_detection/apm_ml_job.ts similarity index 100% rename from x-pack/plugins/apm/common/anomaly_detection/apm_ml_job.ts rename to x-pack/plugins/observability_solution/apm/common/anomaly_detection/apm_ml_job.ts diff --git a/x-pack/plugins/apm/common/anomaly_detection/get_anomaly_detection_setup_state.ts b/x-pack/plugins/observability_solution/apm/common/anomaly_detection/get_anomaly_detection_setup_state.ts similarity index 100% rename from x-pack/plugins/apm/common/anomaly_detection/get_anomaly_detection_setup_state.ts rename to x-pack/plugins/observability_solution/apm/common/anomaly_detection/get_anomaly_detection_setup_state.ts diff --git a/x-pack/plugins/apm/common/anomaly_detection/get_preferred_service_anomaly_timeseries.test.ts b/x-pack/plugins/observability_solution/apm/common/anomaly_detection/get_preferred_service_anomaly_timeseries.test.ts similarity index 100% rename from x-pack/plugins/apm/common/anomaly_detection/get_preferred_service_anomaly_timeseries.test.ts rename to x-pack/plugins/observability_solution/apm/common/anomaly_detection/get_preferred_service_anomaly_timeseries.test.ts diff --git a/x-pack/plugins/apm/common/anomaly_detection/get_preferred_service_anomaly_timeseries.ts b/x-pack/plugins/observability_solution/apm/common/anomaly_detection/get_preferred_service_anomaly_timeseries.ts similarity index 100% rename from x-pack/plugins/apm/common/anomaly_detection/get_preferred_service_anomaly_timeseries.ts rename to x-pack/plugins/observability_solution/apm/common/anomaly_detection/get_preferred_service_anomaly_timeseries.ts diff --git a/x-pack/plugins/apm/common/anomaly_detection/index.ts b/x-pack/plugins/observability_solution/apm/common/anomaly_detection/index.ts similarity index 100% rename from x-pack/plugins/apm/common/anomaly_detection/index.ts rename to x-pack/plugins/observability_solution/apm/common/anomaly_detection/index.ts diff --git a/x-pack/plugins/apm/common/anomaly_detection/service_anomaly_timeseries.ts b/x-pack/plugins/observability_solution/apm/common/anomaly_detection/service_anomaly_timeseries.ts similarity index 100% rename from x-pack/plugins/apm/common/anomaly_detection/service_anomaly_timeseries.ts rename to x-pack/plugins/observability_solution/apm/common/anomaly_detection/service_anomaly_timeseries.ts diff --git a/x-pack/plugins/apm/common/apm_api/parse_endpoint.ts b/x-pack/plugins/observability_solution/apm/common/apm_api/parse_endpoint.ts similarity index 100% rename from x-pack/plugins/apm/common/apm_api/parse_endpoint.ts rename to x-pack/plugins/observability_solution/apm/common/apm_api/parse_endpoint.ts diff --git a/x-pack/plugins/apm/common/apm_feature_flags.ts b/x-pack/plugins/observability_solution/apm/common/apm_feature_flags.ts similarity index 100% rename from x-pack/plugins/apm/common/apm_feature_flags.ts rename to x-pack/plugins/observability_solution/apm/common/apm_feature_flags.ts diff --git a/x-pack/plugins/apm/common/apm_saved_object_constants.ts b/x-pack/plugins/observability_solution/apm/common/apm_saved_object_constants.ts similarity index 100% rename from x-pack/plugins/apm/common/apm_saved_object_constants.ts rename to x-pack/plugins/observability_solution/apm/common/apm_saved_object_constants.ts diff --git a/x-pack/plugins/apm/common/apm_telemetry.test.ts b/x-pack/plugins/observability_solution/apm/common/apm_telemetry.test.ts similarity index 100% rename from x-pack/plugins/apm/common/apm_telemetry.test.ts rename to x-pack/plugins/observability_solution/apm/common/apm_telemetry.test.ts diff --git a/x-pack/plugins/apm/common/apm_telemetry.ts b/x-pack/plugins/observability_solution/apm/common/apm_telemetry.ts similarity index 100% rename from x-pack/plugins/apm/common/apm_telemetry.ts rename to x-pack/plugins/observability_solution/apm/common/apm_telemetry.ts diff --git a/x-pack/plugins/apm/common/assistant/constants.ts b/x-pack/plugins/observability_solution/apm/common/assistant/constants.ts similarity index 100% rename from x-pack/plugins/apm/common/assistant/constants.ts rename to x-pack/plugins/observability_solution/apm/common/assistant/constants.ts diff --git a/x-pack/plugins/apm/common/comparison_rt.ts b/x-pack/plugins/observability_solution/apm/common/comparison_rt.ts similarity index 100% rename from x-pack/plugins/apm/common/comparison_rt.ts rename to x-pack/plugins/observability_solution/apm/common/comparison_rt.ts diff --git a/x-pack/plugins/apm/common/connections.ts b/x-pack/plugins/observability_solution/apm/common/connections.ts similarity index 100% rename from x-pack/plugins/apm/common/connections.ts rename to x-pack/plugins/observability_solution/apm/common/connections.ts diff --git a/x-pack/plugins/apm/common/correlations/constants.ts b/x-pack/plugins/observability_solution/apm/common/correlations/constants.ts similarity index 100% rename from x-pack/plugins/apm/common/correlations/constants.ts rename to x-pack/plugins/observability_solution/apm/common/correlations/constants.ts diff --git a/x-pack/plugins/apm/common/correlations/failed_transactions_correlations/constants.ts b/x-pack/plugins/observability_solution/apm/common/correlations/failed_transactions_correlations/constants.ts similarity index 100% rename from x-pack/plugins/apm/common/correlations/failed_transactions_correlations/constants.ts rename to x-pack/plugins/observability_solution/apm/common/correlations/failed_transactions_correlations/constants.ts diff --git a/x-pack/plugins/apm/common/correlations/failed_transactions_correlations/types.ts b/x-pack/plugins/observability_solution/apm/common/correlations/failed_transactions_correlations/types.ts similarity index 100% rename from x-pack/plugins/apm/common/correlations/failed_transactions_correlations/types.ts rename to x-pack/plugins/observability_solution/apm/common/correlations/failed_transactions_correlations/types.ts diff --git a/x-pack/plugins/apm/common/correlations/field_stats_types.ts b/x-pack/plugins/observability_solution/apm/common/correlations/field_stats_types.ts similarity index 100% rename from x-pack/plugins/apm/common/correlations/field_stats_types.ts rename to x-pack/plugins/observability_solution/apm/common/correlations/field_stats_types.ts diff --git a/x-pack/plugins/apm/common/correlations/latency_correlations/types.ts b/x-pack/plugins/observability_solution/apm/common/correlations/latency_correlations/types.ts similarity index 100% rename from x-pack/plugins/apm/common/correlations/latency_correlations/types.ts rename to x-pack/plugins/observability_solution/apm/common/correlations/latency_correlations/types.ts diff --git a/x-pack/plugins/apm/common/correlations/types.ts b/x-pack/plugins/observability_solution/apm/common/correlations/types.ts similarity index 100% rename from x-pack/plugins/apm/common/correlations/types.ts rename to x-pack/plugins/observability_solution/apm/common/correlations/types.ts diff --git a/x-pack/plugins/apm/common/correlations/utils/get_prioritized_field_value_pairs.test.ts b/x-pack/plugins/observability_solution/apm/common/correlations/utils/get_prioritized_field_value_pairs.test.ts similarity index 100% rename from x-pack/plugins/apm/common/correlations/utils/get_prioritized_field_value_pairs.test.ts rename to x-pack/plugins/observability_solution/apm/common/correlations/utils/get_prioritized_field_value_pairs.test.ts diff --git a/x-pack/plugins/apm/common/correlations/utils/get_prioritized_field_value_pairs.ts b/x-pack/plugins/observability_solution/apm/common/correlations/utils/get_prioritized_field_value_pairs.ts similarity index 100% rename from x-pack/plugins/apm/common/correlations/utils/get_prioritized_field_value_pairs.ts rename to x-pack/plugins/observability_solution/apm/common/correlations/utils/get_prioritized_field_value_pairs.ts diff --git a/x-pack/plugins/apm/common/correlations/utils/has_prefix_to_include.test.ts b/x-pack/plugins/observability_solution/apm/common/correlations/utils/has_prefix_to_include.test.ts similarity index 100% rename from x-pack/plugins/apm/common/correlations/utils/has_prefix_to_include.test.ts rename to x-pack/plugins/observability_solution/apm/common/correlations/utils/has_prefix_to_include.test.ts diff --git a/x-pack/plugins/apm/common/correlations/utils/has_prefix_to_include.ts b/x-pack/plugins/observability_solution/apm/common/correlations/utils/has_prefix_to_include.ts similarity index 100% rename from x-pack/plugins/apm/common/correlations/utils/has_prefix_to_include.ts rename to x-pack/plugins/observability_solution/apm/common/correlations/utils/has_prefix_to_include.ts diff --git a/x-pack/plugins/apm/common/correlations/utils/index.ts b/x-pack/plugins/observability_solution/apm/common/correlations/utils/index.ts similarity index 100% rename from x-pack/plugins/apm/common/correlations/utils/index.ts rename to x-pack/plugins/observability_solution/apm/common/correlations/utils/index.ts diff --git a/x-pack/plugins/apm/common/critical_path/get_aggregated_critical_path_root_nodes.ts b/x-pack/plugins/observability_solution/apm/common/critical_path/get_aggregated_critical_path_root_nodes.ts similarity index 100% rename from x-pack/plugins/apm/common/critical_path/get_aggregated_critical_path_root_nodes.ts rename to x-pack/plugins/observability_solution/apm/common/critical_path/get_aggregated_critical_path_root_nodes.ts diff --git a/x-pack/plugins/apm/common/critical_path/get_critical_path.test.ts b/x-pack/plugins/observability_solution/apm/common/critical_path/get_critical_path.test.ts similarity index 100% rename from x-pack/plugins/apm/common/critical_path/get_critical_path.test.ts rename to x-pack/plugins/observability_solution/apm/common/critical_path/get_critical_path.test.ts diff --git a/x-pack/plugins/apm/common/critical_path/get_critical_path.ts b/x-pack/plugins/observability_solution/apm/common/critical_path/get_critical_path.ts similarity index 100% rename from x-pack/plugins/apm/common/critical_path/get_critical_path.ts rename to x-pack/plugins/observability_solution/apm/common/critical_path/get_critical_path.ts diff --git a/x-pack/plugins/apm/common/critical_path/types.ts b/x-pack/plugins/observability_solution/apm/common/critical_path/types.ts similarity index 100% rename from x-pack/plugins/apm/common/critical_path/types.ts rename to x-pack/plugins/observability_solution/apm/common/critical_path/types.ts diff --git a/x-pack/plugins/apm/common/custom_dashboards.ts b/x-pack/plugins/observability_solution/apm/common/custom_dashboards.ts similarity index 100% rename from x-pack/plugins/apm/common/custom_dashboards.ts rename to x-pack/plugins/observability_solution/apm/common/custom_dashboards.ts diff --git a/x-pack/plugins/apm/common/custom_link/custom_link.test.ts b/x-pack/plugins/observability_solution/apm/common/custom_link/custom_link.test.ts similarity index 100% rename from x-pack/plugins/apm/common/custom_link/custom_link.test.ts rename to x-pack/plugins/observability_solution/apm/common/custom_link/custom_link.test.ts diff --git a/x-pack/plugins/apm/common/custom_link/custom_link_filter_options.ts b/x-pack/plugins/observability_solution/apm/common/custom_link/custom_link_filter_options.ts similarity index 100% rename from x-pack/plugins/apm/common/custom_link/custom_link_filter_options.ts rename to x-pack/plugins/observability_solution/apm/common/custom_link/custom_link_filter_options.ts diff --git a/x-pack/plugins/apm/common/custom_link/custom_link_types.d.ts b/x-pack/plugins/observability_solution/apm/common/custom_link/custom_link_types.d.ts similarity index 100% rename from x-pack/plugins/apm/common/custom_link/custom_link_types.d.ts rename to x-pack/plugins/observability_solution/apm/common/custom_link/custom_link_types.d.ts diff --git a/x-pack/plugins/apm/common/custom_link/index.ts b/x-pack/plugins/observability_solution/apm/common/custom_link/index.ts similarity index 100% rename from x-pack/plugins/apm/common/custom_link/index.ts rename to x-pack/plugins/observability_solution/apm/common/custom_link/index.ts diff --git a/x-pack/plugins/apm/common/data_source.ts b/x-pack/plugins/observability_solution/apm/common/data_source.ts similarity index 100% rename from x-pack/plugins/apm/common/data_source.ts rename to x-pack/plugins/observability_solution/apm/common/data_source.ts diff --git a/x-pack/plugins/apm/common/data_view_constants.ts b/x-pack/plugins/observability_solution/apm/common/data_view_constants.ts similarity index 100% rename from x-pack/plugins/apm/common/data_view_constants.ts rename to x-pack/plugins/observability_solution/apm/common/data_view_constants.ts diff --git a/x-pack/plugins/apm/common/dependencies.ts b/x-pack/plugins/observability_solution/apm/common/dependencies.ts similarity index 100% rename from x-pack/plugins/apm/common/dependencies.ts rename to x-pack/plugins/observability_solution/apm/common/dependencies.ts diff --git a/x-pack/plugins/apm/common/document_type.ts b/x-pack/plugins/observability_solution/apm/common/document_type.ts similarity index 100% rename from x-pack/plugins/apm/common/document_type.ts rename to x-pack/plugins/observability_solution/apm/common/document_type.ts diff --git a/x-pack/plugins/apm/common/environment_filter_values.ts b/x-pack/plugins/observability_solution/apm/common/environment_filter_values.ts similarity index 100% rename from x-pack/plugins/apm/common/environment_filter_values.ts rename to x-pack/plugins/observability_solution/apm/common/environment_filter_values.ts diff --git a/x-pack/plugins/apm/common/environment_rt.ts b/x-pack/plugins/observability_solution/apm/common/environment_rt.ts similarity index 100% rename from x-pack/plugins/apm/common/environment_rt.ts rename to x-pack/plugins/observability_solution/apm/common/environment_rt.ts diff --git a/x-pack/plugins/apm/common/es_fields/__snapshots__/es_fields.test.ts.snap b/x-pack/plugins/observability_solution/apm/common/es_fields/__snapshots__/es_fields.test.ts.snap similarity index 100% rename from x-pack/plugins/apm/common/es_fields/__snapshots__/es_fields.test.ts.snap rename to x-pack/plugins/observability_solution/apm/common/es_fields/__snapshots__/es_fields.test.ts.snap diff --git a/x-pack/plugins/apm/common/es_fields/apm.ts b/x-pack/plugins/observability_solution/apm/common/es_fields/apm.ts similarity index 100% rename from x-pack/plugins/apm/common/es_fields/apm.ts rename to x-pack/plugins/observability_solution/apm/common/es_fields/apm.ts diff --git a/x-pack/plugins/apm/common/es_fields/es_fields.test.ts b/x-pack/plugins/observability_solution/apm/common/es_fields/es_fields.test.ts similarity index 100% rename from x-pack/plugins/apm/common/es_fields/es_fields.test.ts rename to x-pack/plugins/observability_solution/apm/common/es_fields/es_fields.test.ts diff --git a/x-pack/plugins/apm/common/es_fields/infra_metrics.ts b/x-pack/plugins/observability_solution/apm/common/es_fields/infra_metrics.ts similarity index 100% rename from x-pack/plugins/apm/common/es_fields/infra_metrics.ts rename to x-pack/plugins/observability_solution/apm/common/es_fields/infra_metrics.ts diff --git a/x-pack/plugins/apm/common/event_outcome.ts b/x-pack/plugins/observability_solution/apm/common/event_outcome.ts similarity index 100% rename from x-pack/plugins/apm/common/event_outcome.ts rename to x-pack/plugins/observability_solution/apm/common/event_outcome.ts diff --git a/x-pack/plugins/apm/common/fetch_options.ts b/x-pack/plugins/observability_solution/apm/common/fetch_options.ts similarity index 100% rename from x-pack/plugins/apm/common/fetch_options.ts rename to x-pack/plugins/observability_solution/apm/common/fetch_options.ts diff --git a/x-pack/plugins/apm/common/fleet.ts b/x-pack/plugins/observability_solution/apm/common/fleet.ts similarity index 100% rename from x-pack/plugins/apm/common/fleet.ts rename to x-pack/plugins/observability_solution/apm/common/fleet.ts diff --git a/x-pack/plugins/apm/common/i18n.ts b/x-pack/plugins/observability_solution/apm/common/i18n.ts similarity index 100% rename from x-pack/plugins/apm/common/i18n.ts rename to x-pack/plugins/observability_solution/apm/common/i18n.ts diff --git a/x-pack/plugins/apm/common/index.ts b/x-pack/plugins/observability_solution/apm/common/index.ts similarity index 100% rename from x-pack/plugins/apm/common/index.ts rename to x-pack/plugins/observability_solution/apm/common/index.ts diff --git a/x-pack/plugins/apm/common/instances.ts b/x-pack/plugins/observability_solution/apm/common/instances.ts similarity index 100% rename from x-pack/plugins/apm/common/instances.ts rename to x-pack/plugins/observability_solution/apm/common/instances.ts diff --git a/x-pack/plugins/apm/common/latency_aggregation_types.ts b/x-pack/plugins/observability_solution/apm/common/latency_aggregation_types.ts similarity index 100% rename from x-pack/plugins/apm/common/latency_aggregation_types.ts rename to x-pack/plugins/observability_solution/apm/common/latency_aggregation_types.ts diff --git a/x-pack/plugins/apm/common/latency_distribution_chart_types.ts b/x-pack/plugins/observability_solution/apm/common/latency_distribution_chart_types.ts similarity index 100% rename from x-pack/plugins/apm/common/latency_distribution_chart_types.ts rename to x-pack/plugins/observability_solution/apm/common/latency_distribution_chart_types.ts diff --git a/x-pack/plugins/apm/common/license_check.test.ts b/x-pack/plugins/observability_solution/apm/common/license_check.test.ts similarity index 100% rename from x-pack/plugins/apm/common/license_check.test.ts rename to x-pack/plugins/observability_solution/apm/common/license_check.test.ts diff --git a/x-pack/plugins/apm/common/license_check.ts b/x-pack/plugins/observability_solution/apm/common/license_check.ts similarity index 100% rename from x-pack/plugins/apm/common/license_check.ts rename to x-pack/plugins/observability_solution/apm/common/license_check.ts diff --git a/x-pack/plugins/apm/common/mobile/constants.ts b/x-pack/plugins/observability_solution/apm/common/mobile/constants.ts similarity index 100% rename from x-pack/plugins/apm/common/mobile/constants.ts rename to x-pack/plugins/observability_solution/apm/common/mobile/constants.ts diff --git a/x-pack/plugins/apm/common/mobile_types.ts b/x-pack/plugins/observability_solution/apm/common/mobile_types.ts similarity index 100% rename from x-pack/plugins/apm/common/mobile_types.ts rename to x-pack/plugins/observability_solution/apm/common/mobile_types.ts diff --git a/x-pack/plugins/apm/common/privilege_type.ts b/x-pack/plugins/observability_solution/apm/common/privilege_type.ts similarity index 100% rename from x-pack/plugins/apm/common/privilege_type.ts rename to x-pack/plugins/observability_solution/apm/common/privilege_type.ts diff --git a/x-pack/plugins/apm/common/processor_event.ts b/x-pack/plugins/observability_solution/apm/common/processor_event.ts similarity index 100% rename from x-pack/plugins/apm/common/processor_event.ts rename to x-pack/plugins/observability_solution/apm/common/processor_event.ts diff --git a/x-pack/plugins/apm/common/rollup.ts b/x-pack/plugins/observability_solution/apm/common/rollup.ts similarity index 100% rename from x-pack/plugins/apm/common/rollup.ts rename to x-pack/plugins/observability_solution/apm/common/rollup.ts diff --git a/x-pack/plugins/apm/common/rules/apm_rule_types.ts b/x-pack/plugins/observability_solution/apm/common/rules/apm_rule_types.ts similarity index 96% rename from x-pack/plugins/apm/common/rules/apm_rule_types.ts rename to x-pack/plugins/observability_solution/apm/common/rules/apm_rule_types.ts index dff141ba818b9..644191f1d4e82 100644 --- a/x-pack/plugins/apm/common/rules/apm_rule_types.ts +++ b/x-pack/plugins/observability_solution/apm/common/rules/apm_rule_types.ts @@ -328,9 +328,9 @@ export const ANOMALY_DETECTOR_SELECTOR_OPTIONS = [ ].map((type) => ({ type, label: getApmMlDetectorLabel(type) })); // Server side registrations -// x-pack/plugins/apm/server/lib/alerts/.ts -// x-pack/plugins/apm/server/lib/alerts/register_apm_alerts.ts +// x-pack/plugins/observability_solution/apm/server/lib/alerts/.ts +// x-pack/plugins/observability_solution/apm/server/lib/alerts/register_apm_alerts.ts // Client side registrations: -// x-pack/plugins/apm/public/components/alerting//index.tsx -// x-pack/plugins/apm/public/components/alerting/register_apm_alerts +// x-pack/plugins/observability_solution/apm/public/components/alerting//index.tsx +// x-pack/plugins/observability_solution/apm/public/components/alerting/register_apm_alerts diff --git a/x-pack/plugins/apm/common/rules/default_action_message.ts b/x-pack/plugins/observability_solution/apm/common/rules/default_action_message.ts similarity index 100% rename from x-pack/plugins/apm/common/rules/default_action_message.ts rename to x-pack/plugins/observability_solution/apm/common/rules/default_action_message.ts diff --git a/x-pack/plugins/apm/common/rules/get_all_groupby_fields.ts b/x-pack/plugins/observability_solution/apm/common/rules/get_all_groupby_fields.ts similarity index 100% rename from x-pack/plugins/apm/common/rules/get_all_groupby_fields.ts rename to x-pack/plugins/observability_solution/apm/common/rules/get_all_groupby_fields.ts diff --git a/x-pack/plugins/apm/common/rules/schema.ts b/x-pack/plugins/observability_solution/apm/common/rules/schema.ts similarity index 100% rename from x-pack/plugins/apm/common/rules/schema.ts rename to x-pack/plugins/observability_solution/apm/common/rules/schema.ts diff --git a/x-pack/plugins/apm/common/serverless.test.ts b/x-pack/plugins/observability_solution/apm/common/serverless.test.ts similarity index 100% rename from x-pack/plugins/apm/common/serverless.test.ts rename to x-pack/plugins/observability_solution/apm/common/serverless.test.ts diff --git a/x-pack/plugins/apm/common/serverless.ts b/x-pack/plugins/observability_solution/apm/common/serverless.ts similarity index 100% rename from x-pack/plugins/apm/common/serverless.ts rename to x-pack/plugins/observability_solution/apm/common/serverless.ts diff --git a/x-pack/plugins/apm/common/service_groups.test.ts b/x-pack/plugins/observability_solution/apm/common/service_groups.test.ts similarity index 100% rename from x-pack/plugins/apm/common/service_groups.test.ts rename to x-pack/plugins/observability_solution/apm/common/service_groups.test.ts diff --git a/x-pack/plugins/apm/common/service_groups.ts b/x-pack/plugins/observability_solution/apm/common/service_groups.ts similarity index 100% rename from x-pack/plugins/apm/common/service_groups.ts rename to x-pack/plugins/observability_solution/apm/common/service_groups.ts diff --git a/x-pack/plugins/apm/common/service_health_status.ts b/x-pack/plugins/observability_solution/apm/common/service_health_status.ts similarity index 100% rename from x-pack/plugins/apm/common/service_health_status.ts rename to x-pack/plugins/observability_solution/apm/common/service_health_status.ts diff --git a/x-pack/plugins/apm/common/service_inventory.ts b/x-pack/plugins/observability_solution/apm/common/service_inventory.ts similarity index 100% rename from x-pack/plugins/apm/common/service_inventory.ts rename to x-pack/plugins/observability_solution/apm/common/service_inventory.ts diff --git a/x-pack/plugins/apm/common/service_map.ts b/x-pack/plugins/observability_solution/apm/common/service_map.ts similarity index 100% rename from x-pack/plugins/apm/common/service_map.ts rename to x-pack/plugins/observability_solution/apm/common/service_map.ts diff --git a/x-pack/plugins/apm/common/service_metadata.ts b/x-pack/plugins/observability_solution/apm/common/service_metadata.ts similarity index 100% rename from x-pack/plugins/apm/common/service_metadata.ts rename to x-pack/plugins/observability_solution/apm/common/service_metadata.ts diff --git a/x-pack/plugins/apm/common/service_nodes.ts b/x-pack/plugins/observability_solution/apm/common/service_nodes.ts similarity index 100% rename from x-pack/plugins/apm/common/service_nodes.ts rename to x-pack/plugins/observability_solution/apm/common/service_nodes.ts diff --git a/x-pack/plugins/apm/common/span_links.ts b/x-pack/plugins/observability_solution/apm/common/span_links.ts similarity index 100% rename from x-pack/plugins/apm/common/span_links.ts rename to x-pack/plugins/observability_solution/apm/common/span_links.ts diff --git a/x-pack/plugins/apm/common/storage_explorer_types.ts b/x-pack/plugins/observability_solution/apm/common/storage_explorer_types.ts similarity index 100% rename from x-pack/plugins/apm/common/storage_explorer_types.ts rename to x-pack/plugins/observability_solution/apm/common/storage_explorer_types.ts diff --git a/x-pack/plugins/apm/common/time_range_metadata.ts b/x-pack/plugins/observability_solution/apm/common/time_range_metadata.ts similarity index 100% rename from x-pack/plugins/apm/common/time_range_metadata.ts rename to x-pack/plugins/observability_solution/apm/common/time_range_metadata.ts diff --git a/x-pack/plugins/apm/common/trace_explorer.ts b/x-pack/plugins/observability_solution/apm/common/trace_explorer.ts similarity index 100% rename from x-pack/plugins/apm/common/trace_explorer.ts rename to x-pack/plugins/observability_solution/apm/common/trace_explorer.ts diff --git a/x-pack/plugins/apm/common/transaction_types.ts b/x-pack/plugins/observability_solution/apm/common/transaction_types.ts similarity index 100% rename from x-pack/plugins/apm/common/transaction_types.ts rename to x-pack/plugins/observability_solution/apm/common/transaction_types.ts diff --git a/x-pack/plugins/apm/common/tutorial/instructions/apm_agent_instructions.ts b/x-pack/plugins/observability_solution/apm/common/tutorial/instructions/apm_agent_instructions.ts similarity index 100% rename from x-pack/plugins/apm/common/tutorial/instructions/apm_agent_instructions.ts rename to x-pack/plugins/observability_solution/apm/common/tutorial/instructions/apm_agent_instructions.ts diff --git a/x-pack/plugins/apm/common/tutorial/instructions/apm_server_instructions.ts b/x-pack/plugins/observability_solution/apm/common/tutorial/instructions/apm_server_instructions.ts similarity index 100% rename from x-pack/plugins/apm/common/tutorial/instructions/apm_server_instructions.ts rename to x-pack/plugins/observability_solution/apm/common/tutorial/instructions/apm_server_instructions.ts diff --git a/x-pack/plugins/apm/common/tutorial/tutorials.ts b/x-pack/plugins/observability_solution/apm/common/tutorial/tutorials.ts similarity index 100% rename from x-pack/plugins/apm/common/tutorial/tutorials.ts rename to x-pack/plugins/observability_solution/apm/common/tutorial/tutorials.ts diff --git a/x-pack/plugins/apm/common/utils/array_union_to_callable.ts b/x-pack/plugins/observability_solution/apm/common/utils/array_union_to_callable.ts similarity index 100% rename from x-pack/plugins/apm/common/utils/array_union_to_callable.ts rename to x-pack/plugins/observability_solution/apm/common/utils/array_union_to_callable.ts diff --git a/x-pack/plugins/apm/common/utils/as_mutable_array.ts b/x-pack/plugins/observability_solution/apm/common/utils/as_mutable_array.ts similarity index 100% rename from x-pack/plugins/apm/common/utils/as_mutable_array.ts rename to x-pack/plugins/observability_solution/apm/common/utils/as_mutable_array.ts diff --git a/x-pack/plugins/apm/common/utils/environment_query.test.ts b/x-pack/plugins/observability_solution/apm/common/utils/environment_query.test.ts similarity index 100% rename from x-pack/plugins/apm/common/utils/environment_query.test.ts rename to x-pack/plugins/observability_solution/apm/common/utils/environment_query.test.ts diff --git a/x-pack/plugins/apm/common/utils/environment_query.ts b/x-pack/plugins/observability_solution/apm/common/utils/environment_query.ts similarity index 100% rename from x-pack/plugins/apm/common/utils/environment_query.ts rename to x-pack/plugins/observability_solution/apm/common/utils/environment_query.ts diff --git a/x-pack/plugins/apm/common/utils/esql/get_esql_date_range_filter.ts b/x-pack/plugins/observability_solution/apm/common/utils/esql/get_esql_date_range_filter.ts similarity index 100% rename from x-pack/plugins/apm/common/utils/esql/get_esql_date_range_filter.ts rename to x-pack/plugins/observability_solution/apm/common/utils/esql/get_esql_date_range_filter.ts diff --git a/x-pack/plugins/apm/common/utils/esql/get_esql_environment_filter.ts b/x-pack/plugins/observability_solution/apm/common/utils/esql/get_esql_environment_filter.ts similarity index 100% rename from x-pack/plugins/apm/common/utils/esql/get_esql_environment_filter.ts rename to x-pack/plugins/observability_solution/apm/common/utils/esql/get_esql_environment_filter.ts diff --git a/x-pack/plugins/apm/common/utils/esql/index.ts b/x-pack/plugins/observability_solution/apm/common/utils/esql/index.ts similarity index 100% rename from x-pack/plugins/apm/common/utils/esql/index.ts rename to x-pack/plugins/observability_solution/apm/common/utils/esql/index.ts diff --git a/x-pack/plugins/apm/common/utils/field_value_pair_to_kql.ts b/x-pack/plugins/observability_solution/apm/common/utils/field_value_pair_to_kql.ts similarity index 100% rename from x-pack/plugins/apm/common/utils/field_value_pair_to_kql.ts rename to x-pack/plugins/observability_solution/apm/common/utils/field_value_pair_to_kql.ts diff --git a/x-pack/plugins/apm/common/utils/formatters/alert_url.ts b/x-pack/plugins/observability_solution/apm/common/utils/formatters/alert_url.ts similarity index 100% rename from x-pack/plugins/apm/common/utils/formatters/alert_url.ts rename to x-pack/plugins/observability_solution/apm/common/utils/formatters/alert_url.ts diff --git a/x-pack/plugins/apm/common/utils/formatters/datetime.test.ts b/x-pack/plugins/observability_solution/apm/common/utils/formatters/datetime.test.ts similarity index 100% rename from x-pack/plugins/apm/common/utils/formatters/datetime.test.ts rename to x-pack/plugins/observability_solution/apm/common/utils/formatters/datetime.test.ts diff --git a/x-pack/plugins/apm/common/utils/formatters/datetime.ts b/x-pack/plugins/observability_solution/apm/common/utils/formatters/datetime.ts similarity index 100% rename from x-pack/plugins/apm/common/utils/formatters/datetime.ts rename to x-pack/plugins/observability_solution/apm/common/utils/formatters/datetime.ts diff --git a/x-pack/plugins/apm/common/utils/formatters/duration.test.ts b/x-pack/plugins/observability_solution/apm/common/utils/formatters/duration.test.ts similarity index 100% rename from x-pack/plugins/apm/common/utils/formatters/duration.test.ts rename to x-pack/plugins/observability_solution/apm/common/utils/formatters/duration.test.ts diff --git a/x-pack/plugins/apm/common/utils/formatters/duration.ts b/x-pack/plugins/observability_solution/apm/common/utils/formatters/duration.ts similarity index 100% rename from x-pack/plugins/apm/common/utils/formatters/duration.ts rename to x-pack/plugins/observability_solution/apm/common/utils/formatters/duration.ts diff --git a/x-pack/plugins/apm/common/utils/formatters/formatters.test.ts b/x-pack/plugins/observability_solution/apm/common/utils/formatters/formatters.test.ts similarity index 100% rename from x-pack/plugins/apm/common/utils/formatters/formatters.test.ts rename to x-pack/plugins/observability_solution/apm/common/utils/formatters/formatters.test.ts diff --git a/x-pack/plugins/apm/common/utils/formatters/formatters.ts b/x-pack/plugins/observability_solution/apm/common/utils/formatters/formatters.ts similarity index 100% rename from x-pack/plugins/apm/common/utils/formatters/formatters.ts rename to x-pack/plugins/observability_solution/apm/common/utils/formatters/formatters.ts diff --git a/x-pack/plugins/apm/common/utils/formatters/index.ts b/x-pack/plugins/observability_solution/apm/common/utils/formatters/index.ts similarity index 100% rename from x-pack/plugins/apm/common/utils/formatters/index.ts rename to x-pack/plugins/observability_solution/apm/common/utils/formatters/index.ts diff --git a/x-pack/plugins/apm/common/utils/formatters/size.test.ts b/x-pack/plugins/observability_solution/apm/common/utils/formatters/size.test.ts similarity index 100% rename from x-pack/plugins/apm/common/utils/formatters/size.test.ts rename to x-pack/plugins/observability_solution/apm/common/utils/formatters/size.test.ts diff --git a/x-pack/plugins/apm/common/utils/formatters/size.ts b/x-pack/plugins/observability_solution/apm/common/utils/formatters/size.ts similarity index 100% rename from x-pack/plugins/apm/common/utils/formatters/size.ts rename to x-pack/plugins/observability_solution/apm/common/utils/formatters/size.ts diff --git a/x-pack/plugins/apm/common/utils/get_bucket_size/calculate_auto.js b/x-pack/plugins/observability_solution/apm/common/utils/get_bucket_size/calculate_auto.js similarity index 100% rename from x-pack/plugins/apm/common/utils/get_bucket_size/calculate_auto.js rename to x-pack/plugins/observability_solution/apm/common/utils/get_bucket_size/calculate_auto.js diff --git a/x-pack/plugins/apm/common/utils/get_bucket_size/index.ts b/x-pack/plugins/observability_solution/apm/common/utils/get_bucket_size/index.ts similarity index 100% rename from x-pack/plugins/apm/common/utils/get_bucket_size/index.ts rename to x-pack/plugins/observability_solution/apm/common/utils/get_bucket_size/index.ts diff --git a/x-pack/plugins/apm/common/utils/get_bucket_size/unit_to_seconds.js b/x-pack/plugins/observability_solution/apm/common/utils/get_bucket_size/unit_to_seconds.js similarity index 100% rename from x-pack/plugins/apm/common/utils/get_bucket_size/unit_to_seconds.js rename to x-pack/plugins/observability_solution/apm/common/utils/get_bucket_size/unit_to_seconds.js diff --git a/x-pack/plugins/apm/common/utils/get_kuery_fields.test.ts b/x-pack/plugins/observability_solution/apm/common/utils/get_kuery_fields.test.ts similarity index 100% rename from x-pack/plugins/apm/common/utils/get_kuery_fields.test.ts rename to x-pack/plugins/observability_solution/apm/common/utils/get_kuery_fields.test.ts diff --git a/x-pack/plugins/apm/common/utils/get_kuery_fields.ts b/x-pack/plugins/observability_solution/apm/common/utils/get_kuery_fields.ts similarity index 100% rename from x-pack/plugins/apm/common/utils/get_kuery_fields.ts rename to x-pack/plugins/observability_solution/apm/common/utils/get_kuery_fields.ts diff --git a/x-pack/plugins/apm/common/utils/get_kuery_with_mobile_filters.test.ts b/x-pack/plugins/observability_solution/apm/common/utils/get_kuery_with_mobile_filters.test.ts similarity index 100% rename from x-pack/plugins/apm/common/utils/get_kuery_with_mobile_filters.test.ts rename to x-pack/plugins/observability_solution/apm/common/utils/get_kuery_with_mobile_filters.test.ts diff --git a/x-pack/plugins/apm/common/utils/get_kuery_with_mobile_filters.ts b/x-pack/plugins/observability_solution/apm/common/utils/get_kuery_with_mobile_filters.ts similarity index 100% rename from x-pack/plugins/apm/common/utils/get_kuery_with_mobile_filters.ts rename to x-pack/plugins/observability_solution/apm/common/utils/get_kuery_with_mobile_filters.ts diff --git a/x-pack/plugins/apm/common/utils/get_offset_in_ms.ts b/x-pack/plugins/observability_solution/apm/common/utils/get_offset_in_ms.ts similarity index 100% rename from x-pack/plugins/apm/common/utils/get_offset_in_ms.ts rename to x-pack/plugins/observability_solution/apm/common/utils/get_offset_in_ms.ts diff --git a/x-pack/plugins/apm/common/utils/get_preferred_bucket_size_and_data_source.test.ts b/x-pack/plugins/observability_solution/apm/common/utils/get_preferred_bucket_size_and_data_source.test.ts similarity index 100% rename from x-pack/plugins/apm/common/utils/get_preferred_bucket_size_and_data_source.test.ts rename to x-pack/plugins/observability_solution/apm/common/utils/get_preferred_bucket_size_and_data_source.test.ts diff --git a/x-pack/plugins/apm/common/utils/get_preferred_bucket_size_and_data_source.ts b/x-pack/plugins/observability_solution/apm/common/utils/get_preferred_bucket_size_and_data_source.ts similarity index 100% rename from x-pack/plugins/apm/common/utils/get_preferred_bucket_size_and_data_source.ts rename to x-pack/plugins/observability_solution/apm/common/utils/get_preferred_bucket_size_and_data_source.ts diff --git a/x-pack/plugins/apm/common/utils/is_finite_number.ts b/x-pack/plugins/observability_solution/apm/common/utils/is_finite_number.ts similarity index 100% rename from x-pack/plugins/apm/common/utils/is_finite_number.ts rename to x-pack/plugins/observability_solution/apm/common/utils/is_finite_number.ts diff --git a/x-pack/plugins/apm/common/utils/join_by_key/index.test.ts b/x-pack/plugins/observability_solution/apm/common/utils/join_by_key/index.test.ts similarity index 100% rename from x-pack/plugins/apm/common/utils/join_by_key/index.test.ts rename to x-pack/plugins/observability_solution/apm/common/utils/join_by_key/index.test.ts diff --git a/x-pack/plugins/apm/common/utils/join_by_key/index.ts b/x-pack/plugins/observability_solution/apm/common/utils/join_by_key/index.ts similarity index 100% rename from x-pack/plugins/apm/common/utils/join_by_key/index.ts rename to x-pack/plugins/observability_solution/apm/common/utils/join_by_key/index.ts diff --git a/x-pack/plugins/apm/common/utils/kuery_utils.test.ts b/x-pack/plugins/observability_solution/apm/common/utils/kuery_utils.test.ts similarity index 100% rename from x-pack/plugins/apm/common/utils/kuery_utils.test.ts rename to x-pack/plugins/observability_solution/apm/common/utils/kuery_utils.test.ts diff --git a/x-pack/plugins/apm/common/utils/kuery_utils.ts b/x-pack/plugins/observability_solution/apm/common/utils/kuery_utils.ts similarity index 100% rename from x-pack/plugins/apm/common/utils/kuery_utils.ts rename to x-pack/plugins/observability_solution/apm/common/utils/kuery_utils.ts diff --git a/x-pack/plugins/apm/common/utils/maybe.ts b/x-pack/plugins/observability_solution/apm/common/utils/maybe.ts similarity index 100% rename from x-pack/plugins/apm/common/utils/maybe.ts rename to x-pack/plugins/observability_solution/apm/common/utils/maybe.ts diff --git a/x-pack/plugins/apm/common/utils/offset_previous_period_coordinate.test.ts b/x-pack/plugins/observability_solution/apm/common/utils/offset_previous_period_coordinate.test.ts similarity index 100% rename from x-pack/plugins/apm/common/utils/offset_previous_period_coordinate.test.ts rename to x-pack/plugins/observability_solution/apm/common/utils/offset_previous_period_coordinate.test.ts diff --git a/x-pack/plugins/apm/common/utils/offset_previous_period_coordinate.ts b/x-pack/plugins/observability_solution/apm/common/utils/offset_previous_period_coordinate.ts similarity index 100% rename from x-pack/plugins/apm/common/utils/offset_previous_period_coordinate.ts rename to x-pack/plugins/observability_solution/apm/common/utils/offset_previous_period_coordinate.ts diff --git a/x-pack/plugins/apm/common/utils/pick_keys.ts b/x-pack/plugins/observability_solution/apm/common/utils/pick_keys.ts similarity index 100% rename from x-pack/plugins/apm/common/utils/pick_keys.ts rename to x-pack/plugins/observability_solution/apm/common/utils/pick_keys.ts diff --git a/x-pack/plugins/apm/common/utils/term_query.ts b/x-pack/plugins/observability_solution/apm/common/utils/term_query.ts similarity index 100% rename from x-pack/plugins/apm/common/utils/term_query.ts rename to x-pack/plugins/observability_solution/apm/common/utils/term_query.ts diff --git a/x-pack/plugins/apm/common/viz_colors.ts b/x-pack/plugins/observability_solution/apm/common/viz_colors.ts similarity index 100% rename from x-pack/plugins/apm/common/viz_colors.ts rename to x-pack/plugins/observability_solution/apm/common/viz_colors.ts diff --git a/x-pack/plugins/apm/common/waterfall/typings.ts b/x-pack/plugins/observability_solution/apm/common/waterfall/typings.ts similarity index 100% rename from x-pack/plugins/apm/common/waterfall/typings.ts rename to x-pack/plugins/observability_solution/apm/common/waterfall/typings.ts diff --git a/x-pack/plugins/apm/dev_docs/apm_queries.md b/x-pack/plugins/observability_solution/apm/dev_docs/apm_queries.md similarity index 89% rename from x-pack/plugins/apm/dev_docs/apm_queries.md rename to x-pack/plugins/observability_solution/apm/dev_docs/apm_queries.md index acd20597389d9..7b0fd244bfdd5 100644 --- a/x-pack/plugins/apm/dev_docs/apm_queries.md +++ b/x-pack/plugins/observability_solution/apm/dev_docs/apm_queries.md @@ -56,7 +56,7 @@ A pre-aggregated document where `_doc_count` is the number of transaction events You can find all the APM transaction fields [here](https://www.elastic.co/guide/en/apm/server/current/exported-fields-apm-transaction.html). -The decision to use aggregated transactions or not is determined in [`getSearchTransactionsEvents`](https://github.com/elastic/kibana/blob/a2ac439f56313b7a3fc4708f54a4deebf2615136/x-pack/plugins/apm/server/lib/helpers/aggregated_transactions/index.ts#L53-L79) and then used to specify [the transaction index](https://github.com/elastic/kibana/blob/a2ac439f56313b7a3fc4708f54a4deebf2615136/x-pack/plugins/apm/server/lib/suggestions/get_suggestions.ts#L30-L32) and [the latency field](https://github.com/elastic/kibana/blob/a2ac439f56313b7a3fc4708f54a4deebf2615136/x-pack/plugins/apm/server/lib/alerts/chart_preview/get_transaction_duration.ts#L62-L65) +The decision to use aggregated transactions or not is determined in [`getSearchTransactionsEvents`](https://github.com/elastic/kibana/blob/a2ac439f56313b7a3fc4708f54a4deebf2615136/x-pack/plugins/observability_solution/apm/server/lib/helpers/aggregated_transactions/index.ts#L53-L79) and then used to specify [the transaction index](https://github.com/elastic/kibana/blob/a2ac439f56313b7a3fc4708f54a4deebf2615136/x-pack/plugins/observability_solution/apm/server/lib/suggestions/get_suggestions.ts#L30-L32) and [the latency field](https://github.com/elastic/kibana/blob/a2ac439f56313b7a3fc4708f54a4deebf2615136/x-pack/plugins/observability_solution/apm/server/lib/alerts/chart_preview/get_transaction_duration.ts#L62-L65) ### Latency @@ -101,7 +101,7 @@ GET apm-*-metric-*,metrics-apm*/_search?terminate_after=1000 } ``` -Please note: `metricset.name: transaction` was only recently introduced. To retain backwards compatability we still use the old filter `{ "exists": { "field": "transaction.duration.histogram" }}` when filtering for aggregated transactions ([see example](https://github.com/elastic/kibana/blob/2c8686770e64b82cf8e1db5a22327d40d5f8ce45/x-pack/plugins/apm/server/lib/helpers/aggregated_transactions/index.ts#L89-L95)). +Please note: `metricset.name: transaction` was only recently introduced. To retain backwards compatability we still use the old filter `{ "exists": { "field": "transaction.duration.histogram" }}` when filtering for aggregated transactions ([see example](https://github.com/elastic/kibana/blob/2c8686770e64b82cf8e1db5a22327d40d5f8ce45/x-pack/plugins/observability_solution/apm/server/lib/helpers/aggregated_transactions/index.ts#L89-L95)). ### Throughput @@ -291,7 +291,7 @@ System metrics are captured periodically (every 60 seconds by default). You can ![image](https://user-images.githubusercontent.com/209966/135990500-f85bd8d9-b5a5-4b7c-b9e1-0759eefb8a29.png) -Used in: [Metrics section](https://github.com/elastic/kibana/blob/00bb59713ed115343eb70d4e39059476edafbade/x-pack/plugins/apm/server/lib/metrics/by_agent/shared/cpu/index.ts#L83) +Used in: [Metrics section](https://github.com/elastic/kibana/blob/00bb59713ed115343eb70d4e39059476edafbade/x-pack/plugins/observability_solution/apm/server/lib/metrics/by_agent/shared/cpu/index.ts#L83) Noteworthy fields: `system.cpu.total.norm.pct`, `system.process.cpu.total.norm.pct` @@ -377,7 +377,7 @@ GET apm-*-metric-*,metrics-apm*/_search?terminate_after=1000 } ``` -The above example is overly simplified. In reality [we do a bit more](https://github.com/elastic/kibana/blob/fe9b5332e157fd456f81aecfd4ffa78d9e511a66/x-pack/plugins/apm/server/lib/metrics/by_agent/shared/memory/index.ts#L51-L71) to properly calculate memory usage inside containers. Please note that an [Exists Query](https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-exists-query.html) is used in the filter context in the query to ensure that the memory fields exist. +The above example is overly simplified. In reality [we do a bit more](https://github.com/elastic/kibana/blob/fe9b5332e157fd456f81aecfd4ffa78d9e511a66/x-pack/plugins/observability_solution/apm/server/lib/metrics/by_agent/shared/memory/index.ts#L51-L71) to properly calculate memory usage inside containers. Please note that an [Exists Query](https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-exists-query.html) is used in the filter context in the query to ensure that the memory fields exist. # Span breakdown metrics @@ -387,7 +387,7 @@ Span breakdown metrics are used to power the "Time spent by span type" graph. Ag ![image](https://user-images.githubusercontent.com/209966/135990865-9077ae3e-a7a4-4b5d-bdce-41dc832689ea.png) -Used in: ["Time spent by span type" chart](https://github.com/elastic/kibana/blob/723370ab23573e50b3524a62c6b9998f2042423d/x-pack/plugins/apm/server/lib/transactions/breakdown/index.ts#L48-L87) +Used in: ["Time spent by span type" chart](https://github.com/elastic/kibana/blob/723370ab23573e50b3524a62c6b9998f2042423d/x-pack/plugins/observability_solution/apm/server/lib/transactions/breakdown/index.ts#L48-L87) Noteworthy fields: `transaction.name`, `transaction.type`, `span.type`, `span.subtype`, `span.self_time.*` @@ -447,7 +447,7 @@ These metrics measure the count and total duration of requests from one service ![image](https://user-images.githubusercontent.com/209966/135990117-170070da-2fc5-4014-a597-0dda0970854c.png) -Used in: [Dependencies (latency)](https://github.com/elastic/kibana/blob/00bb59713ed115343eb70d4e39059476edafbade/x-pack/plugins/apm/server/lib/backends/get_latency_charts_for_backend.ts#L68-L79), [Dependencies (throughput)](https://github.com/elastic/kibana/blob/00bb59713ed115343eb70d4e39059476edafbade/x-pack/plugins/apm/server/lib/backends/get_throughput_charts_for_backend.ts#L67-L74) and [Service Map](https://github.com/elastic/kibana/blob/00bb59713ed115343eb70d4e39059476edafbade/x-pack/plugins/apm/server/lib/service_map/get_service_map_backend_node_info.ts#L57-L67) +Used in: [Dependencies (latency)](https://github.com/elastic/kibana/blob/00bb59713ed115343eb70d4e39059476edafbade/x-pack/plugins/observability_solution/apm/server/lib/backends/get_latency_charts_for_backend.ts#L68-L79), [Dependencies (throughput)](https://github.com/elastic/kibana/blob/00bb59713ed115343eb70d4e39059476edafbade/x-pack/plugins/observability_solution/apm/server/lib/backends/get_throughput_charts_for_backend.ts#L67-L74) and [Service Map](https://github.com/elastic/kibana/blob/00bb59713ed115343eb70d4e39059476edafbade/x-pack/plugins/observability_solution/apm/server/lib/service_map/get_service_map_backend_node_info.ts#L57-L67) Noteworthy fields: `span.destination.service.*` diff --git a/x-pack/plugins/apm/dev_docs/github_commands.md b/x-pack/plugins/observability_solution/apm/dev_docs/github_commands.md similarity index 100% rename from x-pack/plugins/apm/dev_docs/github_commands.md rename to x-pack/plugins/observability_solution/apm/dev_docs/github_commands.md diff --git a/x-pack/plugins/apm/dev_docs/learning_material.md b/x-pack/plugins/observability_solution/apm/dev_docs/learning_material.md similarity index 100% rename from x-pack/plugins/apm/dev_docs/learning_material.md rename to x-pack/plugins/observability_solution/apm/dev_docs/learning_material.md diff --git a/x-pack/plugins/apm/dev_docs/linting.md b/x-pack/plugins/observability_solution/apm/dev_docs/linting.md similarity index 75% rename from x-pack/plugins/apm/dev_docs/linting.md rename to x-pack/plugins/observability_solution/apm/dev_docs/linting.md index 3dbd7b5b27484..c0046dfe35e89 100644 --- a/x-pack/plugins/apm/dev_docs/linting.md +++ b/x-pack/plugins/observability_solution/apm/dev_docs/linting.md @@ -5,19 +5,19 @@ _Note: Run the commands from the root of Kibana._ ### Typescript ``` -node scripts/type_check.js --project x-pack/plugins/apm/tsconfig.json +node scripts/type_check.js --project x-pack/plugins/observability_solution/apm/tsconfig.json ``` ### Prettier ``` -yarn prettier "./x-pack/plugins/apm/**/*.{tsx,ts,js}" --write +yarn prettier "./x-pack/plugins/observability_solution/apm/**/*.{tsx,ts,js}" --write ``` ### ESLint ``` -node scripts/eslint.js x-pack/plugins/apm +node scripts/eslint.js x-pack/plugins/observability_solution/apm ``` ## Install pre-commit hook (optional) @@ -27,4 +27,4 @@ In case you want to run a couple of checks like linting or check the file casing After the script completes the pre-commit hook will be created within the file .git/hooks/pre-commit. If you choose to not install it, don’t worry, we still run a quick CI check to provide feedback earliest as we can about the same checks. -More information about linting can be found in the [Kibana Guide](https://www.elastic.co/guide/en/kibana/current/kibana-linting.html). \ No newline at end of file +More information about linting can be found in the [Kibana Guide](https://www.elastic.co/guide/en/kibana/current/kibana-linting.html). diff --git a/x-pack/plugins/apm/dev_docs/local_setup.md b/x-pack/plugins/observability_solution/apm/dev_docs/local_setup.md similarity index 94% rename from x-pack/plugins/apm/dev_docs/local_setup.md rename to x-pack/plugins/observability_solution/apm/dev_docs/local_setup.md index 9f3553f3c680c..f4e8427da189a 100644 --- a/x-pack/plugins/apm/dev_docs/local_setup.md +++ b/x-pack/plugins/observability_solution/apm/dev_docs/local_setup.md @@ -85,7 +85,7 @@ elasticsearch.password: changeme APM behaves differently depending on which role and permissions a logged in user has. To create APM users run: ```sh -node x-pack/plugins/apm/scripts/create_apm_users.js --username admin --password changeme --kibana-url http://localhost:5601 +node x-pack/plugins/observability_solution/apm/scripts/create_apm_users.js --username admin --password changeme --kibana-url http://localhost:5601 ``` This will create: diff --git a/x-pack/plugins/apm/dev_docs/overflow_bucket_setup.md b/x-pack/plugins/observability_solution/apm/dev_docs/overflow_bucket_setup.md similarity index 100% rename from x-pack/plugins/apm/dev_docs/overflow_bucket_setup.md rename to x-pack/plugins/observability_solution/apm/dev_docs/overflow_bucket_setup.md diff --git a/x-pack/plugins/apm/dev_docs/query_debugging_in_development_and_production.md b/x-pack/plugins/observability_solution/apm/dev_docs/query_debugging_in_development_and_production.md similarity index 100% rename from x-pack/plugins/apm/dev_docs/query_debugging_in_development_and_production.md rename to x-pack/plugins/observability_solution/apm/dev_docs/query_debugging_in_development_and_production.md diff --git a/x-pack/plugins/apm/dev_docs/routing_and_linking.md b/x-pack/plugins/observability_solution/apm/dev_docs/routing_and_linking.md similarity index 100% rename from x-pack/plugins/apm/dev_docs/routing_and_linking.md rename to x-pack/plugins/observability_solution/apm/dev_docs/routing_and_linking.md diff --git a/x-pack/plugins/apm/dev_docs/telemetry.md b/x-pack/plugins/observability_solution/apm/dev_docs/telemetry.md similarity index 93% rename from x-pack/plugins/apm/dev_docs/telemetry.md rename to x-pack/plugins/observability_solution/apm/dev_docs/telemetry.md index 89293aad75a19..142701b035b5d 100644 --- a/x-pack/plugins/apm/dev_docs/telemetry.md +++ b/x-pack/plugins/observability_solution/apm/dev_docs/telemetry.md @@ -31,7 +31,7 @@ Once uploaded to the telemetry cluster, the data telemetry is stored in In order to collect a new telemetry field you need to add a task which performs the query that collects the data from the cluster. -All the available tasks are [here](https://github.com/elastic/kibana/blob/ba84602455671f0f6175bbc0fd2e8f302c60bbe6/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts) +All the available tasks are [here](https://github.com/elastic/kibana/blob/ba84602455671f0f6175bbc0fd2e8f302c60bbe6/x-pack/plugins/observability_solution/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts) ### Debug telemetry @@ -61,7 +61,7 @@ The collection tasks also use the [`APMDataTelemetry` type](../server/lib/apm_te Running `node scripts/telemetry_check --fix` from the root Kibana directory will update the schemas which should automatically notify the Infra team when a pull request is opened so they can update the mapping in the telemetry clusters. -Running `node scripts/test/jest --updateSnapshot` from the `x-pack/plugins/apm` directory will update the +Running `node scripts/test/jest --updateSnapshot` from the `x-pack/plugins/observability_solution/apm` directory will update the mappings snapshot used in the jest tests. ## Behavioral Telemetry @@ -78,8 +78,8 @@ EBT is part of the core analytics service in Kibana and the `TelemetryService` p #### Collect a new event type -1. You need to define the event type in the [telemetry_events.ts](https://github.com/elastic/kibana/blob/4283802c195231f710be0d9870615fbc31382a31/x-pack/plugins/apm/public/services/telemetry/telemetry_events.ts#L36) -2. Define the tracking method in the [telemetry_client.ts](https://github.com/elastic/kibana/blob/4283802c195231f710be0d9870615fbc31382a31/x-pack/plugins/apm/public/services/telemetry/telemetry_client.ts#L18) +1. You need to define the event type in the [telemetry_events.ts](https://github.com/elastic/kibana/blob/4283802c195231f710be0d9870615fbc31382a31/x-pack/plugins/observability_solution/apm/public/services/telemetry/telemetry_events.ts#L36) +2. Define the tracking method in the [telemetry_client.ts](https://github.com/elastic/kibana/blob/4283802c195231f710be0d9870615fbc31382a31/x-pack/plugins/observability_solution/apm/public/services/telemetry/telemetry_client.ts#L18) 3. Use the tracking method with the telemetry client (`telemetry.reportSearchQuerySumbitted({property: test})`) In addition to the custom properties, analytics module automatically sends context properties. The list of the properties can be found [here](https://docs.elastic.dev/telemetry/collection/event-based-telemetry-context#browser-context) diff --git a/x-pack/plugins/apm/dev_docs/testing.md b/x-pack/plugins/observability_solution/apm/dev_docs/testing.md similarity index 88% rename from x-pack/plugins/apm/dev_docs/testing.md rename to x-pack/plugins/observability_solution/apm/dev_docs/testing.md index 7ce4ed34b9e61..02ff43d37bf75 100644 --- a/x-pack/plugins/apm/dev_docs/testing.md +++ b/x-pack/plugins/observability_solution/apm/dev_docs/testing.md @@ -13,7 +13,7 @@ Unit testing is a good approach if you have a very specific piece of code with l ## Unit Tests (Jest) ``` -node x-pack/plugins/apm/scripts/test/jest [--watch] [--updateSnapshot] +node x-pack/plugins/observability_solution/apm/scripts/test/jest [--watch] [--updateSnapshot] ``` #### Coverage @@ -44,7 +44,7 @@ The API tests are located in [`x-pack/test/apm_api_integration/`](/x-pack/test/a #### Start server and run test (single process) ``` -node x-pack/plugins/apm/scripts/test/api [--trial/--basic] [--help] +node x-pack/plugins/observability_solution/apm/scripts/test/api [--trial/--basic] [--help] ``` The above command will start an ES instance on http://localhost:9220, a Kibana instance on http://localhost:5620 and run the api tests. @@ -55,10 +55,10 @@ Once the tests finish, the instances will be terminated. ```sh # start server -node x-pack/plugins/apm/scripts/test/api --server --basic +node x-pack/plugins/observability_solution/apm/scripts/test/api --server --basic # run tests -node x-pack/plugins/apm/scripts/test/api --runner --basic --grep-files=error_group_list +node x-pack/plugins/observability_solution/apm/scripts/test/api --runner --basic --grep-files=error_group_list ``` ### Update snapshots (from Kibana root) @@ -66,7 +66,7 @@ node x-pack/plugins/apm/scripts/test/api --runner --basic --grep-files=error_gro To update snapshots append `--updateSnapshots` to the `--runner` command: ``` -node x-pack/plugins/apm/scripts/test/api --runner --basic --updateSnapshots +node x-pack/plugins/observability_solution/apm/scripts/test/api --runner --basic --updateSnapshots ``` (The test server needs to be running) @@ -80,7 +80,7 @@ node x-pack/plugins/apm/scripts/test/api --runner --basic --updateSnapshots ## E2E Tests (Cypress) -The E2E tests are located in [`x-pack/plugins/apm/ftr_e2e`](../ftr_e2e). +The E2E tests are located in [`x-pack/plugins/observability_solution/apm/ftr_e2e`](../ftr_e2e). When PR is labeled with `apm:cypress-record`, test runs are recorded to the [Cypress Dashboard](https://dashboard.cypress.io). @@ -98,19 +98,19 @@ Tests run on buildkite PR pipeline are parallelized (4 parallel jobs) and are or #### Start test server ``` -node x-pack/plugins/apm/scripts/test/e2e --server +node x-pack/plugins/observability_solution/apm/scripts/test/e2e --server ``` #### Run tests ``` -node x-pack/plugins/apm/scripts/test/e2e --runner --open +node x-pack/plugins/observability_solution/apm/scripts/test/e2e --runner --open ``` ### Run tests multiple times to check for flakiness ``` -node x-pack/plugins/apm/scripts/test/e2e --runner --times [--spec ] +node x-pack/plugins/observability_solution/apm/scripts/test/e2e --runner --times [--spec ] ``` ### A11y checks @@ -131,7 +131,7 @@ node scripts/functional_test_runner --config x-pack/test/functional/apps/apm/con APM tests are located in `x-pack/test/functional/apps/apm`. For debugging access Elasticsearch on http://localhost:9220` (elastic/changeme) -diff --git a/x-pack/plugins/apm/scripts/test/README.md b/x-pack/plugins/apm/scripts/test/README.md +diff --git a/x-pack/plugins/observability_solution/apm/scripts/test/README.md b/x-pack/plugins/observability_solution/apm/scripts/test/README.md ## Serverless API tests diff --git a/x-pack/plugins/apm/dev_docs/testing_apm_server.md b/x-pack/plugins/observability_solution/apm/dev_docs/testing_apm_server.md similarity index 100% rename from x-pack/plugins/apm/dev_docs/testing_apm_server.md rename to x-pack/plugins/observability_solution/apm/dev_docs/testing_apm_server.md diff --git a/x-pack/plugins/apm/dev_docs/updating_functional_tests_archives.md b/x-pack/plugins/observability_solution/apm/dev_docs/updating_functional_tests_archives.md similarity index 80% rename from x-pack/plugins/apm/dev_docs/updating_functional_tests_archives.md rename to x-pack/plugins/observability_solution/apm/dev_docs/updating_functional_tests_archives.md index 3d1a5f0b00bb4..50a183d502c2f 100644 --- a/x-pack/plugins/apm/dev_docs/updating_functional_tests_archives.md +++ b/x-pack/plugins/observability_solution/apm/dev_docs/updating_functional_tests_archives.md @@ -3,6 +3,4 @@ Some of our API tests use an archive generated by the [`esarchiver`](https://www.elastic.co/guide/en/kibana/current/development-tests.html#development-functional-tests) script. Updating the main archive (`apm_8.0.0`) is a scripted process, where a 30m snapshot is downloaded from a cluster running the [APM Integration Testing server](https://github.com/elastic/apm-integration-testing). The script will copy the generated archives into the `fixtures/es_archiver` folders of our test suites (currently `basic` and `trial`). It will also generate a file that contains metadata about the archive, that can be imported to get the time range of the snapshot. Usage: -`node x-pack/plugins/apm/scripts/create_functional_tests_archive --es-url=https://admin:changeme@localhost:9200 --kibana-url=https://localhost:5601` - - +`node x-pack/plugins/observability_solution/apm/scripts/create_functional_tests_archive --es-url=https://admin:changeme@localhost:9200 --kibana-url=https://localhost:5601` diff --git a/x-pack/plugins/apm/dev_docs/vscode_setup.md b/x-pack/plugins/observability_solution/apm/dev_docs/vscode_setup.md similarity index 88% rename from x-pack/plugins/apm/dev_docs/vscode_setup.md rename to x-pack/plugins/observability_solution/apm/dev_docs/vscode_setup.md index 9be3a53b52176..a5ed2783da9d2 100644 --- a/x-pack/plugins/apm/dev_docs/vscode_setup.md +++ b/x-pack/plugins/observability_solution/apm/dev_docs/vscode_setup.md @@ -1,6 +1,6 @@ # Visual Studio Code -When using [Visual Studio Code](https://code.visualstudio.com/) with APM it's best to set up a [multi-root workspace](https://code.visualstudio.com/docs/editor/multi-root-workspaces) and add the `x-pack/plugins/apm` directory, the `x-pack` directory, and the root of the Kibana repository to the workspace. This makes it so you can navigate and search within APM and use the wider workspace roots when you need to widen your search. +When using [Visual Studio Code](https://code.visualstudio.com/) with APM it's best to set up a [multi-root workspace](https://code.visualstudio.com/docs/editor/multi-root-workspaces) and add the `x-pack/plugins/observability_solution/apm` directory, the `x-pack` directory, and the root of the Kibana repository to the workspace. This makes it so you can navigate and search within APM and use the wider workspace roots when you need to widen your search. ## Using the Jest extension diff --git a/x-pack/plugins/apm/ftr_e2e/README.md b/x-pack/plugins/observability_solution/apm/ftr_e2e/README.md similarity index 92% rename from x-pack/plugins/apm/ftr_e2e/README.md rename to x-pack/plugins/observability_solution/apm/ftr_e2e/README.md index f62040babfe12..8336c037ff21d 100644 --- a/x-pack/plugins/apm/ftr_e2e/README.md +++ b/x-pack/plugins/observability_solution/apm/ftr_e2e/README.md @@ -1,6 +1,6 @@ # APM E2E -APM uses [FTR](../../../../packages/kbn-test/README.md) (functional test runner) and [Cypress](https://www.cypress.io/) to run the e2e tests. The tests are located at `kibana/x-pack/plugins/apm/ftr_e2e/cypress/integration`. +APM uses [FTR](../../../../../packages/kbn-test/README.md) (functional test runner) and [Cypress](https://www.cypress.io/) to run the e2e tests. The tests are located at `kibana/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/integration`. ## Tips and best practices @@ -71,7 +71,7 @@ it('calls the dependencies API', () => { ### Prefer `cy.visitKibana` instead of `cy.visit` -In most cases we should use [`cy.visitKibana`](https://github.com/elastic/kibana/blob/50821db39c07d5d35d510c8082d5c608c4e2fd4e/x-pack/plugins/apm/ftr_e2e/cypress/support/commands.ts#L51-L56) instead of `cy.visit`. +In most cases we should use [`cy.visitKibana`](https://github.com/elastic/kibana/blob/50821db39c07d5d35d510c8082d5c608c4e2fd4e/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/support/commands.ts#L51-L56) instead of `cy.visit`. `cy.visitKibana` will wait for Kibana to have successfully loaded before moving on. This will reduce the risk of timing out later in the test because we split up the wait time in two parts: Kibana load time, and APM load time thus a time budget for each (by default 40 seconds). ### Clean data before and after each test diff --git a/x-pack/plugins/apm/ftr_e2e/apis/fixtures/package_registry_config.yml b/x-pack/plugins/observability_solution/apm/ftr_e2e/apis/fixtures/package_registry_config.yml similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/apis/fixtures/package_registry_config.yml rename to x-pack/plugins/observability_solution/apm/ftr_e2e/apis/fixtures/package_registry_config.yml diff --git a/x-pack/plugins/apm/ftr_e2e/cypress.config.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress.config.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress.config.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress.config.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/.gitignore b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/.gitignore similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/.gitignore rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/.gitignore diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/_404.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/_404.cy.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/_404.cy.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/_404.cy.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/deep_links.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/deep_links.cy.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/deep_links.cy.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/deep_links.cy.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/dependencies/dependencies.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/dependencies/dependencies.cy.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/dependencies/dependencies.cy.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/dependencies/dependencies.cy.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/dependencies/generate_many_dependencies.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/dependencies/generate_many_dependencies.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/dependencies/generate_many_dependencies.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/dependencies/generate_many_dependencies.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/dependency_operation/dependency_operation.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/dependency_operation/dependency_operation.cy.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/dependency_operation/dependency_operation.cy.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/dependency_operation/dependency_operation.cy.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/diagnostics/apm-diagnostics-8.8.0-1687436214804.json b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/diagnostics/apm-diagnostics-8.8.0-1687436214804.json similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/diagnostics/apm-diagnostics-8.8.0-1687436214804.json rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/diagnostics/apm-diagnostics-8.8.0-1687436214804.json diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/diagnostics/diagnostics.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/diagnostics/diagnostics.cy.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/diagnostics/diagnostics.cy.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/diagnostics/diagnostics.cy.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/errors/error_details.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/errors/error_details.cy.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/errors/error_details.cy.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/errors/error_details.cy.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/errors/errors_page.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/errors/errors_page.cy.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/errors/errors_page.cy.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/errors/errors_page.cy.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/errors/generate_data.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/errors/generate_data.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/errors/generate_data.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/errors/generate_data.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/feature_flag/comparison.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/feature_flag/comparison.cy.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/feature_flag/comparison.cy.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/feature_flag/comparison.cy.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/home.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/home.cy.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/home.cy.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/home.cy.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/infrastructure/generate_data.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/infrastructure/generate_data.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/infrastructure/generate_data.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/infrastructure/generate_data.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/infrastructure/infrastructure_page.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/infrastructure/infrastructure_page.cy.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/infrastructure/infrastructure_page.cy.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/infrastructure/infrastructure_page.cy.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/integration_settings/integration_policy.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/integration_settings/integration_policy.cy.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/integration_settings/integration_policy.cy.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/integration_settings/integration_policy.cy.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/mobile/generate_data.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/mobile/generate_data.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/mobile/generate_data.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/mobile/generate_data.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/mobile/mobile_transaction_details.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/mobile/mobile_transaction_details.cy.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/mobile/mobile_transaction_details.cy.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/mobile/mobile_transaction_details.cy.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/mobile/mobile_transactions.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/mobile/mobile_transactions.cy.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/mobile/mobile_transactions.cy.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/mobile/mobile_transactions.cy.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/navigation.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/navigation.cy.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/navigation.cy.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/navigation.cy.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/no_data_screen.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/no_data_screen.cy.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/no_data_screen.cy.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/no_data_screen.cy.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/onboarding/onboarding.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/onboarding/onboarding.cy.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/onboarding/onboarding.cy.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/onboarding/onboarding.cy.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/rules/error_count.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/rules/error_count.cy.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/rules/error_count.cy.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/rules/error_count.cy.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/rules/generate_data.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/rules/generate_data.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/rules/generate_data.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/rules/generate_data.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_groups/generate_data.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_groups/generate_data.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_groups/generate_data.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_groups/generate_data.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_groups/service_groups.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_groups/service_groups.cy.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_groups/service_groups.cy.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_groups/service_groups.cy.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_inventory/generate_data.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_inventory/generate_data.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_inventory/generate_data.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_inventory/generate_data.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_inventory/header_filters/generate_data.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_inventory/header_filters/generate_data.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_inventory/header_filters/generate_data.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_inventory/header_filters/generate_data.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_inventory/header_filters/header_filters.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_inventory/header_filters/header_filters.cy.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_inventory/header_filters/header_filters.cy.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_inventory/header_filters/header_filters.cy.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_inventory/service_inventory.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_inventory/service_inventory.cy.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_inventory/service_inventory.cy.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_inventory/service_inventory.cy.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_map/service_map.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_map/service_map.cy.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_map/service_map.cy.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_map/service_map.cy.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_map/snapshots/detailed_service_map.png b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_map/snapshots/detailed_service_map.png similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_map/snapshots/detailed_service_map.png rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_map/snapshots/detailed_service_map.png diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_map/snapshots/service_map.png b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_map/snapshots/service_map.png similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_map/snapshots/service_map.png rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_map/snapshots/service_map.png diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_overview/alerts_table.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_overview/alerts_table.cy.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_overview/alerts_table.cy.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_overview/alerts_table.cy.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_overview/aws_lambda/aws_lambda.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_overview/aws_lambda/aws_lambda.cy.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_overview/aws_lambda/aws_lambda.cy.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_overview/aws_lambda/aws_lambda.cy.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_overview/aws_lambda/generate_data.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_overview/aws_lambda/generate_data.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_overview/aws_lambda/generate_data.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_overview/aws_lambda/generate_data.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_overview/azure_functions/azure_functions.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_overview/azure_functions/azure_functions.cy.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_overview/azure_functions/azure_functions.cy.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_overview/azure_functions/azure_functions.cy.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_overview/azure_functions/generate_data.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_overview/azure_functions/generate_data.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_overview/azure_functions/generate_data.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_overview/azure_functions/generate_data.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_overview/errors_table.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_overview/errors_table.cy.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_overview/errors_table.cy.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_overview/errors_table.cy.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_overview/generate_data.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_overview/generate_data.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_overview/generate_data.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_overview/generate_data.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_overview/generate_mobile.data.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_overview/generate_mobile.data.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_overview/generate_mobile.data.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_overview/generate_mobile.data.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_overview/header_filters.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_overview/header_filters.cy.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_overview/header_filters.cy.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_overview/header_filters.cy.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_overview/instances_table.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_overview/instances_table.cy.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_overview/instances_table.cy.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_overview/instances_table.cy.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_overview/mobile_overview_with_most_used_charts.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_overview/mobile_overview_with_most_used_charts.cy.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_overview/mobile_overview_with_most_used_charts.cy.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_overview/mobile_overview_with_most_used_charts.cy.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_overview/service_and_mobile_overview.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_overview/service_and_mobile_overview.cy.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_overview/service_and_mobile_overview.cy.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_overview/service_and_mobile_overview.cy.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_overview/service_overview.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_overview/service_overview.cy.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_overview/service_overview.cy.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_overview/service_overview.cy.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_overview/time_comparison.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_overview/time_comparison.cy.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/service_overview/time_comparison.cy.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_overview/time_comparison.cy.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/settings/agent_configurations.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/settings/agent_configurations.cy.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/settings/agent_configurations.cy.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/settings/agent_configurations.cy.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/settings/custom_links.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/settings/custom_links.cy.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/settings/custom_links.cy.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/settings/custom_links.cy.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/storage_explorer/storage_explorer.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/storage_explorer/storage_explorer.cy.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/storage_explorer/storage_explorer.cy.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/storage_explorer/storage_explorer.cy.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/trace_explorer/trace_explorer.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/trace_explorer/trace_explorer.cy.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/trace_explorer/trace_explorer.cy.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/trace_explorer/trace_explorer.cy.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/transaction_details/generate_span_links_data.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/transaction_details/generate_span_links_data.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/transaction_details/generate_span_links_data.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/transaction_details/generate_span_links_data.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/transaction_details/generate_span_stacktrace_data.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/transaction_details/generate_span_stacktrace_data.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/transaction_details/generate_span_stacktrace_data.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/transaction_details/generate_span_stacktrace_data.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/transaction_details/large_trace_in_waterfall/generate_large_trace.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/transaction_details/large_trace_in_waterfall/generate_large_trace.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/transaction_details/large_trace_in_waterfall/generate_large_trace.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/transaction_details/large_trace_in_waterfall/generate_large_trace.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/transaction_details/large_trace_in_waterfall/large_traces_in_waterfall.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/transaction_details/large_trace_in_waterfall/large_traces_in_waterfall.cy.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/transaction_details/large_trace_in_waterfall/large_traces_in_waterfall.cy.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/transaction_details/large_trace_in_waterfall/large_traces_in_waterfall.cy.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/transaction_details/span_links.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/transaction_details/span_links.cy.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/transaction_details/span_links.cy.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/transaction_details/span_links.cy.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/transaction_details/span_stacktrace.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/transaction_details/span_stacktrace.cy.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/transaction_details/span_stacktrace.cy.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/transaction_details/span_stacktrace.cy.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/transaction_details/transaction_details.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/transaction_details/transaction_details.cy.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/transaction_details/transaction_details.cy.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/transaction_details/transaction_details.cy.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/transactions_overview/transactions_overview.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/transactions_overview/transactions_overview.cy.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/transactions_overview/transactions_overview.cy.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/transactions_overview/transactions_overview.cy.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/e2e/tutorial/tutorial.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/tutorial/tutorial.cy.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/e2e/tutorial/tutorial.cy.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/tutorial/tutorial.cy.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/fixtures/es_archiver/apm_8.0.0_empty/mappings.json b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/fixtures/es_archiver/apm_8.0.0_empty/mappings.json similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/fixtures/es_archiver/apm_8.0.0_empty/mappings.json rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/fixtures/es_archiver/apm_8.0.0_empty/mappings.json diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/fixtures/es_archiver/apm_mappings_only_8.0.0/mappings.json b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/fixtures/es_archiver/apm_mappings_only_8.0.0/mappings.json similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/fixtures/es_archiver/apm_mappings_only_8.0.0/mappings.json rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/fixtures/es_archiver/apm_mappings_only_8.0.0/mappings.json diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/fixtures/es_archiver/metrics_8.0.0/mappings.json b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/fixtures/es_archiver/metrics_8.0.0/mappings.json similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/fixtures/es_archiver/metrics_8.0.0/mappings.json rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/fixtures/es_archiver/metrics_8.0.0/mappings.json diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/fixtures/synthtrace/opbeans.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/fixtures/synthtrace/opbeans.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/fixtures/synthtrace/opbeans.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/fixtures/synthtrace/opbeans.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/support/commands.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/support/commands.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/support/commands.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/support/commands.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/support/e2e.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/support/e2e.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/support/e2e.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/support/e2e.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/support/output_command_timings.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/support/output_command_timings.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/support/output_command_timings.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/support/output_command_timings.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/support/types.d.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/support/types.d.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress/support/types.d.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/support/types.d.ts diff --git a/x-pack/plugins/apm/ftr_e2e/cypress_test_runner.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress_test_runner.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/cypress_test_runner.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/cypress_test_runner.ts diff --git a/x-pack/plugins/apm/ftr_e2e/ftr_config.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/ftr_config.ts similarity index 94% rename from x-pack/plugins/apm/ftr_e2e/ftr_config.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/ftr_config.ts index 47e5878e365a9..d0aa9b32a95e7 100644 --- a/x-pack/plugins/apm/ftr_e2e/ftr_config.ts +++ b/x-pack/plugins/observability_solution/apm/ftr_e2e/ftr_config.ts @@ -12,10 +12,10 @@ import { FtrProviderContext } from './ftr_provider_context'; async function ftrConfig({ readConfigFile }: FtrConfigProviderContext) { const kibanaCommonTestsConfig = await readConfigFile( - require.resolve('../../../../test/common/config.js') + require.resolve('../../../../../test/common/config.js') ); const xpackFunctionalTestsConfig = await readConfigFile( - require.resolve('../../../test/functional/config.base.js') + require.resolve('../../../../test/functional/config.base.js') ); return { diff --git a/x-pack/plugins/apm/ftr_e2e/ftr_provider_context.d.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/ftr_provider_context.d.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/ftr_provider_context.d.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/ftr_provider_context.d.ts diff --git a/x-pack/plugins/apm/ftr_e2e/setup_cypress_node_events.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/setup_cypress_node_events.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/setup_cypress_node_events.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/setup_cypress_node_events.ts diff --git a/x-pack/plugins/apm/ftr_e2e/synthtrace.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/synthtrace.ts similarity index 100% rename from x-pack/plugins/apm/ftr_e2e/synthtrace.ts rename to x-pack/plugins/observability_solution/apm/ftr_e2e/synthtrace.ts diff --git a/x-pack/plugins/apm/ftr_e2e/tsconfig.json b/x-pack/plugins/observability_solution/apm/ftr_e2e/tsconfig.json similarity index 50% rename from x-pack/plugins/apm/ftr_e2e/tsconfig.json rename to x-pack/plugins/observability_solution/apm/ftr_e2e/tsconfig.json index b95f24a54d4fb..4c2eb87feda9b 100644 --- a/x-pack/plugins/apm/ftr_e2e/tsconfig.json +++ b/x-pack/plugins/observability_solution/apm/ftr_e2e/tsconfig.json @@ -1,29 +1,20 @@ { - "extends": "../../../../tsconfig.base.json", - "include": [ - "**/*" - ], - "exclude": [ - "tmp", - "target/**/*" - ], + "extends": "../../../../../tsconfig.base.json", + "include": ["**/*"], + "exclude": ["tmp", "target/**/*"], "compilerOptions": { "outDir": "target/types", - "types": [ - "cypress", - "node", - "cypress-real-events" - ], + "types": ["cypress", "node", "cypress-real-events"], "isolatedModules": false }, "kbn_references": [ - { "path": "../../../test/tsconfig.json" }, { "path": "../../../../test/tsconfig.json" }, + { "path": "../../../../../test/tsconfig.json" }, "@kbn/test", "@kbn/apm-synthtrace", "@kbn/apm-synthtrace-client", "@kbn/dev-utils", "@kbn/axe-config", - "@kbn/cypress-config", + "@kbn/cypress-config" ] } diff --git a/x-pack/plugins/apm/jest.config.js b/x-pack/plugins/observability_solution/apm/jest.config.js similarity index 50% rename from x-pack/plugins/apm/jest.config.js rename to x-pack/plugins/observability_solution/apm/jest.config.js index 5d15dd048d4f1..8e02c46d7ecde 100644 --- a/x-pack/plugins/apm/jest.config.js +++ b/x-pack/plugins/observability_solution/apm/jest.config.js @@ -9,13 +9,16 @@ const path = require('path'); module.exports = { preset: '@kbn/test', - rootDir: path.resolve(__dirname, '../../..'), - roots: ['/x-pack/plugins/apm'], - setupFiles: ['/x-pack/plugins/apm/.storybook/jest_setup.js'], - coverageDirectory: '/target/kibana-coverage/jest/x-pack/plugins/apm', + rootDir: path.resolve(__dirname, '../../../..'), + roots: ['/x-pack/plugins/observability_solution/apm'], + setupFiles: [ + '/x-pack/plugins/observability_solution/apm/.storybook/jest_setup.js', + ], + coverageDirectory: + '/target/kibana-coverage/jest/x-pack/plugins/observability_solution/apm', coverageReporters: ['text', 'html'], collectCoverageFrom: [ - '/x-pack/plugins/apm/{common,public,server}/**/*.{js,ts,tsx}', + '/x-pack/plugins/observability_solution/apm/{common,public,server}/**/*.{js,ts,tsx}', '!/**/*.stories.*', ], }; diff --git a/x-pack/plugins/apm/kibana.jsonc b/x-pack/plugins/observability_solution/apm/kibana.jsonc similarity index 100% rename from x-pack/plugins/apm/kibana.jsonc rename to x-pack/plugins/observability_solution/apm/kibana.jsonc diff --git a/x-pack/plugins/apm/public/application/index.tsx b/x-pack/plugins/observability_solution/apm/public/application/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/application/index.tsx rename to x-pack/plugins/observability_solution/apm/public/application/index.tsx diff --git a/x-pack/plugins/apm/public/assets/apm.png b/x-pack/plugins/observability_solution/apm/public/assets/apm.png similarity index 100% rename from x-pack/plugins/apm/public/assets/apm.png rename to x-pack/plugins/observability_solution/apm/public/assets/apm.png diff --git a/x-pack/plugins/apm/public/assets/illustration_integrations_darkmode.svg b/x-pack/plugins/observability_solution/apm/public/assets/illustration_integrations_darkmode.svg similarity index 100% rename from x-pack/plugins/apm/public/assets/illustration_integrations_darkmode.svg rename to x-pack/plugins/observability_solution/apm/public/assets/illustration_integrations_darkmode.svg diff --git a/x-pack/plugins/apm/public/assets/illustration_integrations_lightmode.svg b/x-pack/plugins/observability_solution/apm/public/assets/illustration_integrations_lightmode.svg similarity index 100% rename from x-pack/plugins/apm/public/assets/illustration_integrations_lightmode.svg rename to x-pack/plugins/observability_solution/apm/public/assets/illustration_integrations_lightmode.svg diff --git a/x-pack/plugins/apm/public/assets/no_results_dark.svg b/x-pack/plugins/observability_solution/apm/public/assets/no_results_dark.svg similarity index 100% rename from x-pack/plugins/apm/public/assets/no_results_dark.svg rename to x-pack/plugins/observability_solution/apm/public/assets/no_results_dark.svg diff --git a/x-pack/plugins/apm/public/assets/no_results_light.svg b/x-pack/plugins/observability_solution/apm/public/assets/no_results_light.svg similarity index 100% rename from x-pack/plugins/apm/public/assets/no_results_light.svg rename to x-pack/plugins/observability_solution/apm/public/assets/no_results_light.svg diff --git a/x-pack/plugins/apm/public/assistant_functions/get_apm_timeseries.tsx b/x-pack/plugins/observability_solution/apm/public/assistant_functions/get_apm_timeseries.tsx similarity index 100% rename from x-pack/plugins/apm/public/assistant_functions/get_apm_timeseries.tsx rename to x-pack/plugins/observability_solution/apm/public/assistant_functions/get_apm_timeseries.tsx diff --git a/x-pack/plugins/apm/public/assistant_functions/index.ts b/x-pack/plugins/observability_solution/apm/public/assistant_functions/index.ts similarity index 100% rename from x-pack/plugins/apm/public/assistant_functions/index.ts rename to x-pack/plugins/observability_solution/apm/public/assistant_functions/index.ts diff --git a/x-pack/plugins/apm/public/components/alerting/rule_types/anomaly_rule_type/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/alerting/rule_types/anomaly_rule_type/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/alerting/rule_types/anomaly_rule_type/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/alerting/rule_types/anomaly_rule_type/index.tsx diff --git a/x-pack/plugins/apm/public/components/alerting/rule_types/anomaly_rule_type/select_anomaly_detector.tsx b/x-pack/plugins/observability_solution/apm/public/components/alerting/rule_types/anomaly_rule_type/select_anomaly_detector.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/alerting/rule_types/anomaly_rule_type/select_anomaly_detector.tsx rename to x-pack/plugins/observability_solution/apm/public/components/alerting/rule_types/anomaly_rule_type/select_anomaly_detector.tsx diff --git a/x-pack/plugins/apm/public/components/alerting/rule_types/anomaly_rule_type/select_anomaly_severity.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/alerting/rule_types/anomaly_rule_type/select_anomaly_severity.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/alerting/rule_types/anomaly_rule_type/select_anomaly_severity.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/alerting/rule_types/anomaly_rule_type/select_anomaly_severity.test.tsx diff --git a/x-pack/plugins/apm/public/components/alerting/rule_types/anomaly_rule_type/select_anomaly_severity.tsx b/x-pack/plugins/observability_solution/apm/public/components/alerting/rule_types/anomaly_rule_type/select_anomaly_severity.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/alerting/rule_types/anomaly_rule_type/select_anomaly_severity.tsx rename to x-pack/plugins/observability_solution/apm/public/components/alerting/rule_types/anomaly_rule_type/select_anomaly_severity.tsx diff --git a/x-pack/plugins/apm/public/components/alerting/rule_types/error_count_rule_type/index.stories.tsx b/x-pack/plugins/observability_solution/apm/public/components/alerting/rule_types/error_count_rule_type/index.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/alerting/rule_types/error_count_rule_type/index.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/components/alerting/rule_types/error_count_rule_type/index.stories.tsx diff --git a/x-pack/plugins/apm/public/components/alerting/rule_types/error_count_rule_type/index.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/alerting/rule_types/error_count_rule_type/index.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/alerting/rule_types/error_count_rule_type/index.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/alerting/rule_types/error_count_rule_type/index.test.tsx diff --git a/x-pack/plugins/apm/public/components/alerting/rule_types/error_count_rule_type/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/alerting/rule_types/error_count_rule_type/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/alerting/rule_types/error_count_rule_type/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/alerting/rule_types/error_count_rule_type/index.tsx diff --git a/x-pack/plugins/apm/public/components/alerting/rule_types/register_apm_rule_types.ts b/x-pack/plugins/observability_solution/apm/public/components/alerting/rule_types/register_apm_rule_types.ts similarity index 100% rename from x-pack/plugins/apm/public/components/alerting/rule_types/register_apm_rule_types.ts rename to x-pack/plugins/observability_solution/apm/public/components/alerting/rule_types/register_apm_rule_types.ts diff --git a/x-pack/plugins/apm/public/components/alerting/rule_types/transaction_duration_rule_type/index.stories.tsx b/x-pack/plugins/observability_solution/apm/public/components/alerting/rule_types/transaction_duration_rule_type/index.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/alerting/rule_types/transaction_duration_rule_type/index.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/components/alerting/rule_types/transaction_duration_rule_type/index.stories.tsx diff --git a/x-pack/plugins/apm/public/components/alerting/rule_types/transaction_duration_rule_type/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/alerting/rule_types/transaction_duration_rule_type/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/alerting/rule_types/transaction_duration_rule_type/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/alerting/rule_types/transaction_duration_rule_type/index.tsx diff --git a/x-pack/plugins/apm/public/components/alerting/rule_types/transaction_error_rate_rule_type/index.stories.tsx b/x-pack/plugins/observability_solution/apm/public/components/alerting/rule_types/transaction_error_rate_rule_type/index.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/alerting/rule_types/transaction_error_rate_rule_type/index.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/components/alerting/rule_types/transaction_error_rate_rule_type/index.stories.tsx diff --git a/x-pack/plugins/apm/public/components/alerting/rule_types/transaction_error_rate_rule_type/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/alerting/rule_types/transaction_error_rate_rule_type/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/alerting/rule_types/transaction_error_rate_rule_type/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/alerting/rule_types/transaction_error_rate_rule_type/index.tsx diff --git a/x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/constants.ts b/x-pack/plugins/observability_solution/apm/public/components/alerting/ui_components/alert_details_app_section/constants.ts similarity index 100% rename from x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/constants.ts rename to x-pack/plugins/observability_solution/apm/public/components/alerting/ui_components/alert_details_app_section/constants.ts diff --git a/x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/failed_transaction_chart.tsx b/x-pack/plugins/observability_solution/apm/public/components/alerting/ui_components/alert_details_app_section/failed_transaction_chart.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/failed_transaction_chart.tsx rename to x-pack/plugins/observability_solution/apm/public/components/alerting/ui_components/alert_details_app_section/failed_transaction_chart.tsx diff --git a/x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/helpers.ts b/x-pack/plugins/observability_solution/apm/public/components/alerting/ui_components/alert_details_app_section/helpers.ts similarity index 100% rename from x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/helpers.ts rename to x-pack/plugins/observability_solution/apm/public/components/alerting/ui_components/alert_details_app_section/helpers.ts diff --git a/x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/alerting/ui_components/alert_details_app_section/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/alerting/ui_components/alert_details_app_section/index.tsx diff --git a/x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/latency_alerts_history_chart.tsx b/x-pack/plugins/observability_solution/apm/public/components/alerting/ui_components/alert_details_app_section/latency_alerts_history_chart.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/latency_alerts_history_chart.tsx rename to x-pack/plugins/observability_solution/apm/public/components/alerting/ui_components/alert_details_app_section/latency_alerts_history_chart.tsx diff --git a/x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/latency_chart.tsx b/x-pack/plugins/observability_solution/apm/public/components/alerting/ui_components/alert_details_app_section/latency_chart.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/latency_chart.tsx rename to x-pack/plugins/observability_solution/apm/public/components/alerting/ui_components/alert_details_app_section/latency_chart.tsx diff --git a/x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/throughput_chart.tsx b/x-pack/plugins/observability_solution/apm/public/components/alerting/ui_components/alert_details_app_section/throughput_chart.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/throughput_chart.tsx rename to x-pack/plugins/observability_solution/apm/public/components/alerting/ui_components/alert_details_app_section/throughput_chart.tsx diff --git a/x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/types.ts b/x-pack/plugins/observability_solution/apm/public/components/alerting/ui_components/alert_details_app_section/types.ts similarity index 100% rename from x-pack/plugins/apm/public/components/alerting/ui_components/alert_details_app_section/types.ts rename to x-pack/plugins/observability_solution/apm/public/components/alerting/ui_components/alert_details_app_section/types.ts diff --git a/x-pack/plugins/apm/public/components/alerting/ui_components/alerting_flyout/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/alerting/ui_components/alerting_flyout/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/alerting/ui_components/alerting_flyout/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/alerting/ui_components/alerting_flyout/index.tsx diff --git a/x-pack/plugins/apm/public/components/alerting/ui_components/apm_rule_group_by.tsx b/x-pack/plugins/observability_solution/apm/public/components/alerting/ui_components/apm_rule_group_by.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/alerting/ui_components/apm_rule_group_by.tsx rename to x-pack/plugins/observability_solution/apm/public/components/alerting/ui_components/apm_rule_group_by.tsx diff --git a/x-pack/plugins/apm/public/components/alerting/ui_components/apm_rule_kql_filter.tsx b/x-pack/plugins/observability_solution/apm/public/components/alerting/ui_components/apm_rule_kql_filter.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/alerting/ui_components/apm_rule_kql_filter.tsx rename to x-pack/plugins/observability_solution/apm/public/components/alerting/ui_components/apm_rule_kql_filter.tsx diff --git a/x-pack/plugins/apm/public/components/alerting/ui_components/apm_rule_params_container/index.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/alerting/ui_components/apm_rule_params_container/index.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/alerting/ui_components/apm_rule_params_container/index.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/alerting/ui_components/apm_rule_params_container/index.test.tsx diff --git a/x-pack/plugins/apm/public/components/alerting/ui_components/apm_rule_params_container/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/alerting/ui_components/apm_rule_params_container/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/alerting/ui_components/apm_rule_params_container/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/alerting/ui_components/apm_rule_params_container/index.tsx diff --git a/x-pack/plugins/apm/public/components/alerting/ui_components/apm_rule_unified_search_bar.tsx b/x-pack/plugins/observability_solution/apm/public/components/alerting/ui_components/apm_rule_unified_search_bar.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/alerting/ui_components/apm_rule_unified_search_bar.tsx rename to x-pack/plugins/observability_solution/apm/public/components/alerting/ui_components/apm_rule_unified_search_bar.tsx diff --git a/x-pack/plugins/apm/public/components/alerting/ui_components/chart_preview/chart_preview_helper.tsx b/x-pack/plugins/observability_solution/apm/public/components/alerting/ui_components/chart_preview/chart_preview_helper.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/alerting/ui_components/chart_preview/chart_preview_helper.tsx rename to x-pack/plugins/observability_solution/apm/public/components/alerting/ui_components/chart_preview/chart_preview_helper.tsx diff --git a/x-pack/plugins/apm/public/components/alerting/ui_components/chart_preview/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/alerting/ui_components/chart_preview/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/alerting/ui_components/chart_preview/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/alerting/ui_components/chart_preview/index.tsx diff --git a/x-pack/plugins/apm/public/components/alerting/ui_components/popover_expression.tsx b/x-pack/plugins/observability_solution/apm/public/components/alerting/ui_components/popover_expression.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/alerting/ui_components/popover_expression.tsx rename to x-pack/plugins/observability_solution/apm/public/components/alerting/ui_components/popover_expression.tsx diff --git a/x-pack/plugins/apm/public/components/alerting/utils/fields.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/alerting/utils/fields.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/alerting/utils/fields.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/alerting/utils/fields.test.tsx diff --git a/x-pack/plugins/apm/public/components/alerting/utils/fields.tsx b/x-pack/plugins/observability_solution/apm/public/components/alerting/utils/fields.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/alerting/utils/fields.tsx rename to x-pack/plugins/observability_solution/apm/public/components/alerting/utils/fields.tsx diff --git a/x-pack/plugins/apm/public/components/alerting/utils/get_alerting_capabilities.test.ts b/x-pack/plugins/observability_solution/apm/public/components/alerting/utils/get_alerting_capabilities.test.ts similarity index 100% rename from x-pack/plugins/apm/public/components/alerting/utils/get_alerting_capabilities.test.ts rename to x-pack/plugins/observability_solution/apm/public/components/alerting/utils/get_alerting_capabilities.test.ts diff --git a/x-pack/plugins/apm/public/components/alerting/utils/get_alerting_capabilities.ts b/x-pack/plugins/observability_solution/apm/public/components/alerting/utils/get_alerting_capabilities.ts similarity index 100% rename from x-pack/plugins/apm/public/components/alerting/utils/get_alerting_capabilities.ts rename to x-pack/plugins/observability_solution/apm/public/components/alerting/utils/get_alerting_capabilities.ts diff --git a/x-pack/plugins/apm/public/components/alerting/utils/get_initial_alert_values.test.ts b/x-pack/plugins/observability_solution/apm/public/components/alerting/utils/get_initial_alert_values.test.ts similarity index 100% rename from x-pack/plugins/apm/public/components/alerting/utils/get_initial_alert_values.test.ts rename to x-pack/plugins/observability_solution/apm/public/components/alerting/utils/get_initial_alert_values.test.ts diff --git a/x-pack/plugins/apm/public/components/alerting/utils/get_initial_alert_values.ts b/x-pack/plugins/observability_solution/apm/public/components/alerting/utils/get_initial_alert_values.ts similarity index 100% rename from x-pack/plugins/apm/public/components/alerting/utils/get_initial_alert_values.ts rename to x-pack/plugins/observability_solution/apm/public/components/alerting/utils/get_initial_alert_values.ts diff --git a/x-pack/plugins/apm/public/components/alerting/utils/helper.ts b/x-pack/plugins/observability_solution/apm/public/components/alerting/utils/helper.ts similarity index 100% rename from x-pack/plugins/apm/public/components/alerting/utils/helper.ts rename to x-pack/plugins/observability_solution/apm/public/components/alerting/utils/helper.ts diff --git a/x-pack/plugins/apm/public/components/app/alerts_overview/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/alerts_overview/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/alerts_overview/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/alerts_overview/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/breadcrumb/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/breadcrumb/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/breadcrumb/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/breadcrumb/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/correlations/chart_title_tool_tip.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/correlations/chart_title_tool_tip.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/correlations/chart_title_tool_tip.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/correlations/chart_title_tool_tip.tsx diff --git a/x-pack/plugins/apm/public/components/app/correlations/context_popover/field_stats_popover.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/correlations/context_popover/field_stats_popover.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/correlations/context_popover/field_stats_popover.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/correlations/context_popover/field_stats_popover.tsx diff --git a/x-pack/plugins/apm/public/components/app/correlations/context_popover/index.ts b/x-pack/plugins/observability_solution/apm/public/components/app/correlations/context_popover/index.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/correlations/context_popover/index.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/correlations/context_popover/index.ts diff --git a/x-pack/plugins/apm/public/components/app/correlations/correlations_table.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/correlations/correlations_table.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/correlations/correlations_table.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/correlations/correlations_table.tsx diff --git a/x-pack/plugins/apm/public/components/app/correlations/cross_cluster_search_warning.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/correlations/cross_cluster_search_warning.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/correlations/cross_cluster_search_warning.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/correlations/cross_cluster_search_warning.tsx diff --git a/x-pack/plugins/apm/public/components/app/correlations/empty_state_prompt.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/correlations/empty_state_prompt.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/correlations/empty_state_prompt.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/correlations/empty_state_prompt.tsx diff --git a/x-pack/plugins/apm/public/components/app/correlations/failed_transactions_correlations.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/correlations/failed_transactions_correlations.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/correlations/failed_transactions_correlations.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/correlations/failed_transactions_correlations.tsx diff --git a/x-pack/plugins/apm/public/components/app/correlations/failed_transactions_correlations_help_popover.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/correlations/failed_transactions_correlations_help_popover.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/correlations/failed_transactions_correlations_help_popover.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/correlations/failed_transactions_correlations_help_popover.tsx diff --git a/x-pack/plugins/apm/public/components/app/correlations/get_transaction_distribution_chart_data.ts b/x-pack/plugins/observability_solution/apm/public/components/app/correlations/get_transaction_distribution_chart_data.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/correlations/get_transaction_distribution_chart_data.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/correlations/get_transaction_distribution_chart_data.ts diff --git a/x-pack/plugins/apm/public/components/app/correlations/latency_correlations.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/correlations/latency_correlations.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/correlations/latency_correlations.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/correlations/latency_correlations.test.tsx diff --git a/x-pack/plugins/apm/public/components/app/correlations/latency_correlations.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/correlations/latency_correlations.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/correlations/latency_correlations.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/correlations/latency_correlations.tsx diff --git a/x-pack/plugins/apm/public/components/app/correlations/latency_correlations_help_popover.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/correlations/latency_correlations_help_popover.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/correlations/latency_correlations_help_popover.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/correlations/latency_correlations_help_popover.tsx diff --git a/x-pack/plugins/apm/public/components/app/correlations/progress_controls.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/correlations/progress_controls.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/correlations/progress_controls.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/correlations/progress_controls.tsx diff --git a/x-pack/plugins/apm/public/components/app/correlations/use_failed_transactions_correlations.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/correlations/use_failed_transactions_correlations.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/correlations/use_failed_transactions_correlations.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/correlations/use_failed_transactions_correlations.test.tsx diff --git a/x-pack/plugins/apm/public/components/app/correlations/use_failed_transactions_correlations.ts b/x-pack/plugins/observability_solution/apm/public/components/app/correlations/use_failed_transactions_correlations.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/correlations/use_failed_transactions_correlations.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/correlations/use_failed_transactions_correlations.ts diff --git a/x-pack/plugins/apm/public/components/app/correlations/use_fetch_params.ts b/x-pack/plugins/observability_solution/apm/public/components/app/correlations/use_fetch_params.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/correlations/use_fetch_params.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/correlations/use_fetch_params.ts diff --git a/x-pack/plugins/apm/public/components/app/correlations/use_latency_correlations.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/correlations/use_latency_correlations.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/correlations/use_latency_correlations.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/correlations/use_latency_correlations.test.tsx diff --git a/x-pack/plugins/apm/public/components/app/correlations/use_latency_correlations.ts b/x-pack/plugins/observability_solution/apm/public/components/app/correlations/use_latency_correlations.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/correlations/use_latency_correlations.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/correlations/use_latency_correlations.ts diff --git a/x-pack/plugins/apm/public/components/app/correlations/utils/analysis_hook_utils.ts b/x-pack/plugins/observability_solution/apm/public/components/app/correlations/utils/analysis_hook_utils.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/correlations/utils/analysis_hook_utils.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/correlations/utils/analysis_hook_utils.ts diff --git a/x-pack/plugins/apm/public/components/app/correlations/utils/get_failed_transactions_correlation_impact_label.test.ts b/x-pack/plugins/observability_solution/apm/public/components/app/correlations/utils/get_failed_transactions_correlation_impact_label.test.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/correlations/utils/get_failed_transactions_correlation_impact_label.test.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/correlations/utils/get_failed_transactions_correlation_impact_label.test.ts diff --git a/x-pack/plugins/apm/public/components/app/correlations/utils/get_failed_transactions_correlation_impact_label.ts b/x-pack/plugins/observability_solution/apm/public/components/app/correlations/utils/get_failed_transactions_correlation_impact_label.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/correlations/utils/get_failed_transactions_correlation_impact_label.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/correlations/utils/get_failed_transactions_correlation_impact_label.ts diff --git a/x-pack/plugins/apm/public/components/app/correlations/utils/get_overall_histogram.test.ts b/x-pack/plugins/observability_solution/apm/public/components/app/correlations/utils/get_overall_histogram.test.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/correlations/utils/get_overall_histogram.test.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/correlations/utils/get_overall_histogram.test.ts diff --git a/x-pack/plugins/apm/public/components/app/correlations/utils/get_overall_histogram.ts b/x-pack/plugins/observability_solution/apm/public/components/app/correlations/utils/get_overall_histogram.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/correlations/utils/get_overall_histogram.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/correlations/utils/get_overall_histogram.ts diff --git a/x-pack/plugins/apm/public/components/app/correlations/utils/is_error_message.ts b/x-pack/plugins/observability_solution/apm/public/components/app/correlations/utils/is_error_message.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/correlations/utils/is_error_message.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/correlations/utils/is_error_message.ts diff --git a/x-pack/plugins/apm/public/components/app/dependencies_inventory/dependencies_inventory_table/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/dependencies_inventory/dependencies_inventory_table/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/dependencies_inventory/dependencies_inventory_table/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/dependencies_inventory/dependencies_inventory_table/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/dependencies_inventory/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/dependencies_inventory/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/dependencies_inventory/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/dependencies_inventory/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/dependency_detail_operations/dependency_detail_operations_list/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/dependency_detail_operations/dependency_detail_operations_list/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/dependency_detail_operations/dependency_detail_operations_list/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/dependency_detail_operations/dependency_detail_operations_list/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/dependency_detail_operations/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/dependency_detail_operations/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/dependency_detail_operations/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/dependency_detail_operations/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/dependency_detail_overview/dependencies_detail_table.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/dependency_detail_overview/dependencies_detail_table.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/dependency_detail_overview/dependencies_detail_table.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/dependency_detail_overview/dependencies_detail_table.tsx diff --git a/x-pack/plugins/apm/public/components/app/dependency_detail_overview/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/dependency_detail_overview/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/dependency_detail_overview/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/dependency_detail_overview/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/dependency_detail_view/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/dependency_detail_view/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/dependency_detail_view/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/dependency_detail_view/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/dependency_operation_detail_view/dependency_operation_detail_link.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/dependency_operation_detail_view/dependency_operation_detail_link.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/dependency_operation_detail_view/dependency_operation_detail_link.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/dependency_operation_detail_view/dependency_operation_detail_link.tsx diff --git a/x-pack/plugins/apm/public/components/app/dependency_operation_detail_view/dependency_operation_distribution_chart.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/dependency_operation_detail_view/dependency_operation_distribution_chart.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/dependency_operation_detail_view/dependency_operation_distribution_chart.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/dependency_operation_detail_view/dependency_operation_distribution_chart.tsx diff --git a/x-pack/plugins/apm/public/components/app/dependency_operation_detail_view/detail_view_header/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/dependency_operation_detail_view/detail_view_header/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/dependency_operation_detail_view/detail_view_header/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/dependency_operation_detail_view/detail_view_header/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/dependency_operation_detail_view/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/dependency_operation_detail_view/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/dependency_operation_detail_view/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/dependency_operation_detail_view/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/dependency_operation_detail_view/maybe_redirect_to_available_span_sample.test.ts b/x-pack/plugins/observability_solution/apm/public/components/app/dependency_operation_detail_view/maybe_redirect_to_available_span_sample.test.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/dependency_operation_detail_view/maybe_redirect_to_available_span_sample.test.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/dependency_operation_detail_view/maybe_redirect_to_available_span_sample.test.ts diff --git a/x-pack/plugins/apm/public/components/app/dependency_operation_detail_view/maybe_redirect_to_available_span_sample.ts b/x-pack/plugins/observability_solution/apm/public/components/app/dependency_operation_detail_view/maybe_redirect_to_available_span_sample.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/dependency_operation_detail_view/maybe_redirect_to_available_span_sample.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/dependency_operation_detail_view/maybe_redirect_to_available_span_sample.ts diff --git a/x-pack/plugins/apm/public/components/app/diagnostics/apm_documents_tab.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/diagnostics/apm_documents_tab.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/diagnostics/apm_documents_tab.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/diagnostics/apm_documents_tab.tsx diff --git a/x-pack/plugins/apm/public/components/app/diagnostics/context/diagnostics_context.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/diagnostics/context/diagnostics_context.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/diagnostics/context/diagnostics_context.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/diagnostics/context/diagnostics_context.tsx diff --git a/x-pack/plugins/apm/public/components/app/diagnostics/context/use_diagnostics.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/diagnostics/context/use_diagnostics.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/diagnostics/context/use_diagnostics.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/diagnostics/context/use_diagnostics.tsx diff --git a/x-pack/plugins/apm/public/components/app/diagnostics/data_stream_tab.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/diagnostics/data_stream_tab.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/diagnostics/data_stream_tab.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/diagnostics/data_stream_tab.tsx diff --git a/x-pack/plugins/apm/public/components/app/diagnostics/import_export_tab.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/diagnostics/import_export_tab.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/diagnostics/import_export_tab.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/diagnostics/import_export_tab.tsx diff --git a/x-pack/plugins/apm/public/components/app/diagnostics/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/diagnostics/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/diagnostics/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/diagnostics/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/diagnostics/index_pattern_settings_tab.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/diagnostics/index_pattern_settings_tab.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/diagnostics/index_pattern_settings_tab.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/diagnostics/index_pattern_settings_tab.tsx diff --git a/x-pack/plugins/apm/public/components/app/diagnostics/index_templates_tab.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/diagnostics/index_templates_tab.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/diagnostics/index_templates_tab.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/diagnostics/index_templates_tab.tsx diff --git a/x-pack/plugins/apm/public/components/app/diagnostics/indices_tab.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/diagnostics/indices_tab.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/diagnostics/indices_tab.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/diagnostics/indices_tab.tsx diff --git a/x-pack/plugins/apm/public/components/app/diagnostics/summary_tab/apm_integration_package_status.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/diagnostics/summary_tab/apm_integration_package_status.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/diagnostics/summary_tab/apm_integration_package_status.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/diagnostics/summary_tab/apm_integration_package_status.tsx diff --git a/x-pack/plugins/apm/public/components/app/diagnostics/summary_tab/data_streams_status.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/diagnostics/summary_tab/data_streams_status.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/diagnostics/summary_tab/data_streams_status.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/diagnostics/summary_tab/data_streams_status.tsx diff --git a/x-pack/plugins/apm/public/components/app/diagnostics/summary_tab/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/diagnostics/summary_tab/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/diagnostics/summary_tab/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/diagnostics/summary_tab/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/diagnostics/summary_tab/index_templates_status.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/diagnostics/summary_tab/index_templates_status.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/diagnostics/summary_tab/index_templates_status.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/diagnostics/summary_tab/index_templates_status.tsx diff --git a/x-pack/plugins/apm/public/components/app/diagnostics/summary_tab/indicies_status.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/diagnostics/summary_tab/indicies_status.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/diagnostics/summary_tab/indicies_status.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/diagnostics/summary_tab/indicies_status.tsx diff --git a/x-pack/plugins/apm/public/components/app/diagnostics/summary_tab/tab_status.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/diagnostics/summary_tab/tab_status.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/diagnostics/summary_tab/tab_status.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/diagnostics/summary_tab/tab_status.tsx diff --git a/x-pack/plugins/apm/public/components/app/error_group_details/distribution/index.stories.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/error_group_details/distribution/index.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/error_group_details/distribution/index.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/error_group_details/distribution/index.stories.tsx diff --git a/x-pack/plugins/apm/public/components/app/error_group_details/distribution/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/error_group_details/distribution/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/error_group_details/distribution/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/error_group_details/distribution/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/error_group_details/error_sampler/error_sample_contextual_insight.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/error_group_details/error_sampler/error_sample_contextual_insight.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/error_group_details/error_sampler/error_sample_contextual_insight.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/error_group_details/error_sampler/error_sample_contextual_insight.tsx diff --git a/x-pack/plugins/apm/public/components/app/error_group_details/error_sampler/error_sample_detail.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/error_group_details/error_sampler/error_sample_detail.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/error_group_details/error_sampler/error_sample_detail.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/error_group_details/error_sampler/error_sample_detail.tsx diff --git a/x-pack/plugins/apm/public/components/app/error_group_details/error_sampler/error_tabs.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/error_group_details/error_sampler/error_tabs.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/error_group_details/error_sampler/error_tabs.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/error_group_details/error_sampler/error_tabs.tsx diff --git a/x-pack/plugins/apm/public/components/app/error_group_details/error_sampler/error_ui_actions_context_menu.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/error_group_details/error_sampler/error_ui_actions_context_menu.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/error_group_details/error_sampler/error_ui_actions_context_menu.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/error_group_details/error_sampler/error_ui_actions_context_menu.tsx diff --git a/x-pack/plugins/apm/public/components/app/error_group_details/error_sampler/exception_stacktrace.stories.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/error_group_details/error_sampler/exception_stacktrace.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/error_group_details/error_sampler/exception_stacktrace.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/error_group_details/error_sampler/exception_stacktrace.stories.tsx diff --git a/x-pack/plugins/apm/public/components/app/error_group_details/error_sampler/exception_stacktrace.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/error_group_details/error_sampler/exception_stacktrace.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/error_group_details/error_sampler/exception_stacktrace.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/error_group_details/error_sampler/exception_stacktrace.test.tsx diff --git a/x-pack/plugins/apm/public/components/app/error_group_details/error_sampler/exception_stacktrace.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/error_group_details/error_sampler/exception_stacktrace.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/error_group_details/error_sampler/exception_stacktrace.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/error_group_details/error_sampler/exception_stacktrace.tsx diff --git a/x-pack/plugins/apm/public/components/app/error_group_details/error_sampler/exception_stacktrace_title.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/error_group_details/error_sampler/exception_stacktrace_title.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/error_group_details/error_sampler/exception_stacktrace_title.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/error_group_details/error_sampler/exception_stacktrace_title.tsx diff --git a/x-pack/plugins/apm/public/components/app/error_group_details/error_sampler/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/error_group_details/error_sampler/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/error_group_details/error_sampler/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/error_group_details/error_sampler/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/error_group_details/error_sampler/plaintext_stacktrace.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/error_group_details/error_sampler/plaintext_stacktrace.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/error_group_details/error_sampler/plaintext_stacktrace.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/error_group_details/error_sampler/plaintext_stacktrace.tsx diff --git a/x-pack/plugins/apm/public/components/app/error_group_details/error_sampler/sample_summary.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/error_group_details/error_sampler/sample_summary.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/error_group_details/error_sampler/sample_summary.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/error_group_details/error_sampler/sample_summary.tsx diff --git a/x-pack/plugins/apm/public/components/app/error_group_details/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/error_group_details/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/error_group_details/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/error_group_details/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/error_group_details/top_erroneous_transactions/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/error_group_details/top_erroneous_transactions/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/error_group_details/top_erroneous_transactions/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/error_group_details/top_erroneous_transactions/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/error_group_overview/error_group_list/__fixtures__/props.json b/x-pack/plugins/observability_solution/apm/public/components/app/error_group_overview/error_group_list/__fixtures__/props.json similarity index 100% rename from x-pack/plugins/apm/public/components/app/error_group_overview/error_group_list/__fixtures__/props.json rename to x-pack/plugins/observability_solution/apm/public/components/app/error_group_overview/error_group_list/__fixtures__/props.json diff --git a/x-pack/plugins/apm/public/components/app/error_group_overview/error_group_list/error_group_list.stories.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/error_group_overview/error_group_list/error_group_list.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/error_group_overview/error_group_list/error_group_list.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/error_group_overview/error_group_list/error_group_list.stories.tsx diff --git a/x-pack/plugins/apm/public/components/app/error_group_overview/error_group_list/error_group_list.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/error_group_overview/error_group_list/error_group_list.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/error_group_overview/error_group_list/error_group_list.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/error_group_overview/error_group_list/error_group_list.test.tsx diff --git a/x-pack/plugins/apm/public/components/app/error_group_overview/error_group_list/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/error_group_overview/error_group_list/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/error_group_overview/error_group_list/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/error_group_overview/error_group_list/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/error_group_overview/error_group_list/use_error_group_list_data.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/error_group_overview/error_group_list/use_error_group_list_data.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/error_group_overview/error_group_list/use_error_group_list_data.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/error_group_overview/error_group_list/use_error_group_list_data.tsx diff --git a/x-pack/plugins/apm/public/components/app/error_group_overview/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/error_group_overview/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/error_group_overview/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/error_group_overview/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/help_popover/help_popover.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/help_popover/help_popover.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/help_popover/help_popover.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/help_popover/help_popover.tsx diff --git a/x-pack/plugins/apm/public/components/app/help_popover/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/help_popover/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/help_popover/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/help_popover/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/infra_overview/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/infra_overview/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/infra_overview/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/infra_overview/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/infra_overview/infra_tabs/empty_prompt.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/infra_overview/infra_tabs/empty_prompt.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/infra_overview/infra_tabs/empty_prompt.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/infra_overview/infra_tabs/empty_prompt.tsx diff --git a/x-pack/plugins/apm/public/components/app/infra_overview/infra_tabs/failure_prompt.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/infra_overview/infra_tabs/failure_prompt.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/infra_overview/infra_tabs/failure_prompt.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/infra_overview/infra_tabs/failure_prompt.tsx diff --git a/x-pack/plugins/apm/public/components/app/infra_overview/infra_tabs/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/infra_overview/infra_tabs/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/infra_overview/infra_tabs/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/infra_overview/infra_tabs/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/infra_overview/infra_tabs/use_tabs.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/infra_overview/infra_tabs/use_tabs.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/infra_overview/infra_tabs/use_tabs.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/infra_overview/infra_tabs/use_tabs.test.tsx diff --git a/x-pack/plugins/apm/public/components/app/infra_overview/infra_tabs/use_tabs.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/infra_overview/infra_tabs/use_tabs.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/infra_overview/infra_tabs/use_tabs.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/infra_overview/infra_tabs/use_tabs.tsx diff --git a/x-pack/plugins/apm/public/components/app/metrics/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/metrics/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/metrics/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/metrics/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/metrics/jvm_metrics_overview/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/metrics/jvm_metrics_overview/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/metrics/jvm_metrics_overview/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/metrics/jvm_metrics_overview/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/metrics/serverless_metrics/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/metrics/serverless_metrics/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/metrics/serverless_metrics/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/metrics/serverless_metrics/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/metrics/serverless_metrics/serverless_active_instances.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/metrics/serverless_metrics/serverless_active_instances.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/metrics/serverless_metrics/serverless_active_instances.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/metrics/serverless_metrics/serverless_active_instances.tsx diff --git a/x-pack/plugins/apm/public/components/app/metrics/serverless_metrics/serverless_function_name_link.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/metrics/serverless_metrics/serverless_function_name_link.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/metrics/serverless_metrics/serverless_function_name_link.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/metrics/serverless_metrics/serverless_function_name_link.tsx diff --git a/x-pack/plugins/apm/public/components/app/metrics/serverless_metrics/serverless_functions.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/metrics/serverless_metrics/serverless_functions.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/metrics/serverless_metrics/serverless_functions.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/metrics/serverless_metrics/serverless_functions.tsx diff --git a/x-pack/plugins/apm/public/components/app/metrics/serverless_metrics/serverless_metrics_charts.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/metrics/serverless_metrics/serverless_metrics_charts.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/metrics/serverless_metrics/serverless_metrics_charts.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/metrics/serverless_metrics/serverless_metrics_charts.tsx diff --git a/x-pack/plugins/apm/public/components/app/metrics/serverless_metrics/serverless_summary.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/metrics/serverless_metrics/serverless_summary.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/metrics/serverless_metrics/serverless_summary.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/metrics/serverless_metrics/serverless_summary.tsx diff --git a/x-pack/plugins/apm/public/components/app/metrics/service_metrics/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/metrics/service_metrics/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/metrics/service_metrics/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/metrics/service_metrics/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/metrics/static_dashboard/dashboards/dashboard_catalog.ts b/x-pack/plugins/observability_solution/apm/public/components/app/metrics/static_dashboard/dashboards/dashboard_catalog.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/metrics/static_dashboard/dashboards/dashboard_catalog.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/metrics/static_dashboard/dashboards/dashboard_catalog.ts diff --git a/x-pack/plugins/apm/public/components/app/metrics/static_dashboard/dashboards/java.json b/x-pack/plugins/observability_solution/apm/public/components/app/metrics/static_dashboard/dashboards/java.json similarity index 100% rename from x-pack/plugins/apm/public/components/app/metrics/static_dashboard/dashboards/java.json rename to x-pack/plugins/observability_solution/apm/public/components/app/metrics/static_dashboard/dashboards/java.json diff --git a/x-pack/plugins/apm/public/components/app/metrics/static_dashboard/dashboards/nodejs.json b/x-pack/plugins/observability_solution/apm/public/components/app/metrics/static_dashboard/dashboards/nodejs.json similarity index 100% rename from x-pack/plugins/apm/public/components/app/metrics/static_dashboard/dashboards/nodejs.json rename to x-pack/plugins/observability_solution/apm/public/components/app/metrics/static_dashboard/dashboards/nodejs.json diff --git a/x-pack/plugins/apm/public/components/app/metrics/static_dashboard/dashboards/opentelemetry_nodejs.json b/x-pack/plugins/observability_solution/apm/public/components/app/metrics/static_dashboard/dashboards/opentelemetry_nodejs.json similarity index 100% rename from x-pack/plugins/apm/public/components/app/metrics/static_dashboard/dashboards/opentelemetry_nodejs.json rename to x-pack/plugins/observability_solution/apm/public/components/app/metrics/static_dashboard/dashboards/opentelemetry_nodejs.json diff --git a/x-pack/plugins/apm/public/components/app/metrics/static_dashboard/helper.ts b/x-pack/plugins/observability_solution/apm/public/components/app/metrics/static_dashboard/helper.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/metrics/static_dashboard/helper.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/metrics/static_dashboard/helper.ts diff --git a/x-pack/plugins/apm/public/components/app/metrics/static_dashboard/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/metrics/static_dashboard/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/metrics/static_dashboard/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/metrics/static_dashboard/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/metrics_details/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/metrics_details/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/metrics_details/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/metrics_details/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/metrics_details/serverless_metrics_details/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/metrics_details/serverless_metrics_details/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/metrics_details/serverless_metrics_details/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/metrics_details/serverless_metrics_details/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/metrics_details/service_node_metrics/index.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/metrics_details/service_node_metrics/index.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/metrics_details/service_node_metrics/index.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/metrics_details/service_node_metrics/index.test.tsx diff --git a/x-pack/plugins/apm/public/components/app/metrics_details/service_node_metrics/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/metrics_details/service_node_metrics/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/metrics_details/service_node_metrics/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/metrics_details/service_node_metrics/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/charts/http_requests_chart.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/charts/http_requests_chart.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/charts/http_requests_chart.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/charts/http_requests_chart.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/charts/mobile_errors_and_crashes_treemap/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/charts/mobile_errors_and_crashes_treemap/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/charts/mobile_errors_and_crashes_treemap/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/charts/mobile_errors_and_crashes_treemap/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/charts/mobile_errors_and_crashes_treemap/treemap_select.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/charts/mobile_errors_and_crashes_treemap/treemap_select.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/charts/mobile_errors_and_crashes_treemap/treemap_select.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/charts/mobile_errors_and_crashes_treemap/treemap_select.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/charts/mobile_http_error_rate/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/charts/mobile_http_error_rate/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/charts/mobile_http_error_rate/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/charts/mobile_http_error_rate/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/charts/mobile_most_affected/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/charts/mobile_most_affected/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/charts/mobile_most_affected/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/charts/mobile_most_affected/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/charts/mobile_most_affected/treemap_select.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/charts/mobile_most_affected/treemap_select.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/charts/mobile_most_affected/treemap_select.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/charts/mobile_most_affected/treemap_select.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/charts/mobile_treemap/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/charts/mobile_treemap/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/charts/mobile_treemap/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/charts/mobile_treemap/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/charts/mobile_treemap/treemap_select.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/charts/mobile_treemap/treemap_select.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/charts/mobile_treemap/treemap_select.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/charts/mobile_treemap/treemap_select.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/charts/sessions_chart.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/charts/sessions_chart.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/charts/sessions_chart.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/charts/sessions_chart.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/errors_and_crashes_group_details/crash_group_details/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/errors_and_crashes_group_details/crash_group_details/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/errors_and_crashes_group_details/crash_group_details/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/errors_and_crashes_group_details/crash_group_details/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/errors_and_crashes_group_details/error_group_details/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/errors_and_crashes_group_details/error_group_details/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/errors_and_crashes_group_details/error_group_details/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/errors_and_crashes_group_details/error_group_details/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/errors_and_crashes_group_details/shared/distribution/index.stories.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/errors_and_crashes_group_details/shared/distribution/index.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/errors_and_crashes_group_details/shared/distribution/index.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/errors_and_crashes_group_details/shared/distribution/index.stories.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/errors_and_crashes_group_details/shared/distribution/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/errors_and_crashes_group_details/shared/distribution/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/errors_and_crashes_group_details/shared/distribution/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/errors_and_crashes_group_details/shared/distribution/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/errors_and_crashes_overview/crash_group_list/crash_group_list.stories.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/errors_and_crashes_overview/crash_group_list/crash_group_list.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/errors_and_crashes_overview/crash_group_list/crash_group_list.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/errors_and_crashes_overview/crash_group_list/crash_group_list.stories.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/errors_and_crashes_overview/crash_group_list/crash_group_list.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/errors_and_crashes_overview/crash_group_list/crash_group_list.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/errors_and_crashes_overview/crash_group_list/crash_group_list.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/errors_and_crashes_overview/crash_group_list/crash_group_list.test.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/errors_and_crashes_overview/crash_group_list/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/errors_and_crashes_overview/crash_group_list/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/errors_and_crashes_overview/crash_group_list/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/errors_and_crashes_overview/crash_group_list/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/errors_and_crashes_overview/crashes_overview.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/errors_and_crashes_overview/crashes_overview.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/errors_and_crashes_overview/crashes_overview.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/errors_and_crashes_overview/crashes_overview.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/errors_and_crashes_overview/error_group_list/error_group_list.stories.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/errors_and_crashes_overview/error_group_list/error_group_list.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/errors_and_crashes_overview/error_group_list/error_group_list.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/errors_and_crashes_overview/error_group_list/error_group_list.stories.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/errors_and_crashes_overview/error_group_list/error_group_list.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/errors_and_crashes_overview/error_group_list/error_group_list.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/errors_and_crashes_overview/error_group_list/error_group_list.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/errors_and_crashes_overview/error_group_list/error_group_list.test.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/errors_and_crashes_overview/error_group_list/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/errors_and_crashes_overview/error_group_list/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/errors_and_crashes_overview/error_group_list/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/errors_and_crashes_overview/error_group_list/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/errors_and_crashes_overview/errors_overview.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/errors_and_crashes_overview/errors_overview.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/errors_and_crashes_overview/errors_overview.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/errors_and_crashes_overview/errors_overview.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/errors_and_crashes_overview/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/errors_and_crashes_overview/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/errors_and_crashes_overview/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/errors_and_crashes_overview/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/errors_and_crashes_overview/tabs/tabs.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/errors_and_crashes_overview/tabs/tabs.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/errors_and_crashes_overview/tabs/tabs.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/errors_and_crashes_overview/tabs/tabs.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/search_bar.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/search_bar.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/search_bar.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/search_bar.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/service_overview/filters/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/service_overview/filters/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/service_overview/filters/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/service_overview/filters/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/service_overview/geo_map/embedded_map.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/service_overview/geo_map/embedded_map.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/service_overview/geo_map/embedded_map.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/service_overview/geo_map/embedded_map.test.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/service_overview/geo_map/embedded_map.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/service_overview/geo_map/embedded_map.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/service_overview/geo_map/embedded_map.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/service_overview/geo_map/embedded_map.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/service_overview/geo_map/embedded_map_select.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/service_overview/geo_map/embedded_map_select.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/service_overview/geo_map/embedded_map_select.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/service_overview/geo_map/embedded_map_select.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/service_overview/geo_map/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/service_overview/geo_map/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/service_overview/geo_map/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/service_overview/geo_map/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/service_overview/geo_map/map_layers/get_http_requests_map_layer_list.ts b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/service_overview/geo_map/map_layers/get_http_requests_map_layer_list.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/service_overview/geo_map/map_layers/get_http_requests_map_layer_list.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/service_overview/geo_map/map_layers/get_http_requests_map_layer_list.ts diff --git a/x-pack/plugins/apm/public/components/app/mobile/service_overview/geo_map/map_layers/get_layer_list.ts b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/service_overview/geo_map/map_layers/get_layer_list.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/service_overview/geo_map/map_layers/get_layer_list.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/service_overview/geo_map/map_layers/get_layer_list.ts diff --git a/x-pack/plugins/apm/public/components/app/mobile/service_overview/geo_map/map_layers/get_map_layer_style.ts b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/service_overview/geo_map/map_layers/get_map_layer_style.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/service_overview/geo_map/map_layers/get_map_layer_style.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/service_overview/geo_map/map_layers/get_map_layer_style.ts diff --git a/x-pack/plugins/apm/public/components/app/mobile/service_overview/geo_map/map_layers/get_session_map_layer_list.ts b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/service_overview/geo_map/map_layers/get_session_map_layer_list.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/service_overview/geo_map/map_layers/get_session_map_layer_list.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/service_overview/geo_map/map_layers/get_session_map_layer_list.ts diff --git a/x-pack/plugins/apm/public/components/app/mobile/service_overview/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/service_overview/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/service_overview/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/service_overview/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/service_overview/most_used_charts/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/service_overview/most_used_charts/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/service_overview/most_used_charts/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/service_overview/most_used_charts/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/service_overview/most_used_charts/sunburst_chart.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/service_overview/most_used_charts/sunburst_chart.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/service_overview/most_used_charts/sunburst_chart.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/service_overview/most_used_charts/sunburst_chart.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/service_overview/stats/location_stats.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/service_overview/stats/location_stats.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/service_overview/stats/location_stats.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/service_overview/stats/location_stats.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/service_overview/stats/metric_item.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/service_overview/stats/metric_item.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/service_overview/stats/metric_item.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/service_overview/stats/metric_item.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/service_overview/stats/stats.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/service_overview/stats/stats.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/service_overview/stats/stats.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/service_overview/stats/stats.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/transaction_overview/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/transaction_overview/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/transaction_overview/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/transaction_overview/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/transaction_overview/transaction_charts.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/transaction_overview/transaction_charts.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/transaction_overview/transaction_charts.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/transaction_overview/transaction_charts.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/transaction_overview/transaction_overview_tabs/app_version_tab.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/transaction_overview/transaction_overview_tabs/app_version_tab.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/transaction_overview/transaction_overview_tabs/app_version_tab.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/transaction_overview/transaction_overview_tabs/app_version_tab.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/transaction_overview/transaction_overview_tabs/devices_tab.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/transaction_overview/transaction_overview_tabs/devices_tab.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/transaction_overview/transaction_overview_tabs/devices_tab.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/transaction_overview/transaction_overview_tabs/devices_tab.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/transaction_overview/transaction_overview_tabs/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/transaction_overview/transaction_overview_tabs/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/transaction_overview/transaction_overview_tabs/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/transaction_overview/transaction_overview_tabs/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/transaction_overview/transaction_overview_tabs/os_version_tab.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/transaction_overview/transaction_overview_tabs/os_version_tab.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/transaction_overview/transaction_overview_tabs/os_version_tab.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/transaction_overview/transaction_overview_tabs/os_version_tab.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/transaction_overview/transaction_overview_tabs/stats_list/get_columns.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/transaction_overview/transaction_overview_tabs/stats_list/get_columns.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/transaction_overview/transaction_overview_tabs/stats_list/get_columns.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/transaction_overview/transaction_overview_tabs/stats_list/get_columns.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/transaction_overview/transaction_overview_tabs/stats_list/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/transaction_overview/transaction_overview_tabs/stats_list/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/transaction_overview/transaction_overview_tabs/stats_list/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/transaction_overview/transaction_overview_tabs/stats_list/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/transaction_overview/transaction_overview_tabs/transactions_tab.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/transaction_overview/transaction_overview_tabs/transactions_tab.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/transaction_overview/transaction_overview_tabs/transactions_tab.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/transaction_overview/transaction_overview_tabs/transactions_tab.tsx diff --git a/x-pack/plugins/apm/public/components/app/mobile/transaction_overview/transaction_overview_tabs/use_mobile_statistics_fetcher.ts b/x-pack/plugins/observability_solution/apm/public/components/app/mobile/transaction_overview/transaction_overview_tabs/use_mobile_statistics_fetcher.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/mobile/transaction_overview/transaction_overview_tabs/use_mobile_statistics_fetcher.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/mobile/transaction_overview/transaction_overview_tabs/use_mobile_statistics_fetcher.ts diff --git a/x-pack/plugins/apm/public/components/app/onboarding/agent_config_instructions.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/onboarding/agent_config_instructions.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/onboarding/agent_config_instructions.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/onboarding/agent_config_instructions.tsx diff --git a/x-pack/plugins/apm/public/components/app/onboarding/agent_config_table.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/onboarding/agent_config_table.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/onboarding/agent_config_table.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/onboarding/agent_config_table.tsx diff --git a/x-pack/plugins/apm/public/components/app/onboarding/agent_status_instructions.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/onboarding/agent_status_instructions.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/onboarding/agent_status_instructions.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/onboarding/agent_status_instructions.tsx diff --git a/x-pack/plugins/apm/public/components/app/onboarding/commands/django.ts b/x-pack/plugins/observability_solution/apm/public/components/app/onboarding/commands/django.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/onboarding/commands/django.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/onboarding/commands/django.ts diff --git a/x-pack/plugins/apm/public/components/app/onboarding/commands/dotnet.ts b/x-pack/plugins/observability_solution/apm/public/components/app/onboarding/commands/dotnet.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/onboarding/commands/dotnet.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/onboarding/commands/dotnet.ts diff --git a/x-pack/plugins/apm/public/components/app/onboarding/commands/flask.ts b/x-pack/plugins/observability_solution/apm/public/components/app/onboarding/commands/flask.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/onboarding/commands/flask.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/onboarding/commands/flask.ts diff --git a/x-pack/plugins/apm/public/components/app/onboarding/commands/get_apm_agent_commands.test.ts b/x-pack/plugins/observability_solution/apm/public/components/app/onboarding/commands/get_apm_agent_commands.test.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/onboarding/commands/get_apm_agent_commands.test.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/onboarding/commands/get_apm_agent_commands.test.ts diff --git a/x-pack/plugins/apm/public/components/app/onboarding/commands/get_apm_agent_commands.ts b/x-pack/plugins/observability_solution/apm/public/components/app/onboarding/commands/get_apm_agent_commands.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/onboarding/commands/get_apm_agent_commands.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/onboarding/commands/get_apm_agent_commands.ts diff --git a/x-pack/plugins/apm/public/components/app/onboarding/commands/go.ts b/x-pack/plugins/observability_solution/apm/public/components/app/onboarding/commands/go.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/onboarding/commands/go.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/onboarding/commands/go.ts diff --git a/x-pack/plugins/apm/public/components/app/onboarding/commands/java.ts b/x-pack/plugins/observability_solution/apm/public/components/app/onboarding/commands/java.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/onboarding/commands/java.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/onboarding/commands/java.ts diff --git a/x-pack/plugins/apm/public/components/app/onboarding/commands/node.ts b/x-pack/plugins/observability_solution/apm/public/components/app/onboarding/commands/node.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/onboarding/commands/node.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/onboarding/commands/node.ts diff --git a/x-pack/plugins/apm/public/components/app/onboarding/commands/php.ts b/x-pack/plugins/observability_solution/apm/public/components/app/onboarding/commands/php.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/onboarding/commands/php.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/onboarding/commands/php.ts diff --git a/x-pack/plugins/apm/public/components/app/onboarding/commands/rack.ts b/x-pack/plugins/observability_solution/apm/public/components/app/onboarding/commands/rack.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/onboarding/commands/rack.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/onboarding/commands/rack.ts diff --git a/x-pack/plugins/apm/public/components/app/onboarding/commands/rails.ts b/x-pack/plugins/observability_solution/apm/public/components/app/onboarding/commands/rails.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/onboarding/commands/rails.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/onboarding/commands/rails.ts diff --git a/x-pack/plugins/apm/public/components/app/onboarding/commands/shared_hints.ts b/x-pack/plugins/observability_solution/apm/public/components/app/onboarding/commands/shared_hints.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/onboarding/commands/shared_hints.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/onboarding/commands/shared_hints.ts diff --git a/x-pack/plugins/apm/public/components/app/onboarding/footer.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/onboarding/footer.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/onboarding/footer.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/onboarding/footer.tsx diff --git a/x-pack/plugins/apm/public/components/app/onboarding/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/onboarding/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/onboarding/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/onboarding/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/onboarding/instruction_variants.ts b/x-pack/plugins/observability_solution/apm/public/components/app/onboarding/instruction_variants.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/onboarding/instruction_variants.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/onboarding/instruction_variants.ts diff --git a/x-pack/plugins/apm/public/components/app/onboarding/instructions/api_key_callout.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/onboarding/instructions/api_key_callout.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/onboarding/instructions/api_key_callout.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/onboarding/instructions/api_key_callout.tsx diff --git a/x-pack/plugins/apm/public/components/app/onboarding/instructions/django_agent.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/onboarding/instructions/django_agent.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/onboarding/instructions/django_agent.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/onboarding/instructions/django_agent.tsx diff --git a/x-pack/plugins/apm/public/components/app/onboarding/instructions/dotnet_agent.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/onboarding/instructions/dotnet_agent.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/onboarding/instructions/dotnet_agent.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/onboarding/instructions/dotnet_agent.tsx diff --git a/x-pack/plugins/apm/public/components/app/onboarding/instructions/flask_agent.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/onboarding/instructions/flask_agent.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/onboarding/instructions/flask_agent.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/onboarding/instructions/flask_agent.tsx diff --git a/x-pack/plugins/apm/public/components/app/onboarding/instructions/go_agent.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/onboarding/instructions/go_agent.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/onboarding/instructions/go_agent.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/onboarding/instructions/go_agent.tsx diff --git a/x-pack/plugins/apm/public/components/app/onboarding/instructions/index.ts b/x-pack/plugins/observability_solution/apm/public/components/app/onboarding/instructions/index.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/onboarding/instructions/index.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/onboarding/instructions/index.ts diff --git a/x-pack/plugins/apm/public/components/app/onboarding/instructions/java_agent.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/onboarding/instructions/java_agent.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/onboarding/instructions/java_agent.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/onboarding/instructions/java_agent.tsx diff --git a/x-pack/plugins/apm/public/components/app/onboarding/instructions/node_agent.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/onboarding/instructions/node_agent.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/onboarding/instructions/node_agent.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/onboarding/instructions/node_agent.tsx diff --git a/x-pack/plugins/apm/public/components/app/onboarding/instructions/otel_agent.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/onboarding/instructions/otel_agent.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/onboarding/instructions/otel_agent.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/onboarding/instructions/otel_agent.tsx diff --git a/x-pack/plugins/apm/public/components/app/onboarding/instructions/php_agent.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/onboarding/instructions/php_agent.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/onboarding/instructions/php_agent.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/onboarding/instructions/php_agent.tsx diff --git a/x-pack/plugins/apm/public/components/app/onboarding/instructions/rack_agent.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/onboarding/instructions/rack_agent.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/onboarding/instructions/rack_agent.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/onboarding/instructions/rack_agent.tsx diff --git a/x-pack/plugins/apm/public/components/app/onboarding/instructions/rails_agent.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/onboarding/instructions/rails_agent.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/onboarding/instructions/rails_agent.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/onboarding/instructions/rails_agent.tsx diff --git a/x-pack/plugins/apm/public/components/app/onboarding/instructions_set.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/onboarding/instructions_set.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/onboarding/instructions_set.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/onboarding/instructions_set.tsx diff --git a/x-pack/plugins/apm/public/components/app/onboarding/introduction.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/onboarding/introduction.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/onboarding/introduction.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/onboarding/introduction.tsx diff --git a/x-pack/plugins/apm/public/components/app/onboarding/serverless_instructions.ts b/x-pack/plugins/observability_solution/apm/public/components/app/onboarding/serverless_instructions.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/onboarding/serverless_instructions.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/onboarding/serverless_instructions.ts diff --git a/x-pack/plugins/apm/public/components/app/profiling_overview/host_names_filter_warning.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/profiling_overview/host_names_filter_warning.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/profiling_overview/host_names_filter_warning.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/profiling_overview/host_names_filter_warning.tsx diff --git a/x-pack/plugins/apm/public/components/app/profiling_overview/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/profiling_overview/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/profiling_overview/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/profiling_overview/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/profiling_overview/profiling_flamegraph.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/profiling_overview/profiling_flamegraph.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/profiling_overview/profiling_flamegraph.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/profiling_overview/profiling_flamegraph.tsx diff --git a/x-pack/plugins/apm/public/components/app/profiling_overview/profiling_top_functions.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/profiling_overview/profiling_top_functions.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/profiling_overview/profiling_top_functions.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/profiling_overview/profiling_top_functions.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_dashboards/actions/edit_dashboard.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_dashboards/actions/edit_dashboard.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_dashboards/actions/edit_dashboard.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_dashboards/actions/edit_dashboard.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_dashboards/actions/goto_dashboard.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_dashboards/actions/goto_dashboard.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_dashboards/actions/goto_dashboard.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_dashboards/actions/goto_dashboard.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_dashboards/actions/index.ts b/x-pack/plugins/observability_solution/apm/public/components/app/service_dashboards/actions/index.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_dashboards/actions/index.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/service_dashboards/actions/index.ts diff --git a/x-pack/plugins/apm/public/components/app/service_dashboards/actions/link_dashboard.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_dashboards/actions/link_dashboard.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_dashboards/actions/link_dashboard.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_dashboards/actions/link_dashboard.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_dashboards/actions/save_dashboard_modal.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_dashboards/actions/save_dashboard_modal.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_dashboards/actions/save_dashboard_modal.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_dashboards/actions/save_dashboard_modal.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_dashboards/actions/unlink_dashboard.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_dashboards/actions/unlink_dashboard.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_dashboards/actions/unlink_dashboard.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_dashboards/actions/unlink_dashboard.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_dashboards/context_menu.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_dashboards/context_menu.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_dashboards/context_menu.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_dashboards/context_menu.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_dashboards/dashboard_selector.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_dashboards/dashboard_selector.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_dashboards/dashboard_selector.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_dashboards/dashboard_selector.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_dashboards/empty_dashboards.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_dashboards/empty_dashboards.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_dashboards/empty_dashboards.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_dashboards/empty_dashboards.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_dashboards/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_dashboards/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_dashboards/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_dashboards/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_dependencies/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_dependencies/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_dependencies/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_dependencies/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_dependencies/service_dependencies_breakdown_chart.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_dependencies/service_dependencies_breakdown_chart.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_dependencies/service_dependencies_breakdown_chart.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_dependencies/service_dependencies_breakdown_chart.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_groups/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_groups/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_groups/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_groups/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_groups/refresh_service_groups_subscriber.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_groups/refresh_service_groups_subscriber.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_groups/refresh_service_groups_subscriber.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_groups/refresh_service_groups_subscriber.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_groups/service_group_save/create_button.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_groups/service_group_save/create_button.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_groups/service_group_save/create_button.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_groups/service_group_save/create_button.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_groups/service_group_save/edit_button.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_groups/service_group_save/edit_button.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_groups/service_group_save/edit_button.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_groups/service_group_save/edit_button.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_groups/service_group_save/group_details.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_groups/service_group_save/group_details.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_groups/service_group_save/group_details.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_groups/service_group_save/group_details.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_groups/service_group_save/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_groups/service_group_save/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_groups/service_group_save/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_groups/service_group_save/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_groups/service_group_save/save_button.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_groups/service_group_save/save_button.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_groups/service_group_save/save_button.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_groups/service_group_save/save_button.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_groups/service_group_save/save_modal.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_groups/service_group_save/save_modal.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_groups/service_group_save/save_modal.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_groups/service_group_save/save_modal.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_groups/service_group_save/select_services.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_groups/service_group_save/select_services.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_groups/service_group_save/select_services.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_groups/service_group_save/select_services.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_groups/service_group_save/service_list_preview.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_groups/service_group_save/service_list_preview.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_groups/service_group_save/service_list_preview.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_groups/service_group_save/service_list_preview.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_groups/service_groups_button_group.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_groups/service_groups_button_group.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_groups/service_groups_button_group.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_groups/service_groups_button_group.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_groups/service_groups_list/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_groups/service_groups_list/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_groups/service_groups_list/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_groups/service_groups_list/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_groups/service_groups_list/service_group_card.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_groups/service_groups_list/service_group_card.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_groups/service_groups_list/service_group_card.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_groups/service_groups_list/service_group_card.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_groups/service_groups_list/service_groups_list.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_groups/service_groups_list/service_groups_list.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_groups/service_groups_list/service_groups_list.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_groups/service_groups_list/service_groups_list.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_groups/service_groups_list/service_stat.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_groups/service_groups_list/service_stat.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_groups/service_groups_list/service_stat.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_groups/service_groups_list/service_stat.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_groups/service_groups_list/sort.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_groups/service_groups_list/sort.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_groups/service_groups_list/sort.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_groups/service_groups_list/sort.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_groups/service_groups_tour.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_groups/service_groups_tour.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_groups/service_groups_tour.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_groups/service_groups_tour.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_groups/use_service_groups_tour.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_groups/use_service_groups_tour.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_groups/use_service_groups_tour.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_groups/use_service_groups_tour.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_inventory/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_inventory/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_inventory/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_inventory/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_inventory/service_inventory.stories.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_inventory/service_inventory.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_inventory/service_inventory.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_inventory/service_inventory.stories.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_inventory/service_list/__fixtures__/service_api_mock_data.ts b/x-pack/plugins/observability_solution/apm/public/components/app/service_inventory/service_list/__fixtures__/service_api_mock_data.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_inventory/service_list/__fixtures__/service_api_mock_data.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/service_inventory/service_list/__fixtures__/service_api_mock_data.ts diff --git a/x-pack/plugins/apm/public/components/app/service_inventory/service_list/health_badge.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_inventory/service_list/health_badge.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_inventory/service_list/health_badge.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_inventory/service_list/health_badge.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_inventory/service_list/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_inventory/service_list/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_inventory/service_list/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_inventory/service_list/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_inventory/service_list/order_service_items.test.ts b/x-pack/plugins/observability_solution/apm/public/components/app/service_inventory/service_list/order_service_items.test.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_inventory/service_list/order_service_items.test.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/service_inventory/service_list/order_service_items.test.ts diff --git a/x-pack/plugins/apm/public/components/app/service_inventory/service_list/order_service_items.ts b/x-pack/plugins/observability_solution/apm/public/components/app/service_inventory/service_list/order_service_items.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_inventory/service_list/order_service_items.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/service_inventory/service_list/order_service_items.ts diff --git a/x-pack/plugins/apm/public/components/app/service_inventory/service_list/service_list.stories.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_inventory/service_list/service_list.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_inventory/service_list/service_list.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_inventory/service_list/service_list.stories.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_inventory/service_list/service_list.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_inventory/service_list/service_list.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_inventory/service_list/service_list.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_inventory/service_list/service_list.test.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_logs/index.test.ts b/x-pack/plugins/observability_solution/apm/public/components/app/service_logs/index.test.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_logs/index.test.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/service_logs/index.test.ts diff --git a/x-pack/plugins/apm/public/components/app/service_logs/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_logs/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_logs/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_logs/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_map/__stories__/centerer.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_map/__stories__/centerer.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_map/__stories__/centerer.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_map/__stories__/centerer.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_map/__stories__/cytoscape.stories.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_map/__stories__/cytoscape.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_map/__stories__/cytoscape.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_map/__stories__/cytoscape.stories.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_map/__stories__/cytoscape_example_data.stories.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_map/__stories__/cytoscape_example_data.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_map/__stories__/cytoscape_example_data.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_map/__stories__/cytoscape_example_data.stories.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_map/__stories__/example_grouped_connections.json b/x-pack/plugins/observability_solution/apm/public/components/app/service_map/__stories__/example_grouped_connections.json similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_map/__stories__/example_grouped_connections.json rename to x-pack/plugins/observability_solution/apm/public/components/app/service_map/__stories__/example_grouped_connections.json diff --git a/x-pack/plugins/apm/public/components/app/service_map/__stories__/example_response_hipster_store.json b/x-pack/plugins/observability_solution/apm/public/components/app/service_map/__stories__/example_response_hipster_store.json similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_map/__stories__/example_response_hipster_store.json rename to x-pack/plugins/observability_solution/apm/public/components/app/service_map/__stories__/example_response_hipster_store.json diff --git a/x-pack/plugins/apm/public/components/app/service_map/__stories__/example_response_opbeans_beats.json b/x-pack/plugins/observability_solution/apm/public/components/app/service_map/__stories__/example_response_opbeans_beats.json similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_map/__stories__/example_response_opbeans_beats.json rename to x-pack/plugins/observability_solution/apm/public/components/app/service_map/__stories__/example_response_opbeans_beats.json diff --git a/x-pack/plugins/apm/public/components/app/service_map/__stories__/example_response_todo.json b/x-pack/plugins/observability_solution/apm/public/components/app/service_map/__stories__/example_response_todo.json similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_map/__stories__/example_response_todo.json rename to x-pack/plugins/observability_solution/apm/public/components/app/service_map/__stories__/example_response_todo.json diff --git a/x-pack/plugins/apm/public/components/app/service_map/__stories__/generate_service_map_elements.ts b/x-pack/plugins/observability_solution/apm/public/components/app/service_map/__stories__/generate_service_map_elements.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_map/__stories__/generate_service_map_elements.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/service_map/__stories__/generate_service_map_elements.ts diff --git a/x-pack/plugins/apm/public/components/app/service_map/controls.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_map/controls.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_map/controls.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_map/controls.test.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_map/controls.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_map/controls.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_map/controls.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_map/controls.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_map/cytoscape.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_map/cytoscape.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_map/cytoscape.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_map/cytoscape.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_map/cytoscape_options.ts b/x-pack/plugins/observability_solution/apm/public/components/app/service_map/cytoscape_options.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_map/cytoscape_options.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/service_map/cytoscape_options.ts diff --git a/x-pack/plugins/apm/public/components/app/service_map/disabled_prompt.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_map/disabled_prompt.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_map/disabled_prompt.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_map/disabled_prompt.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_map/empty_banner.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_map/empty_banner.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_map/empty_banner.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_map/empty_banner.test.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_map/empty_banner.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_map/empty_banner.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_map/empty_banner.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_map/empty_banner.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_map/empty_prompt.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_map/empty_prompt.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_map/empty_prompt.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_map/empty_prompt.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_map/icons.ts b/x-pack/plugins/observability_solution/apm/public/components/app/service_map/icons.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_map/icons.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/service_map/icons.ts diff --git a/x-pack/plugins/apm/public/components/app/service_map/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_map/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_map/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_map/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_map/popover/anomaly_detection.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_map/popover/anomaly_detection.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_map/popover/anomaly_detection.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_map/popover/anomaly_detection.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_map/popover/dependency_contents.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_map/popover/dependency_contents.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_map/popover/dependency_contents.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_map/popover/dependency_contents.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_map/popover/edge_contents.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_map/popover/edge_contents.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_map/popover/edge_contents.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_map/popover/edge_contents.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_map/popover/externals_list_contents.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_map/popover/externals_list_contents.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_map/popover/externals_list_contents.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_map/popover/externals_list_contents.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_map/popover/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_map/popover/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_map/popover/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_map/popover/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_map/popover/popover.stories.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_map/popover/popover.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_map/popover/popover.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_map/popover/popover.stories.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_map/popover/popover.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_map/popover/popover.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_map/popover/popover.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_map/popover/popover.test.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_map/popover/resource_contents.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_map/popover/resource_contents.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_map/popover/resource_contents.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_map/popover/resource_contents.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_map/popover/service_contents.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_map/popover/service_contents.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_map/popover/service_contents.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_map/popover/service_contents.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_map/popover/stats_list.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_map/popover/stats_list.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_map/popover/stats_list.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_map/popover/stats_list.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_map/timeout_prompt.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_map/timeout_prompt.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_map/timeout_prompt.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_map/timeout_prompt.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_map/use_cytoscape_event_handlers.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_map/use_cytoscape_event_handlers.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_map/use_cytoscape_event_handlers.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_map/use_cytoscape_event_handlers.test.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_map/use_cytoscape_event_handlers.ts b/x-pack/plugins/observability_solution/apm/public/components/app/service_map/use_cytoscape_event_handlers.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_map/use_cytoscape_event_handlers.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/service_map/use_cytoscape_event_handlers.ts diff --git a/x-pack/plugins/apm/public/components/app/service_map/use_ref_dimensions.ts b/x-pack/plugins/observability_solution/apm/public/components/app/service_map/use_ref_dimensions.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_map/use_ref_dimensions.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/service_map/use_ref_dimensions.ts diff --git a/x-pack/plugins/apm/public/components/app/service_overview/get_throughput_screen_context.ts b/x-pack/plugins/observability_solution/apm/public/components/app/service_overview/get_throughput_screen_context.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_overview/get_throughput_screen_context.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/service_overview/get_throughput_screen_context.ts diff --git a/x-pack/plugins/apm/public/components/app/service_overview/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_overview/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_overview/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_overview/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview.stories.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_overview/service_overview.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_overview/service_overview.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_overview/service_overview.stories.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_overview/service_overview.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_overview/service_overview.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_overview/service_overview.test.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_dependencies_table/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_overview/service_overview_dependencies_table/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_overview/service_overview_dependencies_table/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_overview/service_overview_dependencies_table/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_errors_table/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_overview/service_overview_errors_table/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_overview/service_overview_errors_table/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_overview/service_overview_errors_table/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_chart_and_table.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_overview/service_overview_instances_chart_and_table.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_chart_and_table.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_overview/service_overview_instances_chart_and_table.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/get_columns.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_overview/service_overview_instances_table/get_columns.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/get_columns.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_overview/service_overview_instances_table/get_columns.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_overview/service_overview_instances_table/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_overview/service_overview_instances_table/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/instance_actions_menu/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_overview/service_overview_instances_table/instance_actions_menu/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/instance_actions_menu/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_overview/service_overview_instances_table/instance_actions_menu/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/instance_actions_menu/menu_sections.ts b/x-pack/plugins/observability_solution/apm/public/components/app/service_overview/service_overview_instances_table/instance_actions_menu/menu_sections.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/instance_actions_menu/menu_sections.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/service_overview/service_overview_instances_table/instance_actions_menu/menu_sections.ts diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/instance_details.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_overview/service_overview_instances_table/instance_details.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/instance_details.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_overview/service_overview_instances_table/instance_details.test.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/intance_details.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_overview/service_overview_instances_table/intance_details.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/intance_details.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_overview/service_overview_instances_table/intance_details.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/use_instance_details_fetcher.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_overview/service_overview_instances_table/use_instance_details_fetcher.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/use_instance_details_fetcher.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_overview/service_overview_instances_table/use_instance_details_fetcher.tsx diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_throughput_chart.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_overview/service_overview_throughput_chart.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/service_overview/service_overview_throughput_chart.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/service_overview/service_overview_throughput_chart.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/index.stories.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/index.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/index.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/index.stories.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/service_page/form_row_select.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/service_page/form_row_select.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/service_page/form_row_select.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/service_page/form_row_select.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/service_page/form_row_suggestions_select.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/service_page/form_row_suggestions_select.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/service_page/form_row_suggestions_select.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/service_page/form_row_suggestions_select.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/service_page/service_page.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/service_page/service_page.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/service_page/service_page.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/service_page/service_page.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/settings_page/save_config.ts b/x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/settings_page/save_config.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/settings_page/save_config.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/settings_page/save_config.ts diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/settings_page/setting_form_row.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/settings_page/setting_form_row.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/settings_page/setting_form_row.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/settings_page/setting_form_row.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/settings_page/settings_page.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/settings_page/settings_page.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/settings_page/settings_page.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_configurations/agent_configuration_create_edit/settings_page/settings_page.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_configurations/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_configurations/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/agent_configurations/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_configurations/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_configurations/list/confirm_delete_modal.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_configurations/list/confirm_delete_modal.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/agent_configurations/list/confirm_delete_modal.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_configurations/list/confirm_delete_modal.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_configurations/list/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_configurations/list/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/agent_configurations/list/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_configurations/list/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_explorer/agent_explorer_docs_link/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_explorer/agent_explorer_docs_link/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/agent_explorer/agent_explorer_docs_link/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_explorer/agent_explorer_docs_link/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_explorer/agent_instances/agent_contextual_information/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_explorer/agent_instances/agent_contextual_information/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/agent_explorer/agent_instances/agent_contextual_information/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_explorer/agent_instances/agent_contextual_information/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_explorer/agent_instances/agent_instances_details/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_explorer/agent_instances/agent_instances_details/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/agent_explorer/agent_instances/agent_instances_details/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_explorer/agent_instances/agent_instances_details/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_explorer/agent_instances/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_explorer/agent_instances/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/agent_explorer/agent_instances/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_explorer/agent_instances/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_explorer/agent_latest_version/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_explorer/agent_latest_version/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/agent_explorer/agent_latest_version/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_explorer/agent_latest_version/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_explorer/agent_list/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_explorer/agent_list/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/agent_explorer/agent_list/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_explorer/agent_list/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_explorer/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_explorer/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/agent_explorer/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_explorer/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_keys/agent_keys_table.stories.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_keys/agent_keys_table.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/agent_keys/agent_keys_table.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_keys/agent_keys_table.stories.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_keys/agent_keys_table.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_keys/agent_keys_table.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/agent_keys/agent_keys_table.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_keys/agent_keys_table.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_keys/confirm_delete_modal.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_keys/confirm_delete_modal.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/agent_keys/confirm_delete_modal.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_keys/confirm_delete_modal.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_keys/create_agent_key.stories.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_keys/create_agent_key.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/agent_keys/create_agent_key.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_keys/create_agent_key.stories.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_keys/create_agent_key.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_keys/create_agent_key.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/agent_keys/create_agent_key.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_keys/create_agent_key.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_keys/create_agent_key/agent_key_callout.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_keys/create_agent_key/agent_key_callout.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/agent_keys/create_agent_key/agent_key_callout.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_keys/create_agent_key/agent_key_callout.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_keys/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_keys/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/agent_keys/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_keys/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_keys/prompts/api_keys_not_enabled.stories.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_keys/prompts/api_keys_not_enabled.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/agent_keys/prompts/api_keys_not_enabled.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_keys/prompts/api_keys_not_enabled.stories.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_keys/prompts/api_keys_not_enabled.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_keys/prompts/api_keys_not_enabled.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/agent_keys/prompts/api_keys_not_enabled.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_keys/prompts/api_keys_not_enabled.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_keys/prompts/permission_denied.stories.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_keys/prompts/permission_denied.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/agent_keys/prompts/permission_denied.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_keys/prompts/permission_denied.stories.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/agent_keys/prompts/permission_denied.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_keys/prompts/permission_denied.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/agent_keys/prompts/permission_denied.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_keys/prompts/permission_denied.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/anomaly_detection/add_environments.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/anomaly_detection/add_environments.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/anomaly_detection/add_environments.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/anomaly_detection/add_environments.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/anomaly_detection/create_jobs.ts b/x-pack/plugins/observability_solution/apm/public/components/app/settings/anomaly_detection/create_jobs.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/anomaly_detection/create_jobs.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/anomaly_detection/create_jobs.ts diff --git a/x-pack/plugins/apm/public/components/app/settings/anomaly_detection/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/anomaly_detection/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/anomaly_detection/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/anomaly_detection/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/anomaly_detection/jobs_list.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/anomaly_detection/jobs_list.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/anomaly_detection/jobs_list.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/anomaly_detection/jobs_list.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/anomaly_detection/jobs_list_status.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/anomaly_detection/jobs_list_status.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/anomaly_detection/jobs_list_status.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/anomaly_detection/jobs_list_status.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/apm_indices/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/apm_indices/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/apm_indices/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/apm_indices/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/custom_link/create_custom_link_button.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/custom_link/create_custom_link_button.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/custom_link/create_custom_link_button.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/custom_link/create_custom_link_button.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/delete_button.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/delete_button.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/delete_button.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/delete_button.test.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/delete_button.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/delete_button.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/delete_button.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/delete_button.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/documentation.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/documentation.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/documentation.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/documentation.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/filters_section.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/filters_section.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/filters_section.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/filters_section.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/flyout_footer.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/flyout_footer.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/flyout_footer.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/flyout_footer.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/helper.test.ts b/x-pack/plugins/observability_solution/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/helper.test.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/helper.test.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/helper.test.ts diff --git a/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/helper.ts b/x-pack/plugins/observability_solution/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/helper.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/helper.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/helper.ts diff --git a/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/link_preview.stories.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/link_preview.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/link_preview.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/link_preview.stories.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/link_preview.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/link_preview.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/link_preview.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/link_preview.test.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/link_preview.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/link_preview.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/link_preview.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/link_preview.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/link_section.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/link_section.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/link_section.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/link_section.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/save_custom_link.ts b/x-pack/plugins/observability_solution/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/save_custom_link.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/save_custom_link.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/custom_link/create_edit_custom_link_flyout/save_custom_link.ts diff --git a/x-pack/plugins/apm/public/components/app/settings/custom_link/custom_link_table.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/custom_link/custom_link_table.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/custom_link/custom_link_table.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/custom_link/custom_link_table.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/custom_link/empty_prompt.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/custom_link/empty_prompt.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/custom_link/empty_prompt.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/custom_link/empty_prompt.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/custom_link/index.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/custom_link/index.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/custom_link/index.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/custom_link/index.test.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/custom_link/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/custom_link/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/custom_link/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/custom_link/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/general_settings/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/general_settings/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/general_settings/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/general_settings/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/schema/blog_rocket_720x420.png b/x-pack/plugins/observability_solution/apm/public/components/app/settings/schema/blog_rocket_720x420.png similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/schema/blog_rocket_720x420.png rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/schema/blog_rocket_720x420.png diff --git a/x-pack/plugins/apm/public/components/app/settings/schema/confirm_switch_modal.stories.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/schema/confirm_switch_modal.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/schema/confirm_switch_modal.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/schema/confirm_switch_modal.stories.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/schema/confirm_switch_modal.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/schema/confirm_switch_modal.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/schema/confirm_switch_modal.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/schema/confirm_switch_modal.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/schema/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/schema/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/schema/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/schema/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/schema/migrated/card_footer_content.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/schema/migrated/card_footer_content.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/schema/migrated/card_footer_content.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/schema/migrated/card_footer_content.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/schema/migrated/successful_migration_card.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/schema/migrated/successful_migration_card.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/schema/migrated/successful_migration_card.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/schema/migrated/successful_migration_card.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/schema/migrated/upgrade_available_card.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/schema/migrated/upgrade_available_card.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/schema/migrated/upgrade_available_card.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/schema/migrated/upgrade_available_card.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/schema/migration_in_progress_panel.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/schema/migration_in_progress_panel.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/schema/migration_in_progress_panel.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/schema/migration_in_progress_panel.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/schema/schema.stories.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/schema/schema.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/schema/schema.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/schema/schema.stories.tsx diff --git a/x-pack/plugins/apm/public/components/app/settings/schema/schema_overview.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/schema/schema_overview.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/settings/schema/schema_overview.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/settings/schema/schema_overview.tsx diff --git a/x-pack/plugins/apm/public/components/app/storage_explorer/get_storage_explorer_links.ts b/x-pack/plugins/observability_solution/apm/public/components/app/storage_explorer/get_storage_explorer_links.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/storage_explorer/get_storage_explorer_links.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/storage_explorer/get_storage_explorer_links.ts diff --git a/x-pack/plugins/apm/public/components/app/storage_explorer/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/storage_explorer/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/storage_explorer/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/storage_explorer/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/storage_explorer/index_lifecycle_phase_select.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/storage_explorer/index_lifecycle_phase_select.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/storage_explorer/index_lifecycle_phase_select.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/storage_explorer/index_lifecycle_phase_select.tsx diff --git a/x-pack/plugins/apm/public/components/app/storage_explorer/prompts/permission_denied.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/storage_explorer/prompts/permission_denied.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/storage_explorer/prompts/permission_denied.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/storage_explorer/prompts/permission_denied.tsx diff --git a/x-pack/plugins/apm/public/components/app/storage_explorer/resources/tips_and_resources.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/storage_explorer/resources/tips_and_resources.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/storage_explorer/resources/tips_and_resources.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/storage_explorer/resources/tips_and_resources.tsx diff --git a/x-pack/plugins/apm/public/components/app/storage_explorer/services_table/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/storage_explorer/services_table/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/storage_explorer/services_table/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/storage_explorer/services_table/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/storage_explorer/services_table/index_stats_per_service.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/storage_explorer/services_table/index_stats_per_service.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/storage_explorer/services_table/index_stats_per_service.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/storage_explorer/services_table/index_stats_per_service.tsx diff --git a/x-pack/plugins/apm/public/components/app/storage_explorer/services_table/size_label.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/storage_explorer/services_table/size_label.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/storage_explorer/services_table/size_label.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/storage_explorer/services_table/size_label.tsx diff --git a/x-pack/plugins/apm/public/components/app/storage_explorer/services_table/storage_details_per_service.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/storage_explorer/services_table/storage_details_per_service.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/storage_explorer/services_table/storage_details_per_service.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/storage_explorer/services_table/storage_details_per_service.tsx diff --git a/x-pack/plugins/apm/public/components/app/storage_explorer/storage_chart.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/storage_explorer/storage_chart.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/storage_explorer/storage_chart.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/storage_explorer/storage_chart.tsx diff --git a/x-pack/plugins/apm/public/components/app/storage_explorer/summary_stats.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/storage_explorer/summary_stats.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/storage_explorer/summary_stats.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/storage_explorer/summary_stats.tsx diff --git a/x-pack/plugins/apm/public/components/app/top_traces_overview/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/top_traces_overview/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/top_traces_overview/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/top_traces_overview/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/top_traces_overview/trace_list.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/top_traces_overview/trace_list.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/top_traces_overview/trace_list.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/top_traces_overview/trace_list.tsx diff --git a/x-pack/plugins/apm/public/components/app/trace_explorer/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/trace_explorer/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/trace_explorer/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/trace_explorer/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/trace_explorer/trace_explorer_aggregated_critical_path.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/trace_explorer/trace_explorer_aggregated_critical_path.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/trace_explorer/trace_explorer_aggregated_critical_path.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/trace_explorer/trace_explorer_aggregated_critical_path.tsx diff --git a/x-pack/plugins/apm/public/components/app/trace_explorer/trace_explorer_waterfall.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/trace_explorer/trace_explorer_waterfall.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/trace_explorer/trace_explorer_waterfall.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/trace_explorer/trace_explorer_waterfall.tsx diff --git a/x-pack/plugins/apm/public/components/app/trace_explorer/trace_search_box/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/trace_explorer/trace_search_box/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/trace_explorer/trace_search_box/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/trace_explorer/trace_search_box/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/trace_link/get_redirect_to_trace_page_url.ts b/x-pack/plugins/observability_solution/apm/public/components/app/trace_link/get_redirect_to_trace_page_url.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/trace_link/get_redirect_to_trace_page_url.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/trace_link/get_redirect_to_trace_page_url.ts diff --git a/x-pack/plugins/apm/public/components/app/trace_link/get_redirect_to_transaction_detail_page_url.test.ts b/x-pack/plugins/observability_solution/apm/public/components/app/trace_link/get_redirect_to_transaction_detail_page_url.test.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/trace_link/get_redirect_to_transaction_detail_page_url.test.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/trace_link/get_redirect_to_transaction_detail_page_url.test.ts diff --git a/x-pack/plugins/apm/public/components/app/trace_link/get_redirect_to_transaction_detail_page_url.ts b/x-pack/plugins/observability_solution/apm/public/components/app/trace_link/get_redirect_to_transaction_detail_page_url.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/trace_link/get_redirect_to_transaction_detail_page_url.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/trace_link/get_redirect_to_transaction_detail_page_url.ts diff --git a/x-pack/plugins/apm/public/components/app/trace_link/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/trace_link/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/trace_link/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/trace_link/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/trace_link/trace_link.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/trace_link/trace_link.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/trace_link/trace_link.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/trace_link/trace_link.test.tsx diff --git a/x-pack/plugins/apm/public/components/app/trace_overview/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/trace_overview/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/trace_overview/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/trace_overview/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/aggregated_critical_path_tab.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/aggregated_critical_path_tab.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/aggregated_critical_path_tab.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/aggregated_critical_path_tab.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/distribution/index.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/distribution/index.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/distribution/index.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/distribution/index.test.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/distribution/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/distribution/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/distribution/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/distribution/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/distribution/use_transaction_distribution_chart_data.ts b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/distribution/use_transaction_distribution_chart_data.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/distribution/use_transaction_distribution_chart_data.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/distribution/use_transaction_distribution_chart_data.ts diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/failed_transactions_correlations_tab.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/failed_transactions_correlations_tab.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/failed_transactions_correlations_tab.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/failed_transactions_correlations_tab.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/latency_correlations_tab.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/latency_correlations_tab.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/latency_correlations_tab.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/latency_correlations_tab.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/profiling_flamegraph.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/profiling_flamegraph.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/profiling_flamegraph.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/profiling_flamegraph.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/profiling_tab.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/profiling_tab.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/profiling_tab.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/profiling_tab.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/profiling_top_functions.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/profiling_top_functions.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/profiling_top_functions.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/profiling_top_functions.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/top_errors/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/top_errors/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/top_errors/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/top_errors/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/trace_samples_tab.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/trace_samples_tab.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/trace_samples_tab.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/trace_samples_tab.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/transaction_details_tabs.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/transaction_details_tabs.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/transaction_details_tabs.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/transaction_details_tabs.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/use_waterfall_fetcher.ts b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/use_waterfall_fetcher.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/use_waterfall_fetcher.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/use_waterfall_fetcher.ts diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/maybe_view_trace_link.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/maybe_view_trace_link.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/maybe_view_trace_link.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/maybe_view_trace_link.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/percent_of_parent.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/percent_of_parent.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/percent_of_parent.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/percent_of_parent.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/transaction_tabs.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/transaction_tabs.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/transaction_tabs.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/transaction_tabs.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/marks/get_agent_marks.test.ts b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/marks/get_agent_marks.test.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/marks/get_agent_marks.test.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/marks/get_agent_marks.test.ts diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/marks/get_agent_marks.ts b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/marks/get_agent_marks.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/marks/get_agent_marks.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/marks/get_agent_marks.ts diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/marks/get_error_marks.test.ts b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/marks/get_error_marks.test.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/marks/get_error_marks.test.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/marks/get_error_marks.test.ts diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/marks/get_error_marks.ts b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/marks/get_error_marks.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/marks/get_error_marks.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/marks/get_error_marks.ts diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/marks/index.ts b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/marks/index.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/marks/index.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/marks/index.ts diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/accordion_waterfall.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/accordion_waterfall.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/accordion_waterfall.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/accordion_waterfall.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/badge/cold_start_badge.stories.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/badge/cold_start_badge.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/badge/cold_start_badge.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/badge/cold_start_badge.stories.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/badge/cold_start_badge.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/badge/cold_start_badge.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/badge/cold_start_badge.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/badge/cold_start_badge.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/badge/span_links_badge.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/badge/span_links_badge.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/badge/span_links_badge.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/badge/span_links_badge.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/badge/sync_badge.stories.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/badge/sync_badge.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/badge/sync_badge.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/badge/sync_badge.stories.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/badge/sync_badge.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/badge/sync_badge.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/badge/sync_badge.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/badge/sync_badge.test.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/badge/sync_badge.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/badge/sync_badge.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/badge/sync_badge.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/badge/sync_badge.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/failure_badge.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/failure_badge.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/failure_badge.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/failure_badge.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/flyout_top_level_properties.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/flyout_top_level_properties.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/flyout_top_level_properties.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/flyout_top_level_properties.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/orphan_trace_items_warning.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/orphan_trace_items_warning.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/orphan_trace_items_warning.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/orphan_trace_items_warning.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/responsive_flyout.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/responsive_flyout.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/responsive_flyout.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/responsive_flyout.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/span_db.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/span_db.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/span_db.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/span_db.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/span_flyout.stories.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/span_flyout.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/span_flyout.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/span_flyout.stories.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/sticky_span_properties.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/sticky_span_properties.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/sticky_span_properties.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/sticky_span_properties.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/truncate_height_section.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/truncate_height_section.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/truncate_height_section.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/span_flyout/truncate_height_section.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/transaction_flyout/dropped_spans_warning.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/transaction_flyout/dropped_spans_warning.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/transaction_flyout/dropped_spans_warning.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/transaction_flyout/dropped_spans_warning.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/transaction_flyout/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/transaction_flyout/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/transaction_flyout/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/transaction_flyout/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/transaction_flyout/transaction_flyout.stories.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/transaction_flyout/transaction_flyout.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/transaction_flyout/transaction_flyout.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/transaction_flyout/transaction_flyout.stories.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/waterfall_flyout.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/waterfall_flyout.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/waterfall_flyout.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/waterfall_flyout.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/waterfall_helpers/__snapshots__/waterfall_helpers.test.ts.snap b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/waterfall_helpers/__snapshots__/waterfall_helpers.test.ts.snap similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/waterfall_helpers/__snapshots__/waterfall_helpers.test.ts.snap rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/waterfall_helpers/__snapshots__/waterfall_helpers.test.ts.snap diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/waterfall_helpers/mock_responses/spans.json b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/waterfall_helpers/mock_responses/spans.json similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/waterfall_helpers/mock_responses/spans.json rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/waterfall_helpers/mock_responses/spans.json diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/waterfall_helpers/mock_responses/transaction.json b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/waterfall_helpers/mock_responses/transaction.json similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/waterfall_helpers/mock_responses/transaction.json rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/waterfall_helpers/mock_responses/transaction.json diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/waterfall_helpers/waterfall_helpers.test.ts b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/waterfall_helpers/waterfall_helpers.test.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/waterfall_helpers/waterfall_helpers.test.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/waterfall_helpers/waterfall_helpers.test.ts diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/waterfall_helpers/waterfall_helpers.ts b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/waterfall_helpers/waterfall_helpers.ts similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/waterfall_helpers/waterfall_helpers.ts rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/waterfall_helpers/waterfall_helpers.ts diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/waterfall_item.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/waterfall_item.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/waterfall_item.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall/waterfall_item.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall_container.stories.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall_container.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall_container.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall_container.stories.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall_container.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall_container.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall_container.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall_container.test.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall_legends.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall_legends.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall_legends.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_details/waterfall_with_summary/waterfall_container/waterfall_legends.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_link/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_link/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_link/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_link/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_overview/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_overview/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_overview/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_overview/index.tsx diff --git a/x-pack/plugins/apm/public/components/app/transaction_overview/transaction_overview.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/transaction_overview/transaction_overview.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/app/transaction_overview/transaction_overview.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/app/transaction_overview/transaction_overview.test.tsx diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_agents/agent_instructions_accordion.tsx b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_agents/agent_instructions_accordion.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/fleet_integration/apm_agents/agent_instructions_accordion.tsx rename to x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_agents/agent_instructions_accordion.tsx diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_agents/agent_instructions_mappings.ts b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_agents/agent_instructions_mappings.ts similarity index 100% rename from x-pack/plugins/apm/public/components/fleet_integration/apm_agents/agent_instructions_mappings.ts rename to x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_agents/agent_instructions_mappings.ts diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_agents/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_agents/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/fleet_integration/apm_agents/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_agents/index.tsx diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_agents/render_mustache.ts b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_agents/render_mustache.ts similarity index 100% rename from x-pack/plugins/apm/public/components/fleet_integration/apm_agents/render_mustache.ts rename to x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_agents/render_mustache.ts diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_agents/runtime_attachment/default_discovery_rule.tsx b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_agents/runtime_attachment/default_discovery_rule.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/fleet_integration/apm_agents/runtime_attachment/default_discovery_rule.tsx rename to x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_agents/runtime_attachment/default_discovery_rule.tsx diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_agents/runtime_attachment/discovery_rule.tsx b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_agents/runtime_attachment/discovery_rule.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/fleet_integration/apm_agents/runtime_attachment/discovery_rule.tsx rename to x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_agents/runtime_attachment/discovery_rule.tsx diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_agents/runtime_attachment/edit_discovery_rule.tsx b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_agents/runtime_attachment/edit_discovery_rule.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/fleet_integration/apm_agents/runtime_attachment/edit_discovery_rule.tsx rename to x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_agents/runtime_attachment/edit_discovery_rule.tsx diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_agents/runtime_attachment/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_agents/runtime_attachment/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/fleet_integration/apm_agents/runtime_attachment/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_agents/runtime_attachment/index.tsx diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_agents/runtime_attachment/java_agent_version_input.tsx b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_agents/runtime_attachment/java_agent_version_input.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/fleet_integration/apm_agents/runtime_attachment/java_agent_version_input.tsx rename to x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_agents/runtime_attachment/java_agent_version_input.tsx diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_agents/runtime_attachment/runtime_attachment.stories.tsx b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_agents/runtime_attachment/runtime_attachment.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/fleet_integration/apm_agents/runtime_attachment/runtime_attachment.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_agents/runtime_attachment/runtime_attachment.stories.tsx diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_agents/runtime_attachment/runtime_attachment.tsx b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_agents/runtime_attachment/runtime_attachment.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/fleet_integration/apm_agents/runtime_attachment/runtime_attachment.tsx rename to x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_agents/runtime_attachment/runtime_attachment.tsx diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_agents/runtime_attachment/supported_agents/java_runtime_attachment.tsx b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_agents/runtime_attachment/supported_agents/java_runtime_attachment.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/fleet_integration/apm_agents/runtime_attachment/supported_agents/java_runtime_attachment.tsx rename to x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_agents/runtime_attachment/supported_agents/java_runtime_attachment.tsx diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_agents/runtime_attachment/validate_java_version.test.ts b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_agents/runtime_attachment/validate_java_version.test.ts similarity index 100% rename from x-pack/plugins/apm/public/components/fleet_integration/apm_agents/runtime_attachment/validate_java_version.test.ts rename to x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_agents/runtime_attachment/validate_java_version.test.ts diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_custom_assets_extension.tsx b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_custom_assets_extension.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/fleet_integration/apm_custom_assets_extension.tsx rename to x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_custom_assets_extension.tsx diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_enrollment_flyout_extension.tsx b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_enrollment_flyout_extension.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/fleet_integration/apm_enrollment_flyout_extension.tsx rename to x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_enrollment_flyout_extension.tsx diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/create_apm_policy_form.tsx b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_policy_form/create_apm_policy_form.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/create_apm_policy_form.tsx rename to x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_policy_form/create_apm_policy_form.tsx diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/edit_apm_policy_form.stories.tsx b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_policy_form/edit_apm_policy_form.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/edit_apm_policy_form.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_policy_form/edit_apm_policy_form.stories.tsx diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/edit_apm_policy_form.tsx b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_policy_form/edit_apm_policy_form.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/edit_apm_policy_form.tsx rename to x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_policy_form/edit_apm_policy_form.tsx diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_policy_form/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_policy_form/index.tsx diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_definition/agent_authorization_settings.test.ts b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_policy_form/settings_definition/agent_authorization_settings.test.ts similarity index 100% rename from x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_definition/agent_authorization_settings.test.ts rename to x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_policy_form/settings_definition/agent_authorization_settings.test.ts diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_definition/agent_authorization_settings.ts b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_policy_form/settings_definition/agent_authorization_settings.ts similarity index 100% rename from x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_definition/agent_authorization_settings.ts rename to x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_policy_form/settings_definition/agent_authorization_settings.ts diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_definition/apm_settings.test.ts b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_policy_form/settings_definition/apm_settings.test.ts similarity index 100% rename from x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_definition/apm_settings.test.ts rename to x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_policy_form/settings_definition/apm_settings.test.ts diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_definition/apm_settings.ts b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_policy_form/settings_definition/apm_settings.ts similarity index 100% rename from x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_definition/apm_settings.ts rename to x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_policy_form/settings_definition/apm_settings.ts diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_definition/debug_settings.ts b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_policy_form/settings_definition/debug_settings.ts similarity index 100% rename from x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_definition/debug_settings.ts rename to x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_policy_form/settings_definition/debug_settings.ts diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_definition/rum_settings.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_policy_form/settings_definition/rum_settings.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_definition/rum_settings.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_policy_form/settings_definition/rum_settings.test.tsx diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_definition/rum_settings.ts b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_policy_form/settings_definition/rum_settings.ts similarity index 100% rename from x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_definition/rum_settings.ts rename to x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_policy_form/settings_definition/rum_settings.ts diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_definition/tail_sampling_settings.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_policy_form/settings_definition/tail_sampling_settings.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_definition/tail_sampling_settings.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_policy_form/settings_definition/tail_sampling_settings.test.tsx diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_definition/tail_sampling_settings.tsx b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_policy_form/settings_definition/tail_sampling_settings.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_definition/tail_sampling_settings.tsx rename to x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_policy_form/settings_definition/tail_sampling_settings.tsx diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_definition/tls_settings.test.ts b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_policy_form/settings_definition/tls_settings.test.ts similarity index 100% rename from x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_definition/tls_settings.test.ts rename to x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_policy_form/settings_definition/tls_settings.test.ts diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_definition/tls_settings.ts b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_policy_form/settings_definition/tls_settings.ts similarity index 100% rename from x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_definition/tls_settings.ts rename to x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_policy_form/settings_definition/tls_settings.ts diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_form/form_row_setting.tsx b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_policy_form/settings_form/form_row_setting.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_form/form_row_setting.tsx rename to x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_policy_form/settings_form/form_row_setting.tsx diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_form/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_policy_form/settings_form/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_form/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_policy_form/settings_form/index.tsx diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_form/utils.test.ts b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_policy_form/settings_form/utils.test.ts similarity index 100% rename from x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_form/utils.test.ts rename to x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_policy_form/settings_form/utils.test.ts diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_form/utils.ts b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_policy_form/settings_form/utils.ts similarity index 100% rename from x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/settings_form/utils.ts rename to x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_policy_form/settings_form/utils.ts diff --git a/x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/typings.ts b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_policy_form/typings.ts similarity index 100% rename from x-pack/plugins/apm/public/components/fleet_integration/apm_policy_form/typings.ts rename to x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_policy_form/typings.ts diff --git a/x-pack/plugins/apm/public/components/fleet_integration/index.ts b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/index.ts similarity index 100% rename from x-pack/plugins/apm/public/components/fleet_integration/index.ts rename to x-pack/plugins/observability_solution/apm/public/components/fleet_integration/index.ts diff --git a/x-pack/plugins/apm/public/components/fleet_integration/lazy_apm_agents_tab_extension.tsx b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/lazy_apm_agents_tab_extension.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/fleet_integration/lazy_apm_agents_tab_extension.tsx rename to x-pack/plugins/observability_solution/apm/public/components/fleet_integration/lazy_apm_agents_tab_extension.tsx diff --git a/x-pack/plugins/apm/public/components/fleet_integration/lazy_apm_custom_assets_extension.tsx b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/lazy_apm_custom_assets_extension.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/fleet_integration/lazy_apm_custom_assets_extension.tsx rename to x-pack/plugins/observability_solution/apm/public/components/fleet_integration/lazy_apm_custom_assets_extension.tsx diff --git a/x-pack/plugins/apm/public/components/fleet_integration/lazy_apm_policy_create_extension.tsx b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/lazy_apm_policy_create_extension.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/fleet_integration/lazy_apm_policy_create_extension.tsx rename to x-pack/plugins/observability_solution/apm/public/components/fleet_integration/lazy_apm_policy_create_extension.tsx diff --git a/x-pack/plugins/apm/public/components/fleet_integration/lazy_apm_policy_edit_extension.tsx b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/lazy_apm_policy_edit_extension.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/fleet_integration/lazy_apm_policy_edit_extension.tsx rename to x-pack/plugins/observability_solution/apm/public/components/fleet_integration/lazy_apm_policy_edit_extension.tsx diff --git a/x-pack/plugins/apm/public/components/routing/apm_error_boundary.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/apm_error_boundary.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/apm_error_boundary.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/apm_error_boundary.tsx diff --git a/x-pack/plugins/apm/public/components/routing/apm_route_config.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/apm_route_config.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/apm_route_config.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/apm_route_config.tsx diff --git a/x-pack/plugins/apm/public/components/routing/app_root/apm_header_action_menu/alerting_popover_flyout.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/app_root/apm_header_action_menu/alerting_popover_flyout.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/app_root/apm_header_action_menu/alerting_popover_flyout.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/app_root/apm_header_action_menu/alerting_popover_flyout.tsx diff --git a/x-pack/plugins/apm/public/components/routing/app_root/apm_header_action_menu/anomaly_detection_setup_link.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/app_root/apm_header_action_menu/anomaly_detection_setup_link.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/app_root/apm_header_action_menu/anomaly_detection_setup_link.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/app_root/apm_header_action_menu/anomaly_detection_setup_link.test.tsx diff --git a/x-pack/plugins/apm/public/components/routing/app_root/apm_header_action_menu/anomaly_detection_setup_link.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/app_root/apm_header_action_menu/anomaly_detection_setup_link.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/app_root/apm_header_action_menu/anomaly_detection_setup_link.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/app_root/apm_header_action_menu/anomaly_detection_setup_link.tsx diff --git a/x-pack/plugins/apm/public/components/routing/app_root/apm_header_action_menu/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/app_root/apm_header_action_menu/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/app_root/apm_header_action_menu/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/app_root/apm_header_action_menu/index.tsx diff --git a/x-pack/plugins/apm/public/components/routing/app_root/apm_header_action_menu/inspector_header_link.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/app_root/apm_header_action_menu/inspector_header_link.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/app_root/apm_header_action_menu/inspector_header_link.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/app_root/apm_header_action_menu/inspector_header_link.tsx diff --git a/x-pack/plugins/apm/public/components/routing/app_root/apm_header_action_menu/labs/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/app_root/apm_header_action_menu/labs/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/app_root/apm_header_action_menu/labs/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/app_root/apm_header_action_menu/labs/index.tsx diff --git a/x-pack/plugins/apm/public/components/routing/app_root/apm_header_action_menu/labs/labs_flyout.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/app_root/apm_header_action_menu/labs/labs_flyout.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/app_root/apm_header_action_menu/labs/labs_flyout.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/app_root/apm_header_action_menu/labs/labs_flyout.tsx diff --git a/x-pack/plugins/apm/public/components/routing/app_root/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/app_root/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/app_root/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/app_root/index.tsx diff --git a/x-pack/plugins/apm/public/components/routing/app_root/redirect_dependencies_to_dependencies_inventory.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/app_root/redirect_dependencies_to_dependencies_inventory.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/app_root/redirect_dependencies_to_dependencies_inventory.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/app_root/redirect_dependencies_to_dependencies_inventory.tsx diff --git a/x-pack/plugins/apm/public/components/routing/app_root/redirect_with_default_date_range/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/app_root/redirect_with_default_date_range/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/app_root/redirect_with_default_date_range/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/app_root/redirect_with_default_date_range/index.tsx diff --git a/x-pack/plugins/apm/public/components/routing/app_root/redirect_with_default_environment/index.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/app_root/redirect_with_default_environment/index.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/app_root/redirect_with_default_environment/index.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/app_root/redirect_with_default_environment/index.test.tsx diff --git a/x-pack/plugins/apm/public/components/routing/app_root/redirect_with_default_environment/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/app_root/redirect_with_default_environment/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/app_root/redirect_with_default_environment/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/app_root/redirect_with_default_environment/index.tsx diff --git a/x-pack/plugins/apm/public/components/routing/app_root/redirect_with_offset/index.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/app_root/redirect_with_offset/index.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/app_root/redirect_with_offset/index.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/app_root/redirect_with_offset/index.test.tsx diff --git a/x-pack/plugins/apm/public/components/routing/app_root/redirect_with_offset/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/app_root/redirect_with_offset/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/app_root/redirect_with_offset/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/app_root/redirect_with_offset/index.tsx diff --git a/x-pack/plugins/apm/public/components/routing/app_root/scroll_to_top_on_path_change.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/app_root/scroll_to_top_on_path_change.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/app_root/scroll_to_top_on_path_change.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/app_root/scroll_to_top_on_path_change.tsx diff --git a/x-pack/plugins/apm/public/components/routing/app_root/update_execution_context_on_route_change.ts b/x-pack/plugins/observability_solution/apm/public/components/routing/app_root/update_execution_context_on_route_change.ts similarity index 100% rename from x-pack/plugins/apm/public/components/routing/app_root/update_execution_context_on_route_change.ts rename to x-pack/plugins/observability_solution/apm/public/components/routing/app_root/update_execution_context_on_route_change.ts diff --git a/x-pack/plugins/apm/public/components/routing/home/dependencies.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/home/dependencies.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/home/dependencies.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/home/dependencies.tsx diff --git a/x-pack/plugins/apm/public/components/routing/home/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/home/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/home/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/home/index.tsx diff --git a/x-pack/plugins/apm/public/components/routing/home/legacy_backends.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/home/legacy_backends.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/home/legacy_backends.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/home/legacy_backends.tsx diff --git a/x-pack/plugins/apm/public/components/routing/home/page_template.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/home/page_template.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/home/page_template.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/home/page_template.tsx diff --git a/x-pack/plugins/apm/public/components/routing/home/storage_explorer.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/home/storage_explorer.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/home/storage_explorer.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/home/storage_explorer.tsx diff --git a/x-pack/plugins/apm/public/components/routing/mobile_service_detail/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/mobile_service_detail/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/mobile_service_detail/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/mobile_service_detail/index.tsx diff --git a/x-pack/plugins/apm/public/components/routing/onboarding/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/onboarding/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/onboarding/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/onboarding/index.tsx diff --git a/x-pack/plugins/apm/public/components/routing/onboarding/redirect.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/onboarding/redirect.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/onboarding/redirect.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/onboarding/redirect.tsx diff --git a/x-pack/plugins/apm/public/components/routing/redirect_to.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/redirect_to.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/redirect_to.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/redirect_to.tsx diff --git a/x-pack/plugins/apm/public/components/routing/service_detail/apm_service_wrapper.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/service_detail/apm_service_wrapper.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/service_detail/apm_service_wrapper.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/service_detail/apm_service_wrapper.tsx diff --git a/x-pack/plugins/apm/public/components/routing/service_detail/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/service_detail/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/service_detail/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/service_detail/index.tsx diff --git a/x-pack/plugins/apm/public/components/routing/service_detail/redirect_to_default_service_route_view.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/service_detail/redirect_to_default_service_route_view.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/service_detail/redirect_to_default_service_route_view.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/service_detail/redirect_to_default_service_route_view.tsx diff --git a/x-pack/plugins/apm/public/components/routing/settings/create_agent_configuration_route_view.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/settings/create_agent_configuration_route_view.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/settings/create_agent_configuration_route_view.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/settings/create_agent_configuration_route_view.tsx diff --git a/x-pack/plugins/apm/public/components/routing/settings/edit_agent_configuration_route_view.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/settings/edit_agent_configuration_route_view.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/settings/edit_agent_configuration_route_view.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/settings/edit_agent_configuration_route_view.tsx diff --git a/x-pack/plugins/apm/public/components/routing/settings/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/settings/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/settings/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/settings/index.tsx diff --git a/x-pack/plugins/apm/public/components/routing/templates/apm_main_template.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/templates/apm_main_template.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/templates/apm_main_template.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/templates/apm_main_template.tsx diff --git a/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/analyze_data_button.stories.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/templates/apm_service_template/analyze_data_button.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/templates/apm_service_template/analyze_data_button.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/templates/apm_service_template/analyze_data_button.stories.tsx diff --git a/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/analyze_data_button.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/templates/apm_service_template/analyze_data_button.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/templates/apm_service_template/analyze_data_button.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/templates/apm_service_template/analyze_data_button.test.tsx diff --git a/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/analyze_data_button.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/templates/apm_service_template/analyze_data_button.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/templates/apm_service_template/analyze_data_button.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/templates/apm_service_template/analyze_data_button.tsx diff --git a/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/index.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/templates/apm_service_template/index.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/templates/apm_service_template/index.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/templates/apm_service_template/index.test.tsx diff --git a/x-pack/plugins/apm/public/components/routing/templates/apm_service_template/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/templates/apm_service_template/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/templates/apm_service_template/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/templates/apm_service_template/index.tsx diff --git a/x-pack/plugins/apm/public/components/routing/templates/dependency_detail_template.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/templates/dependency_detail_template.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/templates/dependency_detail_template.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/templates/dependency_detail_template.tsx diff --git a/x-pack/plugins/apm/public/components/routing/templates/mobile_service_template/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/templates/mobile_service_template/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/templates/mobile_service_template/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/templates/mobile_service_template/index.tsx diff --git a/x-pack/plugins/apm/public/components/routing/templates/no_data_config.ts b/x-pack/plugins/observability_solution/apm/public/components/routing/templates/no_data_config.ts similarity index 100% rename from x-pack/plugins/apm/public/components/routing/templates/no_data_config.ts rename to x-pack/plugins/observability_solution/apm/public/components/routing/templates/no_data_config.ts diff --git a/x-pack/plugins/apm/public/components/routing/templates/service_group_template.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/templates/service_group_template.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/templates/service_group_template.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/templates/service_group_template.tsx diff --git a/x-pack/plugins/apm/public/components/routing/templates/settings_template.stories.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/templates/settings_template.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/templates/settings_template.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/templates/settings_template.stories.tsx diff --git a/x-pack/plugins/apm/public/components/routing/templates/settings_template.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/templates/settings_template.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/templates/settings_template.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/templates/settings_template.test.tsx diff --git a/x-pack/plugins/apm/public/components/routing/templates/settings_template.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/templates/settings_template.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/templates/settings_template.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/templates/settings_template.tsx diff --git a/x-pack/plugins/apm/public/components/routing/track_pageview.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/track_pageview.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/routing/track_pageview.tsx rename to x-pack/plugins/observability_solution/apm/public/components/routing/track_pageview.tsx diff --git a/x-pack/plugins/apm/public/components/shared/aggregated_transactions_badge/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/aggregated_transactions_badge/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/aggregated_transactions_badge/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/aggregated_transactions_badge/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/beta_badge.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/beta_badge.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/beta_badge.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/beta_badge.tsx diff --git a/x-pack/plugins/apm/public/components/shared/charts/breakdown_chart/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/breakdown_chart/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/breakdown_chart/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/breakdown_chart/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/charts/chart_container.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/chart_container.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/chart_container.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/chart_container.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/charts/chart_container.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/chart_container.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/chart_container.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/chart_container.tsx diff --git a/x-pack/plugins/apm/public/components/shared/charts/duration_distribution_chart/index.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/duration_distribution_chart/index.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/duration_distribution_chart/index.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/duration_distribution_chart/index.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/charts/duration_distribution_chart/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/duration_distribution_chart/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/duration_distribution_chart/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/duration_distribution_chart/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/charts/duration_distribution_chart/total_doc_count_label.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/duration_distribution_chart/total_doc_count_label.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/duration_distribution_chart/total_doc_count_label.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/duration_distribution_chart/total_doc_count_label.tsx diff --git a/x-pack/plugins/apm/public/components/shared/charts/duration_distribution_chart_with_scrubber/index.test.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/duration_distribution_chart_with_scrubber/index.test.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/duration_distribution_chart_with_scrubber/index.test.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/duration_distribution_chart_with_scrubber/index.test.ts diff --git a/x-pack/plugins/apm/public/components/shared/charts/duration_distribution_chart_with_scrubber/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/duration_distribution_chart_with_scrubber/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/duration_distribution_chart_with_scrubber/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/duration_distribution_chart_with_scrubber/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/charts/failed_transaction_rate_chart/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/failed_transaction_rate_chart/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/failed_transaction_rate_chart/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/failed_transaction_rate_chart/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/charts/helper/get_chart_anomaly_timeseries.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/helper/get_chart_anomaly_timeseries.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/helper/get_chart_anomaly_timeseries.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/helper/get_chart_anomaly_timeseries.tsx diff --git a/x-pack/plugins/apm/public/components/shared/charts/helper/get_empty_series.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/helper/get_empty_series.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/helper/get_empty_series.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/helper/get_empty_series.ts diff --git a/x-pack/plugins/apm/public/components/shared/charts/helper/get_timeseries_color.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/helper/get_timeseries_color.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/helper/get_timeseries_color.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/helper/get_timeseries_color.ts diff --git a/x-pack/plugins/apm/public/components/shared/charts/helper/get_timezone_offset_in_ms.test.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/helper/get_timezone_offset_in_ms.test.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/helper/get_timezone_offset_in_ms.test.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/helper/get_timezone_offset_in_ms.test.ts diff --git a/x-pack/plugins/apm/public/components/shared/charts/helper/get_timezone_offset_in_ms.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/helper/get_timezone_offset_in_ms.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/helper/get_timezone_offset_in_ms.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/helper/get_timezone_offset_in_ms.ts diff --git a/x-pack/plugins/apm/public/components/shared/charts/helper/helper.test.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/helper/helper.test.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/helper/helper.test.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/helper/helper.test.ts diff --git a/x-pack/plugins/apm/public/components/shared/charts/helper/helper.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/helper/helper.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/helper/helper.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/helper/helper.ts diff --git a/x-pack/plugins/apm/public/components/shared/charts/helper/timezone.test.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/helper/timezone.test.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/helper/timezone.test.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/helper/timezone.test.ts diff --git a/x-pack/plugins/apm/public/components/shared/charts/helper/timezone.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/helper/timezone.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/helper/timezone.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/helper/timezone.ts diff --git a/x-pack/plugins/apm/public/components/shared/charts/instances_latency_distribution_chart/custom_tooltip.stories.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/instances_latency_distribution_chart/custom_tooltip.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/instances_latency_distribution_chart/custom_tooltip.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/instances_latency_distribution_chart/custom_tooltip.stories.tsx diff --git a/x-pack/plugins/apm/public/components/shared/charts/instances_latency_distribution_chart/custom_tooltip.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/instances_latency_distribution_chart/custom_tooltip.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/instances_latency_distribution_chart/custom_tooltip.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/instances_latency_distribution_chart/custom_tooltip.tsx diff --git a/x-pack/plugins/apm/public/components/shared/charts/instances_latency_distribution_chart/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/instances_latency_distribution_chart/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/instances_latency_distribution_chart/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/instances_latency_distribution_chart/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/charts/instances_latency_distribution_chart/instances_latency_distribution_chart.stories.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/instances_latency_distribution_chart/instances_latency_distribution_chart.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/instances_latency_distribution_chart/instances_latency_distribution_chart.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/instances_latency_distribution_chart/instances_latency_distribution_chart.stories.tsx diff --git a/x-pack/plugins/apm/public/components/shared/charts/latency_chart/get_latency_chart_screen_context.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/latency_chart/get_latency_chart_screen_context.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/latency_chart/get_latency_chart_screen_context.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/latency_chart/get_latency_chart_screen_context.ts diff --git a/x-pack/plugins/apm/public/components/shared/charts/latency_chart/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/latency_chart/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/latency_chart/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/latency_chart/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/charts/latency_chart/latency_chart.stories.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/latency_chart/latency_chart.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/latency_chart/latency_chart.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/latency_chart/latency_chart.stories.tsx diff --git a/x-pack/plugins/apm/public/components/shared/charts/latency_chart/latency_chart.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/latency_chart/latency_chart.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/latency_chart/latency_chart.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/latency_chart/latency_chart.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/charts/metrics_chart/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/metrics_chart/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/metrics_chart/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/metrics_chart/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/charts/spark_plot/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/spark_plot/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/spark_plot/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/spark_plot/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/charts/timeline/__snapshots__/timeline.test.tsx.snap b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/timeline/__snapshots__/timeline.test.tsx.snap similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/timeline/__snapshots__/timeline.test.tsx.snap rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/timeline/__snapshots__/timeline.test.tsx.snap diff --git a/x-pack/plugins/apm/public/components/shared/charts/timeline/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/timeline/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/timeline/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/timeline/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/charts/timeline/last_tick_value.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/timeline/last_tick_value.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/timeline/last_tick_value.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/timeline/last_tick_value.tsx diff --git a/x-pack/plugins/apm/public/components/shared/charts/timeline/legend.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/timeline/legend.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/timeline/legend.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/timeline/legend.tsx diff --git a/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/__snapshots__/agent_marker.test.tsx.snap b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/timeline/marker/__snapshots__/agent_marker.test.tsx.snap similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/timeline/marker/__snapshots__/agent_marker.test.tsx.snap rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/timeline/marker/__snapshots__/agent_marker.test.tsx.snap diff --git a/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/__snapshots__/index.test.tsx.snap b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/timeline/marker/__snapshots__/index.test.tsx.snap similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/timeline/marker/__snapshots__/index.test.tsx.snap rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/timeline/marker/__snapshots__/index.test.tsx.snap diff --git a/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/agent_marker.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/timeline/marker/agent_marker.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/timeline/marker/agent_marker.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/timeline/marker/agent_marker.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/agent_marker.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/timeline/marker/agent_marker.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/timeline/marker/agent_marker.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/timeline/marker/agent_marker.tsx diff --git a/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/error_marker.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/timeline/marker/error_marker.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/timeline/marker/error_marker.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/timeline/marker/error_marker.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/error_marker.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/timeline/marker/error_marker.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/timeline/marker/error_marker.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/timeline/marker/error_marker.tsx diff --git a/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/index.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/timeline/marker/index.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/timeline/marker/index.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/timeline/marker/index.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/charts/timeline/marker/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/timeline/marker/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/timeline/marker/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/timeline/marker/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/charts/timeline/plot_utils.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/timeline/plot_utils.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/timeline/plot_utils.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/timeline/plot_utils.ts diff --git a/x-pack/plugins/apm/public/components/shared/charts/timeline/timeline.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/timeline/timeline.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/timeline/timeline.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/timeline/timeline.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/charts/timeline/timeline_axis.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/timeline/timeline_axis.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/timeline/timeline_axis.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/timeline/timeline_axis.tsx diff --git a/x-pack/plugins/apm/public/components/shared/charts/timeline/vertical_lines.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/timeline/vertical_lines.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/timeline/vertical_lines.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/timeline/vertical_lines.tsx diff --git a/x-pack/plugins/apm/public/components/shared/charts/timeseries_chart.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/timeseries_chart.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/timeseries_chart.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/timeseries_chart.tsx diff --git a/x-pack/plugins/apm/public/components/shared/charts/timeseries_chart_with_context.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/timeseries_chart_with_context.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/timeseries_chart_with_context.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/timeseries_chart_with_context.tsx diff --git a/x-pack/plugins/apm/public/components/shared/charts/transaction_breakdown_chart/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/transaction_breakdown_chart/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/transaction_breakdown_chart/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/transaction_breakdown_chart/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/charts/transaction_breakdown_chart/use_transaction_breakdown.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/transaction_breakdown_chart/use_transaction_breakdown.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/transaction_breakdown_chart/use_transaction_breakdown.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/transaction_breakdown_chart/use_transaction_breakdown.ts diff --git a/x-pack/plugins/apm/public/components/shared/charts/transaction_charts/helper.test.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/transaction_charts/helper.test.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/transaction_charts/helper.test.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/transaction_charts/helper.test.ts diff --git a/x-pack/plugins/apm/public/components/shared/charts/transaction_charts/helper.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/transaction_charts/helper.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/transaction_charts/helper.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/transaction_charts/helper.tsx diff --git a/x-pack/plugins/apm/public/components/shared/charts/transaction_charts/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/transaction_charts/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/transaction_charts/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/transaction_charts/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/charts/transaction_charts/ml_header.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/transaction_charts/ml_header.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/transaction_charts/ml_header.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/transaction_charts/ml_header.tsx diff --git a/x-pack/plugins/apm/public/components/shared/charts/transaction_coldstart_rate_chart/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/transaction_coldstart_rate_chart/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/transaction_coldstart_rate_chart/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/transaction_coldstart_rate_chart/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/charts/treemap_chart/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/charts/treemap_chart/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/charts/treemap_chart/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/charts/treemap_chart/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/critical_path_flamegraph/critical_path_flamegraph_tooltip.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/critical_path_flamegraph/critical_path_flamegraph_tooltip.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/critical_path_flamegraph/critical_path_flamegraph_tooltip.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/critical_path_flamegraph/critical_path_flamegraph_tooltip.tsx diff --git a/x-pack/plugins/apm/public/components/shared/critical_path_flamegraph/critical_path_to_flamegraph.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/critical_path_flamegraph/critical_path_to_flamegraph.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/critical_path_flamegraph/critical_path_to_flamegraph.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/critical_path_flamegraph/critical_path_to_flamegraph.ts diff --git a/x-pack/plugins/apm/public/components/shared/critical_path_flamegraph/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/critical_path_flamegraph/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/critical_path_flamegraph/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/critical_path_flamegraph/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/date_picker/apm_date_picker.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/date_picker/apm_date_picker.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/date_picker/apm_date_picker.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/date_picker/apm_date_picker.tsx diff --git a/x-pack/plugins/apm/public/components/shared/date_picker/date_picker.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/date_picker/date_picker.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/date_picker/date_picker.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/date_picker/date_picker.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/date_picker/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/date_picker/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/date_picker/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/date_picker/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/date_picker/typings.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/date_picker/typings.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/date_picker/typings.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/date_picker/typings.ts diff --git a/x-pack/plugins/apm/public/components/shared/dependencies_table/dependencies_table_service_map_link.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/dependencies_table/dependencies_table_service_map_link.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/dependencies_table/dependencies_table_service_map_link.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/dependencies_table/dependencies_table_service_map_link.tsx diff --git a/x-pack/plugins/apm/public/components/shared/dependencies_table/get_span_metric_columns.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/dependencies_table/get_span_metric_columns.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/dependencies_table/get_span_metric_columns.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/dependencies_table/get_span_metric_columns.tsx diff --git a/x-pack/plugins/apm/public/components/shared/dependencies_table/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/dependencies_table/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/dependencies_table/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/dependencies_table/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/dependency_metric_charts/dependency_failed_transaction_rate_chart.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/dependency_metric_charts/dependency_failed_transaction_rate_chart.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/dependency_metric_charts/dependency_failed_transaction_rate_chart.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/dependency_metric_charts/dependency_failed_transaction_rate_chart.tsx diff --git a/x-pack/plugins/apm/public/components/shared/dependency_metric_charts/dependency_latency_chart.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/dependency_metric_charts/dependency_latency_chart.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/dependency_metric_charts/dependency_latency_chart.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/dependency_metric_charts/dependency_latency_chart.tsx diff --git a/x-pack/plugins/apm/public/components/shared/dependency_metric_charts/dependency_metric_charts_route_params.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/dependency_metric_charts/dependency_metric_charts_route_params.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/dependency_metric_charts/dependency_metric_charts_route_params.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/dependency_metric_charts/dependency_metric_charts_route_params.ts diff --git a/x-pack/plugins/apm/public/components/shared/dependency_metric_charts/dependency_throughput_chart.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/dependency_metric_charts/dependency_throughput_chart.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/dependency_metric_charts/dependency_throughput_chart.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/dependency_metric_charts/dependency_throughput_chart.tsx diff --git a/x-pack/plugins/apm/public/components/shared/dependency_metric_charts/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/dependency_metric_charts/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/dependency_metric_charts/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/dependency_metric_charts/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/empty_message.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/empty_message.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/empty_message.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/empty_message.tsx diff --git a/x-pack/plugins/apm/public/components/shared/environment_badge/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/environment_badge/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/environment_badge/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/environment_badge/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/environment_filter/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/environment_filter/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/environment_filter/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/environment_filter/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/environment_select/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/environment_select/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/environment_select/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/environment_select/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/error_state_prompt.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/error_state_prompt.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/error_state_prompt.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/error_state_prompt.tsx diff --git a/x-pack/plugins/apm/public/components/shared/errors_table/get_columns.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/errors_table/get_columns.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/errors_table/get_columns.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/errors_table/get_columns.tsx diff --git a/x-pack/plugins/apm/public/components/shared/get_bool_filter.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/get_bool_filter.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/get_bool_filter.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/get_bool_filter.ts diff --git a/x-pack/plugins/apm/public/components/shared/height_retainer/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/height_retainer/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/height_retainer/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/height_retainer/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/height_retainer/resetting_height_container.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/height_retainer/resetting_height_container.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/height_retainer/resetting_height_container.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/height_retainer/resetting_height_container.tsx diff --git a/x-pack/plugins/apm/public/components/shared/impact_bar/__snapshots__/impact_bar.test.js.snap b/x-pack/plugins/observability_solution/apm/public/components/shared/impact_bar/__snapshots__/impact_bar.test.js.snap similarity index 100% rename from x-pack/plugins/apm/public/components/shared/impact_bar/__snapshots__/impact_bar.test.js.snap rename to x-pack/plugins/observability_solution/apm/public/components/shared/impact_bar/__snapshots__/impact_bar.test.js.snap diff --git a/x-pack/plugins/apm/public/components/shared/impact_bar/impact_bar.test.js b/x-pack/plugins/observability_solution/apm/public/components/shared/impact_bar/impact_bar.test.js similarity index 100% rename from x-pack/plugins/apm/public/components/shared/impact_bar/impact_bar.test.js rename to x-pack/plugins/observability_solution/apm/public/components/shared/impact_bar/impact_bar.test.js diff --git a/x-pack/plugins/apm/public/components/shared/impact_bar/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/impact_bar/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/impact_bar/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/impact_bar/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/is_route_with_time_range.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/is_route_with_time_range.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/is_route_with_time_range.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/is_route_with_time_range.ts diff --git a/x-pack/plugins/apm/public/components/shared/item_badge/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/item_badge/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/item_badge/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/item_badge/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/key_value_filter_list/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/key_value_filter_list/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/key_value_filter_list/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/key_value_filter_list/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/key_value_filter_list/key_value_filter_list.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/key_value_filter_list/key_value_filter_list.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/key_value_filter_list/key_value_filter_list.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/key_value_filter_list/key_value_filter_list.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/key_value_table/formatted_value.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/key_value_table/formatted_value.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/key_value_table/formatted_value.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/key_value_table/formatted_value.tsx diff --git a/x-pack/plugins/apm/public/components/shared/key_value_table/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/key_value_table/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/key_value_table/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/key_value_table/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/key_value_table/key_value_table.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/key_value_table/key_value_table.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/key_value_table/key_value_table.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/key_value_table/key_value_table.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/kuery_bar/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/kuery_bar/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/kuery_bar/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/kuery_bar/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/kuery_bar/typeahead/click_outside.js b/x-pack/plugins/observability_solution/apm/public/components/shared/kuery_bar/typeahead/click_outside.js similarity index 100% rename from x-pack/plugins/apm/public/components/shared/kuery_bar/typeahead/click_outside.js rename to x-pack/plugins/observability_solution/apm/public/components/shared/kuery_bar/typeahead/click_outside.js diff --git a/x-pack/plugins/apm/public/components/shared/kuery_bar/typeahead/index.js b/x-pack/plugins/observability_solution/apm/public/components/shared/kuery_bar/typeahead/index.js similarity index 100% rename from x-pack/plugins/apm/public/components/shared/kuery_bar/typeahead/index.js rename to x-pack/plugins/observability_solution/apm/public/components/shared/kuery_bar/typeahead/index.js diff --git a/x-pack/plugins/apm/public/components/shared/kuery_bar/typeahead/suggestion.js b/x-pack/plugins/observability_solution/apm/public/components/shared/kuery_bar/typeahead/suggestion.js similarity index 100% rename from x-pack/plugins/apm/public/components/shared/kuery_bar/typeahead/suggestion.js rename to x-pack/plugins/observability_solution/apm/public/components/shared/kuery_bar/typeahead/suggestion.js diff --git a/x-pack/plugins/apm/public/components/shared/kuery_bar/typeahead/suggestions.js b/x-pack/plugins/observability_solution/apm/public/components/shared/kuery_bar/typeahead/suggestions.js similarity index 100% rename from x-pack/plugins/apm/public/components/shared/kuery_bar/typeahead/suggestions.js rename to x-pack/plugins/observability_solution/apm/public/components/shared/kuery_bar/typeahead/suggestions.js diff --git a/x-pack/plugins/apm/public/components/shared/kuery_bar/utils.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/kuery_bar/utils.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/kuery_bar/utils.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/kuery_bar/utils.ts diff --git a/x-pack/plugins/apm/public/components/shared/license_prompt/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/license_prompt/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/license_prompt/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/license_prompt/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/license_prompt/license_prompt.stories.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/license_prompt/license_prompt.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/license_prompt/license_prompt.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/license_prompt/license_prompt.stories.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/apm/agent_configuration_links.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/agent_configuration_links.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/apm/agent_configuration_links.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/agent_configuration_links.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/apm/apm_link.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/apm_link.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/apm/apm_link.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/apm_link.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/apm/apm_link.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/apm_link.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/apm/apm_link.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/apm_link.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/apm/error_detail_link.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/error_detail_link.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/apm/error_detail_link.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/error_detail_link.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/apm/error_overview_link.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/error_overview_link.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/apm/error_overview_link.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/error_overview_link.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/apm/home_link.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/home_link.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/apm/home_link.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/home_link.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/apm/max_groups_message.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/max_groups_message.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/apm/max_groups_message.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/max_groups_message.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/apm/metric_overview_link.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/metric_overview_link.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/apm/metric_overview_link.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/metric_overview_link.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/apm/mobile/crash_detail_link.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/mobile/crash_detail_link.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/apm/mobile/crash_detail_link.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/mobile/crash_detail_link.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/apm/mobile/error_detail_link.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/mobile/error_detail_link.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/apm/mobile/error_detail_link.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/mobile/error_detail_link.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/apm/mobile/error_overview_link.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/mobile/error_overview_link.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/apm/mobile/error_overview_link.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/mobile/error_overview_link.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/apm/service_inventory_link.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/service_inventory_link.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/apm/service_inventory_link.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/service_inventory_link.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/apm/service_link/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/service_link/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/apm/service_link/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/service_link/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/apm/service_link/service_link.stories.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/service_link/service_link.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/apm/service_link/service_link.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/service_link/service_link.stories.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/apm/service_link/service_link.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/service_link/service_link.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/apm/service_link/service_link.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/service_link/service_link.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/apm/service_map_link.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/service_map_link.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/apm/service_map_link.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/service_map_link.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/apm/service_node_metric_overview_link.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/service_node_metric_overview_link.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/apm/service_node_metric_overview_link.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/service_node_metric_overview_link.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/apm/service_node_overview_link.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/service_node_overview_link.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/apm/service_node_overview_link.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/service_node_overview_link.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/apm/service_transactions_overview_link.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/service_transactions_overview_link.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/apm/service_transactions_overview_link.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/service_transactions_overview_link.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/apm/service_transactions_overview_link.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/service_transactions_overview_link.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/apm/service_transactions_overview_link.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/service_transactions_overview_link.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/apm/trace_overview_link.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/trace_overview_link.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/apm/trace_overview_link.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/trace_overview_link.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/apm/transaction_detail_link/index.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/transaction_detail_link/index.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/apm/transaction_detail_link/index.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/transaction_detail_link/index.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/apm/transaction_detail_link/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/transaction_detail_link/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/apm/transaction_detail_link/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/transaction_detail_link/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/apm/transaction_overview_link.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/transaction_overview_link.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/apm/transaction_overview_link.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/transaction_overview_link.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/apm/transaction_overview_link.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/transaction_overview_link.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/apm/transaction_overview_link.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/transaction_overview_link.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/dependency_link.stories.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/dependency_link.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/dependency_link.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/dependency_link.stories.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/dependency_link.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/dependency_link.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/dependency_link.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/dependency_link.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/dependency_link.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/dependency_link.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/dependency_link.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/dependency_link.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/discover_links/__fixtures__/mock_transaction.json b/x-pack/plugins/observability_solution/apm/public/components/shared/links/discover_links/__fixtures__/mock_transaction.json similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/discover_links/__fixtures__/mock_transaction.json rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/discover_links/__fixtures__/mock_transaction.json diff --git a/x-pack/plugins/apm/public/components/shared/links/discover_links/__snapshots__/discover_error_button.test.tsx.snap b/x-pack/plugins/observability_solution/apm/public/components/shared/links/discover_links/__snapshots__/discover_error_button.test.tsx.snap similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/discover_links/__snapshots__/discover_error_button.test.tsx.snap rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/discover_links/__snapshots__/discover_error_button.test.tsx.snap diff --git a/x-pack/plugins/apm/public/components/shared/links/discover_links/__snapshots__/discover_error_link.test.tsx.snap b/x-pack/plugins/observability_solution/apm/public/components/shared/links/discover_links/__snapshots__/discover_error_link.test.tsx.snap similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/discover_links/__snapshots__/discover_error_link.test.tsx.snap rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/discover_links/__snapshots__/discover_error_link.test.tsx.snap diff --git a/x-pack/plugins/apm/public/components/shared/links/discover_links/__snapshots__/discover_transaction_button.test.tsx.snap b/x-pack/plugins/observability_solution/apm/public/components/shared/links/discover_links/__snapshots__/discover_transaction_button.test.tsx.snap similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/discover_links/__snapshots__/discover_transaction_button.test.tsx.snap rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/discover_links/__snapshots__/discover_transaction_button.test.tsx.snap diff --git a/x-pack/plugins/apm/public/components/shared/links/discover_links/__snapshots__/discover_transaction_link.test.tsx.snap b/x-pack/plugins/observability_solution/apm/public/components/shared/links/discover_links/__snapshots__/discover_transaction_link.test.tsx.snap similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/discover_links/__snapshots__/discover_transaction_link.test.tsx.snap rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/discover_links/__snapshots__/discover_transaction_link.test.tsx.snap diff --git a/x-pack/plugins/apm/public/components/shared/links/discover_links/discover_error_button.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/discover_links/discover_error_button.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/discover_links/discover_error_button.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/discover_links/discover_error_button.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/discover_links/discover_error_link.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/discover_links/discover_error_link.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/discover_links/discover_error_link.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/discover_links/discover_error_link.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/discover_links/discover_error_link.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/discover_links/discover_error_link.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/discover_links/discover_error_link.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/discover_links/discover_error_link.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/discover_links/discover_link.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/discover_links/discover_link.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/discover_links/discover_link.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/discover_links/discover_link.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/discover_links/discover_links.integration.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/discover_links/discover_links.integration.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/discover_links/discover_links.integration.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/discover_links/discover_links.integration.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/discover_links/discover_span_link.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/discover_links/discover_span_link.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/discover_links/discover_span_link.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/discover_links/discover_span_link.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/discover_links/discover_transaction_button.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/discover_links/discover_transaction_button.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/discover_links/discover_transaction_button.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/discover_links/discover_transaction_button.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/discover_links/discover_transaction_link.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/discover_links/discover_transaction_link.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/discover_links/discover_transaction_link.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/discover_links/discover_transaction_link.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/discover_links/discover_transaction_link.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/discover_links/discover_transaction_link.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/discover_links/discover_transaction_link.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/discover_links/discover_transaction_link.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/elastic_docs_link.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/elastic_docs_link.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/elastic_docs_link.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/elastic_docs_link.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/infra_link.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/infra_link.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/infra_link.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/infra_link.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/infra_link.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/infra_link.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/infra_link.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/infra_link.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/kibana.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/links/kibana.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/kibana.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/kibana.ts diff --git a/x-pack/plugins/apm/public/components/shared/links/machine_learning_links/mlexplorer_link.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/machine_learning_links/mlexplorer_link.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/machine_learning_links/mlexplorer_link.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/machine_learning_links/mlexplorer_link.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/machine_learning_links/mlexplorer_link.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/machine_learning_links/mlexplorer_link.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/machine_learning_links/mlexplorer_link.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/machine_learning_links/mlexplorer_link.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/machine_learning_links/mlmanage_jobs_link.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/machine_learning_links/mlmanage_jobs_link.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/machine_learning_links/mlmanage_jobs_link.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/machine_learning_links/mlmanage_jobs_link.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/machine_learning_links/mlmanage_jobs_link.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/machine_learning_links/mlmanage_jobs_link.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/machine_learning_links/mlmanage_jobs_link.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/machine_learning_links/mlmanage_jobs_link.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/machine_learning_links/mlsingle_metric_link.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/machine_learning_links/mlsingle_metric_link.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/machine_learning_links/mlsingle_metric_link.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/machine_learning_links/mlsingle_metric_link.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/machine_learning_links/mlsingle_metric_link.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/machine_learning_links/mlsingle_metric_link.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/machine_learning_links/mlsingle_metric_link.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/machine_learning_links/mlsingle_metric_link.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/rison_helpers.test.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/links/rison_helpers.test.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/rison_helpers.test.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/rison_helpers.test.ts diff --git a/x-pack/plugins/apm/public/components/shared/links/rison_helpers.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/links/rison_helpers.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/rison_helpers.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/rison_helpers.ts diff --git a/x-pack/plugins/apm/public/components/shared/links/setup_instructions_link.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/setup_instructions_link.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/setup_instructions_link.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/setup_instructions_link.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/url_helpers.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/url_helpers.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/url_helpers.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/url_helpers.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/links/url_helpers.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/links/url_helpers.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/links/url_helpers.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/links/url_helpers.ts diff --git a/x-pack/plugins/apm/public/components/shared/list_metric.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/list_metric.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/list_metric.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/list_metric.tsx diff --git a/x-pack/plugins/apm/public/components/shared/loading_state_prompt.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/loading_state_prompt.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/loading_state_prompt.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/loading_state_prompt.tsx diff --git a/x-pack/plugins/apm/public/components/shared/managed_table/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/managed_table/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/managed_table/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/managed_table/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/managed_table/managed_table.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/managed_table/managed_table.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/managed_table/managed_table.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/managed_table/managed_table.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/metadata_table/error_metadata/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/metadata_table/error_metadata/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/metadata_table/error_metadata/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/metadata_table/error_metadata/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/metadata_table/helper.test.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/metadata_table/helper.test.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/metadata_table/helper.test.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/metadata_table/helper.test.ts diff --git a/x-pack/plugins/apm/public/components/shared/metadata_table/helper.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/metadata_table/helper.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/metadata_table/helper.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/metadata_table/helper.ts diff --git a/x-pack/plugins/apm/public/components/shared/metadata_table/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/metadata_table/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/metadata_table/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/metadata_table/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/metadata_table/metadata_table.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/metadata_table/metadata_table.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/metadata_table/metadata_table.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/metadata_table/metadata_table.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/metadata_table/section.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/metadata_table/section.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/metadata_table/section.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/metadata_table/section.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/metadata_table/section.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/metadata_table/section.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/metadata_table/section.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/metadata_table/section.tsx diff --git a/x-pack/plugins/apm/public/components/shared/metadata_table/span_metadata/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/metadata_table/span_metadata/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/metadata_table/span_metadata/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/metadata_table/span_metadata/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/metadata_table/transaction_metadata/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/metadata_table/transaction_metadata/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/metadata_table/transaction_metadata/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/metadata_table/transaction_metadata/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/metadata_table/types.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/metadata_table/types.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/metadata_table/types.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/metadata_table/types.ts diff --git a/x-pack/plugins/apm/public/components/shared/ml_callout/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/ml_callout/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/ml_callout/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/ml_callout/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/monaco_code_editor/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/monaco_code_editor/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/monaco_code_editor/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/monaco_code_editor/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/overview_table_container/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/overview_table_container/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/overview_table_container/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/overview_table_container/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/popover_tooltip/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/popover_tooltip/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/popover_tooltip/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/popover_tooltip/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/profiling/flamegraph/flamegraph_link.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/profiling/flamegraph/flamegraph_link.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/profiling/flamegraph/flamegraph_link.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/profiling/flamegraph/flamegraph_link.tsx diff --git a/x-pack/plugins/apm/public/components/shared/profiling/flamegraph/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/profiling/flamegraph/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/profiling/flamegraph/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/profiling/flamegraph/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/profiling/top_functions/top_functions_link.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/profiling/top_functions/top_functions_link.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/profiling/top_functions/top_functions_link.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/profiling/top_functions/top_functions_link.tsx diff --git a/x-pack/plugins/apm/public/components/shared/search_bar/search_bar.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/search_bar/search_bar.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/search_bar/search_bar.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/search_bar/search_bar.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/search_bar/search_bar.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/search_bar/search_bar.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/search_bar/search_bar.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/search_bar/search_bar.tsx diff --git a/x-pack/plugins/apm/public/components/shared/select_with_placeholder/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/select_with_placeholder/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/select_with_placeholder/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/select_with_placeholder/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/service_icons/cloud_details.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/service_icons/cloud_details.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/service_icons/cloud_details.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/service_icons/cloud_details.tsx diff --git a/x-pack/plugins/apm/public/components/shared/service_icons/container_details.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/service_icons/container_details.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/service_icons/container_details.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/service_icons/container_details.tsx diff --git a/x-pack/plugins/apm/public/components/shared/service_icons/icon_popover.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/service_icons/icon_popover.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/service_icons/icon_popover.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/service_icons/icon_popover.tsx diff --git a/x-pack/plugins/apm/public/components/shared/service_icons/index.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/service_icons/index.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/service_icons/index.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/service_icons/index.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/service_icons/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/service_icons/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/service_icons/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/service_icons/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/service_icons/otel_details.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/service_icons/otel_details.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/service_icons/otel_details.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/service_icons/otel_details.tsx diff --git a/x-pack/plugins/apm/public/components/shared/service_icons/serverless_details.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/service_icons/serverless_details.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/service_icons/serverless_details.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/service_icons/serverless_details.tsx diff --git a/x-pack/plugins/apm/public/components/shared/service_icons/service_details.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/service_icons/service_details.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/service_icons/service_details.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/service_icons/service_details.tsx diff --git a/x-pack/plugins/apm/public/components/shared/service_icons/service_icons.stories.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/service_icons/service_icons.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/service_icons/service_icons.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/service_icons/service_icons.stories.tsx diff --git a/x-pack/plugins/apm/public/components/shared/slo_callout/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/slo_callout/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/slo_callout/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/slo_callout/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/span_icon/get_span_icon.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/get_span_icon.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/span_icon/get_span_icon.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/get_span_icon.ts diff --git a/x-pack/plugins/apm/public/components/shared/span_icon/icons/aws.svg b/x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/aws.svg similarity index 100% rename from x-pack/plugins/apm/public/components/shared/span_icon/icons/aws.svg rename to x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/aws.svg diff --git a/x-pack/plugins/apm/public/components/shared/span_icon/icons/azure.svg b/x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/azure.svg similarity index 100% rename from x-pack/plugins/apm/public/components/shared/span_icon/icons/azure.svg rename to x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/azure.svg diff --git a/x-pack/plugins/apm/public/components/shared/span_icon/icons/blob_storage.svg b/x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/blob_storage.svg similarity index 100% rename from x-pack/plugins/apm/public/components/shared/span_icon/icons/blob_storage.svg rename to x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/blob_storage.svg diff --git a/x-pack/plugins/apm/public/components/shared/span_icon/icons/cassandra.svg b/x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/cassandra.svg similarity index 100% rename from x-pack/plugins/apm/public/components/shared/span_icon/icons/cassandra.svg rename to x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/cassandra.svg diff --git a/x-pack/plugins/apm/public/components/shared/span_icon/icons/cosmos_db.svg b/x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/cosmos_db.svg similarity index 100% rename from x-pack/plugins/apm/public/components/shared/span_icon/icons/cosmos_db.svg rename to x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/cosmos_db.svg diff --git a/x-pack/plugins/apm/public/components/shared/span_icon/icons/database.svg b/x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/database.svg similarity index 100% rename from x-pack/plugins/apm/public/components/shared/span_icon/icons/database.svg rename to x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/database.svg diff --git a/x-pack/plugins/apm/public/components/shared/span_icon/icons/default.svg b/x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/default.svg similarity index 100% rename from x-pack/plugins/apm/public/components/shared/span_icon/icons/default.svg rename to x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/default.svg diff --git a/x-pack/plugins/apm/public/components/shared/span_icon/icons/documents.svg b/x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/documents.svg similarity index 100% rename from x-pack/plugins/apm/public/components/shared/span_icon/icons/documents.svg rename to x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/documents.svg diff --git a/x-pack/plugins/apm/public/components/shared/span_icon/icons/dynamo_db.svg b/x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/dynamo_db.svg similarity index 100% rename from x-pack/plugins/apm/public/components/shared/span_icon/icons/dynamo_db.svg rename to x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/dynamo_db.svg diff --git a/x-pack/plugins/apm/public/components/shared/span_icon/icons/elasticsearch.svg b/x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/elasticsearch.svg similarity index 100% rename from x-pack/plugins/apm/public/components/shared/span_icon/icons/elasticsearch.svg rename to x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/elasticsearch.svg diff --git a/x-pack/plugins/apm/public/components/shared/span_icon/icons/file_share_storage.svg b/x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/file_share_storage.svg similarity index 100% rename from x-pack/plugins/apm/public/components/shared/span_icon/icons/file_share_storage.svg rename to x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/file_share_storage.svg diff --git a/x-pack/plugins/apm/public/components/shared/span_icon/icons/globe.svg b/x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/globe.svg similarity index 100% rename from x-pack/plugins/apm/public/components/shared/span_icon/icons/globe.svg rename to x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/globe.svg diff --git a/x-pack/plugins/apm/public/components/shared/span_icon/icons/graphql.svg b/x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/graphql.svg similarity index 100% rename from x-pack/plugins/apm/public/components/shared/span_icon/icons/graphql.svg rename to x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/graphql.svg diff --git a/x-pack/plugins/apm/public/components/shared/span_icon/icons/grpc.svg b/x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/grpc.svg similarity index 100% rename from x-pack/plugins/apm/public/components/shared/span_icon/icons/grpc.svg rename to x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/grpc.svg diff --git a/x-pack/plugins/apm/public/components/shared/span_icon/icons/handlebars.svg b/x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/handlebars.svg similarity index 100% rename from x-pack/plugins/apm/public/components/shared/span_icon/icons/handlebars.svg rename to x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/handlebars.svg diff --git a/x-pack/plugins/apm/public/components/shared/span_icon/icons/kafka.svg b/x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/kafka.svg similarity index 100% rename from x-pack/plugins/apm/public/components/shared/span_icon/icons/kafka.svg rename to x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/kafka.svg diff --git a/x-pack/plugins/apm/public/components/shared/span_icon/icons/ldap.svg b/x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/ldap.svg similarity index 100% rename from x-pack/plugins/apm/public/components/shared/span_icon/icons/ldap.svg rename to x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/ldap.svg diff --git a/x-pack/plugins/apm/public/components/shared/span_icon/icons/mongodb.svg b/x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/mongodb.svg similarity index 100% rename from x-pack/plugins/apm/public/components/shared/span_icon/icons/mongodb.svg rename to x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/mongodb.svg diff --git a/x-pack/plugins/apm/public/components/shared/span_icon/icons/mysql.svg b/x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/mysql.svg similarity index 100% rename from x-pack/plugins/apm/public/components/shared/span_icon/icons/mysql.svg rename to x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/mysql.svg diff --git a/x-pack/plugins/apm/public/components/shared/span_icon/icons/postgresql.svg b/x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/postgresql.svg similarity index 100% rename from x-pack/plugins/apm/public/components/shared/span_icon/icons/postgresql.svg rename to x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/postgresql.svg diff --git a/x-pack/plugins/apm/public/components/shared/span_icon/icons/redis.svg b/x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/redis.svg similarity index 100% rename from x-pack/plugins/apm/public/components/shared/span_icon/icons/redis.svg rename to x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/redis.svg diff --git a/x-pack/plugins/apm/public/components/shared/span_icon/icons/s3.svg b/x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/s3.svg similarity index 100% rename from x-pack/plugins/apm/public/components/shared/span_icon/icons/s3.svg rename to x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/s3.svg diff --git a/x-pack/plugins/apm/public/components/shared/span_icon/icons/service_bus.svg b/x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/service_bus.svg similarity index 100% rename from x-pack/plugins/apm/public/components/shared/span_icon/icons/service_bus.svg rename to x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/service_bus.svg diff --git a/x-pack/plugins/apm/public/components/shared/span_icon/icons/sns.svg b/x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/sns.svg similarity index 100% rename from x-pack/plugins/apm/public/components/shared/span_icon/icons/sns.svg rename to x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/sns.svg diff --git a/x-pack/plugins/apm/public/components/shared/span_icon/icons/sqs.svg b/x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/sqs.svg similarity index 100% rename from x-pack/plugins/apm/public/components/shared/span_icon/icons/sqs.svg rename to x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/sqs.svg diff --git a/x-pack/plugins/apm/public/components/shared/span_icon/icons/storage_queue.svg b/x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/storage_queue.svg similarity index 100% rename from x-pack/plugins/apm/public/components/shared/span_icon/icons/storage_queue.svg rename to x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/storage_queue.svg diff --git a/x-pack/plugins/apm/public/components/shared/span_icon/icons/table_storage.svg b/x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/table_storage.svg similarity index 100% rename from x-pack/plugins/apm/public/components/shared/span_icon/icons/table_storage.svg rename to x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/table_storage.svg diff --git a/x-pack/plugins/apm/public/components/shared/span_icon/icons/websocket.svg b/x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/websocket.svg similarity index 100% rename from x-pack/plugins/apm/public/components/shared/span_icon/icons/websocket.svg rename to x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/icons/websocket.svg diff --git a/x-pack/plugins/apm/public/components/shared/span_icon/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/span_icon/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/span_icon/span_icon.stories.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/span_icon.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/span_icon/span_icon.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/span_icon.stories.tsx diff --git a/x-pack/plugins/apm/public/components/shared/span_links/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/span_links/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/span_links/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/span_links/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/span_links/span_links_callout.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/span_links/span_links_callout.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/span_links/span_links_callout.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/span_links/span_links_callout.tsx diff --git a/x-pack/plugins/apm/public/components/shared/span_links/span_links_tab_content.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/span_links/span_links_tab_content.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/span_links/span_links_tab_content.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/span_links/span_links_tab_content.tsx diff --git a/x-pack/plugins/apm/public/components/shared/span_links/span_links_table.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/span_links/span_links_table.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/span_links/span_links_table.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/span_links/span_links_table.tsx diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/__fixtures__/stacktraces.json b/x-pack/plugins/observability_solution/apm/public/components/shared/stacktrace/__fixtures__/stacktraces.json similarity index 100% rename from x-pack/plugins/apm/public/components/shared/stacktrace/__fixtures__/stacktraces.json rename to x-pack/plugins/observability_solution/apm/public/components/shared/stacktrace/__fixtures__/stacktraces.json diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/cause_stacktrace.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/stacktrace/cause_stacktrace.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/stacktrace/cause_stacktrace.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/stacktrace/cause_stacktrace.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/cause_stacktrace.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/stacktrace/cause_stacktrace.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/stacktrace/cause_stacktrace.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/stacktrace/cause_stacktrace.tsx diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/context.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/stacktrace/context.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/stacktrace/context.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/stacktrace/context.tsx diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/stacktrace/frame_heading.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/stacktrace/frame_heading.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/stacktrace/frame_heading.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/stacktrace/frame_heading.tsx diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/c_sharp_frame_heading_renderer.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/stacktrace/frame_heading_renderers/c_sharp_frame_heading_renderer.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/c_sharp_frame_heading_renderer.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/stacktrace/frame_heading_renderers/c_sharp_frame_heading_renderer.tsx diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/default_frame_heading_renderer.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/stacktrace/frame_heading_renderers/default_frame_heading_renderer.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/default_frame_heading_renderer.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/stacktrace/frame_heading_renderers/default_frame_heading_renderer.tsx diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/index.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/stacktrace/frame_heading_renderers/index.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/index.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/stacktrace/frame_heading_renderers/index.ts diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/java_frame_heading_renderer.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/stacktrace/frame_heading_renderers/java_frame_heading_renderer.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/java_frame_heading_renderer.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/stacktrace/frame_heading_renderers/java_frame_heading_renderer.tsx diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/java_script_frame_heading_renderer.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/stacktrace/frame_heading_renderers/java_script_frame_heading_renderer.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/java_script_frame_heading_renderer.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/stacktrace/frame_heading_renderers/java_script_frame_heading_renderer.tsx diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/php_frame_heading_renderer.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/stacktrace/frame_heading_renderers/php_frame_heading_renderer.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/php_frame_heading_renderer.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/stacktrace/frame_heading_renderers/php_frame_heading_renderer.tsx diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/ruby_frame_heading_renderer.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/stacktrace/frame_heading_renderers/ruby_frame_heading_renderer.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/stacktrace/frame_heading_renderers/ruby_frame_heading_renderer.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/stacktrace/frame_heading_renderers/ruby_frame_heading_renderer.tsx diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/stacktrace/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/stacktrace/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/stacktrace/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/library_stacktrace.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/stacktrace/library_stacktrace.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/stacktrace/library_stacktrace.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/stacktrace/library_stacktrace.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/library_stacktrace.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/stacktrace/library_stacktrace.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/stacktrace/library_stacktrace.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/stacktrace/library_stacktrace.tsx diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/stackframe.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/stacktrace/stackframe.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/stacktrace/stackframe.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/stacktrace/stackframe.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/stackframe.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/stacktrace/stackframe.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/stacktrace/stackframe.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/stacktrace/stackframe.tsx diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/stacktrace.test.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/stacktrace/stacktrace.test.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/stacktrace/stacktrace.test.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/stacktrace/stacktrace.test.ts diff --git a/x-pack/plugins/apm/public/components/shared/stacktrace/variables.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/stacktrace/variables.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/stacktrace/variables.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/stacktrace/variables.tsx diff --git a/x-pack/plugins/apm/public/components/shared/sticky_properties/__snapshots__/sticky_properties.test.tsx.snap b/x-pack/plugins/observability_solution/apm/public/components/shared/sticky_properties/__snapshots__/sticky_properties.test.tsx.snap similarity index 100% rename from x-pack/plugins/apm/public/components/shared/sticky_properties/__snapshots__/sticky_properties.test.tsx.snap rename to x-pack/plugins/observability_solution/apm/public/components/shared/sticky_properties/__snapshots__/sticky_properties.test.tsx.snap diff --git a/x-pack/plugins/apm/public/components/shared/sticky_properties/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/sticky_properties/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/sticky_properties/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/sticky_properties/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/sticky_properties/sticky_properties.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/sticky_properties/sticky_properties.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/sticky_properties/sticky_properties.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/sticky_properties/sticky_properties.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/suggestions_select/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/suggestions_select/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/suggestions_select/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/suggestions_select/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/suggestions_select/suggestions_select.stories.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/suggestions_select/suggestions_select.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/suggestions_select/suggestions_select.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/suggestions_select/suggestions_select.stories.tsx diff --git a/x-pack/plugins/apm/public/components/shared/suggestions_select/suggestions_select.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/suggestions_select/suggestions_select.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/suggestions_select/suggestions_select.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/suggestions_select/suggestions_select.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/summary/__fixtures__/transactions.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/summary/__fixtures__/transactions.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/summary/__fixtures__/transactions.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/summary/__fixtures__/transactions.ts diff --git a/x-pack/plugins/apm/public/components/shared/summary/composite_span_duration_summary_item.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/summary/composite_span_duration_summary_item.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/summary/composite_span_duration_summary_item.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/summary/composite_span_duration_summary_item.tsx diff --git a/x-pack/plugins/apm/public/components/shared/summary/duration_summary_item.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/summary/duration_summary_item.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/summary/duration_summary_item.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/summary/duration_summary_item.tsx diff --git a/x-pack/plugins/apm/public/components/shared/summary/error_count_summary_item_badge.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/summary/error_count_summary_item_badge.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/summary/error_count_summary_item_badge.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/summary/error_count_summary_item_badge.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/summary/error_count_summary_item_badge.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/summary/error_count_summary_item_badge.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/summary/error_count_summary_item_badge.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/summary/error_count_summary_item_badge.tsx diff --git a/x-pack/plugins/apm/public/components/shared/summary/http_info_summary_item/http_info_summary_item.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/summary/http_info_summary_item/http_info_summary_item.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/summary/http_info_summary_item/http_info_summary_item.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/summary/http_info_summary_item/http_info_summary_item.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/summary/http_info_summary_item/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/summary/http_info_summary_item/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/summary/http_info_summary_item/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/summary/http_info_summary_item/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/summary/http_status_badge/http_status_badge.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/summary/http_status_badge/http_status_badge.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/summary/http_status_badge/http_status_badge.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/summary/http_status_badge/http_status_badge.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/summary/http_status_badge/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/summary/http_status_badge/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/summary/http_status_badge/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/summary/http_status_badge/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/summary/http_status_badge/status_codes.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/summary/http_status_badge/status_codes.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/summary/http_status_badge/status_codes.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/summary/http_status_badge/status_codes.ts diff --git a/x-pack/plugins/apm/public/components/shared/summary/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/summary/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/summary/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/summary/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/summary/transaction_result_summary_item.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/summary/transaction_result_summary_item.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/summary/transaction_result_summary_item.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/summary/transaction_result_summary_item.tsx diff --git a/x-pack/plugins/apm/public/components/shared/summary/transaction_summary.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/summary/transaction_summary.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/summary/transaction_summary.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/summary/transaction_summary.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/summary/transaction_summary.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/summary/transaction_summary.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/summary/transaction_summary.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/summary/transaction_summary.tsx diff --git a/x-pack/plugins/apm/public/components/shared/summary/user_agent_summary_item.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/summary/user_agent_summary_item.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/summary/user_agent_summary_item.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/summary/user_agent_summary_item.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/summary/user_agent_summary_item.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/summary/user_agent_summary_item.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/summary/user_agent_summary_item.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/summary/user_agent_summary_item.tsx diff --git a/x-pack/plugins/apm/public/components/shared/table_search_bar/table_search_bar.test.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/table_search_bar/table_search_bar.test.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/table_search_bar/table_search_bar.test.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/table_search_bar/table_search_bar.test.ts diff --git a/x-pack/plugins/apm/public/components/shared/table_search_bar/table_search_bar.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/table_search_bar/table_search_bar.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/table_search_bar/table_search_bar.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/table_search_bar/table_search_bar.tsx diff --git a/x-pack/plugins/apm/public/components/shared/technical_preview_badge.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/technical_preview_badge.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/technical_preview_badge.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/technical_preview_badge.tsx diff --git a/x-pack/plugins/apm/public/components/shared/time_comparison/comparison.test.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/time_comparison/comparison.test.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/time_comparison/comparison.test.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/time_comparison/comparison.test.ts diff --git a/x-pack/plugins/apm/public/components/shared/time_comparison/get_comparison_chart_theme.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/time_comparison/get_comparison_chart_theme.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/time_comparison/get_comparison_chart_theme.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/time_comparison/get_comparison_chart_theme.ts diff --git a/x-pack/plugins/apm/public/components/shared/time_comparison/get_comparison_enabled.test.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/time_comparison/get_comparison_enabled.test.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/time_comparison/get_comparison_enabled.test.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/time_comparison/get_comparison_enabled.test.ts diff --git a/x-pack/plugins/apm/public/components/shared/time_comparison/get_comparison_enabled.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/time_comparison/get_comparison_enabled.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/time_comparison/get_comparison_enabled.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/time_comparison/get_comparison_enabled.ts diff --git a/x-pack/plugins/apm/public/components/shared/time_comparison/get_comparison_options.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/time_comparison/get_comparison_options.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/time_comparison/get_comparison_options.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/time_comparison/get_comparison_options.ts diff --git a/x-pack/plugins/apm/public/components/shared/time_comparison/index.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/time_comparison/index.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/time_comparison/index.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/time_comparison/index.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/time_comparison/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/time_comparison/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/time_comparison/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/time_comparison/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/timestamp_tooltip/index.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/timestamp_tooltip/index.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/timestamp_tooltip/index.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/timestamp_tooltip/index.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/timestamp_tooltip/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/timestamp_tooltip/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/timestamp_tooltip/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/timestamp_tooltip/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/__fixtures__/mock_data.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/transaction_action_menu/__fixtures__/mock_data.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/transaction_action_menu/__fixtures__/mock_data.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/transaction_action_menu/__fixtures__/mock_data.ts diff --git a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/__snapshots__/transaction_action_menu.test.tsx.snap b/x-pack/plugins/observability_solution/apm/public/components/shared/transaction_action_menu/__snapshots__/transaction_action_menu.test.tsx.snap similarity index 100% rename from x-pack/plugins/apm/public/components/shared/transaction_action_menu/__snapshots__/transaction_action_menu.test.tsx.snap rename to x-pack/plugins/observability_solution/apm/public/components/shared/transaction_action_menu/__snapshots__/transaction_action_menu.test.tsx.snap diff --git a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/custom_link_flyout.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/transaction_action_menu/custom_link_flyout.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/transaction_action_menu/custom_link_flyout.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/transaction_action_menu/custom_link_flyout.tsx diff --git a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/custom_link_menu_section/custom_link_list.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/transaction_action_menu/custom_link_menu_section/custom_link_list.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/transaction_action_menu/custom_link_menu_section/custom_link_list.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/transaction_action_menu/custom_link_menu_section/custom_link_list.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/custom_link_menu_section/custom_link_list.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/transaction_action_menu/custom_link_menu_section/custom_link_list.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/transaction_action_menu/custom_link_menu_section/custom_link_list.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/transaction_action_menu/custom_link_menu_section/custom_link_list.tsx diff --git a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/custom_link_menu_section/custom_link_toolbar.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/transaction_action_menu/custom_link_menu_section/custom_link_toolbar.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/transaction_action_menu/custom_link_menu_section/custom_link_toolbar.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/transaction_action_menu/custom_link_menu_section/custom_link_toolbar.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/custom_link_menu_section/custom_link_toolbar.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/transaction_action_menu/custom_link_menu_section/custom_link_toolbar.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/transaction_action_menu/custom_link_menu_section/custom_link_toolbar.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/transaction_action_menu/custom_link_menu_section/custom_link_toolbar.tsx diff --git a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/custom_link_menu_section/index.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/transaction_action_menu/custom_link_menu_section/index.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/transaction_action_menu/custom_link_menu_section/index.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/transaction_action_menu/custom_link_menu_section/index.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/custom_link_menu_section/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/transaction_action_menu/custom_link_menu_section/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/transaction_action_menu/custom_link_menu_section/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/transaction_action_menu/custom_link_menu_section/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/sections.test.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/transaction_action_menu/sections.test.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/transaction_action_menu/sections.test.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/transaction_action_menu/sections.test.ts diff --git a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/sections.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/transaction_action_menu/sections.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/transaction_action_menu/sections.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/transaction_action_menu/sections.ts diff --git a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/sections_helper.test.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/transaction_action_menu/sections_helper.test.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/transaction_action_menu/sections_helper.test.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/transaction_action_menu/sections_helper.test.ts diff --git a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/sections_helper.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/transaction_action_menu/sections_helper.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/transaction_action_menu/sections_helper.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/transaction_action_menu/sections_helper.ts diff --git a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/transaction_action_menu.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/transaction_action_menu/transaction_action_menu.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/transaction_action_menu/transaction_action_menu.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/transaction_action_menu/transaction_action_menu.test.tsx diff --git a/x-pack/plugins/apm/public/components/shared/transaction_action_menu/transaction_action_menu.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/transaction_action_menu/transaction_action_menu.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/transaction_action_menu/transaction_action_menu.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/transaction_action_menu/transaction_action_menu.tsx diff --git a/x-pack/plugins/apm/public/components/shared/transaction_type_select.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/transaction_type_select.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/transaction_type_select.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/transaction_type_select.tsx diff --git a/x-pack/plugins/apm/public/components/shared/transactions_table/get_columns.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/transactions_table/get_columns.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/transactions_table/get_columns.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/transactions_table/get_columns.tsx diff --git a/x-pack/plugins/apm/public/components/shared/transactions_table/get_latency_column_label.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/transactions_table/get_latency_column_label.ts similarity index 100% rename from x-pack/plugins/apm/public/components/shared/transactions_table/get_latency_column_label.ts rename to x-pack/plugins/observability_solution/apm/public/components/shared/transactions_table/get_latency_column_label.ts diff --git a/x-pack/plugins/apm/public/components/shared/transactions_table/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/transactions_table/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/transactions_table/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/transactions_table/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/truncate_with_tooltip/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/truncate_with_tooltip/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/truncate_with_tooltip/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/truncate_with_tooltip/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/unified_search_bar/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/unified_search_bar/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/unified_search_bar/index.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/unified_search_bar/index.tsx diff --git a/x-pack/plugins/apm/public/components/shared/unified_search_bar/unified_search_bar.test.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/unified_search_bar/unified_search_bar.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/components/shared/unified_search_bar/unified_search_bar.test.tsx rename to x-pack/plugins/observability_solution/apm/public/components/shared/unified_search_bar/unified_search_bar.test.tsx diff --git a/x-pack/plugins/apm/public/context/annotations/annotations_context.tsx b/x-pack/plugins/observability_solution/apm/public/context/annotations/annotations_context.tsx similarity index 100% rename from x-pack/plugins/apm/public/context/annotations/annotations_context.tsx rename to x-pack/plugins/observability_solution/apm/public/context/annotations/annotations_context.tsx diff --git a/x-pack/plugins/apm/public/context/annotations/use_annotations_context.ts b/x-pack/plugins/observability_solution/apm/public/context/annotations/use_annotations_context.ts similarity index 100% rename from x-pack/plugins/apm/public/context/annotations/use_annotations_context.ts rename to x-pack/plugins/observability_solution/apm/public/context/annotations/use_annotations_context.ts diff --git a/x-pack/plugins/apm/public/context/anomaly_detection_jobs/anomaly_detection_jobs_context.tsx b/x-pack/plugins/observability_solution/apm/public/context/anomaly_detection_jobs/anomaly_detection_jobs_context.tsx similarity index 100% rename from x-pack/plugins/apm/public/context/anomaly_detection_jobs/anomaly_detection_jobs_context.tsx rename to x-pack/plugins/observability_solution/apm/public/context/anomaly_detection_jobs/anomaly_detection_jobs_context.tsx diff --git a/x-pack/plugins/apm/public/context/anomaly_detection_jobs/use_anomaly_detection_jobs_context.ts b/x-pack/plugins/observability_solution/apm/public/context/anomaly_detection_jobs/use_anomaly_detection_jobs_context.ts similarity index 100% rename from x-pack/plugins/apm/public/context/anomaly_detection_jobs/use_anomaly_detection_jobs_context.ts rename to x-pack/plugins/observability_solution/apm/public/context/anomaly_detection_jobs/use_anomaly_detection_jobs_context.ts diff --git a/x-pack/plugins/apm/public/context/apm_plugin/apm_plugin_context.tsx b/x-pack/plugins/observability_solution/apm/public/context/apm_plugin/apm_plugin_context.tsx similarity index 100% rename from x-pack/plugins/apm/public/context/apm_plugin/apm_plugin_context.tsx rename to x-pack/plugins/observability_solution/apm/public/context/apm_plugin/apm_plugin_context.tsx diff --git a/x-pack/plugins/apm/public/context/apm_plugin/mock_apm_plugin_context.tsx b/x-pack/plugins/observability_solution/apm/public/context/apm_plugin/mock_apm_plugin_context.tsx similarity index 100% rename from x-pack/plugins/apm/public/context/apm_plugin/mock_apm_plugin_context.tsx rename to x-pack/plugins/observability_solution/apm/public/context/apm_plugin/mock_apm_plugin_context.tsx diff --git a/x-pack/plugins/apm/public/context/apm_plugin/mock_apm_plugin_storybook.tsx b/x-pack/plugins/observability_solution/apm/public/context/apm_plugin/mock_apm_plugin_storybook.tsx similarity index 100% rename from x-pack/plugins/apm/public/context/apm_plugin/mock_apm_plugin_storybook.tsx rename to x-pack/plugins/observability_solution/apm/public/context/apm_plugin/mock_apm_plugin_storybook.tsx diff --git a/x-pack/plugins/apm/public/context/apm_plugin/use_apm_plugin_context.ts b/x-pack/plugins/observability_solution/apm/public/context/apm_plugin/use_apm_plugin_context.ts similarity index 100% rename from x-pack/plugins/apm/public/context/apm_plugin/use_apm_plugin_context.ts rename to x-pack/plugins/observability_solution/apm/public/context/apm_plugin/use_apm_plugin_context.ts diff --git a/x-pack/plugins/apm/public/context/apm_service/apm_service_context.test.tsx b/x-pack/plugins/observability_solution/apm/public/context/apm_service/apm_service_context.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/context/apm_service/apm_service_context.test.tsx rename to x-pack/plugins/observability_solution/apm/public/context/apm_service/apm_service_context.test.tsx diff --git a/x-pack/plugins/apm/public/context/apm_service/apm_service_context.tsx b/x-pack/plugins/observability_solution/apm/public/context/apm_service/apm_service_context.tsx similarity index 100% rename from x-pack/plugins/apm/public/context/apm_service/apm_service_context.tsx rename to x-pack/plugins/observability_solution/apm/public/context/apm_service/apm_service_context.tsx diff --git a/x-pack/plugins/apm/public/context/apm_service/use_apm_service_context.ts b/x-pack/plugins/observability_solution/apm/public/context/apm_service/use_apm_service_context.ts similarity index 100% rename from x-pack/plugins/apm/public/context/apm_service/use_apm_service_context.ts rename to x-pack/plugins/observability_solution/apm/public/context/apm_service/use_apm_service_context.ts diff --git a/x-pack/plugins/apm/public/context/apm_service/use_service_agent_fetcher.ts b/x-pack/plugins/observability_solution/apm/public/context/apm_service/use_service_agent_fetcher.ts similarity index 100% rename from x-pack/plugins/apm/public/context/apm_service/use_service_agent_fetcher.ts rename to x-pack/plugins/observability_solution/apm/public/context/apm_service/use_service_agent_fetcher.ts diff --git a/x-pack/plugins/apm/public/context/apm_service/use_service_transaction_types_fetcher.tsx b/x-pack/plugins/observability_solution/apm/public/context/apm_service/use_service_transaction_types_fetcher.tsx similarity index 100% rename from x-pack/plugins/apm/public/context/apm_service/use_service_transaction_types_fetcher.tsx rename to x-pack/plugins/observability_solution/apm/public/context/apm_service/use_service_transaction_types_fetcher.tsx diff --git a/x-pack/plugins/apm/public/context/breadcrumbs/context.tsx b/x-pack/plugins/observability_solution/apm/public/context/breadcrumbs/context.tsx similarity index 100% rename from x-pack/plugins/apm/public/context/breadcrumbs/context.tsx rename to x-pack/plugins/observability_solution/apm/public/context/breadcrumbs/context.tsx diff --git a/x-pack/plugins/apm/public/context/breadcrumbs/use_breadcrumb.ts b/x-pack/plugins/observability_solution/apm/public/context/breadcrumbs/use_breadcrumb.ts similarity index 100% rename from x-pack/plugins/apm/public/context/breadcrumbs/use_breadcrumb.ts rename to x-pack/plugins/observability_solution/apm/public/context/breadcrumbs/use_breadcrumb.ts diff --git a/x-pack/plugins/apm/public/context/chart_pointer_event/chart_pointer_event_context.tsx b/x-pack/plugins/observability_solution/apm/public/context/chart_pointer_event/chart_pointer_event_context.tsx similarity index 100% rename from x-pack/plugins/apm/public/context/chart_pointer_event/chart_pointer_event_context.tsx rename to x-pack/plugins/observability_solution/apm/public/context/chart_pointer_event/chart_pointer_event_context.tsx diff --git a/x-pack/plugins/apm/public/context/chart_pointer_event/use_chart_pointer_event_context.tsx b/x-pack/plugins/observability_solution/apm/public/context/chart_pointer_event/use_chart_pointer_event_context.tsx similarity index 100% rename from x-pack/plugins/apm/public/context/chart_pointer_event/use_chart_pointer_event_context.tsx rename to x-pack/plugins/observability_solution/apm/public/context/chart_pointer_event/use_chart_pointer_event_context.tsx diff --git a/x-pack/plugins/apm/public/context/environments_context/environments_context.tsx b/x-pack/plugins/observability_solution/apm/public/context/environments_context/environments_context.tsx similarity index 100% rename from x-pack/plugins/apm/public/context/environments_context/environments_context.tsx rename to x-pack/plugins/observability_solution/apm/public/context/environments_context/environments_context.tsx diff --git a/x-pack/plugins/apm/public/context/environments_context/use_environments_context.tsx b/x-pack/plugins/observability_solution/apm/public/context/environments_context/use_environments_context.tsx similarity index 100% rename from x-pack/plugins/apm/public/context/environments_context/use_environments_context.tsx rename to x-pack/plugins/observability_solution/apm/public/context/environments_context/use_environments_context.tsx diff --git a/x-pack/plugins/apm/public/context/kibana_environment_context/kibana_environment_context.tsx b/x-pack/plugins/observability_solution/apm/public/context/kibana_environment_context/kibana_environment_context.tsx similarity index 100% rename from x-pack/plugins/apm/public/context/kibana_environment_context/kibana_environment_context.tsx rename to x-pack/plugins/observability_solution/apm/public/context/kibana_environment_context/kibana_environment_context.tsx diff --git a/x-pack/plugins/apm/public/context/kibana_environment_context/use_kibana_environment_context.tsx b/x-pack/plugins/observability_solution/apm/public/context/kibana_environment_context/use_kibana_environment_context.tsx similarity index 100% rename from x-pack/plugins/apm/public/context/kibana_environment_context/use_kibana_environment_context.tsx rename to x-pack/plugins/observability_solution/apm/public/context/kibana_environment_context/use_kibana_environment_context.tsx diff --git a/x-pack/plugins/apm/public/context/license/invalid_license_notification.tsx b/x-pack/plugins/observability_solution/apm/public/context/license/invalid_license_notification.tsx similarity index 100% rename from x-pack/plugins/apm/public/context/license/invalid_license_notification.tsx rename to x-pack/plugins/observability_solution/apm/public/context/license/invalid_license_notification.tsx diff --git a/x-pack/plugins/apm/public/context/license/license_context.tsx b/x-pack/plugins/observability_solution/apm/public/context/license/license_context.tsx similarity index 100% rename from x-pack/plugins/apm/public/context/license/license_context.tsx rename to x-pack/plugins/observability_solution/apm/public/context/license/license_context.tsx diff --git a/x-pack/plugins/apm/public/context/license/use_license_context.ts b/x-pack/plugins/observability_solution/apm/public/context/license/use_license_context.ts similarity index 100% rename from x-pack/plugins/apm/public/context/license/use_license_context.ts rename to x-pack/plugins/observability_solution/apm/public/context/license/use_license_context.ts diff --git a/x-pack/plugins/apm/public/context/service_anomaly_timeseries/service_anomaly_timeseries_context.tsx b/x-pack/plugins/observability_solution/apm/public/context/service_anomaly_timeseries/service_anomaly_timeseries_context.tsx similarity index 100% rename from x-pack/plugins/apm/public/context/service_anomaly_timeseries/service_anomaly_timeseries_context.tsx rename to x-pack/plugins/observability_solution/apm/public/context/service_anomaly_timeseries/service_anomaly_timeseries_context.tsx diff --git a/x-pack/plugins/apm/public/context/service_anomaly_timeseries/use_service_anomaly_timeseries_context.tsx b/x-pack/plugins/observability_solution/apm/public/context/service_anomaly_timeseries/use_service_anomaly_timeseries_context.tsx similarity index 100% rename from x-pack/plugins/apm/public/context/service_anomaly_timeseries/use_service_anomaly_timeseries_context.tsx rename to x-pack/plugins/observability_solution/apm/public/context/service_anomaly_timeseries/use_service_anomaly_timeseries_context.tsx diff --git a/x-pack/plugins/apm/public/context/time_range_id/time_range_id_context.tsx b/x-pack/plugins/observability_solution/apm/public/context/time_range_id/time_range_id_context.tsx similarity index 100% rename from x-pack/plugins/apm/public/context/time_range_id/time_range_id_context.tsx rename to x-pack/plugins/observability_solution/apm/public/context/time_range_id/time_range_id_context.tsx diff --git a/x-pack/plugins/apm/public/context/time_range_id/use_time_range_id.ts b/x-pack/plugins/observability_solution/apm/public/context/time_range_id/use_time_range_id.ts similarity index 100% rename from x-pack/plugins/apm/public/context/time_range_id/use_time_range_id.ts rename to x-pack/plugins/observability_solution/apm/public/context/time_range_id/use_time_range_id.ts diff --git a/x-pack/plugins/apm/public/context/time_range_metadata/mock_time_range_metadata_context_provider.tsx b/x-pack/plugins/observability_solution/apm/public/context/time_range_metadata/mock_time_range_metadata_context_provider.tsx similarity index 100% rename from x-pack/plugins/apm/public/context/time_range_metadata/mock_time_range_metadata_context_provider.tsx rename to x-pack/plugins/observability_solution/apm/public/context/time_range_metadata/mock_time_range_metadata_context_provider.tsx diff --git a/x-pack/plugins/apm/public/context/time_range_metadata/time_range_metadata_context.tsx b/x-pack/plugins/observability_solution/apm/public/context/time_range_metadata/time_range_metadata_context.tsx similarity index 100% rename from x-pack/plugins/apm/public/context/time_range_metadata/time_range_metadata_context.tsx rename to x-pack/plugins/observability_solution/apm/public/context/time_range_metadata/time_range_metadata_context.tsx diff --git a/x-pack/plugins/apm/public/context/time_range_metadata/use_search_service_destination_metrics.ts b/x-pack/plugins/observability_solution/apm/public/context/time_range_metadata/use_search_service_destination_metrics.ts similarity index 100% rename from x-pack/plugins/apm/public/context/time_range_metadata/use_search_service_destination_metrics.ts rename to x-pack/plugins/observability_solution/apm/public/context/time_range_metadata/use_search_service_destination_metrics.ts diff --git a/x-pack/plugins/apm/public/context/time_range_metadata/use_time_range_metadata_context.ts b/x-pack/plugins/observability_solution/apm/public/context/time_range_metadata/use_time_range_metadata_context.ts similarity index 100% rename from x-pack/plugins/apm/public/context/time_range_metadata/use_time_range_metadata_context.ts rename to x-pack/plugins/observability_solution/apm/public/context/time_range_metadata/use_time_range_metadata_context.ts diff --git a/x-pack/plugins/apm/public/context/url_params_context/constants.ts b/x-pack/plugins/observability_solution/apm/public/context/url_params_context/constants.ts similarity index 100% rename from x-pack/plugins/apm/public/context/url_params_context/constants.ts rename to x-pack/plugins/observability_solution/apm/public/context/url_params_context/constants.ts diff --git a/x-pack/plugins/apm/public/context/url_params_context/helpers.test.ts b/x-pack/plugins/observability_solution/apm/public/context/url_params_context/helpers.test.ts similarity index 100% rename from x-pack/plugins/apm/public/context/url_params_context/helpers.test.ts rename to x-pack/plugins/observability_solution/apm/public/context/url_params_context/helpers.test.ts diff --git a/x-pack/plugins/apm/public/context/url_params_context/helpers.ts b/x-pack/plugins/observability_solution/apm/public/context/url_params_context/helpers.ts similarity index 100% rename from x-pack/plugins/apm/public/context/url_params_context/helpers.ts rename to x-pack/plugins/observability_solution/apm/public/context/url_params_context/helpers.ts diff --git a/x-pack/plugins/apm/public/context/url_params_context/mock_url_params_context_provider.tsx b/x-pack/plugins/observability_solution/apm/public/context/url_params_context/mock_url_params_context_provider.tsx similarity index 100% rename from x-pack/plugins/apm/public/context/url_params_context/mock_url_params_context_provider.tsx rename to x-pack/plugins/observability_solution/apm/public/context/url_params_context/mock_url_params_context_provider.tsx diff --git a/x-pack/plugins/apm/public/context/url_params_context/resolve_url_params.ts b/x-pack/plugins/observability_solution/apm/public/context/url_params_context/resolve_url_params.ts similarity index 100% rename from x-pack/plugins/apm/public/context/url_params_context/resolve_url_params.ts rename to x-pack/plugins/observability_solution/apm/public/context/url_params_context/resolve_url_params.ts diff --git a/x-pack/plugins/apm/public/context/url_params_context/types.ts b/x-pack/plugins/observability_solution/apm/public/context/url_params_context/types.ts similarity index 100% rename from x-pack/plugins/apm/public/context/url_params_context/types.ts rename to x-pack/plugins/observability_solution/apm/public/context/url_params_context/types.ts diff --git a/x-pack/plugins/apm/public/context/url_params_context/url_params_context.test.tsx b/x-pack/plugins/observability_solution/apm/public/context/url_params_context/url_params_context.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/context/url_params_context/url_params_context.test.tsx rename to x-pack/plugins/observability_solution/apm/public/context/url_params_context/url_params_context.test.tsx diff --git a/x-pack/plugins/apm/public/context/url_params_context/url_params_context.tsx b/x-pack/plugins/observability_solution/apm/public/context/url_params_context/url_params_context.tsx similarity index 100% rename from x-pack/plugins/apm/public/context/url_params_context/url_params_context.tsx rename to x-pack/plugins/observability_solution/apm/public/context/url_params_context/url_params_context.tsx diff --git a/x-pack/plugins/apm/public/context/url_params_context/use_url_params.tsx b/x-pack/plugins/observability_solution/apm/public/context/url_params_context/use_url_params.tsx similarity index 100% rename from x-pack/plugins/apm/public/context/url_params_context/use_url_params.tsx rename to x-pack/plugins/observability_solution/apm/public/context/url_params_context/use_url_params.tsx diff --git a/x-pack/plugins/apm/public/feature_catalogue_entry.ts b/x-pack/plugins/observability_solution/apm/public/feature_catalogue_entry.ts similarity index 100% rename from x-pack/plugins/apm/public/feature_catalogue_entry.ts rename to x-pack/plugins/observability_solution/apm/public/feature_catalogue_entry.ts diff --git a/x-pack/plugins/apm/public/hooks/create_shared_use_fetcher.tsx b/x-pack/plugins/observability_solution/apm/public/hooks/create_shared_use_fetcher.tsx similarity index 100% rename from x-pack/plugins/apm/public/hooks/create_shared_use_fetcher.tsx rename to x-pack/plugins/observability_solution/apm/public/hooks/create_shared_use_fetcher.tsx diff --git a/x-pack/plugins/apm/public/hooks/use_adhoc_apm_data_view.ts b/x-pack/plugins/observability_solution/apm/public/hooks/use_adhoc_apm_data_view.ts similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_adhoc_apm_data_view.ts rename to x-pack/plugins/observability_solution/apm/public/hooks/use_adhoc_apm_data_view.ts diff --git a/x-pack/plugins/apm/public/hooks/use_apm_feature_flag.ts b/x-pack/plugins/observability_solution/apm/public/hooks/use_apm_feature_flag.ts similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_apm_feature_flag.ts rename to x-pack/plugins/observability_solution/apm/public/hooks/use_apm_feature_flag.ts diff --git a/x-pack/plugins/apm/public/hooks/use_apm_params.ts b/x-pack/plugins/observability_solution/apm/public/hooks/use_apm_params.ts similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_apm_params.ts rename to x-pack/plugins/observability_solution/apm/public/hooks/use_apm_params.ts diff --git a/x-pack/plugins/apm/public/hooks/use_apm_route_path.ts b/x-pack/plugins/observability_solution/apm/public/hooks/use_apm_route_path.ts similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_apm_route_path.ts rename to x-pack/plugins/observability_solution/apm/public/hooks/use_apm_route_path.ts diff --git a/x-pack/plugins/apm/public/hooks/use_apm_router.ts b/x-pack/plugins/observability_solution/apm/public/hooks/use_apm_router.ts similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_apm_router.ts rename to x-pack/plugins/observability_solution/apm/public/hooks/use_apm_router.ts diff --git a/x-pack/plugins/apm/public/hooks/use_breakpoints.test.tsx b/x-pack/plugins/observability_solution/apm/public/hooks/use_breakpoints.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_breakpoints.test.tsx rename to x-pack/plugins/observability_solution/apm/public/hooks/use_breakpoints.test.tsx diff --git a/x-pack/plugins/apm/public/hooks/use_breakpoints.ts b/x-pack/plugins/observability_solution/apm/public/hooks/use_breakpoints.ts similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_breakpoints.ts rename to x-pack/plugins/observability_solution/apm/public/hooks/use_breakpoints.ts diff --git a/x-pack/plugins/apm/public/hooks/use_crash_group_distribution_fetcher.tsx b/x-pack/plugins/observability_solution/apm/public/hooks/use_crash_group_distribution_fetcher.tsx similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_crash_group_distribution_fetcher.tsx rename to x-pack/plugins/observability_solution/apm/public/hooks/use_crash_group_distribution_fetcher.tsx diff --git a/x-pack/plugins/apm/public/hooks/use_critical_path_feature_enabled_setting.ts b/x-pack/plugins/observability_solution/apm/public/hooks/use_critical_path_feature_enabled_setting.ts similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_critical_path_feature_enabled_setting.ts rename to x-pack/plugins/observability_solution/apm/public/hooks/use_critical_path_feature_enabled_setting.ts diff --git a/x-pack/plugins/apm/public/hooks/use_current_user.ts b/x-pack/plugins/observability_solution/apm/public/hooks/use_current_user.ts similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_current_user.ts rename to x-pack/plugins/observability_solution/apm/public/hooks/use_current_user.ts diff --git a/x-pack/plugins/apm/public/hooks/use_dashboards_fetcher.ts b/x-pack/plugins/observability_solution/apm/public/hooks/use_dashboards_fetcher.ts similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_dashboards_fetcher.ts rename to x-pack/plugins/observability_solution/apm/public/hooks/use_dashboards_fetcher.ts diff --git a/x-pack/plugins/apm/public/hooks/use_date_range_redirect.ts b/x-pack/plugins/observability_solution/apm/public/hooks/use_date_range_redirect.ts similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_date_range_redirect.ts rename to x-pack/plugins/observability_solution/apm/public/hooks/use_date_range_redirect.ts diff --git a/x-pack/plugins/apm/public/hooks/use_debounce.test.tsx b/x-pack/plugins/observability_solution/apm/public/hooks/use_debounce.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_debounce.test.tsx rename to x-pack/plugins/observability_solution/apm/public/hooks/use_debounce.test.tsx diff --git a/x-pack/plugins/apm/public/hooks/use_debounce.tsx b/x-pack/plugins/observability_solution/apm/public/hooks/use_debounce.tsx similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_debounce.tsx rename to x-pack/plugins/observability_solution/apm/public/hooks/use_debounce.tsx diff --git a/x-pack/plugins/apm/public/hooks/use_deep_object_identity.ts b/x-pack/plugins/observability_solution/apm/public/hooks/use_deep_object_identity.ts similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_deep_object_identity.ts rename to x-pack/plugins/observability_solution/apm/public/hooks/use_deep_object_identity.ts diff --git a/x-pack/plugins/apm/public/hooks/use_default_environment.ts b/x-pack/plugins/observability_solution/apm/public/hooks/use_default_environment.ts similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_default_environment.ts rename to x-pack/plugins/observability_solution/apm/public/hooks/use_default_environment.ts diff --git a/x-pack/plugins/apm/public/hooks/use_default_time_range.ts b/x-pack/plugins/observability_solution/apm/public/hooks/use_default_time_range.ts similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_default_time_range.ts rename to x-pack/plugins/observability_solution/apm/public/hooks/use_default_time_range.ts diff --git a/x-pack/plugins/apm/public/hooks/use_dependency_detail_operations_breadcrumb.ts b/x-pack/plugins/observability_solution/apm/public/hooks/use_dependency_detail_operations_breadcrumb.ts similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_dependency_detail_operations_breadcrumb.ts rename to x-pack/plugins/observability_solution/apm/public/hooks/use_dependency_detail_operations_breadcrumb.ts diff --git a/x-pack/plugins/apm/public/hooks/use_environments_fetcher.tsx b/x-pack/plugins/observability_solution/apm/public/hooks/use_environments_fetcher.tsx similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_environments_fetcher.tsx rename to x-pack/plugins/observability_solution/apm/public/hooks/use_environments_fetcher.tsx diff --git a/x-pack/plugins/apm/public/hooks/use_error_group_distribution_fetcher.tsx b/x-pack/plugins/observability_solution/apm/public/hooks/use_error_group_distribution_fetcher.tsx similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_error_group_distribution_fetcher.tsx rename to x-pack/plugins/observability_solution/apm/public/hooks/use_error_group_distribution_fetcher.tsx diff --git a/x-pack/plugins/apm/public/hooks/use_fallback_to_transactions_fetcher.tsx b/x-pack/plugins/observability_solution/apm/public/hooks/use_fallback_to_transactions_fetcher.tsx similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_fallback_to_transactions_fetcher.tsx rename to x-pack/plugins/observability_solution/apm/public/hooks/use_fallback_to_transactions_fetcher.tsx diff --git a/x-pack/plugins/apm/public/hooks/use_fetcher.integration.test.tsx b/x-pack/plugins/observability_solution/apm/public/hooks/use_fetcher.integration.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_fetcher.integration.test.tsx rename to x-pack/plugins/observability_solution/apm/public/hooks/use_fetcher.integration.test.tsx diff --git a/x-pack/plugins/apm/public/hooks/use_fetcher.test.tsx b/x-pack/plugins/observability_solution/apm/public/hooks/use_fetcher.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_fetcher.test.tsx rename to x-pack/plugins/observability_solution/apm/public/hooks/use_fetcher.test.tsx diff --git a/x-pack/plugins/apm/public/hooks/use_fetcher.tsx b/x-pack/plugins/observability_solution/apm/public/hooks/use_fetcher.tsx similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_fetcher.tsx rename to x-pack/plugins/observability_solution/apm/public/hooks/use_fetcher.tsx diff --git a/x-pack/plugins/apm/public/hooks/use_filters_for_embeddable_charts.ts b/x-pack/plugins/observability_solution/apm/public/hooks/use_filters_for_embeddable_charts.ts similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_filters_for_embeddable_charts.ts rename to x-pack/plugins/observability_solution/apm/public/hooks/use_filters_for_embeddable_charts.ts diff --git a/x-pack/plugins/apm/public/hooks/use_kibana_url.ts b/x-pack/plugins/observability_solution/apm/public/hooks/use_kibana_url.ts similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_kibana_url.ts rename to x-pack/plugins/observability_solution/apm/public/hooks/use_kibana_url.ts diff --git a/x-pack/plugins/apm/public/hooks/use_local_storage.ts b/x-pack/plugins/observability_solution/apm/public/hooks/use_local_storage.ts similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_local_storage.ts rename to x-pack/plugins/observability_solution/apm/public/hooks/use_local_storage.ts diff --git a/x-pack/plugins/apm/public/hooks/use_ml_manage_jobs_href.ts b/x-pack/plugins/observability_solution/apm/public/hooks/use_ml_manage_jobs_href.ts similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_ml_manage_jobs_href.ts rename to x-pack/plugins/observability_solution/apm/public/hooks/use_ml_manage_jobs_href.ts diff --git a/x-pack/plugins/apm/public/hooks/use_preferred_data_source_and_bucket_size.ts b/x-pack/plugins/observability_solution/apm/public/hooks/use_preferred_data_source_and_bucket_size.ts similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_preferred_data_source_and_bucket_size.ts rename to x-pack/plugins/observability_solution/apm/public/hooks/use_preferred_data_source_and_bucket_size.ts diff --git a/x-pack/plugins/apm/public/hooks/use_preferred_service_anomaly_timeseries.ts b/x-pack/plugins/observability_solution/apm/public/hooks/use_preferred_service_anomaly_timeseries.ts similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_preferred_service_anomaly_timeseries.ts rename to x-pack/plugins/observability_solution/apm/public/hooks/use_preferred_service_anomaly_timeseries.ts diff --git a/x-pack/plugins/apm/public/hooks/use_previous_period_text.ts b/x-pack/plugins/observability_solution/apm/public/hooks/use_previous_period_text.ts similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_previous_period_text.ts rename to x-pack/plugins/observability_solution/apm/public/hooks/use_previous_period_text.ts diff --git a/x-pack/plugins/apm/public/hooks/use_processor_event.ts b/x-pack/plugins/observability_solution/apm/public/hooks/use_processor_event.ts similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_processor_event.ts rename to x-pack/plugins/observability_solution/apm/public/hooks/use_processor_event.ts diff --git a/x-pack/plugins/apm/public/hooks/use_profiling_integration_setting.ts b/x-pack/plugins/observability_solution/apm/public/hooks/use_profiling_integration_setting.ts similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_profiling_integration_setting.ts rename to x-pack/plugins/observability_solution/apm/public/hooks/use_profiling_integration_setting.ts diff --git a/x-pack/plugins/apm/public/hooks/use_profiling_plugin.tsx b/x-pack/plugins/observability_solution/apm/public/hooks/use_profiling_plugin.tsx similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_profiling_plugin.tsx rename to x-pack/plugins/observability_solution/apm/public/hooks/use_profiling_plugin.tsx diff --git a/x-pack/plugins/apm/public/hooks/use_progressive_fetcher.tsx b/x-pack/plugins/observability_solution/apm/public/hooks/use_progressive_fetcher.tsx similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_progressive_fetcher.tsx rename to x-pack/plugins/observability_solution/apm/public/hooks/use_progressive_fetcher.tsx diff --git a/x-pack/plugins/apm/public/hooks/use_sample_chart_selection.ts b/x-pack/plugins/observability_solution/apm/public/hooks/use_sample_chart_selection.ts similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_sample_chart_selection.ts rename to x-pack/plugins/observability_solution/apm/public/hooks/use_sample_chart_selection.ts diff --git a/x-pack/plugins/apm/public/hooks/use_service_metric_charts_fetcher.ts b/x-pack/plugins/observability_solution/apm/public/hooks/use_service_metric_charts_fetcher.ts similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_service_metric_charts_fetcher.ts rename to x-pack/plugins/observability_solution/apm/public/hooks/use_service_metric_charts_fetcher.ts diff --git a/x-pack/plugins/apm/public/hooks/use_service_name.tsx b/x-pack/plugins/observability_solution/apm/public/hooks/use_service_name.tsx similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_service_name.tsx rename to x-pack/plugins/observability_solution/apm/public/hooks/use_service_name.tsx diff --git a/x-pack/plugins/apm/public/hooks/use_theme.tsx b/x-pack/plugins/observability_solution/apm/public/hooks/use_theme.tsx similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_theme.tsx rename to x-pack/plugins/observability_solution/apm/public/hooks/use_theme.tsx diff --git a/x-pack/plugins/apm/public/hooks/use_time_range.test.ts b/x-pack/plugins/observability_solution/apm/public/hooks/use_time_range.test.ts similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_time_range.test.ts rename to x-pack/plugins/observability_solution/apm/public/hooks/use_time_range.test.ts diff --git a/x-pack/plugins/apm/public/hooks/use_time_range.ts b/x-pack/plugins/observability_solution/apm/public/hooks/use_time_range.ts similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_time_range.ts rename to x-pack/plugins/observability_solution/apm/public/hooks/use_time_range.ts diff --git a/x-pack/plugins/apm/public/hooks/use_trace_explorer_enabled_setting.ts b/x-pack/plugins/observability_solution/apm/public/hooks/use_trace_explorer_enabled_setting.ts similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_trace_explorer_enabled_setting.ts rename to x-pack/plugins/observability_solution/apm/public/hooks/use_trace_explorer_enabled_setting.ts diff --git a/x-pack/plugins/apm/public/hooks/use_trace_explorer_samples.ts b/x-pack/plugins/observability_solution/apm/public/hooks/use_trace_explorer_samples.ts similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_trace_explorer_samples.ts rename to x-pack/plugins/observability_solution/apm/public/hooks/use_trace_explorer_samples.ts diff --git a/x-pack/plugins/apm/public/hooks/use_transaction_latency_chart_fetcher.ts b/x-pack/plugins/observability_solution/apm/public/hooks/use_transaction_latency_chart_fetcher.ts similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_transaction_latency_chart_fetcher.ts rename to x-pack/plugins/observability_solution/apm/public/hooks/use_transaction_latency_chart_fetcher.ts diff --git a/x-pack/plugins/apm/public/hooks/use_transaction_trace_samples_fetcher.ts b/x-pack/plugins/observability_solution/apm/public/hooks/use_transaction_trace_samples_fetcher.ts similarity index 100% rename from x-pack/plugins/apm/public/hooks/use_transaction_trace_samples_fetcher.ts rename to x-pack/plugins/observability_solution/apm/public/hooks/use_transaction_trace_samples_fetcher.ts diff --git a/x-pack/plugins/apm/public/icon.svg b/x-pack/plugins/observability_solution/apm/public/icon.svg similarity index 100% rename from x-pack/plugins/apm/public/icon.svg rename to x-pack/plugins/observability_solution/apm/public/icon.svg diff --git a/x-pack/plugins/apm/public/images/apm_ml_anomaly_detection_example.png b/x-pack/plugins/observability_solution/apm/public/images/apm_ml_anomaly_detection_example.png similarity index 100% rename from x-pack/plugins/apm/public/images/apm_ml_anomaly_detection_example.png rename to x-pack/plugins/observability_solution/apm/public/images/apm_ml_anomaly_detection_example.png diff --git a/x-pack/plugins/apm/public/index.ts b/x-pack/plugins/observability_solution/apm/public/index.ts similarity index 100% rename from x-pack/plugins/apm/public/index.ts rename to x-pack/plugins/observability_solution/apm/public/index.ts diff --git a/x-pack/plugins/apm/public/locator/helpers.ts b/x-pack/plugins/observability_solution/apm/public/locator/helpers.ts similarity index 100% rename from x-pack/plugins/apm/public/locator/helpers.ts rename to x-pack/plugins/observability_solution/apm/public/locator/helpers.ts diff --git a/x-pack/plugins/apm/public/locator/service_detail_locator.test.ts b/x-pack/plugins/observability_solution/apm/public/locator/service_detail_locator.test.ts similarity index 100% rename from x-pack/plugins/apm/public/locator/service_detail_locator.test.ts rename to x-pack/plugins/observability_solution/apm/public/locator/service_detail_locator.test.ts diff --git a/x-pack/plugins/apm/public/locator/service_detail_locator.ts b/x-pack/plugins/observability_solution/apm/public/locator/service_detail_locator.ts similarity index 100% rename from x-pack/plugins/apm/public/locator/service_detail_locator.ts rename to x-pack/plugins/observability_solution/apm/public/locator/service_detail_locator.ts diff --git a/x-pack/plugins/apm/public/plugin.ts b/x-pack/plugins/observability_solution/apm/public/plugin.ts similarity index 100% rename from x-pack/plugins/apm/public/plugin.ts rename to x-pack/plugins/observability_solution/apm/public/plugin.ts diff --git a/x-pack/plugins/apm/public/selectors/latency_chart_selector.test.ts b/x-pack/plugins/observability_solution/apm/public/selectors/latency_chart_selector.test.ts similarity index 100% rename from x-pack/plugins/apm/public/selectors/latency_chart_selector.test.ts rename to x-pack/plugins/observability_solution/apm/public/selectors/latency_chart_selector.test.ts diff --git a/x-pack/plugins/apm/public/selectors/latency_chart_selectors.ts b/x-pack/plugins/observability_solution/apm/public/selectors/latency_chart_selectors.ts similarity index 100% rename from x-pack/plugins/apm/public/selectors/latency_chart_selectors.ts rename to x-pack/plugins/observability_solution/apm/public/selectors/latency_chart_selectors.ts diff --git a/x-pack/plugins/apm/public/services/__mocks__/SessionStorageMock.ts b/x-pack/plugins/observability_solution/apm/public/services/__mocks__/SessionStorageMock.ts similarity index 100% rename from x-pack/plugins/apm/public/services/__mocks__/SessionStorageMock.ts rename to x-pack/plugins/observability_solution/apm/public/services/__mocks__/SessionStorageMock.ts diff --git a/x-pack/plugins/apm/public/services/call_api.test.ts b/x-pack/plugins/observability_solution/apm/public/services/call_api.test.ts similarity index 100% rename from x-pack/plugins/apm/public/services/call_api.test.ts rename to x-pack/plugins/observability_solution/apm/public/services/call_api.test.ts diff --git a/x-pack/plugins/apm/public/services/call_apm_api.test.ts b/x-pack/plugins/observability_solution/apm/public/services/call_apm_api.test.ts similarity index 100% rename from x-pack/plugins/apm/public/services/call_apm_api.test.ts rename to x-pack/plugins/observability_solution/apm/public/services/call_apm_api.test.ts diff --git a/x-pack/plugins/apm/public/services/rest/apm_observability_overview_fetchers.test.ts b/x-pack/plugins/observability_solution/apm/public/services/rest/apm_observability_overview_fetchers.test.ts similarity index 100% rename from x-pack/plugins/apm/public/services/rest/apm_observability_overview_fetchers.test.ts rename to x-pack/plugins/observability_solution/apm/public/services/rest/apm_observability_overview_fetchers.test.ts diff --git a/x-pack/plugins/apm/public/services/rest/apm_observability_overview_fetchers.ts b/x-pack/plugins/observability_solution/apm/public/services/rest/apm_observability_overview_fetchers.ts similarity index 100% rename from x-pack/plugins/apm/public/services/rest/apm_observability_overview_fetchers.ts rename to x-pack/plugins/observability_solution/apm/public/services/rest/apm_observability_overview_fetchers.ts diff --git a/x-pack/plugins/apm/public/services/rest/call_api.ts b/x-pack/plugins/observability_solution/apm/public/services/rest/call_api.ts similarity index 100% rename from x-pack/plugins/apm/public/services/rest/call_api.ts rename to x-pack/plugins/observability_solution/apm/public/services/rest/call_api.ts diff --git a/x-pack/plugins/apm/public/services/rest/call_apm_api_spy.ts b/x-pack/plugins/observability_solution/apm/public/services/rest/call_apm_api_spy.ts similarity index 100% rename from x-pack/plugins/apm/public/services/rest/call_apm_api_spy.ts rename to x-pack/plugins/observability_solution/apm/public/services/rest/call_apm_api_spy.ts diff --git a/x-pack/plugins/apm/public/services/rest/create_call_apm_api.ts b/x-pack/plugins/observability_solution/apm/public/services/rest/create_call_apm_api.ts similarity index 100% rename from x-pack/plugins/apm/public/services/rest/create_call_apm_api.ts rename to x-pack/plugins/observability_solution/apm/public/services/rest/create_call_apm_api.ts diff --git a/x-pack/plugins/apm/public/services/telemetry/index.ts b/x-pack/plugins/observability_solution/apm/public/services/telemetry/index.ts similarity index 100% rename from x-pack/plugins/apm/public/services/telemetry/index.ts rename to x-pack/plugins/observability_solution/apm/public/services/telemetry/index.ts diff --git a/x-pack/plugins/apm/public/services/telemetry/telemetry_client.ts b/x-pack/plugins/observability_solution/apm/public/services/telemetry/telemetry_client.ts similarity index 100% rename from x-pack/plugins/apm/public/services/telemetry/telemetry_client.ts rename to x-pack/plugins/observability_solution/apm/public/services/telemetry/telemetry_client.ts diff --git a/x-pack/plugins/apm/public/services/telemetry/telemetry_events.ts b/x-pack/plugins/observability_solution/apm/public/services/telemetry/telemetry_events.ts similarity index 100% rename from x-pack/plugins/apm/public/services/telemetry/telemetry_events.ts rename to x-pack/plugins/observability_solution/apm/public/services/telemetry/telemetry_events.ts diff --git a/x-pack/plugins/apm/public/services/telemetry/telemetry_service.test.ts b/x-pack/plugins/observability_solution/apm/public/services/telemetry/telemetry_service.test.ts similarity index 100% rename from x-pack/plugins/apm/public/services/telemetry/telemetry_service.test.ts rename to x-pack/plugins/observability_solution/apm/public/services/telemetry/telemetry_service.test.ts diff --git a/x-pack/plugins/apm/public/services/telemetry/telemetry_service.ts b/x-pack/plugins/observability_solution/apm/public/services/telemetry/telemetry_service.ts similarity index 100% rename from x-pack/plugins/apm/public/services/telemetry/telemetry_service.ts rename to x-pack/plugins/observability_solution/apm/public/services/telemetry/telemetry_service.ts diff --git a/x-pack/plugins/apm/public/services/telemetry/types.ts b/x-pack/plugins/observability_solution/apm/public/services/telemetry/types.ts similarity index 100% rename from x-pack/plugins/apm/public/services/telemetry/types.ts rename to x-pack/plugins/observability_solution/apm/public/services/telemetry/types.ts diff --git a/x-pack/plugins/apm/public/set_help_extension.ts b/x-pack/plugins/observability_solution/apm/public/set_help_extension.ts similarity index 100% rename from x-pack/plugins/apm/public/set_help_extension.ts rename to x-pack/plugins/observability_solution/apm/public/set_help_extension.ts diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/agent_config_instructions.test.tsx b/x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/agent_config_instructions.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/tutorial/config_agent/agent_config_instructions.test.tsx rename to x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/agent_config_instructions.test.tsx diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/agent_config_instructions.tsx b/x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/agent_config_instructions.tsx similarity index 100% rename from x-pack/plugins/apm/public/tutorial/config_agent/agent_config_instructions.tsx rename to x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/agent_config_instructions.tsx diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/agent_config_table.tsx b/x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/agent_config_table.tsx similarity index 100% rename from x-pack/plugins/apm/public/tutorial/config_agent/agent_config_table.tsx rename to x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/agent_config_table.tsx diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/commands/django.ts b/x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/commands/django.ts similarity index 100% rename from x-pack/plugins/apm/public/tutorial/config_agent/commands/django.ts rename to x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/commands/django.ts diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/commands/dotnet.ts b/x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/commands/dotnet.ts similarity index 100% rename from x-pack/plugins/apm/public/tutorial/config_agent/commands/dotnet.ts rename to x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/commands/dotnet.ts diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/commands/flask.ts b/x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/commands/flask.ts similarity index 100% rename from x-pack/plugins/apm/public/tutorial/config_agent/commands/flask.ts rename to x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/commands/flask.ts diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/commands/get_apm_agent_commands.test.ts b/x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/commands/get_apm_agent_commands.test.ts similarity index 100% rename from x-pack/plugins/apm/public/tutorial/config_agent/commands/get_apm_agent_commands.test.ts rename to x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/commands/get_apm_agent_commands.test.ts diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/commands/get_apm_agent_commands.ts b/x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/commands/get_apm_agent_commands.ts similarity index 100% rename from x-pack/plugins/apm/public/tutorial/config_agent/commands/get_apm_agent_commands.ts rename to x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/commands/get_apm_agent_commands.ts diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/commands/go.ts b/x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/commands/go.ts similarity index 100% rename from x-pack/plugins/apm/public/tutorial/config_agent/commands/go.ts rename to x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/commands/go.ts diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/commands/java.ts b/x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/commands/java.ts similarity index 100% rename from x-pack/plugins/apm/public/tutorial/config_agent/commands/java.ts rename to x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/commands/java.ts diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/commands/node.ts b/x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/commands/node.ts similarity index 100% rename from x-pack/plugins/apm/public/tutorial/config_agent/commands/node.ts rename to x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/commands/node.ts diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/commands/php.ts b/x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/commands/php.ts similarity index 100% rename from x-pack/plugins/apm/public/tutorial/config_agent/commands/php.ts rename to x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/commands/php.ts diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/commands/rack.ts b/x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/commands/rack.ts similarity index 100% rename from x-pack/plugins/apm/public/tutorial/config_agent/commands/rack.ts rename to x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/commands/rack.ts diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/commands/rails.ts b/x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/commands/rails.ts similarity index 100% rename from x-pack/plugins/apm/public/tutorial/config_agent/commands/rails.ts rename to x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/commands/rails.ts diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/commands/rum.ts b/x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/commands/rum.ts similarity index 100% rename from x-pack/plugins/apm/public/tutorial/config_agent/commands/rum.ts rename to x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/commands/rum.ts diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/commands/shared_hints.ts b/x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/commands/shared_hints.ts similarity index 100% rename from x-pack/plugins/apm/public/tutorial/config_agent/commands/shared_hints.ts rename to x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/commands/shared_hints.ts diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/config_agent.stories.tsx b/x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/config_agent.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/tutorial/config_agent/config_agent.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/config_agent.stories.tsx diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/get_policy_options.test.ts b/x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/get_policy_options.test.ts similarity index 100% rename from x-pack/plugins/apm/public/tutorial/config_agent/get_policy_options.test.ts rename to x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/get_policy_options.test.ts diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/get_policy_options.ts b/x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/get_policy_options.ts similarity index 100% rename from x-pack/plugins/apm/public/tutorial/config_agent/get_policy_options.ts rename to x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/get_policy_options.ts diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/index.test.tsx b/x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/index.test.tsx similarity index 100% rename from x-pack/plugins/apm/public/tutorial/config_agent/index.test.tsx rename to x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/index.test.tsx diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/index.tsx b/x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/tutorial/config_agent/index.tsx rename to x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/index.tsx diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/opentelemetry_instructions.tsx b/x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/opentelemetry_instructions.tsx similarity index 100% rename from x-pack/plugins/apm/public/tutorial/config_agent/opentelemetry_instructions.tsx rename to x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/opentelemetry_instructions.tsx diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/policy_selector.tsx b/x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/policy_selector.tsx similarity index 100% rename from x-pack/plugins/apm/public/tutorial/config_agent/policy_selector.tsx rename to x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/policy_selector.tsx diff --git a/x-pack/plugins/apm/public/tutorial/config_agent/rum_script.tsx b/x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/rum_script.tsx similarity index 100% rename from x-pack/plugins/apm/public/tutorial/config_agent/rum_script.tsx rename to x-pack/plugins/observability_solution/apm/public/tutorial/config_agent/rum_script.tsx diff --git a/x-pack/plugins/apm/public/tutorial/tutorial_apm_fleet_check.ts b/x-pack/plugins/observability_solution/apm/public/tutorial/tutorial_apm_fleet_check.ts similarity index 100% rename from x-pack/plugins/apm/public/tutorial/tutorial_apm_fleet_check.ts rename to x-pack/plugins/observability_solution/apm/public/tutorial/tutorial_apm_fleet_check.ts diff --git a/x-pack/plugins/apm/public/tutorial/tutorial_fleet_instructions/index.tsx b/x-pack/plugins/observability_solution/apm/public/tutorial/tutorial_fleet_instructions/index.tsx similarity index 100% rename from x-pack/plugins/apm/public/tutorial/tutorial_fleet_instructions/index.tsx rename to x-pack/plugins/observability_solution/apm/public/tutorial/tutorial_fleet_instructions/index.tsx diff --git a/x-pack/plugins/apm/public/tutorial/tutorial_fleet_instructions/tutorial_fleet_instructions.stories.tsx b/x-pack/plugins/observability_solution/apm/public/tutorial/tutorial_fleet_instructions/tutorial_fleet_instructions.stories.tsx similarity index 100% rename from x-pack/plugins/apm/public/tutorial/tutorial_fleet_instructions/tutorial_fleet_instructions.stories.tsx rename to x-pack/plugins/observability_solution/apm/public/tutorial/tutorial_fleet_instructions/tutorial_fleet_instructions.stories.tsx diff --git a/x-pack/plugins/apm/public/update_badge.ts b/x-pack/plugins/observability_solution/apm/public/update_badge.ts similarity index 100% rename from x-pack/plugins/apm/public/update_badge.ts rename to x-pack/plugins/observability_solution/apm/public/update_badge.ts diff --git a/x-pack/plugins/apm/public/utils/download_json.ts b/x-pack/plugins/observability_solution/apm/public/utils/download_json.ts similarity index 100% rename from x-pack/plugins/apm/public/utils/download_json.ts rename to x-pack/plugins/observability_solution/apm/public/utils/download_json.ts diff --git a/x-pack/plugins/apm/public/utils/flatten_object.test.ts b/x-pack/plugins/observability_solution/apm/public/utils/flatten_object.test.ts similarity index 100% rename from x-pack/plugins/apm/public/utils/flatten_object.test.ts rename to x-pack/plugins/observability_solution/apm/public/utils/flatten_object.test.ts diff --git a/x-pack/plugins/apm/public/utils/flatten_object.ts b/x-pack/plugins/observability_solution/apm/public/utils/flatten_object.ts similarity index 100% rename from x-pack/plugins/apm/public/utils/flatten_object.ts rename to x-pack/plugins/observability_solution/apm/public/utils/flatten_object.ts diff --git a/x-pack/plugins/apm/public/utils/get_path_for_feedback.test.ts b/x-pack/plugins/observability_solution/apm/public/utils/get_path_for_feedback.test.ts similarity index 100% rename from x-pack/plugins/apm/public/utils/get_path_for_feedback.test.ts rename to x-pack/plugins/observability_solution/apm/public/utils/get_path_for_feedback.test.ts diff --git a/x-pack/plugins/apm/public/utils/get_path_for_feedback.ts b/x-pack/plugins/observability_solution/apm/public/utils/get_path_for_feedback.ts similarity index 100% rename from x-pack/plugins/apm/public/utils/get_path_for_feedback.ts rename to x-pack/plugins/observability_solution/apm/public/utils/get_path_for_feedback.ts diff --git a/x-pack/plugins/apm/public/utils/http_status_code_to_color.ts b/x-pack/plugins/observability_solution/apm/public/utils/http_status_code_to_color.ts similarity index 100% rename from x-pack/plugins/apm/public/utils/http_status_code_to_color.ts rename to x-pack/plugins/observability_solution/apm/public/utils/http_status_code_to_color.ts diff --git a/x-pack/plugins/apm/public/utils/style.ts b/x-pack/plugins/observability_solution/apm/public/utils/style.ts similarity index 100% rename from x-pack/plugins/apm/public/utils/style.ts rename to x-pack/plugins/observability_solution/apm/public/utils/style.ts diff --git a/x-pack/plugins/apm/public/utils/test_helpers.tsx b/x-pack/plugins/observability_solution/apm/public/utils/test_helpers.tsx similarity index 100% rename from x-pack/plugins/apm/public/utils/test_helpers.tsx rename to x-pack/plugins/observability_solution/apm/public/utils/test_helpers.tsx diff --git a/x-pack/plugins/apm/readme.md b/x-pack/plugins/observability_solution/apm/readme.md similarity index 100% rename from x-pack/plugins/apm/readme.md rename to x-pack/plugins/observability_solution/apm/readme.md diff --git a/x-pack/plugins/apm/scripts/.gitignore b/x-pack/plugins/observability_solution/apm/scripts/.gitignore similarity index 100% rename from x-pack/plugins/apm/scripts/.gitignore rename to x-pack/plugins/observability_solution/apm/scripts/.gitignore diff --git a/x-pack/plugins/apm/scripts/create_apm_users.js b/x-pack/plugins/observability_solution/apm/scripts/create_apm_users.js similarity index 100% rename from x-pack/plugins/apm/scripts/create_apm_users.js rename to x-pack/plugins/observability_solution/apm/scripts/create_apm_users.js diff --git a/x-pack/plugins/apm/scripts/create_apm_users/create_apm_users_cli.ts b/x-pack/plugins/observability_solution/apm/scripts/create_apm_users/create_apm_users_cli.ts similarity index 100% rename from x-pack/plugins/apm/scripts/create_apm_users/create_apm_users_cli.ts rename to x-pack/plugins/observability_solution/apm/scripts/create_apm_users/create_apm_users_cli.ts diff --git a/x-pack/plugins/apm/scripts/create_diagnostics_bundle.js b/x-pack/plugins/observability_solution/apm/scripts/create_diagnostics_bundle.js similarity index 100% rename from x-pack/plugins/apm/scripts/create_diagnostics_bundle.js rename to x-pack/plugins/observability_solution/apm/scripts/create_diagnostics_bundle.js diff --git a/x-pack/plugins/apm/scripts/create_functional_tests_archive.js b/x-pack/plugins/observability_solution/apm/scripts/create_functional_tests_archive.js similarity index 100% rename from x-pack/plugins/apm/scripts/create_functional_tests_archive.js rename to x-pack/plugins/observability_solution/apm/scripts/create_functional_tests_archive.js diff --git a/x-pack/plugins/apm/scripts/create_functional_tests_archive/index.ts b/x-pack/plugins/observability_solution/apm/scripts/create_functional_tests_archive/index.ts similarity index 100% rename from x-pack/plugins/apm/scripts/create_functional_tests_archive/index.ts rename to x-pack/plugins/observability_solution/apm/scripts/create_functional_tests_archive/index.ts diff --git a/x-pack/plugins/apm/scripts/diagnostics_bundle/cli.ts b/x-pack/plugins/observability_solution/apm/scripts/diagnostics_bundle/cli.ts similarity index 100% rename from x-pack/plugins/apm/scripts/diagnostics_bundle/cli.ts rename to x-pack/plugins/observability_solution/apm/scripts/diagnostics_bundle/cli.ts diff --git a/x-pack/plugins/apm/scripts/diagnostics_bundle/diagnostics_bundle.ts b/x-pack/plugins/observability_solution/apm/scripts/diagnostics_bundle/diagnostics_bundle.ts similarity index 100% rename from x-pack/plugins/apm/scripts/diagnostics_bundle/diagnostics_bundle.ts rename to x-pack/plugins/observability_solution/apm/scripts/diagnostics_bundle/diagnostics_bundle.ts diff --git a/x-pack/plugins/apm/scripts/eslint.js b/x-pack/plugins/observability_solution/apm/scripts/eslint.js similarity index 100% rename from x-pack/plugins/apm/scripts/eslint.js rename to x-pack/plugins/observability_solution/apm/scripts/eslint.js diff --git a/x-pack/plugins/apm/scripts/generate_telemetry_fields_table.js b/x-pack/plugins/observability_solution/apm/scripts/generate_telemetry_fields_table.js similarity index 100% rename from x-pack/plugins/apm/scripts/generate_telemetry_fields_table.js rename to x-pack/plugins/observability_solution/apm/scripts/generate_telemetry_fields_table.js diff --git a/x-pack/plugins/apm/scripts/infer_route_return_types.js b/x-pack/plugins/observability_solution/apm/scripts/infer_route_return_types.js similarity index 100% rename from x-pack/plugins/apm/scripts/infer_route_return_types.js rename to x-pack/plugins/observability_solution/apm/scripts/infer_route_return_types.js diff --git a/x-pack/plugins/apm/scripts/infer_route_return_types/index.ts b/x-pack/plugins/observability_solution/apm/scripts/infer_route_return_types/index.ts similarity index 97% rename from x-pack/plugins/apm/scripts/infer_route_return_types/index.ts rename to x-pack/plugins/observability_solution/apm/scripts/infer_route_return_types/index.ts index ce4ba6a9b16df..8658c5359e314 100644 --- a/x-pack/plugins/apm/scripts/infer_route_return_types/index.ts +++ b/x-pack/plugins/observability_solution/apm/scripts/infer_route_return_types/index.ts @@ -37,7 +37,8 @@ const project = new Project({ }); const glob = - (argv.glob as string | undefined) || 'x-pack/plugins/apm/server/**/route.ts'; + (argv.glob as string | undefined) || + 'x-pack/plugins/observability_solution/apm/server/**/route.ts'; const files = project.getSourceFiles(glob); diff --git a/x-pack/plugins/apm/scripts/package.json b/x-pack/plugins/observability_solution/apm/scripts/package.json similarity index 100% rename from x-pack/plugins/apm/scripts/package.json rename to x-pack/plugins/observability_solution/apm/scripts/package.json diff --git a/x-pack/plugins/apm/scripts/precommit.js b/x-pack/plugins/observability_solution/apm/scripts/precommit.js similarity index 94% rename from x-pack/plugins/apm/scripts/precommit.js rename to x-pack/plugins/observability_solution/apm/scripts/precommit.js index c018770a65553..2dc449368b68b 100644 --- a/x-pack/plugins/apm/scripts/precommit.js +++ b/x-pack/plugins/observability_solution/apm/scripts/precommit.js @@ -16,7 +16,10 @@ const root = resolve(__dirname, '../../../..'); const execaOpts = { cwd: root, stderr: 'pipe' }; -const tsconfig = resolve(root, 'x-pack/plugins/apm/tsconfig.json'); +const tsconfig = resolve( + root, + 'x-pack/plugins/observability_solution/apm/tsconfig.json' +); const testTsconfig = resolve(root, 'x-pack/test/tsconfig.json'); diff --git a/x-pack/plugins/apm/scripts/shared/download_telemetry_template.ts b/x-pack/plugins/observability_solution/apm/scripts/shared/download_telemetry_template.ts similarity index 100% rename from x-pack/plugins/apm/scripts/shared/download_telemetry_template.ts rename to x-pack/plugins/observability_solution/apm/scripts/shared/download_telemetry_template.ts diff --git a/x-pack/plugins/apm/scripts/shared/get_es_client.ts b/x-pack/plugins/observability_solution/apm/scripts/shared/get_es_client.ts similarity index 100% rename from x-pack/plugins/apm/scripts/shared/get_es_client.ts rename to x-pack/plugins/observability_solution/apm/scripts/shared/get_es_client.ts diff --git a/x-pack/plugins/apm/scripts/shared/get_http_auth.ts b/x-pack/plugins/observability_solution/apm/scripts/shared/get_http_auth.ts similarity index 100% rename from x-pack/plugins/apm/scripts/shared/get_http_auth.ts rename to x-pack/plugins/observability_solution/apm/scripts/shared/get_http_auth.ts diff --git a/x-pack/plugins/apm/scripts/shared/parse_index_url.ts b/x-pack/plugins/observability_solution/apm/scripts/shared/parse_index_url.ts similarity index 100% rename from x-pack/plugins/apm/scripts/shared/parse_index_url.ts rename to x-pack/plugins/observability_solution/apm/scripts/shared/parse_index_url.ts diff --git a/x-pack/plugins/apm/scripts/shared/read_kibana_config.ts b/x-pack/plugins/observability_solution/apm/scripts/shared/read_kibana_config.ts similarity index 100% rename from x-pack/plugins/apm/scripts/shared/read_kibana_config.ts rename to x-pack/plugins/observability_solution/apm/scripts/shared/read_kibana_config.ts diff --git a/x-pack/plugins/apm/scripts/telemetry/main.ts b/x-pack/plugins/observability_solution/apm/scripts/telemetry/main.ts similarity index 94% rename from x-pack/plugins/apm/scripts/telemetry/main.ts rename to x-pack/plugins/observability_solution/apm/scripts/telemetry/main.ts index 87d3c72e95fe8..1bab04e579fb7 100644 --- a/x-pack/plugins/apm/scripts/telemetry/main.ts +++ b/x-pack/plugins/observability_solution/apm/scripts/telemetry/main.ts @@ -8,7 +8,8 @@ import fs from 'fs'; import { apmSchema } from '../../server/lib/apm_telemetry/schema'; -const markdownFilePath = 'x-pack/plugins/apm/dev_docs/apm_telemetry_fields.md'; +const markdownFilePath = + 'x-pack/plugins/observability_solution/apm/dev_docs/apm_telemetry_fields.md'; function extractFieldDescriptions( schema: any, diff --git a/x-pack/plugins/apm/scripts/test/README.md b/x-pack/plugins/observability_solution/apm/scripts/test/README.md similarity index 100% rename from x-pack/plugins/apm/scripts/test/README.md rename to x-pack/plugins/observability_solution/apm/scripts/test/README.md diff --git a/x-pack/plugins/apm/scripts/test/api.js b/x-pack/plugins/observability_solution/apm/scripts/test/api.js similarity index 100% rename from x-pack/plugins/apm/scripts/test/api.js rename to x-pack/plugins/observability_solution/apm/scripts/test/api.js diff --git a/x-pack/plugins/apm/scripts/test/e2e.js b/x-pack/plugins/observability_solution/apm/scripts/test/e2e.js similarity index 100% rename from x-pack/plugins/apm/scripts/test/e2e.js rename to x-pack/plugins/observability_solution/apm/scripts/test/e2e.js diff --git a/x-pack/plugins/apm/scripts/test/jest.js b/x-pack/plugins/observability_solution/apm/scripts/test/jest.js similarity index 100% rename from x-pack/plugins/apm/scripts/test/jest.js rename to x-pack/plugins/observability_solution/apm/scripts/test/jest.js diff --git a/x-pack/plugins/apm/scripts/upload_telemetry_data.js b/x-pack/plugins/observability_solution/apm/scripts/upload_telemetry_data.js similarity index 100% rename from x-pack/plugins/apm/scripts/upload_telemetry_data.js rename to x-pack/plugins/observability_solution/apm/scripts/upload_telemetry_data.js diff --git a/x-pack/plugins/apm/server/assistant_functions/get_apm_correlations.ts b/x-pack/plugins/observability_solution/apm/server/assistant_functions/get_apm_correlations.ts similarity index 100% rename from x-pack/plugins/apm/server/assistant_functions/get_apm_correlations.ts rename to x-pack/plugins/observability_solution/apm/server/assistant_functions/get_apm_correlations.ts diff --git a/x-pack/plugins/apm/server/assistant_functions/get_apm_downstream_dependencies.ts b/x-pack/plugins/observability_solution/apm/server/assistant_functions/get_apm_downstream_dependencies.ts similarity index 100% rename from x-pack/plugins/apm/server/assistant_functions/get_apm_downstream_dependencies.ts rename to x-pack/plugins/observability_solution/apm/server/assistant_functions/get_apm_downstream_dependencies.ts diff --git a/x-pack/plugins/apm/server/assistant_functions/get_apm_error_document.ts b/x-pack/plugins/observability_solution/apm/server/assistant_functions/get_apm_error_document.ts similarity index 100% rename from x-pack/plugins/apm/server/assistant_functions/get_apm_error_document.ts rename to x-pack/plugins/observability_solution/apm/server/assistant_functions/get_apm_error_document.ts diff --git a/x-pack/plugins/apm/server/assistant_functions/get_apm_service_summary.ts b/x-pack/plugins/observability_solution/apm/server/assistant_functions/get_apm_service_summary.ts similarity index 100% rename from x-pack/plugins/apm/server/assistant_functions/get_apm_service_summary.ts rename to x-pack/plugins/observability_solution/apm/server/assistant_functions/get_apm_service_summary.ts diff --git a/x-pack/plugins/apm/server/assistant_functions/get_apm_services_list.ts b/x-pack/plugins/observability_solution/apm/server/assistant_functions/get_apm_services_list.ts similarity index 100% rename from x-pack/plugins/apm/server/assistant_functions/get_apm_services_list.ts rename to x-pack/plugins/observability_solution/apm/server/assistant_functions/get_apm_services_list.ts diff --git a/x-pack/plugins/apm/server/assistant_functions/get_apm_timeseries.ts b/x-pack/plugins/observability_solution/apm/server/assistant_functions/get_apm_timeseries.ts similarity index 100% rename from x-pack/plugins/apm/server/assistant_functions/get_apm_timeseries.ts rename to x-pack/plugins/observability_solution/apm/server/assistant_functions/get_apm_timeseries.ts diff --git a/x-pack/plugins/apm/server/assistant_functions/index.ts b/x-pack/plugins/observability_solution/apm/server/assistant_functions/index.ts similarity index 100% rename from x-pack/plugins/apm/server/assistant_functions/index.ts rename to x-pack/plugins/observability_solution/apm/server/assistant_functions/index.ts diff --git a/x-pack/plugins/apm/server/deprecations/deprecations.test.ts b/x-pack/plugins/observability_solution/apm/server/deprecations/deprecations.test.ts similarity index 100% rename from x-pack/plugins/apm/server/deprecations/deprecations.test.ts rename to x-pack/plugins/observability_solution/apm/server/deprecations/deprecations.test.ts diff --git a/x-pack/plugins/apm/server/deprecations/index.ts b/x-pack/plugins/observability_solution/apm/server/deprecations/index.ts similarity index 100% rename from x-pack/plugins/apm/server/deprecations/index.ts rename to x-pack/plugins/observability_solution/apm/server/deprecations/index.ts diff --git a/x-pack/plugins/apm/server/feature.ts b/x-pack/plugins/observability_solution/apm/server/feature.ts similarity index 100% rename from x-pack/plugins/apm/server/feature.ts rename to x-pack/plugins/observability_solution/apm/server/feature.ts diff --git a/x-pack/plugins/apm/server/index.ts b/x-pack/plugins/observability_solution/apm/server/index.ts similarity index 100% rename from x-pack/plugins/apm/server/index.ts rename to x-pack/plugins/observability_solution/apm/server/index.ts diff --git a/x-pack/plugins/apm/server/lib/anomaly_detection/anomaly_search.ts b/x-pack/plugins/observability_solution/apm/server/lib/anomaly_detection/anomaly_search.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/anomaly_detection/anomaly_search.ts rename to x-pack/plugins/observability_solution/apm/server/lib/anomaly_detection/anomaly_search.ts diff --git a/x-pack/plugins/apm/server/lib/anomaly_detection/apm_ml_anomaly_query.ts b/x-pack/plugins/observability_solution/apm/server/lib/anomaly_detection/apm_ml_anomaly_query.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/anomaly_detection/apm_ml_anomaly_query.ts rename to x-pack/plugins/observability_solution/apm/server/lib/anomaly_detection/apm_ml_anomaly_query.ts diff --git a/x-pack/plugins/apm/server/lib/anomaly_detection/apm_ml_jobs_query.ts b/x-pack/plugins/observability_solution/apm/server/lib/anomaly_detection/apm_ml_jobs_query.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/anomaly_detection/apm_ml_jobs_query.ts rename to x-pack/plugins/observability_solution/apm/server/lib/anomaly_detection/apm_ml_jobs_query.ts diff --git a/x-pack/plugins/apm/server/lib/anomaly_detection/constants.ts b/x-pack/plugins/observability_solution/apm/server/lib/anomaly_detection/constants.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/anomaly_detection/constants.ts rename to x-pack/plugins/observability_solution/apm/server/lib/anomaly_detection/constants.ts diff --git a/x-pack/plugins/apm/server/lib/anomaly_detection/create_anomaly_detection_jobs.ts b/x-pack/plugins/observability_solution/apm/server/lib/anomaly_detection/create_anomaly_detection_jobs.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/anomaly_detection/create_anomaly_detection_jobs.ts rename to x-pack/plugins/observability_solution/apm/server/lib/anomaly_detection/create_anomaly_detection_jobs.ts diff --git a/x-pack/plugins/apm/server/lib/anomaly_detection/get_anomaly_detection_jobs.ts b/x-pack/plugins/observability_solution/apm/server/lib/anomaly_detection/get_anomaly_detection_jobs.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/anomaly_detection/get_anomaly_detection_jobs.ts rename to x-pack/plugins/observability_solution/apm/server/lib/anomaly_detection/get_anomaly_detection_jobs.ts diff --git a/x-pack/plugins/apm/server/lib/anomaly_detection/get_anomaly_result_bucket_size.ts b/x-pack/plugins/observability_solution/apm/server/lib/anomaly_detection/get_anomaly_result_bucket_size.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/anomaly_detection/get_anomaly_result_bucket_size.ts rename to x-pack/plugins/observability_solution/apm/server/lib/anomaly_detection/get_anomaly_result_bucket_size.ts diff --git a/x-pack/plugins/apm/server/lib/anomaly_detection/get_anomaly_timeseries.ts b/x-pack/plugins/observability_solution/apm/server/lib/anomaly_detection/get_anomaly_timeseries.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/anomaly_detection/get_anomaly_timeseries.ts rename to x-pack/plugins/observability_solution/apm/server/lib/anomaly_detection/get_anomaly_timeseries.ts diff --git a/x-pack/plugins/apm/server/lib/anomaly_detection/get_ml_jobs_with_apm_group.ts b/x-pack/plugins/observability_solution/apm/server/lib/anomaly_detection/get_ml_jobs_with_apm_group.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/anomaly_detection/get_ml_jobs_with_apm_group.ts rename to x-pack/plugins/observability_solution/apm/server/lib/anomaly_detection/get_ml_jobs_with_apm_group.ts diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/__snapshots__/tasks.test.ts.snap b/x-pack/plugins/observability_solution/apm/server/lib/apm_telemetry/collect_data_telemetry/__snapshots__/tasks.test.ts.snap similarity index 100% rename from x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/__snapshots__/tasks.test.ts.snap rename to x-pack/plugins/observability_solution/apm/server/lib/apm_telemetry/collect_data_telemetry/__snapshots__/tasks.test.ts.snap diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/index.ts b/x-pack/plugins/observability_solution/apm/server/lib/apm_telemetry/collect_data_telemetry/index.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/index.ts rename to x-pack/plugins/observability_solution/apm/server/lib/apm_telemetry/collect_data_telemetry/index.ts diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.test.ts b/x-pack/plugins/observability_solution/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.test.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.test.ts rename to x-pack/plugins/observability_solution/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.test.ts diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts b/x-pack/plugins/observability_solution/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts rename to x-pack/plugins/observability_solution/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/index.ts b/x-pack/plugins/observability_solution/apm/server/lib/apm_telemetry/index.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/apm_telemetry/index.ts rename to x-pack/plugins/observability_solution/apm/server/lib/apm_telemetry/index.ts diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/schema.ts b/x-pack/plugins/observability_solution/apm/server/lib/apm_telemetry/schema.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/apm_telemetry/schema.ts rename to x-pack/plugins/observability_solution/apm/server/lib/apm_telemetry/schema.ts diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/telemetry_client.ts b/x-pack/plugins/observability_solution/apm/server/lib/apm_telemetry/telemetry_client.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/apm_telemetry/telemetry_client.ts rename to x-pack/plugins/observability_solution/apm/server/lib/apm_telemetry/telemetry_client.ts diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/types.ts b/x-pack/plugins/observability_solution/apm/server/lib/apm_telemetry/types.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/apm_telemetry/types.ts rename to x-pack/plugins/observability_solution/apm/server/lib/apm_telemetry/types.ts diff --git a/x-pack/plugins/apm/server/lib/connections/exclude_rum_exit_spans_query.ts b/x-pack/plugins/observability_solution/apm/server/lib/connections/exclude_rum_exit_spans_query.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/connections/exclude_rum_exit_spans_query.ts rename to x-pack/plugins/observability_solution/apm/server/lib/connections/exclude_rum_exit_spans_query.ts diff --git a/x-pack/plugins/apm/server/lib/connections/get_connection_stats/get_connection_stats_items_with_relative_impact.ts b/x-pack/plugins/observability_solution/apm/server/lib/connections/get_connection_stats/get_connection_stats_items_with_relative_impact.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/connections/get_connection_stats/get_connection_stats_items_with_relative_impact.ts rename to x-pack/plugins/observability_solution/apm/server/lib/connections/get_connection_stats/get_connection_stats_items_with_relative_impact.ts diff --git a/x-pack/plugins/apm/server/lib/connections/get_connection_stats/get_destination_map.ts b/x-pack/plugins/observability_solution/apm/server/lib/connections/get_connection_stats/get_destination_map.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/connections/get_connection_stats/get_destination_map.ts rename to x-pack/plugins/observability_solution/apm/server/lib/connections/get_connection_stats/get_destination_map.ts diff --git a/x-pack/plugins/apm/server/lib/connections/get_connection_stats/get_stats.ts b/x-pack/plugins/observability_solution/apm/server/lib/connections/get_connection_stats/get_stats.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/connections/get_connection_stats/get_stats.ts rename to x-pack/plugins/observability_solution/apm/server/lib/connections/get_connection_stats/get_stats.ts diff --git a/x-pack/plugins/apm/server/lib/connections/get_connection_stats/index.ts b/x-pack/plugins/observability_solution/apm/server/lib/connections/get_connection_stats/index.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/connections/get_connection_stats/index.ts rename to x-pack/plugins/observability_solution/apm/server/lib/connections/get_connection_stats/index.ts diff --git a/x-pack/plugins/apm/server/lib/helpers/calculate_throughput.ts b/x-pack/plugins/observability_solution/apm/server/lib/helpers/calculate_throughput.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/helpers/calculate_throughput.ts rename to x-pack/plugins/observability_solution/apm/server/lib/helpers/calculate_throughput.ts diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/call_async_with_debug.ts b/x-pack/plugins/observability_solution/apm/server/lib/helpers/create_es_client/call_async_with_debug.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/helpers/create_es_client/call_async_with_debug.ts rename to x-pack/plugins/observability_solution/apm/server/lib/helpers/create_es_client/call_async_with_debug.ts diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/cancel_es_request_on_abort.ts b/x-pack/plugins/observability_solution/apm/server/lib/helpers/create_es_client/cancel_es_request_on_abort.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/helpers/create_es_client/cancel_es_request_on_abort.ts rename to x-pack/plugins/observability_solution/apm/server/lib/helpers/create_es_client/cancel_es_request_on_abort.ts diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/get_request_base.test.ts b/x-pack/plugins/observability_solution/apm/server/lib/helpers/create_es_client/create_apm_event_client/get_request_base.test.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/get_request_base.test.ts rename to x-pack/plugins/observability_solution/apm/server/lib/helpers/create_es_client/create_apm_event_client/get_request_base.test.ts diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/get_request_base.ts b/x-pack/plugins/observability_solution/apm/server/lib/helpers/create_es_client/create_apm_event_client/get_request_base.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/get_request_base.ts rename to x-pack/plugins/observability_solution/apm/server/lib/helpers/create_es_client/create_apm_event_client/get_request_base.ts diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.test.ts b/x-pack/plugins/observability_solution/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.test.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.test.ts rename to x-pack/plugins/observability_solution/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.test.ts diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.ts b/x-pack/plugins/observability_solution/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.ts rename to x-pack/plugins/observability_solution/apm/server/lib/helpers/create_es_client/create_apm_event_client/index.ts diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_infra_metrics_client/create_infra_metrics_client.ts b/x-pack/plugins/observability_solution/apm/server/lib/helpers/create_es_client/create_infra_metrics_client/create_infra_metrics_client.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/helpers/create_es_client/create_infra_metrics_client/create_infra_metrics_client.ts rename to x-pack/plugins/observability_solution/apm/server/lib/helpers/create_es_client/create_infra_metrics_client/create_infra_metrics_client.ts diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/create_internal_es_client/index.ts b/x-pack/plugins/observability_solution/apm/server/lib/helpers/create_es_client/create_internal_es_client/index.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/helpers/create_es_client/create_internal_es_client/index.ts rename to x-pack/plugins/observability_solution/apm/server/lib/helpers/create_es_client/create_internal_es_client/index.ts diff --git a/x-pack/plugins/apm/server/lib/helpers/create_es_client/document_type.ts b/x-pack/plugins/observability_solution/apm/server/lib/helpers/create_es_client/document_type.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/helpers/create_es_client/document_type.ts rename to x-pack/plugins/observability_solution/apm/server/lib/helpers/create_es_client/document_type.ts diff --git a/x-pack/plugins/apm/server/lib/helpers/get_apm_alerts_client.ts b/x-pack/plugins/observability_solution/apm/server/lib/helpers/get_apm_alerts_client.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/helpers/get_apm_alerts_client.ts rename to x-pack/plugins/observability_solution/apm/server/lib/helpers/get_apm_alerts_client.ts diff --git a/x-pack/plugins/apm/server/lib/helpers/get_apm_event_client.ts b/x-pack/plugins/observability_solution/apm/server/lib/helpers/get_apm_event_client.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/helpers/get_apm_event_client.ts rename to x-pack/plugins/observability_solution/apm/server/lib/helpers/get_apm_event_client.ts diff --git a/x-pack/plugins/apm/server/lib/helpers/get_bucket_size_for_aggregated_transactions/index.test.ts b/x-pack/plugins/observability_solution/apm/server/lib/helpers/get_bucket_size_for_aggregated_transactions/index.test.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/helpers/get_bucket_size_for_aggregated_transactions/index.test.ts rename to x-pack/plugins/observability_solution/apm/server/lib/helpers/get_bucket_size_for_aggregated_transactions/index.test.ts diff --git a/x-pack/plugins/apm/server/lib/helpers/get_bucket_size_for_aggregated_transactions/index.ts b/x-pack/plugins/observability_solution/apm/server/lib/helpers/get_bucket_size_for_aggregated_transactions/index.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/helpers/get_bucket_size_for_aggregated_transactions/index.ts rename to x-pack/plugins/observability_solution/apm/server/lib/helpers/get_bucket_size_for_aggregated_transactions/index.ts diff --git a/x-pack/plugins/apm/server/lib/helpers/get_document_sources.ts b/x-pack/plugins/observability_solution/apm/server/lib/helpers/get_document_sources.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/helpers/get_document_sources.ts rename to x-pack/plugins/observability_solution/apm/server/lib/helpers/get_document_sources.ts diff --git a/x-pack/plugins/apm/server/lib/helpers/get_error_name.test.ts b/x-pack/plugins/observability_solution/apm/server/lib/helpers/get_error_name.test.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/helpers/get_error_name.test.ts rename to x-pack/plugins/observability_solution/apm/server/lib/helpers/get_error_name.test.ts diff --git a/x-pack/plugins/apm/server/lib/helpers/get_error_name.ts b/x-pack/plugins/observability_solution/apm/server/lib/helpers/get_error_name.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/helpers/get_error_name.ts rename to x-pack/plugins/observability_solution/apm/server/lib/helpers/get_error_name.ts diff --git a/x-pack/plugins/apm/server/lib/helpers/get_es_capabilities.ts b/x-pack/plugins/observability_solution/apm/server/lib/helpers/get_es_capabilities.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/helpers/get_es_capabilities.ts rename to x-pack/plugins/observability_solution/apm/server/lib/helpers/get_es_capabilities.ts diff --git a/x-pack/plugins/apm/server/lib/helpers/get_internal_saved_objects_client.ts b/x-pack/plugins/observability_solution/apm/server/lib/helpers/get_internal_saved_objects_client.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/helpers/get_internal_saved_objects_client.ts rename to x-pack/plugins/observability_solution/apm/server/lib/helpers/get_internal_saved_objects_client.ts diff --git a/x-pack/plugins/apm/server/lib/helpers/get_ml_client.ts b/x-pack/plugins/observability_solution/apm/server/lib/helpers/get_ml_client.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/helpers/get_ml_client.ts rename to x-pack/plugins/observability_solution/apm/server/lib/helpers/get_ml_client.ts diff --git a/x-pack/plugins/apm/server/lib/helpers/get_random_sampler/index.ts b/x-pack/plugins/observability_solution/apm/server/lib/helpers/get_random_sampler/index.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/helpers/get_random_sampler/index.ts rename to x-pack/plugins/observability_solution/apm/server/lib/helpers/get_random_sampler/index.ts diff --git a/x-pack/plugins/apm/server/lib/helpers/latency_aggregation_type/index.ts b/x-pack/plugins/observability_solution/apm/server/lib/helpers/latency_aggregation_type/index.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/helpers/latency_aggregation_type/index.ts rename to x-pack/plugins/observability_solution/apm/server/lib/helpers/latency_aggregation_type/index.ts diff --git a/x-pack/plugins/apm/server/lib/helpers/metrics.ts b/x-pack/plugins/observability_solution/apm/server/lib/helpers/metrics.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/helpers/metrics.ts rename to x-pack/plugins/observability_solution/apm/server/lib/helpers/metrics.ts diff --git a/x-pack/plugins/apm/server/lib/helpers/round_to_nearest_five_or_ten.test.ts b/x-pack/plugins/observability_solution/apm/server/lib/helpers/round_to_nearest_five_or_ten.test.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/helpers/round_to_nearest_five_or_ten.test.ts rename to x-pack/plugins/observability_solution/apm/server/lib/helpers/round_to_nearest_five_or_ten.test.ts diff --git a/x-pack/plugins/apm/server/lib/helpers/round_to_nearest_five_or_ten.ts b/x-pack/plugins/observability_solution/apm/server/lib/helpers/round_to_nearest_five_or_ten.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/helpers/round_to_nearest_five_or_ten.ts rename to x-pack/plugins/observability_solution/apm/server/lib/helpers/round_to_nearest_five_or_ten.ts diff --git a/x-pack/plugins/apm/server/lib/helpers/spans/get_is_using_service_destination_metrics.ts b/x-pack/plugins/observability_solution/apm/server/lib/helpers/spans/get_is_using_service_destination_metrics.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/helpers/spans/get_is_using_service_destination_metrics.ts rename to x-pack/plugins/observability_solution/apm/server/lib/helpers/spans/get_is_using_service_destination_metrics.ts diff --git a/x-pack/plugins/apm/server/lib/helpers/transaction_coldstart_rate.ts b/x-pack/plugins/observability_solution/apm/server/lib/helpers/transaction_coldstart_rate.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/helpers/transaction_coldstart_rate.ts rename to x-pack/plugins/observability_solution/apm/server/lib/helpers/transaction_coldstart_rate.ts diff --git a/x-pack/plugins/apm/server/lib/helpers/transaction_error_rate.ts b/x-pack/plugins/observability_solution/apm/server/lib/helpers/transaction_error_rate.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/helpers/transaction_error_rate.ts rename to x-pack/plugins/observability_solution/apm/server/lib/helpers/transaction_error_rate.ts diff --git a/x-pack/plugins/apm/server/lib/helpers/transactions/__snapshots__/get_is_using_transaction_events.test.ts.snap b/x-pack/plugins/observability_solution/apm/server/lib/helpers/transactions/__snapshots__/get_is_using_transaction_events.test.ts.snap similarity index 100% rename from x-pack/plugins/apm/server/lib/helpers/transactions/__snapshots__/get_is_using_transaction_events.test.ts.snap rename to x-pack/plugins/observability_solution/apm/server/lib/helpers/transactions/__snapshots__/get_is_using_transaction_events.test.ts.snap diff --git a/x-pack/plugins/apm/server/lib/helpers/transactions/get_is_using_transaction_events.test.ts b/x-pack/plugins/observability_solution/apm/server/lib/helpers/transactions/get_is_using_transaction_events.test.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/helpers/transactions/get_is_using_transaction_events.test.ts rename to x-pack/plugins/observability_solution/apm/server/lib/helpers/transactions/get_is_using_transaction_events.test.ts diff --git a/x-pack/plugins/apm/server/lib/helpers/transactions/get_is_using_transaction_events.ts b/x-pack/plugins/observability_solution/apm/server/lib/helpers/transactions/get_is_using_transaction_events.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/helpers/transactions/get_is_using_transaction_events.ts rename to x-pack/plugins/observability_solution/apm/server/lib/helpers/transactions/get_is_using_transaction_events.ts diff --git a/x-pack/plugins/apm/server/lib/helpers/transactions/index.ts b/x-pack/plugins/observability_solution/apm/server/lib/helpers/transactions/index.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/helpers/transactions/index.ts rename to x-pack/plugins/observability_solution/apm/server/lib/helpers/transactions/index.ts diff --git a/x-pack/plugins/apm/server/lib/service_group_query.ts b/x-pack/plugins/observability_solution/apm/server/lib/service_group_query.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/service_group_query.ts rename to x-pack/plugins/observability_solution/apm/server/lib/service_group_query.ts diff --git a/x-pack/plugins/apm/server/lib/service_group_query_with_overflow.ts b/x-pack/plugins/observability_solution/apm/server/lib/service_group_query_with_overflow.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/service_group_query_with_overflow.ts rename to x-pack/plugins/observability_solution/apm/server/lib/service_group_query_with_overflow.ts diff --git a/x-pack/plugins/apm/server/lib/transaction_groups/get_coldstart_rate.ts b/x-pack/plugins/observability_solution/apm/server/lib/transaction_groups/get_coldstart_rate.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/transaction_groups/get_coldstart_rate.ts rename to x-pack/plugins/observability_solution/apm/server/lib/transaction_groups/get_coldstart_rate.ts diff --git a/x-pack/plugins/apm/server/lib/transaction_groups/get_failed_transaction_rate.ts b/x-pack/plugins/observability_solution/apm/server/lib/transaction_groups/get_failed_transaction_rate.ts similarity index 100% rename from x-pack/plugins/apm/server/lib/transaction_groups/get_failed_transaction_rate.ts rename to x-pack/plugins/observability_solution/apm/server/lib/transaction_groups/get_failed_transaction_rate.ts diff --git a/x-pack/plugins/apm/server/plugin.ts b/x-pack/plugins/observability_solution/apm/server/plugin.ts similarity index 100% rename from x-pack/plugins/apm/server/plugin.ts rename to x-pack/plugins/observability_solution/apm/server/plugin.ts diff --git a/x-pack/plugins/apm/server/routes/agent_explorer/error_with_status_code.ts b/x-pack/plugins/observability_solution/apm/server/routes/agent_explorer/error_with_status_code.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/agent_explorer/error_with_status_code.ts rename to x-pack/plugins/observability_solution/apm/server/routes/agent_explorer/error_with_status_code.ts diff --git a/x-pack/plugins/apm/server/routes/agent_explorer/fetch_agents_last_version.test.ts b/x-pack/plugins/observability_solution/apm/server/routes/agent_explorer/fetch_agents_last_version.test.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/agent_explorer/fetch_agents_last_version.test.ts rename to x-pack/plugins/observability_solution/apm/server/routes/agent_explorer/fetch_agents_last_version.test.ts diff --git a/x-pack/plugins/apm/server/routes/agent_explorer/fetch_agents_latest_version.ts b/x-pack/plugins/observability_solution/apm/server/routes/agent_explorer/fetch_agents_latest_version.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/agent_explorer/fetch_agents_latest_version.ts rename to x-pack/plugins/observability_solution/apm/server/routes/agent_explorer/fetch_agents_latest_version.ts diff --git a/x-pack/plugins/apm/server/routes/agent_explorer/get_agent_instances.ts b/x-pack/plugins/observability_solution/apm/server/routes/agent_explorer/get_agent_instances.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/agent_explorer/get_agent_instances.ts rename to x-pack/plugins/observability_solution/apm/server/routes/agent_explorer/get_agent_instances.ts diff --git a/x-pack/plugins/apm/server/routes/agent_explorer/get_agent_url_repository.ts b/x-pack/plugins/observability_solution/apm/server/routes/agent_explorer/get_agent_url_repository.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/agent_explorer/get_agent_url_repository.ts rename to x-pack/plugins/observability_solution/apm/server/routes/agent_explorer/get_agent_url_repository.ts diff --git a/x-pack/plugins/apm/server/routes/agent_explorer/get_agents.ts b/x-pack/plugins/observability_solution/apm/server/routes/agent_explorer/get_agents.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/agent_explorer/get_agents.ts rename to x-pack/plugins/observability_solution/apm/server/routes/agent_explorer/get_agents.ts diff --git a/x-pack/plugins/apm/server/routes/agent_explorer/get_agents_items.ts b/x-pack/plugins/observability_solution/apm/server/routes/agent_explorer/get_agents_items.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/agent_explorer/get_agents_items.ts rename to x-pack/plugins/observability_solution/apm/server/routes/agent_explorer/get_agents_items.ts diff --git a/x-pack/plugins/apm/server/routes/agent_explorer/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/agent_explorer/route.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/agent_explorer/route.ts rename to x-pack/plugins/observability_solution/apm/server/routes/agent_explorer/route.ts diff --git a/x-pack/plugins/apm/server/routes/agent_keys/create_agent_key.ts b/x-pack/plugins/observability_solution/apm/server/routes/agent_keys/create_agent_key.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/agent_keys/create_agent_key.ts rename to x-pack/plugins/observability_solution/apm/server/routes/agent_keys/create_agent_key.ts diff --git a/x-pack/plugins/apm/server/routes/agent_keys/get_agent_keys.ts b/x-pack/plugins/observability_solution/apm/server/routes/agent_keys/get_agent_keys.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/agent_keys/get_agent_keys.ts rename to x-pack/plugins/observability_solution/apm/server/routes/agent_keys/get_agent_keys.ts diff --git a/x-pack/plugins/apm/server/routes/agent_keys/get_agent_keys_privileges.ts b/x-pack/plugins/observability_solution/apm/server/routes/agent_keys/get_agent_keys_privileges.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/agent_keys/get_agent_keys_privileges.ts rename to x-pack/plugins/observability_solution/apm/server/routes/agent_keys/get_agent_keys_privileges.ts diff --git a/x-pack/plugins/apm/server/routes/agent_keys/invalidate_agent_key.ts b/x-pack/plugins/observability_solution/apm/server/routes/agent_keys/invalidate_agent_key.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/agent_keys/invalidate_agent_key.ts rename to x-pack/plugins/observability_solution/apm/server/routes/agent_keys/invalidate_agent_key.ts diff --git a/x-pack/plugins/apm/server/routes/agent_keys/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/agent_keys/route.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/agent_keys/route.ts rename to x-pack/plugins/observability_solution/apm/server/routes/agent_keys/route.ts diff --git a/x-pack/plugins/apm/server/routes/alerts/action_variables.ts b/x-pack/plugins/observability_solution/apm/server/routes/alerts/action_variables.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/alerts/action_variables.ts rename to x-pack/plugins/observability_solution/apm/server/routes/alerts/action_variables.ts diff --git a/x-pack/plugins/apm/server/routes/alerts/alerting_es_client.ts b/x-pack/plugins/observability_solution/apm/server/routes/alerts/alerting_es_client.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/alerts/alerting_es_client.ts rename to x-pack/plugins/observability_solution/apm/server/routes/alerts/alerting_es_client.ts diff --git a/x-pack/plugins/apm/server/routes/alerts/register_apm_rule_types.ts b/x-pack/plugins/observability_solution/apm/server/routes/alerts/register_apm_rule_types.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/alerts/register_apm_rule_types.ts rename to x-pack/plugins/observability_solution/apm/server/routes/alerts/register_apm_rule_types.ts diff --git a/x-pack/plugins/apm/server/routes/alerts/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/alerts/route.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/alerts/route.ts rename to x-pack/plugins/observability_solution/apm/server/routes/alerts/route.ts diff --git a/x-pack/plugins/apm/server/routes/alerts/rule_types/anomaly/get_service_group_fields_for_anomaly.ts b/x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/anomaly/get_service_group_fields_for_anomaly.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/alerts/rule_types/anomaly/get_service_group_fields_for_anomaly.ts rename to x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/anomaly/get_service_group_fields_for_anomaly.ts diff --git a/x-pack/plugins/apm/server/routes/alerts/rule_types/anomaly/register_anomaly_rule_type.test.ts b/x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/anomaly/register_anomaly_rule_type.test.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/alerts/rule_types/anomaly/register_anomaly_rule_type.test.ts rename to x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/anomaly/register_anomaly_rule_type.test.ts diff --git a/x-pack/plugins/apm/server/routes/alerts/rule_types/anomaly/register_anomaly_rule_type.ts b/x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/anomaly/register_anomaly_rule_type.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/alerts/rule_types/anomaly/register_anomaly_rule_type.ts rename to x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/anomaly/register_anomaly_rule_type.ts diff --git a/x-pack/plugins/apm/server/routes/alerts/rule_types/docs/params_property_apm_anomaly.yaml b/x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/docs/params_property_apm_anomaly.yaml similarity index 100% rename from x-pack/plugins/apm/server/routes/alerts/rule_types/docs/params_property_apm_anomaly.yaml rename to x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/docs/params_property_apm_anomaly.yaml diff --git a/x-pack/plugins/apm/server/routes/alerts/rule_types/docs/params_property_apm_error_count.yaml b/x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/docs/params_property_apm_error_count.yaml similarity index 100% rename from x-pack/plugins/apm/server/routes/alerts/rule_types/docs/params_property_apm_error_count.yaml rename to x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/docs/params_property_apm_error_count.yaml diff --git a/x-pack/plugins/apm/server/routes/alerts/rule_types/docs/params_property_apm_transaction_duration.yaml b/x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/docs/params_property_apm_transaction_duration.yaml similarity index 100% rename from x-pack/plugins/apm/server/routes/alerts/rule_types/docs/params_property_apm_transaction_duration.yaml rename to x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/docs/params_property_apm_transaction_duration.yaml diff --git a/x-pack/plugins/apm/server/routes/alerts/rule_types/docs/params_property_apm_transaction_error_rate.yaml b/x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/docs/params_property_apm_transaction_error_rate.yaml similarity index 100% rename from x-pack/plugins/apm/server/routes/alerts/rule_types/docs/params_property_apm_transaction_error_rate.yaml rename to x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/docs/params_property_apm_transaction_error_rate.yaml diff --git a/x-pack/plugins/apm/server/routes/alerts/rule_types/error_count/get_error_count_chart_preview.ts b/x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/error_count/get_error_count_chart_preview.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/alerts/rule_types/error_count/get_error_count_chart_preview.ts rename to x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/error_count/get_error_count_chart_preview.ts diff --git a/x-pack/plugins/apm/server/routes/alerts/rule_types/error_count/register_error_count_rule_type.test.ts b/x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/error_count/register_error_count_rule_type.test.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/alerts/rule_types/error_count/register_error_count_rule_type.test.ts rename to x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/error_count/register_error_count_rule_type.test.ts diff --git a/x-pack/plugins/apm/server/routes/alerts/rule_types/error_count/register_error_count_rule_type.ts b/x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/error_count/register_error_count_rule_type.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/alerts/rule_types/error_count/register_error_count_rule_type.ts rename to x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/error_count/register_error_count_rule_type.ts diff --git a/x-pack/plugins/apm/server/routes/alerts/rule_types/get_service_group_fields.test.ts b/x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/get_service_group_fields.test.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/alerts/rule_types/get_service_group_fields.test.ts rename to x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/get_service_group_fields.test.ts diff --git a/x-pack/plugins/apm/server/routes/alerts/rule_types/get_service_group_fields.ts b/x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/get_service_group_fields.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/alerts/rule_types/get_service_group_fields.ts rename to x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/get_service_group_fields.ts diff --git a/x-pack/plugins/apm/server/routes/alerts/rule_types/transaction_duration/average_or_percentile_agg.ts b/x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/transaction_duration/average_or_percentile_agg.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/alerts/rule_types/transaction_duration/average_or_percentile_agg.ts rename to x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/transaction_duration/average_or_percentile_agg.ts diff --git a/x-pack/plugins/apm/server/routes/alerts/rule_types/transaction_duration/get_transaction_duration_chart_preview.ts b/x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/transaction_duration/get_transaction_duration_chart_preview.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/alerts/rule_types/transaction_duration/get_transaction_duration_chart_preview.ts rename to x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/transaction_duration/get_transaction_duration_chart_preview.ts diff --git a/x-pack/plugins/apm/server/routes/alerts/rule_types/transaction_duration/register_transaction_duration_rule_type.test.ts b/x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/transaction_duration/register_transaction_duration_rule_type.test.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/alerts/rule_types/transaction_duration/register_transaction_duration_rule_type.test.ts rename to x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/transaction_duration/register_transaction_duration_rule_type.test.ts diff --git a/x-pack/plugins/apm/server/routes/alerts/rule_types/transaction_duration/register_transaction_duration_rule_type.ts b/x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/transaction_duration/register_transaction_duration_rule_type.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/alerts/rule_types/transaction_duration/register_transaction_duration_rule_type.ts rename to x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/transaction_duration/register_transaction_duration_rule_type.ts diff --git a/x-pack/plugins/apm/server/routes/alerts/rule_types/transaction_error_rate/get_transaction_error_rate_chart_preview.ts b/x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/transaction_error_rate/get_transaction_error_rate_chart_preview.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/alerts/rule_types/transaction_error_rate/get_transaction_error_rate_chart_preview.ts rename to x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/transaction_error_rate/get_transaction_error_rate_chart_preview.ts diff --git a/x-pack/plugins/apm/server/routes/alerts/rule_types/transaction_error_rate/register_transaction_error_rate_rule_type.test.ts b/x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/transaction_error_rate/register_transaction_error_rate_rule_type.test.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/alerts/rule_types/transaction_error_rate/register_transaction_error_rate_rule_type.test.ts rename to x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/transaction_error_rate/register_transaction_error_rate_rule_type.test.ts diff --git a/x-pack/plugins/apm/server/routes/alerts/rule_types/transaction_error_rate/register_transaction_error_rate_rule_type.ts b/x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/transaction_error_rate/register_transaction_error_rate_rule_type.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/alerts/rule_types/transaction_error_rate/register_transaction_error_rate_rule_type.ts rename to x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/transaction_error_rate/register_transaction_error_rate_rule_type.ts diff --git a/x-pack/plugins/apm/server/routes/alerts/rule_types/utils/get_filtered_series_for_preview_chart.ts b/x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/utils/get_filtered_series_for_preview_chart.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/alerts/rule_types/utils/get_filtered_series_for_preview_chart.ts rename to x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/utils/get_filtered_series_for_preview_chart.ts diff --git a/x-pack/plugins/apm/server/routes/alerts/rule_types/utils/get_groupby_action_variables.test.ts b/x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/utils/get_groupby_action_variables.test.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/alerts/rule_types/utils/get_groupby_action_variables.test.ts rename to x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/utils/get_groupby_action_variables.test.ts diff --git a/x-pack/plugins/apm/server/routes/alerts/rule_types/utils/get_groupby_action_variables.ts b/x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/utils/get_groupby_action_variables.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/alerts/rule_types/utils/get_groupby_action_variables.ts rename to x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/utils/get_groupby_action_variables.ts diff --git a/x-pack/plugins/apm/server/routes/alerts/rule_types/utils/get_groupby_terms.test.ts b/x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/utils/get_groupby_terms.test.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/alerts/rule_types/utils/get_groupby_terms.test.ts rename to x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/utils/get_groupby_terms.test.ts diff --git a/x-pack/plugins/apm/server/routes/alerts/rule_types/utils/get_groupby_terms.ts b/x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/utils/get_groupby_terms.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/alerts/rule_types/utils/get_groupby_terms.ts rename to x-pack/plugins/observability_solution/apm/server/routes/alerts/rule_types/utils/get_groupby_terms.ts diff --git a/x-pack/plugins/apm/server/routes/alerts/test_utils/index.ts b/x-pack/plugins/observability_solution/apm/server/routes/alerts/test_utils/index.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/alerts/test_utils/index.ts rename to x-pack/plugins/observability_solution/apm/server/routes/alerts/test_utils/index.ts diff --git a/x-pack/plugins/apm/server/routes/apm_routes/create_apm_server_route.ts b/x-pack/plugins/observability_solution/apm/server/routes/apm_routes/create_apm_server_route.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/apm_routes/create_apm_server_route.ts rename to x-pack/plugins/observability_solution/apm/server/routes/apm_routes/create_apm_server_route.ts diff --git a/x-pack/plugins/apm/server/routes/apm_routes/get_global_apm_server_route_repository.ts b/x-pack/plugins/observability_solution/apm/server/routes/apm_routes/get_global_apm_server_route_repository.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/apm_routes/get_global_apm_server_route_repository.ts rename to x-pack/plugins/observability_solution/apm/server/routes/apm_routes/get_global_apm_server_route_repository.ts diff --git a/x-pack/plugins/apm/server/routes/apm_routes/register_apm_server_routes.test.ts b/x-pack/plugins/observability_solution/apm/server/routes/apm_routes/register_apm_server_routes.test.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/apm_routes/register_apm_server_routes.test.ts rename to x-pack/plugins/observability_solution/apm/server/routes/apm_routes/register_apm_server_routes.test.ts diff --git a/x-pack/plugins/apm/server/routes/apm_routes/register_apm_server_routes.ts b/x-pack/plugins/observability_solution/apm/server/routes/apm_routes/register_apm_server_routes.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/apm_routes/register_apm_server_routes.ts rename to x-pack/plugins/observability_solution/apm/server/routes/apm_routes/register_apm_server_routes.ts diff --git a/x-pack/plugins/apm/server/routes/assistant_functions/get_apm_correlation_values/index.ts b/x-pack/plugins/observability_solution/apm/server/routes/assistant_functions/get_apm_correlation_values/index.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/assistant_functions/get_apm_correlation_values/index.ts rename to x-pack/plugins/observability_solution/apm/server/routes/assistant_functions/get_apm_correlation_values/index.ts diff --git a/x-pack/plugins/apm/server/routes/assistant_functions/get_apm_downstream_dependencies/index.ts b/x-pack/plugins/observability_solution/apm/server/routes/assistant_functions/get_apm_downstream_dependencies/index.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/assistant_functions/get_apm_downstream_dependencies/index.ts rename to x-pack/plugins/observability_solution/apm/server/routes/assistant_functions/get_apm_downstream_dependencies/index.ts diff --git a/x-pack/plugins/apm/server/routes/assistant_functions/get_apm_error_document/index.ts b/x-pack/plugins/observability_solution/apm/server/routes/assistant_functions/get_apm_error_document/index.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/assistant_functions/get_apm_error_document/index.ts rename to x-pack/plugins/observability_solution/apm/server/routes/assistant_functions/get_apm_error_document/index.ts diff --git a/x-pack/plugins/apm/server/routes/assistant_functions/get_apm_service_summary/index.ts b/x-pack/plugins/observability_solution/apm/server/routes/assistant_functions/get_apm_service_summary/index.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/assistant_functions/get_apm_service_summary/index.ts rename to x-pack/plugins/observability_solution/apm/server/routes/assistant_functions/get_apm_service_summary/index.ts diff --git a/x-pack/plugins/apm/server/routes/assistant_functions/get_apm_timeseries/fetch_timeseries.ts b/x-pack/plugins/observability_solution/apm/server/routes/assistant_functions/get_apm_timeseries/fetch_timeseries.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/assistant_functions/get_apm_timeseries/fetch_timeseries.ts rename to x-pack/plugins/observability_solution/apm/server/routes/assistant_functions/get_apm_timeseries/fetch_timeseries.ts diff --git a/x-pack/plugins/apm/server/routes/assistant_functions/get_apm_timeseries/get_error_event_rate.ts b/x-pack/plugins/observability_solution/apm/server/routes/assistant_functions/get_apm_timeseries/get_error_event_rate.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/assistant_functions/get_apm_timeseries/get_error_event_rate.ts rename to x-pack/plugins/observability_solution/apm/server/routes/assistant_functions/get_apm_timeseries/get_error_event_rate.ts diff --git a/x-pack/plugins/apm/server/routes/assistant_functions/get_apm_timeseries/get_exit_span_failure_rate.ts b/x-pack/plugins/observability_solution/apm/server/routes/assistant_functions/get_apm_timeseries/get_exit_span_failure_rate.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/assistant_functions/get_apm_timeseries/get_exit_span_failure_rate.ts rename to x-pack/plugins/observability_solution/apm/server/routes/assistant_functions/get_apm_timeseries/get_exit_span_failure_rate.ts diff --git a/x-pack/plugins/apm/server/routes/assistant_functions/get_apm_timeseries/get_exit_span_latency.ts b/x-pack/plugins/observability_solution/apm/server/routes/assistant_functions/get_apm_timeseries/get_exit_span_latency.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/assistant_functions/get_apm_timeseries/get_exit_span_latency.ts rename to x-pack/plugins/observability_solution/apm/server/routes/assistant_functions/get_apm_timeseries/get_exit_span_latency.ts diff --git a/x-pack/plugins/apm/server/routes/assistant_functions/get_apm_timeseries/get_exit_span_throughput.ts b/x-pack/plugins/observability_solution/apm/server/routes/assistant_functions/get_apm_timeseries/get_exit_span_throughput.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/assistant_functions/get_apm_timeseries/get_exit_span_throughput.ts rename to x-pack/plugins/observability_solution/apm/server/routes/assistant_functions/get_apm_timeseries/get_exit_span_throughput.ts diff --git a/x-pack/plugins/apm/server/routes/assistant_functions/get_apm_timeseries/get_transaction_failure_rate.ts b/x-pack/plugins/observability_solution/apm/server/routes/assistant_functions/get_apm_timeseries/get_transaction_failure_rate.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/assistant_functions/get_apm_timeseries/get_transaction_failure_rate.ts rename to x-pack/plugins/observability_solution/apm/server/routes/assistant_functions/get_apm_timeseries/get_transaction_failure_rate.ts diff --git a/x-pack/plugins/apm/server/routes/assistant_functions/get_apm_timeseries/get_transaction_latency.ts b/x-pack/plugins/observability_solution/apm/server/routes/assistant_functions/get_apm_timeseries/get_transaction_latency.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/assistant_functions/get_apm_timeseries/get_transaction_latency.ts rename to x-pack/plugins/observability_solution/apm/server/routes/assistant_functions/get_apm_timeseries/get_transaction_latency.ts diff --git a/x-pack/plugins/apm/server/routes/assistant_functions/get_apm_timeseries/get_transaction_throughput.ts b/x-pack/plugins/observability_solution/apm/server/routes/assistant_functions/get_apm_timeseries/get_transaction_throughput.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/assistant_functions/get_apm_timeseries/get_transaction_throughput.ts rename to x-pack/plugins/observability_solution/apm/server/routes/assistant_functions/get_apm_timeseries/get_transaction_throughput.ts diff --git a/x-pack/plugins/apm/server/routes/assistant_functions/get_apm_timeseries/index.ts b/x-pack/plugins/observability_solution/apm/server/routes/assistant_functions/get_apm_timeseries/index.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/assistant_functions/get_apm_timeseries/index.ts rename to x-pack/plugins/observability_solution/apm/server/routes/assistant_functions/get_apm_timeseries/index.ts diff --git a/x-pack/plugins/apm/server/routes/assistant_functions/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/assistant_functions/route.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/assistant_functions/route.ts rename to x-pack/plugins/observability_solution/apm/server/routes/assistant_functions/route.ts diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/fetch_duration_correlation.ts b/x-pack/plugins/observability_solution/apm/server/routes/correlations/queries/fetch_duration_correlation.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/correlations/queries/fetch_duration_correlation.ts rename to x-pack/plugins/observability_solution/apm/server/routes/correlations/queries/fetch_duration_correlation.ts diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/fetch_duration_correlation_with_histogram.ts b/x-pack/plugins/observability_solution/apm/server/routes/correlations/queries/fetch_duration_correlation_with_histogram.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/correlations/queries/fetch_duration_correlation_with_histogram.ts rename to x-pack/plugins/observability_solution/apm/server/routes/correlations/queries/fetch_duration_correlation_with_histogram.ts diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/fetch_duration_field_candidates.ts b/x-pack/plugins/observability_solution/apm/server/routes/correlations/queries/fetch_duration_field_candidates.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/correlations/queries/fetch_duration_field_candidates.ts rename to x-pack/plugins/observability_solution/apm/server/routes/correlations/queries/fetch_duration_field_candidates.ts diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/fetch_duration_fractions.ts b/x-pack/plugins/observability_solution/apm/server/routes/correlations/queries/fetch_duration_fractions.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/correlations/queries/fetch_duration_fractions.ts rename to x-pack/plugins/observability_solution/apm/server/routes/correlations/queries/fetch_duration_fractions.ts diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/fetch_duration_histogram_range_steps.ts b/x-pack/plugins/observability_solution/apm/server/routes/correlations/queries/fetch_duration_histogram_range_steps.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/correlations/queries/fetch_duration_histogram_range_steps.ts rename to x-pack/plugins/observability_solution/apm/server/routes/correlations/queries/fetch_duration_histogram_range_steps.ts diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/fetch_duration_percentiles.ts b/x-pack/plugins/observability_solution/apm/server/routes/correlations/queries/fetch_duration_percentiles.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/correlations/queries/fetch_duration_percentiles.ts rename to x-pack/plugins/observability_solution/apm/server/routes/correlations/queries/fetch_duration_percentiles.ts diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/fetch_duration_ranges.ts b/x-pack/plugins/observability_solution/apm/server/routes/correlations/queries/fetch_duration_ranges.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/correlations/queries/fetch_duration_ranges.ts rename to x-pack/plugins/observability_solution/apm/server/routes/correlations/queries/fetch_duration_ranges.ts diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/fetch_failed_events_correlation_p_values.ts b/x-pack/plugins/observability_solution/apm/server/routes/correlations/queries/fetch_failed_events_correlation_p_values.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/correlations/queries/fetch_failed_events_correlation_p_values.ts rename to x-pack/plugins/observability_solution/apm/server/routes/correlations/queries/fetch_failed_events_correlation_p_values.ts diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/fetch_field_value_pairs.ts b/x-pack/plugins/observability_solution/apm/server/routes/correlations/queries/fetch_field_value_pairs.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/correlations/queries/fetch_field_value_pairs.ts rename to x-pack/plugins/observability_solution/apm/server/routes/correlations/queries/fetch_field_value_pairs.ts diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/fetch_p_values.ts b/x-pack/plugins/observability_solution/apm/server/routes/correlations/queries/fetch_p_values.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/correlations/queries/fetch_p_values.ts rename to x-pack/plugins/observability_solution/apm/server/routes/correlations/queries/fetch_p_values.ts diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/fetch_significant_correlations.ts b/x-pack/plugins/observability_solution/apm/server/routes/correlations/queries/fetch_significant_correlations.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/correlations/queries/fetch_significant_correlations.ts rename to x-pack/plugins/observability_solution/apm/server/routes/correlations/queries/fetch_significant_correlations.ts diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/field_stats/fetch_field_value_field_stats.ts b/x-pack/plugins/observability_solution/apm/server/routes/correlations/queries/field_stats/fetch_field_value_field_stats.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/correlations/queries/field_stats/fetch_field_value_field_stats.ts rename to x-pack/plugins/observability_solution/apm/server/routes/correlations/queries/field_stats/fetch_field_value_field_stats.ts diff --git a/x-pack/plugins/apm/server/routes/correlations/queries/get_common_correlations_query.ts b/x-pack/plugins/observability_solution/apm/server/routes/correlations/queries/get_common_correlations_query.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/correlations/queries/get_common_correlations_query.ts rename to x-pack/plugins/observability_solution/apm/server/routes/correlations/queries/get_common_correlations_query.ts diff --git a/x-pack/plugins/apm/server/routes/correlations/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/correlations/route.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/correlations/route.ts rename to x-pack/plugins/observability_solution/apm/server/routes/correlations/route.ts diff --git a/x-pack/plugins/apm/server/routes/correlations/utils/compute_expectations_and_ranges.test.ts b/x-pack/plugins/observability_solution/apm/server/routes/correlations/utils/compute_expectations_and_ranges.test.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/correlations/utils/compute_expectations_and_ranges.test.ts rename to x-pack/plugins/observability_solution/apm/server/routes/correlations/utils/compute_expectations_and_ranges.test.ts diff --git a/x-pack/plugins/apm/server/routes/correlations/utils/compute_expectations_and_ranges.ts b/x-pack/plugins/observability_solution/apm/server/routes/correlations/utils/compute_expectations_and_ranges.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/correlations/utils/compute_expectations_and_ranges.ts rename to x-pack/plugins/observability_solution/apm/server/routes/correlations/utils/compute_expectations_and_ranges.ts diff --git a/x-pack/plugins/apm/server/routes/correlations/utils/get_duration_field.ts b/x-pack/plugins/observability_solution/apm/server/routes/correlations/utils/get_duration_field.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/correlations/utils/get_duration_field.ts rename to x-pack/plugins/observability_solution/apm/server/routes/correlations/utils/get_duration_field.ts diff --git a/x-pack/plugins/apm/server/routes/correlations/utils/get_event_type.ts b/x-pack/plugins/observability_solution/apm/server/routes/correlations/utils/get_event_type.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/correlations/utils/get_event_type.ts rename to x-pack/plugins/observability_solution/apm/server/routes/correlations/utils/get_event_type.ts diff --git a/x-pack/plugins/apm/server/routes/correlations/utils/index.ts b/x-pack/plugins/observability_solution/apm/server/routes/correlations/utils/index.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/correlations/utils/index.ts rename to x-pack/plugins/observability_solution/apm/server/routes/correlations/utils/index.ts diff --git a/x-pack/plugins/apm/server/routes/correlations/utils/split_all_settled_promises.ts b/x-pack/plugins/observability_solution/apm/server/routes/correlations/utils/split_all_settled_promises.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/correlations/utils/split_all_settled_promises.ts rename to x-pack/plugins/observability_solution/apm/server/routes/correlations/utils/split_all_settled_promises.ts diff --git a/x-pack/plugins/apm/server/routes/custom_dashboards/get_custom_dashboards.ts b/x-pack/plugins/observability_solution/apm/server/routes/custom_dashboards/get_custom_dashboards.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/custom_dashboards/get_custom_dashboards.ts rename to x-pack/plugins/observability_solution/apm/server/routes/custom_dashboards/get_custom_dashboards.ts diff --git a/x-pack/plugins/apm/server/routes/custom_dashboards/get_services_with_dashboards.ts b/x-pack/plugins/observability_solution/apm/server/routes/custom_dashboards/get_services_with_dashboards.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/custom_dashboards/get_services_with_dashboards.ts rename to x-pack/plugins/observability_solution/apm/server/routes/custom_dashboards/get_services_with_dashboards.ts diff --git a/x-pack/plugins/apm/server/routes/custom_dashboards/remove_service_dashboard.ts b/x-pack/plugins/observability_solution/apm/server/routes/custom_dashboards/remove_service_dashboard.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/custom_dashboards/remove_service_dashboard.ts rename to x-pack/plugins/observability_solution/apm/server/routes/custom_dashboards/remove_service_dashboard.ts diff --git a/x-pack/plugins/apm/server/routes/custom_dashboards/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/custom_dashboards/route.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/custom_dashboards/route.ts rename to x-pack/plugins/observability_solution/apm/server/routes/custom_dashboards/route.ts diff --git a/x-pack/plugins/apm/server/routes/custom_dashboards/save_service_dashboard.ts b/x-pack/plugins/observability_solution/apm/server/routes/custom_dashboards/save_service_dashboard.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/custom_dashboards/save_service_dashboard.ts rename to x-pack/plugins/observability_solution/apm/server/routes/custom_dashboards/save_service_dashboard.ts diff --git a/x-pack/plugins/apm/server/routes/data_view/create_static_data_view.test.ts b/x-pack/plugins/observability_solution/apm/server/routes/data_view/create_static_data_view.test.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/data_view/create_static_data_view.test.ts rename to x-pack/plugins/observability_solution/apm/server/routes/data_view/create_static_data_view.test.ts diff --git a/x-pack/plugins/apm/server/routes/data_view/create_static_data_view.ts b/x-pack/plugins/observability_solution/apm/server/routes/data_view/create_static_data_view.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/data_view/create_static_data_view.ts rename to x-pack/plugins/observability_solution/apm/server/routes/data_view/create_static_data_view.ts diff --git a/x-pack/plugins/apm/server/routes/data_view/get_apm_data_view_index_pattern.test.ts b/x-pack/plugins/observability_solution/apm/server/routes/data_view/get_apm_data_view_index_pattern.test.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/data_view/get_apm_data_view_index_pattern.test.ts rename to x-pack/plugins/observability_solution/apm/server/routes/data_view/get_apm_data_view_index_pattern.test.ts diff --git a/x-pack/plugins/apm/server/routes/data_view/get_apm_data_view_index_pattern.ts b/x-pack/plugins/observability_solution/apm/server/routes/data_view/get_apm_data_view_index_pattern.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/data_view/get_apm_data_view_index_pattern.ts rename to x-pack/plugins/observability_solution/apm/server/routes/data_view/get_apm_data_view_index_pattern.ts diff --git a/x-pack/plugins/apm/server/routes/data_view/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/data_view/route.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/data_view/route.ts rename to x-pack/plugins/observability_solution/apm/server/routes/data_view/route.ts diff --git a/x-pack/plugins/apm/server/routes/debug_telemetry/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/debug_telemetry/route.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/debug_telemetry/route.ts rename to x-pack/plugins/observability_solution/apm/server/routes/debug_telemetry/route.ts diff --git a/x-pack/plugins/apm/server/routes/default_api_types.ts b/x-pack/plugins/observability_solution/apm/server/routes/default_api_types.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/default_api_types.ts rename to x-pack/plugins/observability_solution/apm/server/routes/default_api_types.ts diff --git a/x-pack/plugins/apm/server/routes/dependencies/get_dependency_latency_distribution.ts b/x-pack/plugins/observability_solution/apm/server/routes/dependencies/get_dependency_latency_distribution.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/dependencies/get_dependency_latency_distribution.ts rename to x-pack/plugins/observability_solution/apm/server/routes/dependencies/get_dependency_latency_distribution.ts diff --git a/x-pack/plugins/apm/server/routes/dependencies/get_error_rate_charts_for_dependency.ts b/x-pack/plugins/observability_solution/apm/server/routes/dependencies/get_error_rate_charts_for_dependency.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/dependencies/get_error_rate_charts_for_dependency.ts rename to x-pack/plugins/observability_solution/apm/server/routes/dependencies/get_error_rate_charts_for_dependency.ts diff --git a/x-pack/plugins/apm/server/routes/dependencies/get_latency_charts_for_dependency.ts b/x-pack/plugins/observability_solution/apm/server/routes/dependencies/get_latency_charts_for_dependency.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/dependencies/get_latency_charts_for_dependency.ts rename to x-pack/plugins/observability_solution/apm/server/routes/dependencies/get_latency_charts_for_dependency.ts diff --git a/x-pack/plugins/apm/server/routes/dependencies/get_metadata_for_dependency.ts b/x-pack/plugins/observability_solution/apm/server/routes/dependencies/get_metadata_for_dependency.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/dependencies/get_metadata_for_dependency.ts rename to x-pack/plugins/observability_solution/apm/server/routes/dependencies/get_metadata_for_dependency.ts diff --git a/x-pack/plugins/apm/server/routes/dependencies/get_throughput_charts_for_dependency.ts b/x-pack/plugins/observability_solution/apm/server/routes/dependencies/get_throughput_charts_for_dependency.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/dependencies/get_throughput_charts_for_dependency.ts rename to x-pack/plugins/observability_solution/apm/server/routes/dependencies/get_throughput_charts_for_dependency.ts diff --git a/x-pack/plugins/apm/server/routes/dependencies/get_top_dependencies.ts b/x-pack/plugins/observability_solution/apm/server/routes/dependencies/get_top_dependencies.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/dependencies/get_top_dependencies.ts rename to x-pack/plugins/observability_solution/apm/server/routes/dependencies/get_top_dependencies.ts diff --git a/x-pack/plugins/apm/server/routes/dependencies/get_top_dependency_operations.ts b/x-pack/plugins/observability_solution/apm/server/routes/dependencies/get_top_dependency_operations.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/dependencies/get_top_dependency_operations.ts rename to x-pack/plugins/observability_solution/apm/server/routes/dependencies/get_top_dependency_operations.ts diff --git a/x-pack/plugins/apm/server/routes/dependencies/get_top_dependency_spans.ts b/x-pack/plugins/observability_solution/apm/server/routes/dependencies/get_top_dependency_spans.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/dependencies/get_top_dependency_spans.ts rename to x-pack/plugins/observability_solution/apm/server/routes/dependencies/get_top_dependency_spans.ts diff --git a/x-pack/plugins/apm/server/routes/dependencies/get_upstream_services_for_dependency.ts b/x-pack/plugins/observability_solution/apm/server/routes/dependencies/get_upstream_services_for_dependency.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/dependencies/get_upstream_services_for_dependency.ts rename to x-pack/plugins/observability_solution/apm/server/routes/dependencies/get_upstream_services_for_dependency.ts diff --git a/x-pack/plugins/apm/server/routes/dependencies/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/dependencies/route.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/dependencies/route.ts rename to x-pack/plugins/observability_solution/apm/server/routes/dependencies/route.ts diff --git a/x-pack/plugins/apm/server/routes/diagnostics/bundle/get_apm_events.ts b/x-pack/plugins/observability_solution/apm/server/routes/diagnostics/bundle/get_apm_events.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/diagnostics/bundle/get_apm_events.ts rename to x-pack/plugins/observability_solution/apm/server/routes/diagnostics/bundle/get_apm_events.ts diff --git a/x-pack/plugins/apm/server/routes/diagnostics/bundle/get_data_streams.ts b/x-pack/plugins/observability_solution/apm/server/routes/diagnostics/bundle/get_data_streams.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/diagnostics/bundle/get_data_streams.ts rename to x-pack/plugins/observability_solution/apm/server/routes/diagnostics/bundle/get_data_streams.ts diff --git a/x-pack/plugins/apm/server/routes/diagnostics/bundle/get_existing_index_templates.ts b/x-pack/plugins/observability_solution/apm/server/routes/diagnostics/bundle/get_existing_index_templates.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/diagnostics/bundle/get_existing_index_templates.ts rename to x-pack/plugins/observability_solution/apm/server/routes/diagnostics/bundle/get_existing_index_templates.ts diff --git a/x-pack/plugins/apm/server/routes/diagnostics/bundle/get_field_caps.ts b/x-pack/plugins/observability_solution/apm/server/routes/diagnostics/bundle/get_field_caps.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/diagnostics/bundle/get_field_caps.ts rename to x-pack/plugins/observability_solution/apm/server/routes/diagnostics/bundle/get_field_caps.ts diff --git a/x-pack/plugins/apm/server/routes/diagnostics/bundle/get_index_template.ts b/x-pack/plugins/observability_solution/apm/server/routes/diagnostics/bundle/get_index_template.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/diagnostics/bundle/get_index_template.ts rename to x-pack/plugins/observability_solution/apm/server/routes/diagnostics/bundle/get_index_template.ts diff --git a/x-pack/plugins/apm/server/routes/diagnostics/bundle/get_index_templates_by_index_pattern.ts b/x-pack/plugins/observability_solution/apm/server/routes/diagnostics/bundle/get_index_templates_by_index_pattern.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/diagnostics/bundle/get_index_templates_by_index_pattern.ts rename to x-pack/plugins/observability_solution/apm/server/routes/diagnostics/bundle/get_index_templates_by_index_pattern.ts diff --git a/x-pack/plugins/apm/server/routes/diagnostics/bundle/get_indices.ts b/x-pack/plugins/observability_solution/apm/server/routes/diagnostics/bundle/get_indices.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/diagnostics/bundle/get_indices.ts rename to x-pack/plugins/observability_solution/apm/server/routes/diagnostics/bundle/get_indices.ts diff --git a/x-pack/plugins/apm/server/routes/diagnostics/bundle/get_indices_states.ts b/x-pack/plugins/observability_solution/apm/server/routes/diagnostics/bundle/get_indices_states.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/diagnostics/bundle/get_indices_states.ts rename to x-pack/plugins/observability_solution/apm/server/routes/diagnostics/bundle/get_indices_states.ts diff --git a/x-pack/plugins/apm/server/routes/diagnostics/bundle/get_non_data_stream_indices.ts b/x-pack/plugins/observability_solution/apm/server/routes/diagnostics/bundle/get_non_data_stream_indices.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/diagnostics/bundle/get_non_data_stream_indices.ts rename to x-pack/plugins/observability_solution/apm/server/routes/diagnostics/bundle/get_non_data_stream_indices.ts diff --git a/x-pack/plugins/apm/server/routes/diagnostics/create_typed_es_client.ts b/x-pack/plugins/observability_solution/apm/server/routes/diagnostics/create_typed_es_client.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/diagnostics/create_typed_es_client.ts rename to x-pack/plugins/observability_solution/apm/server/routes/diagnostics/create_typed_es_client.ts diff --git a/x-pack/plugins/apm/server/routes/diagnostics/get_diagnostics_bundle.ts b/x-pack/plugins/observability_solution/apm/server/routes/diagnostics/get_diagnostics_bundle.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/diagnostics/get_diagnostics_bundle.ts rename to x-pack/plugins/observability_solution/apm/server/routes/diagnostics/get_diagnostics_bundle.ts diff --git a/x-pack/plugins/apm/server/routes/diagnostics/get_elasticsearch_version.ts b/x-pack/plugins/observability_solution/apm/server/routes/diagnostics/get_elasticsearch_version.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/diagnostics/get_elasticsearch_version.ts rename to x-pack/plugins/observability_solution/apm/server/routes/diagnostics/get_elasticsearch_version.ts diff --git a/x-pack/plugins/apm/server/routes/diagnostics/get_fleet_package_info.ts b/x-pack/plugins/observability_solution/apm/server/routes/diagnostics/get_fleet_package_info.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/diagnostics/get_fleet_package_info.ts rename to x-pack/plugins/observability_solution/apm/server/routes/diagnostics/get_fleet_package_info.ts diff --git a/x-pack/plugins/apm/server/routes/diagnostics/helpers/get_apm_index_template_names.ts b/x-pack/plugins/observability_solution/apm/server/routes/diagnostics/helpers/get_apm_index_template_names.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/diagnostics/helpers/get_apm_index_template_names.ts rename to x-pack/plugins/observability_solution/apm/server/routes/diagnostics/helpers/get_apm_index_template_names.ts diff --git a/x-pack/plugins/apm/server/routes/diagnostics/helpers/get_diagnostic_privileges.ts b/x-pack/plugins/observability_solution/apm/server/routes/diagnostics/helpers/get_diagnostic_privileges.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/diagnostics/helpers/get_diagnostic_privileges.ts rename to x-pack/plugins/observability_solution/apm/server/routes/diagnostics/helpers/get_diagnostic_privileges.ts diff --git a/x-pack/plugins/apm/server/routes/diagnostics/helpers/handle_exceptions.ts b/x-pack/plugins/observability_solution/apm/server/routes/diagnostics/helpers/handle_exceptions.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/diagnostics/helpers/handle_exceptions.ts rename to x-pack/plugins/observability_solution/apm/server/routes/diagnostics/helpers/handle_exceptions.ts diff --git a/x-pack/plugins/apm/server/routes/diagnostics/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/diagnostics/route.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/diagnostics/route.ts rename to x-pack/plugins/observability_solution/apm/server/routes/diagnostics/route.ts diff --git a/x-pack/plugins/apm/server/routes/environments/__snapshots__/get_all_environments.test.ts.snap b/x-pack/plugins/observability_solution/apm/server/routes/environments/__snapshots__/get_all_environments.test.ts.snap similarity index 100% rename from x-pack/plugins/apm/server/routes/environments/__snapshots__/get_all_environments.test.ts.snap rename to x-pack/plugins/observability_solution/apm/server/routes/environments/__snapshots__/get_all_environments.test.ts.snap diff --git a/x-pack/plugins/apm/server/routes/environments/get_all_environments.test.ts b/x-pack/plugins/observability_solution/apm/server/routes/environments/get_all_environments.test.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/environments/get_all_environments.test.ts rename to x-pack/plugins/observability_solution/apm/server/routes/environments/get_all_environments.test.ts diff --git a/x-pack/plugins/apm/server/routes/environments/get_all_environments.ts b/x-pack/plugins/observability_solution/apm/server/routes/environments/get_all_environments.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/environments/get_all_environments.ts rename to x-pack/plugins/observability_solution/apm/server/routes/environments/get_all_environments.ts diff --git a/x-pack/plugins/apm/server/routes/environments/get_environments.ts b/x-pack/plugins/observability_solution/apm/server/routes/environments/get_environments.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/environments/get_environments.ts rename to x-pack/plugins/observability_solution/apm/server/routes/environments/get_environments.ts diff --git a/x-pack/plugins/apm/server/routes/environments/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/environments/route.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/environments/route.ts rename to x-pack/plugins/observability_solution/apm/server/routes/environments/route.ts diff --git a/x-pack/plugins/apm/server/routes/errors/distribution/__snapshots__/get_buckets.test.ts.snap b/x-pack/plugins/observability_solution/apm/server/routes/errors/distribution/__snapshots__/get_buckets.test.ts.snap similarity index 100% rename from x-pack/plugins/apm/server/routes/errors/distribution/__snapshots__/get_buckets.test.ts.snap rename to x-pack/plugins/observability_solution/apm/server/routes/errors/distribution/__snapshots__/get_buckets.test.ts.snap diff --git a/x-pack/plugins/apm/server/routes/errors/distribution/__snapshots__/queries.test.ts.snap b/x-pack/plugins/observability_solution/apm/server/routes/errors/distribution/__snapshots__/queries.test.ts.snap similarity index 100% rename from x-pack/plugins/apm/server/routes/errors/distribution/__snapshots__/queries.test.ts.snap rename to x-pack/plugins/observability_solution/apm/server/routes/errors/distribution/__snapshots__/queries.test.ts.snap diff --git a/x-pack/plugins/apm/server/routes/errors/distribution/get_buckets.test.ts b/x-pack/plugins/observability_solution/apm/server/routes/errors/distribution/get_buckets.test.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/errors/distribution/get_buckets.test.ts rename to x-pack/plugins/observability_solution/apm/server/routes/errors/distribution/get_buckets.test.ts diff --git a/x-pack/plugins/apm/server/routes/errors/distribution/get_buckets.ts b/x-pack/plugins/observability_solution/apm/server/routes/errors/distribution/get_buckets.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/errors/distribution/get_buckets.ts rename to x-pack/plugins/observability_solution/apm/server/routes/errors/distribution/get_buckets.ts diff --git a/x-pack/plugins/apm/server/routes/errors/distribution/get_distribution.ts b/x-pack/plugins/observability_solution/apm/server/routes/errors/distribution/get_distribution.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/errors/distribution/get_distribution.ts rename to x-pack/plugins/observability_solution/apm/server/routes/errors/distribution/get_distribution.ts diff --git a/x-pack/plugins/apm/server/routes/errors/distribution/queries.test.ts b/x-pack/plugins/observability_solution/apm/server/routes/errors/distribution/queries.test.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/errors/distribution/queries.test.ts rename to x-pack/plugins/observability_solution/apm/server/routes/errors/distribution/queries.test.ts diff --git a/x-pack/plugins/apm/server/routes/errors/erroneous_transactions/get_top_erroneous_transactions.ts b/x-pack/plugins/observability_solution/apm/server/routes/errors/erroneous_transactions/get_top_erroneous_transactions.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/errors/erroneous_transactions/get_top_erroneous_transactions.ts rename to x-pack/plugins/observability_solution/apm/server/routes/errors/erroneous_transactions/get_top_erroneous_transactions.ts diff --git a/x-pack/plugins/apm/server/routes/errors/get_error_groups/get_error_group_detailed_statistics.ts b/x-pack/plugins/observability_solution/apm/server/routes/errors/get_error_groups/get_error_group_detailed_statistics.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/errors/get_error_groups/get_error_group_detailed_statistics.ts rename to x-pack/plugins/observability_solution/apm/server/routes/errors/get_error_groups/get_error_group_detailed_statistics.ts diff --git a/x-pack/plugins/apm/server/routes/errors/get_error_groups/get_error_group_main_statistics.ts b/x-pack/plugins/observability_solution/apm/server/routes/errors/get_error_groups/get_error_group_main_statistics.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/errors/get_error_groups/get_error_group_main_statistics.ts rename to x-pack/plugins/observability_solution/apm/server/routes/errors/get_error_groups/get_error_group_main_statistics.ts diff --git a/x-pack/plugins/apm/server/routes/errors/get_error_groups/get_error_group_sample_ids.ts b/x-pack/plugins/observability_solution/apm/server/routes/errors/get_error_groups/get_error_group_sample_ids.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/errors/get_error_groups/get_error_group_sample_ids.ts rename to x-pack/plugins/observability_solution/apm/server/routes/errors/get_error_groups/get_error_group_sample_ids.ts diff --git a/x-pack/plugins/apm/server/routes/errors/get_error_groups/get_error_sample_details.ts b/x-pack/plugins/observability_solution/apm/server/routes/errors/get_error_groups/get_error_sample_details.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/errors/get_error_groups/get_error_sample_details.ts rename to x-pack/plugins/observability_solution/apm/server/routes/errors/get_error_groups/get_error_sample_details.ts diff --git a/x-pack/plugins/apm/server/routes/errors/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/errors/route.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/errors/route.ts rename to x-pack/plugins/observability_solution/apm/server/routes/errors/route.ts diff --git a/x-pack/plugins/apm/server/routes/event_metadata/get_event_metadata.ts b/x-pack/plugins/observability_solution/apm/server/routes/event_metadata/get_event_metadata.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/event_metadata/get_event_metadata.ts rename to x-pack/plugins/observability_solution/apm/server/routes/event_metadata/get_event_metadata.ts diff --git a/x-pack/plugins/apm/server/routes/event_metadata/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/event_metadata/route.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/event_metadata/route.ts rename to x-pack/plugins/observability_solution/apm/server/routes/event_metadata/route.ts diff --git a/x-pack/plugins/apm/server/routes/fallback_to_transactions/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/fallback_to_transactions/route.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/fallback_to_transactions/route.ts rename to x-pack/plugins/observability_solution/apm/server/routes/fallback_to_transactions/route.ts diff --git a/x-pack/plugins/apm/server/routes/fleet/api_keys/add_api_keys_to_policies_if_missing.ts b/x-pack/plugins/observability_solution/apm/server/routes/fleet/api_keys/add_api_keys_to_policies_if_missing.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/fleet/api_keys/add_api_keys_to_policies_if_missing.ts rename to x-pack/plugins/observability_solution/apm/server/routes/fleet/api_keys/add_api_keys_to_policies_if_missing.ts diff --git a/x-pack/plugins/apm/server/routes/fleet/api_keys/create_apm_api_keys.ts b/x-pack/plugins/observability_solution/apm/server/routes/fleet/api_keys/create_apm_api_keys.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/fleet/api_keys/create_apm_api_keys.ts rename to x-pack/plugins/observability_solution/apm/server/routes/fleet/api_keys/create_apm_api_keys.ts diff --git a/x-pack/plugins/apm/server/routes/fleet/create_cloud_apm_package_policy.ts b/x-pack/plugins/observability_solution/apm/server/routes/fleet/create_cloud_apm_package_policy.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/fleet/create_cloud_apm_package_policy.ts rename to x-pack/plugins/observability_solution/apm/server/routes/fleet/create_cloud_apm_package_policy.ts diff --git a/x-pack/plugins/apm/server/routes/fleet/get_agents.ts b/x-pack/plugins/observability_solution/apm/server/routes/fleet/get_agents.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/fleet/get_agents.ts rename to x-pack/plugins/observability_solution/apm/server/routes/fleet/get_agents.ts diff --git a/x-pack/plugins/apm/server/routes/fleet/get_apm_package_policies.ts b/x-pack/plugins/observability_solution/apm/server/routes/fleet/get_apm_package_policies.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/fleet/get_apm_package_policies.ts rename to x-pack/plugins/observability_solution/apm/server/routes/fleet/get_apm_package_policies.ts diff --git a/x-pack/plugins/apm/server/routes/fleet/get_apm_package_policy_definition.ts b/x-pack/plugins/observability_solution/apm/server/routes/fleet/get_apm_package_policy_definition.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/fleet/get_apm_package_policy_definition.ts rename to x-pack/plugins/observability_solution/apm/server/routes/fleet/get_apm_package_policy_definition.ts diff --git a/x-pack/plugins/apm/server/routes/fleet/get_cloud_apm_package_policy.ts b/x-pack/plugins/observability_solution/apm/server/routes/fleet/get_cloud_apm_package_policy.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/fleet/get_cloud_apm_package_policy.ts rename to x-pack/plugins/observability_solution/apm/server/routes/fleet/get_cloud_apm_package_policy.ts diff --git a/x-pack/plugins/apm/server/routes/fleet/get_java_agent_versions.test.ts b/x-pack/plugins/observability_solution/apm/server/routes/fleet/get_java_agent_versions.test.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/fleet/get_java_agent_versions.test.ts rename to x-pack/plugins/observability_solution/apm/server/routes/fleet/get_java_agent_versions.test.ts diff --git a/x-pack/plugins/apm/server/routes/fleet/get_java_agent_versions.ts b/x-pack/plugins/observability_solution/apm/server/routes/fleet/get_java_agent_versions.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/fleet/get_java_agent_versions.ts rename to x-pack/plugins/observability_solution/apm/server/routes/fleet/get_java_agent_versions.ts diff --git a/x-pack/plugins/apm/server/routes/fleet/get_latest_apm_package.ts b/x-pack/plugins/observability_solution/apm/server/routes/fleet/get_latest_apm_package.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/fleet/get_latest_apm_package.ts rename to x-pack/plugins/observability_solution/apm/server/routes/fleet/get_latest_apm_package.ts diff --git a/x-pack/plugins/apm/server/routes/fleet/get_package_policy_decorators.ts b/x-pack/plugins/observability_solution/apm/server/routes/fleet/get_package_policy_decorators.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/fleet/get_package_policy_decorators.ts rename to x-pack/plugins/observability_solution/apm/server/routes/fleet/get_package_policy_decorators.ts diff --git a/x-pack/plugins/apm/server/routes/fleet/get_unsupported_apm_server_schema.test.ts b/x-pack/plugins/observability_solution/apm/server/routes/fleet/get_unsupported_apm_server_schema.test.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/fleet/get_unsupported_apm_server_schema.test.ts rename to x-pack/plugins/observability_solution/apm/server/routes/fleet/get_unsupported_apm_server_schema.test.ts diff --git a/x-pack/plugins/apm/server/routes/fleet/get_unsupported_apm_server_schema.ts b/x-pack/plugins/observability_solution/apm/server/routes/fleet/get_unsupported_apm_server_schema.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/fleet/get_unsupported_apm_server_schema.ts rename to x-pack/plugins/observability_solution/apm/server/routes/fleet/get_unsupported_apm_server_schema.ts diff --git a/x-pack/plugins/apm/server/routes/fleet/is_superuser.ts b/x-pack/plugins/observability_solution/apm/server/routes/fleet/is_superuser.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/fleet/is_superuser.ts rename to x-pack/plugins/observability_solution/apm/server/routes/fleet/is_superuser.ts diff --git a/x-pack/plugins/apm/server/routes/fleet/merge_package_policy_with_apm.ts b/x-pack/plugins/observability_solution/apm/server/routes/fleet/merge_package_policy_with_apm.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/fleet/merge_package_policy_with_apm.ts rename to x-pack/plugins/observability_solution/apm/server/routes/fleet/merge_package_policy_with_apm.ts diff --git a/x-pack/plugins/apm/server/routes/fleet/register_fleet_policy_callbacks.ts b/x-pack/plugins/observability_solution/apm/server/routes/fleet/register_fleet_policy_callbacks.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/fleet/register_fleet_policy_callbacks.ts rename to x-pack/plugins/observability_solution/apm/server/routes/fleet/register_fleet_policy_callbacks.ts diff --git a/x-pack/plugins/apm/server/routes/fleet/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/fleet/route.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/fleet/route.ts rename to x-pack/plugins/observability_solution/apm/server/routes/fleet/route.ts diff --git a/x-pack/plugins/apm/server/routes/fleet/run_migration_check.ts b/x-pack/plugins/observability_solution/apm/server/routes/fleet/run_migration_check.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/fleet/run_migration_check.ts rename to x-pack/plugins/observability_solution/apm/server/routes/fleet/run_migration_check.ts diff --git a/x-pack/plugins/apm/server/routes/fleet/source_maps.test.ts b/x-pack/plugins/observability_solution/apm/server/routes/fleet/source_maps.test.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/fleet/source_maps.test.ts rename to x-pack/plugins/observability_solution/apm/server/routes/fleet/source_maps.test.ts diff --git a/x-pack/plugins/apm/server/routes/fleet/source_maps.ts b/x-pack/plugins/observability_solution/apm/server/routes/fleet/source_maps.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/fleet/source_maps.ts rename to x-pack/plugins/observability_solution/apm/server/routes/fleet/source_maps.ts diff --git a/x-pack/plugins/apm/server/routes/fleet/sync_agent_configs_to_apm_package_policies.ts b/x-pack/plugins/observability_solution/apm/server/routes/fleet/sync_agent_configs_to_apm_package_policies.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/fleet/sync_agent_configs_to_apm_package_policies.ts rename to x-pack/plugins/observability_solution/apm/server/routes/fleet/sync_agent_configs_to_apm_package_policies.ts diff --git a/x-pack/plugins/apm/server/routes/fleet/translate_legacy_schema_paths.test.ts b/x-pack/plugins/observability_solution/apm/server/routes/fleet/translate_legacy_schema_paths.test.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/fleet/translate_legacy_schema_paths.test.ts rename to x-pack/plugins/observability_solution/apm/server/routes/fleet/translate_legacy_schema_paths.test.ts diff --git a/x-pack/plugins/apm/server/routes/fleet/translate_legacy_schema_paths.ts b/x-pack/plugins/observability_solution/apm/server/routes/fleet/translate_legacy_schema_paths.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/fleet/translate_legacy_schema_paths.ts rename to x-pack/plugins/observability_solution/apm/server/routes/fleet/translate_legacy_schema_paths.ts diff --git a/x-pack/plugins/apm/server/routes/historical_data/has_historical_agent_data.ts b/x-pack/plugins/observability_solution/apm/server/routes/historical_data/has_historical_agent_data.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/historical_data/has_historical_agent_data.ts rename to x-pack/plugins/observability_solution/apm/server/routes/historical_data/has_historical_agent_data.ts diff --git a/x-pack/plugins/apm/server/routes/historical_data/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/historical_data/route.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/historical_data/route.ts rename to x-pack/plugins/observability_solution/apm/server/routes/historical_data/route.ts diff --git a/x-pack/plugins/apm/server/routes/infrastructure/get_host_names.ts b/x-pack/plugins/observability_solution/apm/server/routes/infrastructure/get_host_names.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/infrastructure/get_host_names.ts rename to x-pack/plugins/observability_solution/apm/server/routes/infrastructure/get_host_names.ts diff --git a/x-pack/plugins/apm/server/routes/infrastructure/get_infrastructure_data.ts b/x-pack/plugins/observability_solution/apm/server/routes/infrastructure/get_infrastructure_data.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/infrastructure/get_infrastructure_data.ts rename to x-pack/plugins/observability_solution/apm/server/routes/infrastructure/get_infrastructure_data.ts diff --git a/x-pack/plugins/apm/server/routes/infrastructure/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/infrastructure/route.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/infrastructure/route.ts rename to x-pack/plugins/observability_solution/apm/server/routes/infrastructure/route.ts diff --git a/x-pack/plugins/apm/server/routes/latency_distribution/get_overall_latency_distribution.ts b/x-pack/plugins/observability_solution/apm/server/routes/latency_distribution/get_overall_latency_distribution.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/latency_distribution/get_overall_latency_distribution.ts rename to x-pack/plugins/observability_solution/apm/server/routes/latency_distribution/get_overall_latency_distribution.ts diff --git a/x-pack/plugins/apm/server/routes/latency_distribution/get_percentile_threshold_value.ts b/x-pack/plugins/observability_solution/apm/server/routes/latency_distribution/get_percentile_threshold_value.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/latency_distribution/get_percentile_threshold_value.ts rename to x-pack/plugins/observability_solution/apm/server/routes/latency_distribution/get_percentile_threshold_value.ts diff --git a/x-pack/plugins/apm/server/routes/latency_distribution/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/latency_distribution/route.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/latency_distribution/route.ts rename to x-pack/plugins/observability_solution/apm/server/routes/latency_distribution/route.ts diff --git a/x-pack/plugins/apm/server/routes/latency_distribution/types.ts b/x-pack/plugins/observability_solution/apm/server/routes/latency_distribution/types.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/latency_distribution/types.ts rename to x-pack/plugins/observability_solution/apm/server/routes/latency_distribution/types.ts diff --git a/x-pack/plugins/apm/server/routes/metrics/__snapshots__/queries.test.ts.snap b/x-pack/plugins/observability_solution/apm/server/routes/metrics/__snapshots__/queries.test.ts.snap similarity index 100% rename from x-pack/plugins/apm/server/routes/metrics/__snapshots__/queries.test.ts.snap rename to x-pack/plugins/observability_solution/apm/server/routes/metrics/__snapshots__/queries.test.ts.snap diff --git a/x-pack/plugins/apm/server/routes/metrics/by_agent/default.ts b/x-pack/plugins/observability_solution/apm/server/routes/metrics/by_agent/default.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/metrics/by_agent/default.ts rename to x-pack/plugins/observability_solution/apm/server/routes/metrics/by_agent/default.ts diff --git a/x-pack/plugins/apm/server/routes/metrics/by_agent/java/gc/fetch_and_transform_gc_metrics.test.ts b/x-pack/plugins/observability_solution/apm/server/routes/metrics/by_agent/java/gc/fetch_and_transform_gc_metrics.test.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/metrics/by_agent/java/gc/fetch_and_transform_gc_metrics.test.ts rename to x-pack/plugins/observability_solution/apm/server/routes/metrics/by_agent/java/gc/fetch_and_transform_gc_metrics.test.ts diff --git a/x-pack/plugins/apm/server/routes/metrics/by_agent/java/gc/fetch_and_transform_gc_metrics.ts b/x-pack/plugins/observability_solution/apm/server/routes/metrics/by_agent/java/gc/fetch_and_transform_gc_metrics.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/metrics/by_agent/java/gc/fetch_and_transform_gc_metrics.ts rename to x-pack/plugins/observability_solution/apm/server/routes/metrics/by_agent/java/gc/fetch_and_transform_gc_metrics.ts diff --git a/x-pack/plugins/apm/server/routes/metrics/by_agent/java/gc/get_gc_rate_chart.ts b/x-pack/plugins/observability_solution/apm/server/routes/metrics/by_agent/java/gc/get_gc_rate_chart.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/metrics/by_agent/java/gc/get_gc_rate_chart.ts rename to x-pack/plugins/observability_solution/apm/server/routes/metrics/by_agent/java/gc/get_gc_rate_chart.ts diff --git a/x-pack/plugins/apm/server/routes/metrics/by_agent/java/gc/get_gc_time_chart.ts b/x-pack/plugins/observability_solution/apm/server/routes/metrics/by_agent/java/gc/get_gc_time_chart.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/metrics/by_agent/java/gc/get_gc_time_chart.ts rename to x-pack/plugins/observability_solution/apm/server/routes/metrics/by_agent/java/gc/get_gc_time_chart.ts diff --git a/x-pack/plugins/apm/server/routes/metrics/by_agent/java/heap_memory/index.ts b/x-pack/plugins/observability_solution/apm/server/routes/metrics/by_agent/java/heap_memory/index.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/metrics/by_agent/java/heap_memory/index.ts rename to x-pack/plugins/observability_solution/apm/server/routes/metrics/by_agent/java/heap_memory/index.ts diff --git a/x-pack/plugins/apm/server/routes/metrics/by_agent/java/index.ts b/x-pack/plugins/observability_solution/apm/server/routes/metrics/by_agent/java/index.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/metrics/by_agent/java/index.ts rename to x-pack/plugins/observability_solution/apm/server/routes/metrics/by_agent/java/index.ts diff --git a/x-pack/plugins/apm/server/routes/metrics/by_agent/java/non_heap_memory/index.ts b/x-pack/plugins/observability_solution/apm/server/routes/metrics/by_agent/java/non_heap_memory/index.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/metrics/by_agent/java/non_heap_memory/index.ts rename to x-pack/plugins/observability_solution/apm/server/routes/metrics/by_agent/java/non_heap_memory/index.ts diff --git a/x-pack/plugins/apm/server/routes/metrics/by_agent/java/otel_cpu/index.ts b/x-pack/plugins/observability_solution/apm/server/routes/metrics/by_agent/java/otel_cpu/index.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/metrics/by_agent/java/otel_cpu/index.ts rename to x-pack/plugins/observability_solution/apm/server/routes/metrics/by_agent/java/otel_cpu/index.ts diff --git a/x-pack/plugins/apm/server/routes/metrics/by_agent/java/thread_count/index.ts b/x-pack/plugins/observability_solution/apm/server/routes/metrics/by_agent/java/thread_count/index.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/metrics/by_agent/java/thread_count/index.ts rename to x-pack/plugins/observability_solution/apm/server/routes/metrics/by_agent/java/thread_count/index.ts diff --git a/x-pack/plugins/apm/server/routes/metrics/by_agent/shared/cpu/index.ts b/x-pack/plugins/observability_solution/apm/server/routes/metrics/by_agent/shared/cpu/index.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/metrics/by_agent/shared/cpu/index.ts rename to x-pack/plugins/observability_solution/apm/server/routes/metrics/by_agent/shared/cpu/index.ts diff --git a/x-pack/plugins/apm/server/routes/metrics/by_agent/shared/memory/index.ts b/x-pack/plugins/observability_solution/apm/server/routes/metrics/by_agent/shared/memory/index.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/metrics/by_agent/shared/memory/index.ts rename to x-pack/plugins/observability_solution/apm/server/routes/metrics/by_agent/shared/memory/index.ts diff --git a/x-pack/plugins/apm/server/routes/metrics/fetch_and_transform_metrics.ts b/x-pack/plugins/observability_solution/apm/server/routes/metrics/fetch_and_transform_metrics.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/metrics/fetch_and_transform_metrics.ts rename to x-pack/plugins/observability_solution/apm/server/routes/metrics/fetch_and_transform_metrics.ts diff --git a/x-pack/plugins/apm/server/routes/metrics/get_metrics_chart_data_by_agent.ts b/x-pack/plugins/observability_solution/apm/server/routes/metrics/get_metrics_chart_data_by_agent.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/metrics/get_metrics_chart_data_by_agent.ts rename to x-pack/plugins/observability_solution/apm/server/routes/metrics/get_metrics_chart_data_by_agent.ts diff --git a/x-pack/plugins/apm/server/routes/metrics/get_service_nodes.ts b/x-pack/plugins/observability_solution/apm/server/routes/metrics/get_service_nodes.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/metrics/get_service_nodes.ts rename to x-pack/plugins/observability_solution/apm/server/routes/metrics/get_service_nodes.ts diff --git a/x-pack/plugins/apm/server/routes/metrics/has_otel_metrics.ts b/x-pack/plugins/observability_solution/apm/server/routes/metrics/has_otel_metrics.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/metrics/has_otel_metrics.ts rename to x-pack/plugins/observability_solution/apm/server/routes/metrics/has_otel_metrics.ts diff --git a/x-pack/plugins/apm/server/routes/metrics/queries.test.ts b/x-pack/plugins/observability_solution/apm/server/routes/metrics/queries.test.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/metrics/queries.test.ts rename to x-pack/plugins/observability_solution/apm/server/routes/metrics/queries.test.ts diff --git a/x-pack/plugins/apm/server/routes/metrics/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/metrics/route.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/metrics/route.ts rename to x-pack/plugins/observability_solution/apm/server/routes/metrics/route.ts diff --git a/x-pack/plugins/apm/server/routes/metrics/serverless/get_active_instances_overview.ts b/x-pack/plugins/observability_solution/apm/server/routes/metrics/serverless/get_active_instances_overview.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/metrics/serverless/get_active_instances_overview.ts rename to x-pack/plugins/observability_solution/apm/server/routes/metrics/serverless/get_active_instances_overview.ts diff --git a/x-pack/plugins/apm/server/routes/metrics/serverless/get_active_instances_timeseries.ts b/x-pack/plugins/observability_solution/apm/server/routes/metrics/serverless/get_active_instances_timeseries.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/metrics/serverless/get_active_instances_timeseries.ts rename to x-pack/plugins/observability_solution/apm/server/routes/metrics/serverless/get_active_instances_timeseries.ts diff --git a/x-pack/plugins/apm/server/routes/metrics/serverless/get_cold_start_count_chart.ts b/x-pack/plugins/observability_solution/apm/server/routes/metrics/serverless/get_cold_start_count_chart.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/metrics/serverless/get_cold_start_count_chart.ts rename to x-pack/plugins/observability_solution/apm/server/routes/metrics/serverless/get_cold_start_count_chart.ts diff --git a/x-pack/plugins/apm/server/routes/metrics/serverless/get_cold_start_duration_chart.ts b/x-pack/plugins/observability_solution/apm/server/routes/metrics/serverless/get_cold_start_duration_chart.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/metrics/serverless/get_cold_start_duration_chart.ts rename to x-pack/plugins/observability_solution/apm/server/routes/metrics/serverless/get_cold_start_duration_chart.ts diff --git a/x-pack/plugins/apm/server/routes/metrics/serverless/get_compute_usage_chart.ts b/x-pack/plugins/observability_solution/apm/server/routes/metrics/serverless/get_compute_usage_chart.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/metrics/serverless/get_compute_usage_chart.ts rename to x-pack/plugins/observability_solution/apm/server/routes/metrics/serverless/get_compute_usage_chart.ts diff --git a/x-pack/plugins/apm/server/routes/metrics/serverless/get_serverless_agent_metrics_chart.ts b/x-pack/plugins/observability_solution/apm/server/routes/metrics/serverless/get_serverless_agent_metrics_chart.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/metrics/serverless/get_serverless_agent_metrics_chart.ts rename to x-pack/plugins/observability_solution/apm/server/routes/metrics/serverless/get_serverless_agent_metrics_chart.ts diff --git a/x-pack/plugins/apm/server/routes/metrics/serverless/get_serverless_function_latency_chart.ts b/x-pack/plugins/observability_solution/apm/server/routes/metrics/serverless/get_serverless_function_latency_chart.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/metrics/serverless/get_serverless_function_latency_chart.ts rename to x-pack/plugins/observability_solution/apm/server/routes/metrics/serverless/get_serverless_function_latency_chart.ts diff --git a/x-pack/plugins/apm/server/routes/metrics/serverless/get_serverless_functions_overview.ts b/x-pack/plugins/observability_solution/apm/server/routes/metrics/serverless/get_serverless_functions_overview.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/metrics/serverless/get_serverless_functions_overview.ts rename to x-pack/plugins/observability_solution/apm/server/routes/metrics/serverless/get_serverless_functions_overview.ts diff --git a/x-pack/plugins/apm/server/routes/metrics/serverless/get_serverless_summary.ts b/x-pack/plugins/observability_solution/apm/server/routes/metrics/serverless/get_serverless_summary.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/metrics/serverless/get_serverless_summary.ts rename to x-pack/plugins/observability_solution/apm/server/routes/metrics/serverless/get_serverless_summary.ts diff --git a/x-pack/plugins/apm/server/routes/metrics/serverless/helper.test.ts b/x-pack/plugins/observability_solution/apm/server/routes/metrics/serverless/helper.test.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/metrics/serverless/helper.test.ts rename to x-pack/plugins/observability_solution/apm/server/routes/metrics/serverless/helper.test.ts diff --git a/x-pack/plugins/apm/server/routes/metrics/serverless/helper.ts b/x-pack/plugins/observability_solution/apm/server/routes/metrics/serverless/helper.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/metrics/serverless/helper.ts rename to x-pack/plugins/observability_solution/apm/server/routes/metrics/serverless/helper.ts diff --git a/x-pack/plugins/apm/server/routes/metrics/serverless/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/metrics/serverless/route.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/metrics/serverless/route.ts rename to x-pack/plugins/observability_solution/apm/server/routes/metrics/serverless/route.ts diff --git a/x-pack/plugins/apm/server/routes/metrics/types.ts b/x-pack/plugins/observability_solution/apm/server/routes/metrics/types.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/metrics/types.ts rename to x-pack/plugins/observability_solution/apm/server/routes/metrics/types.ts diff --git a/x-pack/plugins/apm/server/routes/mobile/crashes/distribution/__snapshots__/get_buckets.test.ts.snap b/x-pack/plugins/observability_solution/apm/server/routes/mobile/crashes/distribution/__snapshots__/get_buckets.test.ts.snap similarity index 100% rename from x-pack/plugins/apm/server/routes/mobile/crashes/distribution/__snapshots__/get_buckets.test.ts.snap rename to x-pack/plugins/observability_solution/apm/server/routes/mobile/crashes/distribution/__snapshots__/get_buckets.test.ts.snap diff --git a/x-pack/plugins/apm/server/routes/mobile/crashes/distribution/__snapshots__/queries.test.ts.snap b/x-pack/plugins/observability_solution/apm/server/routes/mobile/crashes/distribution/__snapshots__/queries.test.ts.snap similarity index 100% rename from x-pack/plugins/apm/server/routes/mobile/crashes/distribution/__snapshots__/queries.test.ts.snap rename to x-pack/plugins/observability_solution/apm/server/routes/mobile/crashes/distribution/__snapshots__/queries.test.ts.snap diff --git a/x-pack/plugins/apm/server/routes/mobile/crashes/distribution/get_buckets.test.ts b/x-pack/plugins/observability_solution/apm/server/routes/mobile/crashes/distribution/get_buckets.test.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/mobile/crashes/distribution/get_buckets.test.ts rename to x-pack/plugins/observability_solution/apm/server/routes/mobile/crashes/distribution/get_buckets.test.ts diff --git a/x-pack/plugins/apm/server/routes/mobile/crashes/distribution/get_buckets.ts b/x-pack/plugins/observability_solution/apm/server/routes/mobile/crashes/distribution/get_buckets.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/mobile/crashes/distribution/get_buckets.ts rename to x-pack/plugins/observability_solution/apm/server/routes/mobile/crashes/distribution/get_buckets.ts diff --git a/x-pack/plugins/apm/server/routes/mobile/crashes/distribution/get_distribution.ts b/x-pack/plugins/observability_solution/apm/server/routes/mobile/crashes/distribution/get_distribution.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/mobile/crashes/distribution/get_distribution.ts rename to x-pack/plugins/observability_solution/apm/server/routes/mobile/crashes/distribution/get_distribution.ts diff --git a/x-pack/plugins/apm/server/routes/mobile/crashes/distribution/queries.test.ts b/x-pack/plugins/observability_solution/apm/server/routes/mobile/crashes/distribution/queries.test.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/mobile/crashes/distribution/queries.test.ts rename to x-pack/plugins/observability_solution/apm/server/routes/mobile/crashes/distribution/queries.test.ts diff --git a/x-pack/plugins/apm/server/routes/mobile/crashes/get_crash_groups/get_crash_group_main_statistics.ts b/x-pack/plugins/observability_solution/apm/server/routes/mobile/crashes/get_crash_groups/get_crash_group_main_statistics.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/mobile/crashes/get_crash_groups/get_crash_group_main_statistics.ts rename to x-pack/plugins/observability_solution/apm/server/routes/mobile/crashes/get_crash_groups/get_crash_group_main_statistics.ts diff --git a/x-pack/plugins/apm/server/routes/mobile/crashes/get_mobile_crash_group_detailed_statistics.ts b/x-pack/plugins/observability_solution/apm/server/routes/mobile/crashes/get_mobile_crash_group_detailed_statistics.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/mobile/crashes/get_mobile_crash_group_detailed_statistics.ts rename to x-pack/plugins/observability_solution/apm/server/routes/mobile/crashes/get_mobile_crash_group_detailed_statistics.ts diff --git a/x-pack/plugins/apm/server/routes/mobile/crashes/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/mobile/crashes/route.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/mobile/crashes/route.ts rename to x-pack/plugins/observability_solution/apm/server/routes/mobile/crashes/route.ts diff --git a/x-pack/plugins/apm/server/routes/mobile/errors/get_mobile_error_group_detailed_statistics.ts b/x-pack/plugins/observability_solution/apm/server/routes/mobile/errors/get_mobile_error_group_detailed_statistics.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/mobile/errors/get_mobile_error_group_detailed_statistics.ts rename to x-pack/plugins/observability_solution/apm/server/routes/mobile/errors/get_mobile_error_group_detailed_statistics.ts diff --git a/x-pack/plugins/apm/server/routes/mobile/errors/get_mobile_error_group_main_statistics.ts b/x-pack/plugins/observability_solution/apm/server/routes/mobile/errors/get_mobile_error_group_main_statistics.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/mobile/errors/get_mobile_error_group_main_statistics.ts rename to x-pack/plugins/observability_solution/apm/server/routes/mobile/errors/get_mobile_error_group_main_statistics.ts diff --git a/x-pack/plugins/apm/server/routes/mobile/errors/get_mobile_errors_terms_by_field.ts b/x-pack/plugins/observability_solution/apm/server/routes/mobile/errors/get_mobile_errors_terms_by_field.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/mobile/errors/get_mobile_errors_terms_by_field.ts rename to x-pack/plugins/observability_solution/apm/server/routes/mobile/errors/get_mobile_errors_terms_by_field.ts diff --git a/x-pack/plugins/apm/server/routes/mobile/errors/get_mobile_http_errors.ts b/x-pack/plugins/observability_solution/apm/server/routes/mobile/errors/get_mobile_http_errors.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/mobile/errors/get_mobile_http_errors.ts rename to x-pack/plugins/observability_solution/apm/server/routes/mobile/errors/get_mobile_http_errors.ts diff --git a/x-pack/plugins/apm/server/routes/mobile/errors/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/mobile/errors/route.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/mobile/errors/route.ts rename to x-pack/plugins/observability_solution/apm/server/routes/mobile/errors/route.ts diff --git a/x-pack/plugins/apm/server/routes/mobile/get_device_os_app.ts b/x-pack/plugins/observability_solution/apm/server/routes/mobile/get_device_os_app.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/mobile/get_device_os_app.ts rename to x-pack/plugins/observability_solution/apm/server/routes/mobile/get_device_os_app.ts diff --git a/x-pack/plugins/apm/server/routes/mobile/get_mobile_average_launch_time.ts b/x-pack/plugins/observability_solution/apm/server/routes/mobile/get_mobile_average_launch_time.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/mobile/get_mobile_average_launch_time.ts rename to x-pack/plugins/observability_solution/apm/server/routes/mobile/get_mobile_average_launch_time.ts diff --git a/x-pack/plugins/apm/server/routes/mobile/get_mobile_crash_rate.ts b/x-pack/plugins/observability_solution/apm/server/routes/mobile/get_mobile_crash_rate.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/mobile/get_mobile_crash_rate.ts rename to x-pack/plugins/observability_solution/apm/server/routes/mobile/get_mobile_crash_rate.ts diff --git a/x-pack/plugins/apm/server/routes/mobile/get_mobile_crashes_by_location.ts b/x-pack/plugins/observability_solution/apm/server/routes/mobile/get_mobile_crashes_by_location.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/mobile/get_mobile_crashes_by_location.ts rename to x-pack/plugins/observability_solution/apm/server/routes/mobile/get_mobile_crashes_by_location.ts diff --git a/x-pack/plugins/apm/server/routes/mobile/get_mobile_detailed_statistics_by_field.ts b/x-pack/plugins/observability_solution/apm/server/routes/mobile/get_mobile_detailed_statistics_by_field.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/mobile/get_mobile_detailed_statistics_by_field.ts rename to x-pack/plugins/observability_solution/apm/server/routes/mobile/get_mobile_detailed_statistics_by_field.ts diff --git a/x-pack/plugins/apm/server/routes/mobile/get_mobile_filters.ts b/x-pack/plugins/observability_solution/apm/server/routes/mobile/get_mobile_filters.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/mobile/get_mobile_filters.ts rename to x-pack/plugins/observability_solution/apm/server/routes/mobile/get_mobile_filters.ts diff --git a/x-pack/plugins/apm/server/routes/mobile/get_mobile_http_requests.ts b/x-pack/plugins/observability_solution/apm/server/routes/mobile/get_mobile_http_requests.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/mobile/get_mobile_http_requests.ts rename to x-pack/plugins/observability_solution/apm/server/routes/mobile/get_mobile_http_requests.ts diff --git a/x-pack/plugins/apm/server/routes/mobile/get_mobile_http_requests_by_location.ts b/x-pack/plugins/observability_solution/apm/server/routes/mobile/get_mobile_http_requests_by_location.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/mobile/get_mobile_http_requests_by_location.ts rename to x-pack/plugins/observability_solution/apm/server/routes/mobile/get_mobile_http_requests_by_location.ts diff --git a/x-pack/plugins/apm/server/routes/mobile/get_mobile_launches_by_location.ts b/x-pack/plugins/observability_solution/apm/server/routes/mobile/get_mobile_launches_by_location.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/mobile/get_mobile_launches_by_location.ts rename to x-pack/plugins/observability_solution/apm/server/routes/mobile/get_mobile_launches_by_location.ts diff --git a/x-pack/plugins/apm/server/routes/mobile/get_mobile_location_stats.ts b/x-pack/plugins/observability_solution/apm/server/routes/mobile/get_mobile_location_stats.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/mobile/get_mobile_location_stats.ts rename to x-pack/plugins/observability_solution/apm/server/routes/mobile/get_mobile_location_stats.ts diff --git a/x-pack/plugins/apm/server/routes/mobile/get_mobile_main_statistics_by_field.ts b/x-pack/plugins/observability_solution/apm/server/routes/mobile/get_mobile_main_statistics_by_field.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/mobile/get_mobile_main_statistics_by_field.ts rename to x-pack/plugins/observability_solution/apm/server/routes/mobile/get_mobile_main_statistics_by_field.ts diff --git a/x-pack/plugins/apm/server/routes/mobile/get_mobile_most_used_charts/index.ts b/x-pack/plugins/observability_solution/apm/server/routes/mobile/get_mobile_most_used_charts/index.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/mobile/get_mobile_most_used_charts/index.ts rename to x-pack/plugins/observability_solution/apm/server/routes/mobile/get_mobile_most_used_charts/index.ts diff --git a/x-pack/plugins/apm/server/routes/mobile/get_mobile_most_used_charts/merge_other_count.ts b/x-pack/plugins/observability_solution/apm/server/routes/mobile/get_mobile_most_used_charts/merge_other_count.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/mobile/get_mobile_most_used_charts/merge_other_count.ts rename to x-pack/plugins/observability_solution/apm/server/routes/mobile/get_mobile_most_used_charts/merge_other_count.ts diff --git a/x-pack/plugins/apm/server/routes/mobile/get_mobile_sessions.ts b/x-pack/plugins/observability_solution/apm/server/routes/mobile/get_mobile_sessions.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/mobile/get_mobile_sessions.ts rename to x-pack/plugins/observability_solution/apm/server/routes/mobile/get_mobile_sessions.ts diff --git a/x-pack/plugins/apm/server/routes/mobile/get_mobile_sessions_by_location.ts b/x-pack/plugins/observability_solution/apm/server/routes/mobile/get_mobile_sessions_by_location.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/mobile/get_mobile_sessions_by_location.ts rename to x-pack/plugins/observability_solution/apm/server/routes/mobile/get_mobile_sessions_by_location.ts diff --git a/x-pack/plugins/apm/server/routes/mobile/get_mobile_stats.ts b/x-pack/plugins/observability_solution/apm/server/routes/mobile/get_mobile_stats.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/mobile/get_mobile_stats.ts rename to x-pack/plugins/observability_solution/apm/server/routes/mobile/get_mobile_stats.ts diff --git a/x-pack/plugins/apm/server/routes/mobile/get_mobile_terms_by_field.ts b/x-pack/plugins/observability_solution/apm/server/routes/mobile/get_mobile_terms_by_field.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/mobile/get_mobile_terms_by_field.ts rename to x-pack/plugins/observability_solution/apm/server/routes/mobile/get_mobile_terms_by_field.ts diff --git a/x-pack/plugins/apm/server/routes/mobile/get_nct.ts b/x-pack/plugins/observability_solution/apm/server/routes/mobile/get_nct.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/mobile/get_nct.ts rename to x-pack/plugins/observability_solution/apm/server/routes/mobile/get_nct.ts diff --git a/x-pack/plugins/apm/server/routes/mobile/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/mobile/route.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/mobile/route.ts rename to x-pack/plugins/observability_solution/apm/server/routes/mobile/route.ts diff --git a/x-pack/plugins/apm/server/routes/observability_overview/get_observability_overview_data.ts b/x-pack/plugins/observability_solution/apm/server/routes/observability_overview/get_observability_overview_data.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/observability_overview/get_observability_overview_data.ts rename to x-pack/plugins/observability_solution/apm/server/routes/observability_overview/get_observability_overview_data.ts diff --git a/x-pack/plugins/apm/server/routes/observability_overview/get_service_count.ts b/x-pack/plugins/observability_solution/apm/server/routes/observability_overview/get_service_count.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/observability_overview/get_service_count.ts rename to x-pack/plugins/observability_solution/apm/server/routes/observability_overview/get_service_count.ts diff --git a/x-pack/plugins/apm/server/routes/observability_overview/get_transactions_per_minute.ts b/x-pack/plugins/observability_solution/apm/server/routes/observability_overview/get_transactions_per_minute.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/observability_overview/get_transactions_per_minute.ts rename to x-pack/plugins/observability_solution/apm/server/routes/observability_overview/get_transactions_per_minute.ts diff --git a/x-pack/plugins/apm/server/routes/observability_overview/has_data.ts b/x-pack/plugins/observability_solution/apm/server/routes/observability_overview/has_data.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/observability_overview/has_data.ts rename to x-pack/plugins/observability_solution/apm/server/routes/observability_overview/has_data.ts diff --git a/x-pack/plugins/apm/server/routes/observability_overview/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/observability_overview/route.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/observability_overview/route.ts rename to x-pack/plugins/observability_solution/apm/server/routes/observability_overview/route.ts diff --git a/x-pack/plugins/apm/server/routes/profiling/get_service_host_names.ts b/x-pack/plugins/observability_solution/apm/server/routes/profiling/get_service_host_names.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/profiling/get_service_host_names.ts rename to x-pack/plugins/observability_solution/apm/server/routes/profiling/get_service_host_names.ts diff --git a/x-pack/plugins/apm/server/routes/profiling/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/profiling/route.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/profiling/route.ts rename to x-pack/plugins/observability_solution/apm/server/routes/profiling/route.ts diff --git a/x-pack/plugins/apm/server/routes/profiling/utils.test.ts b/x-pack/plugins/observability_solution/apm/server/routes/profiling/utils.test.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/profiling/utils.test.ts rename to x-pack/plugins/observability_solution/apm/server/routes/profiling/utils.test.ts diff --git a/x-pack/plugins/apm/server/routes/profiling/utils.ts b/x-pack/plugins/observability_solution/apm/server/routes/profiling/utils.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/profiling/utils.ts rename to x-pack/plugins/observability_solution/apm/server/routes/profiling/utils.ts diff --git a/x-pack/plugins/apm/server/routes/service_groups/delete_service_group.ts b/x-pack/plugins/observability_solution/apm/server/routes/service_groups/delete_service_group.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/service_groups/delete_service_group.ts rename to x-pack/plugins/observability_solution/apm/server/routes/service_groups/delete_service_group.ts diff --git a/x-pack/plugins/apm/server/routes/service_groups/get_service_group.ts b/x-pack/plugins/observability_solution/apm/server/routes/service_groups/get_service_group.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/service_groups/get_service_group.ts rename to x-pack/plugins/observability_solution/apm/server/routes/service_groups/get_service_group.ts diff --git a/x-pack/plugins/apm/server/routes/service_groups/get_service_group_alerts.ts b/x-pack/plugins/observability_solution/apm/server/routes/service_groups/get_service_group_alerts.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/service_groups/get_service_group_alerts.ts rename to x-pack/plugins/observability_solution/apm/server/routes/service_groups/get_service_group_alerts.ts diff --git a/x-pack/plugins/apm/server/routes/service_groups/get_service_groups.ts b/x-pack/plugins/observability_solution/apm/server/routes/service_groups/get_service_groups.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/service_groups/get_service_groups.ts rename to x-pack/plugins/observability_solution/apm/server/routes/service_groups/get_service_groups.ts diff --git a/x-pack/plugins/apm/server/routes/service_groups/get_services_counts.ts b/x-pack/plugins/observability_solution/apm/server/routes/service_groups/get_services_counts.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/service_groups/get_services_counts.ts rename to x-pack/plugins/observability_solution/apm/server/routes/service_groups/get_services_counts.ts diff --git a/x-pack/plugins/apm/server/routes/service_groups/lookup_services.ts b/x-pack/plugins/observability_solution/apm/server/routes/service_groups/lookup_services.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/service_groups/lookup_services.ts rename to x-pack/plugins/observability_solution/apm/server/routes/service_groups/lookup_services.ts diff --git a/x-pack/plugins/apm/server/routes/service_groups/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/service_groups/route.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/service_groups/route.ts rename to x-pack/plugins/observability_solution/apm/server/routes/service_groups/route.ts diff --git a/x-pack/plugins/apm/server/routes/service_groups/save_service_group.ts b/x-pack/plugins/observability_solution/apm/server/routes/service_groups/save_service_group.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/service_groups/save_service_group.ts rename to x-pack/plugins/observability_solution/apm/server/routes/service_groups/save_service_group.ts diff --git a/x-pack/plugins/apm/server/routes/service_map/fetch_service_paths_from_trace_ids.ts b/x-pack/plugins/observability_solution/apm/server/routes/service_map/fetch_service_paths_from_trace_ids.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/service_map/fetch_service_paths_from_trace_ids.ts rename to x-pack/plugins/observability_solution/apm/server/routes/service_map/fetch_service_paths_from_trace_ids.ts diff --git a/x-pack/plugins/apm/server/routes/service_map/get_service_anomalies.ts b/x-pack/plugins/observability_solution/apm/server/routes/service_map/get_service_anomalies.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/service_map/get_service_anomalies.ts rename to x-pack/plugins/observability_solution/apm/server/routes/service_map/get_service_anomalies.ts diff --git a/x-pack/plugins/apm/server/routes/service_map/get_service_map.ts b/x-pack/plugins/observability_solution/apm/server/routes/service_map/get_service_map.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/service_map/get_service_map.ts rename to x-pack/plugins/observability_solution/apm/server/routes/service_map/get_service_map.ts diff --git a/x-pack/plugins/apm/server/routes/service_map/get_service_map_dependency_node_info.ts b/x-pack/plugins/observability_solution/apm/server/routes/service_map/get_service_map_dependency_node_info.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/service_map/get_service_map_dependency_node_info.ts rename to x-pack/plugins/observability_solution/apm/server/routes/service_map/get_service_map_dependency_node_info.ts diff --git a/x-pack/plugins/apm/server/routes/service_map/get_service_map_from_trace_ids.test.ts b/x-pack/plugins/observability_solution/apm/server/routes/service_map/get_service_map_from_trace_ids.test.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/service_map/get_service_map_from_trace_ids.test.ts rename to x-pack/plugins/observability_solution/apm/server/routes/service_map/get_service_map_from_trace_ids.test.ts diff --git a/x-pack/plugins/apm/server/routes/service_map/get_service_map_from_trace_ids.ts b/x-pack/plugins/observability_solution/apm/server/routes/service_map/get_service_map_from_trace_ids.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/service_map/get_service_map_from_trace_ids.ts rename to x-pack/plugins/observability_solution/apm/server/routes/service_map/get_service_map_from_trace_ids.ts diff --git a/x-pack/plugins/apm/server/routes/service_map/get_service_map_service_node_info.ts b/x-pack/plugins/observability_solution/apm/server/routes/service_map/get_service_map_service_node_info.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/service_map/get_service_map_service_node_info.ts rename to x-pack/plugins/observability_solution/apm/server/routes/service_map/get_service_map_service_node_info.ts diff --git a/x-pack/plugins/apm/server/routes/service_map/get_service_stats.ts b/x-pack/plugins/observability_solution/apm/server/routes/service_map/get_service_stats.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/service_map/get_service_stats.ts rename to x-pack/plugins/observability_solution/apm/server/routes/service_map/get_service_stats.ts diff --git a/x-pack/plugins/apm/server/routes/service_map/get_trace_sample_ids.ts b/x-pack/plugins/observability_solution/apm/server/routes/service_map/get_trace_sample_ids.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/service_map/get_trace_sample_ids.ts rename to x-pack/plugins/observability_solution/apm/server/routes/service_map/get_trace_sample_ids.ts diff --git a/x-pack/plugins/apm/server/routes/service_map/group_resource_nodes.test.ts b/x-pack/plugins/observability_solution/apm/server/routes/service_map/group_resource_nodes.test.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/service_map/group_resource_nodes.test.ts rename to x-pack/plugins/observability_solution/apm/server/routes/service_map/group_resource_nodes.test.ts diff --git a/x-pack/plugins/apm/server/routes/service_map/group_resource_nodes.ts b/x-pack/plugins/observability_solution/apm/server/routes/service_map/group_resource_nodes.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/service_map/group_resource_nodes.ts rename to x-pack/plugins/observability_solution/apm/server/routes/service_map/group_resource_nodes.ts diff --git a/x-pack/plugins/apm/server/routes/service_map/mock_responses/group_resource_nodes_grouped.json b/x-pack/plugins/observability_solution/apm/server/routes/service_map/mock_responses/group_resource_nodes_grouped.json similarity index 100% rename from x-pack/plugins/apm/server/routes/service_map/mock_responses/group_resource_nodes_grouped.json rename to x-pack/plugins/observability_solution/apm/server/routes/service_map/mock_responses/group_resource_nodes_grouped.json diff --git a/x-pack/plugins/apm/server/routes/service_map/mock_responses/group_resource_nodes_pregrouped.json b/x-pack/plugins/observability_solution/apm/server/routes/service_map/mock_responses/group_resource_nodes_pregrouped.json similarity index 100% rename from x-pack/plugins/apm/server/routes/service_map/mock_responses/group_resource_nodes_pregrouped.json rename to x-pack/plugins/observability_solution/apm/server/routes/service_map/mock_responses/group_resource_nodes_pregrouped.json diff --git a/x-pack/plugins/apm/server/routes/service_map/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/service_map/route.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/service_map/route.ts rename to x-pack/plugins/observability_solution/apm/server/routes/service_map/route.ts diff --git a/x-pack/plugins/apm/server/routes/service_map/transform_service_map_responses.test.ts b/x-pack/plugins/observability_solution/apm/server/routes/service_map/transform_service_map_responses.test.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/service_map/transform_service_map_responses.test.ts rename to x-pack/plugins/observability_solution/apm/server/routes/service_map/transform_service_map_responses.test.ts diff --git a/x-pack/plugins/apm/server/routes/service_map/transform_service_map_responses.ts b/x-pack/plugins/observability_solution/apm/server/routes/service_map/transform_service_map_responses.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/service_map/transform_service_map_responses.ts rename to x-pack/plugins/observability_solution/apm/server/routes/service_map/transform_service_map_responses.ts diff --git a/x-pack/plugins/apm/server/routes/services/annotations/__fixtures__/multiple_versions.json b/x-pack/plugins/observability_solution/apm/server/routes/services/annotations/__fixtures__/multiple_versions.json similarity index 100% rename from x-pack/plugins/apm/server/routes/services/annotations/__fixtures__/multiple_versions.json rename to x-pack/plugins/observability_solution/apm/server/routes/services/annotations/__fixtures__/multiple_versions.json diff --git a/x-pack/plugins/apm/server/routes/services/annotations/__fixtures__/no_versions.json b/x-pack/plugins/observability_solution/apm/server/routes/services/annotations/__fixtures__/no_versions.json similarity index 100% rename from x-pack/plugins/apm/server/routes/services/annotations/__fixtures__/no_versions.json rename to x-pack/plugins/observability_solution/apm/server/routes/services/annotations/__fixtures__/no_versions.json diff --git a/x-pack/plugins/apm/server/routes/services/annotations/__fixtures__/one_version.json b/x-pack/plugins/observability_solution/apm/server/routes/services/annotations/__fixtures__/one_version.json similarity index 100% rename from x-pack/plugins/apm/server/routes/services/annotations/__fixtures__/one_version.json rename to x-pack/plugins/observability_solution/apm/server/routes/services/annotations/__fixtures__/one_version.json diff --git a/x-pack/plugins/apm/server/routes/services/annotations/__fixtures__/versions_first_seen.json b/x-pack/plugins/observability_solution/apm/server/routes/services/annotations/__fixtures__/versions_first_seen.json similarity index 100% rename from x-pack/plugins/apm/server/routes/services/annotations/__fixtures__/versions_first_seen.json rename to x-pack/plugins/observability_solution/apm/server/routes/services/annotations/__fixtures__/versions_first_seen.json diff --git a/x-pack/plugins/apm/server/routes/services/annotations/get_derived_service_annotations.ts b/x-pack/plugins/observability_solution/apm/server/routes/services/annotations/get_derived_service_annotations.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/services/annotations/get_derived_service_annotations.ts rename to x-pack/plugins/observability_solution/apm/server/routes/services/annotations/get_derived_service_annotations.ts diff --git a/x-pack/plugins/apm/server/routes/services/annotations/get_stored_annotations.ts b/x-pack/plugins/observability_solution/apm/server/routes/services/annotations/get_stored_annotations.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/services/annotations/get_stored_annotations.ts rename to x-pack/plugins/observability_solution/apm/server/routes/services/annotations/get_stored_annotations.ts diff --git a/x-pack/plugins/apm/server/routes/services/annotations/index.ts b/x-pack/plugins/observability_solution/apm/server/routes/services/annotations/index.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/services/annotations/index.ts rename to x-pack/plugins/observability_solution/apm/server/routes/services/annotations/index.ts diff --git a/x-pack/plugins/apm/server/routes/services/get_service_agent.ts b/x-pack/plugins/observability_solution/apm/server/routes/services/get_service_agent.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/services/get_service_agent.ts rename to x-pack/plugins/observability_solution/apm/server/routes/services/get_service_agent.ts diff --git a/x-pack/plugins/apm/server/routes/services/get_service_dependencies.ts b/x-pack/plugins/observability_solution/apm/server/routes/services/get_service_dependencies.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/services/get_service_dependencies.ts rename to x-pack/plugins/observability_solution/apm/server/routes/services/get_service_dependencies.ts diff --git a/x-pack/plugins/apm/server/routes/services/get_service_dependencies_breakdown.ts b/x-pack/plugins/observability_solution/apm/server/routes/services/get_service_dependencies_breakdown.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/services/get_service_dependencies_breakdown.ts rename to x-pack/plugins/observability_solution/apm/server/routes/services/get_service_dependencies_breakdown.ts diff --git a/x-pack/plugins/apm/server/routes/services/get_service_instance_container_metadata.ts b/x-pack/plugins/observability_solution/apm/server/routes/services/get_service_instance_container_metadata.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/services/get_service_instance_container_metadata.ts rename to x-pack/plugins/observability_solution/apm/server/routes/services/get_service_instance_container_metadata.ts diff --git a/x-pack/plugins/apm/server/routes/services/get_service_instance_metadata_details.ts b/x-pack/plugins/observability_solution/apm/server/routes/services/get_service_instance_metadata_details.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/services/get_service_instance_metadata_details.ts rename to x-pack/plugins/observability_solution/apm/server/routes/services/get_service_instance_metadata_details.ts diff --git a/x-pack/plugins/apm/server/routes/services/get_service_instances/detailed_statistics.ts b/x-pack/plugins/observability_solution/apm/server/routes/services/get_service_instances/detailed_statistics.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/services/get_service_instances/detailed_statistics.ts rename to x-pack/plugins/observability_solution/apm/server/routes/services/get_service_instances/detailed_statistics.ts diff --git a/x-pack/plugins/apm/server/routes/services/get_service_instances/get_service_instances_system_metric_statistics.ts b/x-pack/plugins/observability_solution/apm/server/routes/services/get_service_instances/get_service_instances_system_metric_statistics.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/services/get_service_instances/get_service_instances_system_metric_statistics.ts rename to x-pack/plugins/observability_solution/apm/server/routes/services/get_service_instances/get_service_instances_system_metric_statistics.ts diff --git a/x-pack/plugins/apm/server/routes/services/get_service_instances/get_service_instances_transaction_statistics.ts b/x-pack/plugins/observability_solution/apm/server/routes/services/get_service_instances/get_service_instances_transaction_statistics.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/services/get_service_instances/get_service_instances_transaction_statistics.ts rename to x-pack/plugins/observability_solution/apm/server/routes/services/get_service_instances/get_service_instances_transaction_statistics.ts diff --git a/x-pack/plugins/apm/server/routes/services/get_service_instances/main_statistics.ts b/x-pack/plugins/observability_solution/apm/server/routes/services/get_service_instances/main_statistics.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/services/get_service_instances/main_statistics.ts rename to x-pack/plugins/observability_solution/apm/server/routes/services/get_service_instances/main_statistics.ts diff --git a/x-pack/plugins/apm/server/routes/services/get_service_metadata_details.ts b/x-pack/plugins/observability_solution/apm/server/routes/services/get_service_metadata_details.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/services/get_service_metadata_details.ts rename to x-pack/plugins/observability_solution/apm/server/routes/services/get_service_metadata_details.ts diff --git a/x-pack/plugins/apm/server/routes/services/get_service_metadata_icons.ts b/x-pack/plugins/observability_solution/apm/server/routes/services/get_service_metadata_icons.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/services/get_service_metadata_icons.ts rename to x-pack/plugins/observability_solution/apm/server/routes/services/get_service_metadata_icons.ts diff --git a/x-pack/plugins/apm/server/routes/services/get_service_node_metadata.ts b/x-pack/plugins/observability_solution/apm/server/routes/services/get_service_node_metadata.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/services/get_service_node_metadata.ts rename to x-pack/plugins/observability_solution/apm/server/routes/services/get_service_node_metadata.ts diff --git a/x-pack/plugins/apm/server/routes/services/get_service_overview_container_metadata.ts b/x-pack/plugins/observability_solution/apm/server/routes/services/get_service_overview_container_metadata.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/services/get_service_overview_container_metadata.ts rename to x-pack/plugins/observability_solution/apm/server/routes/services/get_service_overview_container_metadata.ts diff --git a/x-pack/plugins/apm/server/routes/services/get_service_transaction_group_detailed_statistics.ts b/x-pack/plugins/observability_solution/apm/server/routes/services/get_service_transaction_group_detailed_statistics.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/services/get_service_transaction_group_detailed_statistics.ts rename to x-pack/plugins/observability_solution/apm/server/routes/services/get_service_transaction_group_detailed_statistics.ts diff --git a/x-pack/plugins/apm/server/routes/services/get_service_transaction_groups.ts b/x-pack/plugins/observability_solution/apm/server/routes/services/get_service_transaction_groups.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/services/get_service_transaction_groups.ts rename to x-pack/plugins/observability_solution/apm/server/routes/services/get_service_transaction_groups.ts diff --git a/x-pack/plugins/apm/server/routes/services/get_service_transaction_groups_alerts.ts b/x-pack/plugins/observability_solution/apm/server/routes/services/get_service_transaction_groups_alerts.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/services/get_service_transaction_groups_alerts.ts rename to x-pack/plugins/observability_solution/apm/server/routes/services/get_service_transaction_groups_alerts.ts diff --git a/x-pack/plugins/apm/server/routes/services/get_service_transaction_types.ts b/x-pack/plugins/observability_solution/apm/server/routes/services/get_service_transaction_types.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/services/get_service_transaction_types.ts rename to x-pack/plugins/observability_solution/apm/server/routes/services/get_service_transaction_types.ts diff --git a/x-pack/plugins/apm/server/routes/services/get_services/get_health_statuses.ts b/x-pack/plugins/observability_solution/apm/server/routes/services/get_services/get_health_statuses.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/services/get_services/get_health_statuses.ts rename to x-pack/plugins/observability_solution/apm/server/routes/services/get_services/get_health_statuses.ts diff --git a/x-pack/plugins/apm/server/routes/services/get_services/get_service_alerts.ts b/x-pack/plugins/observability_solution/apm/server/routes/services/get_services/get_service_alerts.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/services/get_services/get_service_alerts.ts rename to x-pack/plugins/observability_solution/apm/server/routes/services/get_services/get_service_alerts.ts diff --git a/x-pack/plugins/apm/server/routes/services/get_services/get_service_names_from_terms_enum.ts b/x-pack/plugins/observability_solution/apm/server/routes/services/get_services/get_service_names_from_terms_enum.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/services/get_services/get_service_names_from_terms_enum.ts rename to x-pack/plugins/observability_solution/apm/server/routes/services/get_services/get_service_names_from_terms_enum.ts diff --git a/x-pack/plugins/apm/server/routes/services/get_services/get_service_transaction_stats.ts b/x-pack/plugins/observability_solution/apm/server/routes/services/get_services/get_service_transaction_stats.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/services/get_services/get_service_transaction_stats.ts rename to x-pack/plugins/observability_solution/apm/server/routes/services/get_services/get_service_transaction_stats.ts diff --git a/x-pack/plugins/apm/server/routes/services/get_services/get_services_items.ts b/x-pack/plugins/observability_solution/apm/server/routes/services/get_services/get_services_items.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/services/get_services/get_services_items.ts rename to x-pack/plugins/observability_solution/apm/server/routes/services/get_services/get_services_items.ts diff --git a/x-pack/plugins/apm/server/routes/services/get_services/get_services_without_transactions.ts b/x-pack/plugins/observability_solution/apm/server/routes/services/get_services/get_services_without_transactions.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/services/get_services/get_services_without_transactions.ts rename to x-pack/plugins/observability_solution/apm/server/routes/services/get_services/get_services_without_transactions.ts diff --git a/x-pack/plugins/apm/server/routes/services/get_services/merge_service_stats.test.ts b/x-pack/plugins/observability_solution/apm/server/routes/services/get_services/merge_service_stats.test.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/services/get_services/merge_service_stats.test.ts rename to x-pack/plugins/observability_solution/apm/server/routes/services/get_services/merge_service_stats.test.ts diff --git a/x-pack/plugins/apm/server/routes/services/get_services/merge_service_stats.ts b/x-pack/plugins/observability_solution/apm/server/routes/services/get_services/merge_service_stats.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/services/get_services/merge_service_stats.ts rename to x-pack/plugins/observability_solution/apm/server/routes/services/get_services/merge_service_stats.ts diff --git a/x-pack/plugins/apm/server/routes/services/get_services_detailed_statistics/get_service_transaction_detailed_statistics.ts b/x-pack/plugins/observability_solution/apm/server/routes/services/get_services_detailed_statistics/get_service_transaction_detailed_statistics.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/services/get_services_detailed_statistics/get_service_transaction_detailed_statistics.ts rename to x-pack/plugins/observability_solution/apm/server/routes/services/get_services_detailed_statistics/get_service_transaction_detailed_statistics.ts diff --git a/x-pack/plugins/apm/server/routes/services/get_services_detailed_statistics/index.ts b/x-pack/plugins/observability_solution/apm/server/routes/services/get_services_detailed_statistics/index.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/services/get_services_detailed_statistics/index.ts rename to x-pack/plugins/observability_solution/apm/server/routes/services/get_services_detailed_statistics/index.ts diff --git a/x-pack/plugins/apm/server/routes/services/get_throughput.ts b/x-pack/plugins/observability_solution/apm/server/routes/services/get_throughput.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/services/get_throughput.ts rename to x-pack/plugins/observability_solution/apm/server/routes/services/get_throughput.ts diff --git a/x-pack/plugins/apm/server/routes/services/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/services/route.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/services/route.ts rename to x-pack/plugins/observability_solution/apm/server/routes/services/route.ts diff --git a/x-pack/plugins/apm/server/routes/settings/agent_configuration/__snapshots__/queries.test.ts.snap b/x-pack/plugins/observability_solution/apm/server/routes/settings/agent_configuration/__snapshots__/queries.test.ts.snap similarity index 100% rename from x-pack/plugins/apm/server/routes/settings/agent_configuration/__snapshots__/queries.test.ts.snap rename to x-pack/plugins/observability_solution/apm/server/routes/settings/agent_configuration/__snapshots__/queries.test.ts.snap diff --git a/x-pack/plugins/apm/server/routes/settings/agent_configuration/convert_settings_to_string.ts b/x-pack/plugins/observability_solution/apm/server/routes/settings/agent_configuration/convert_settings_to_string.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/settings/agent_configuration/convert_settings_to_string.ts rename to x-pack/plugins/observability_solution/apm/server/routes/settings/agent_configuration/convert_settings_to_string.ts diff --git a/x-pack/plugins/apm/server/routes/settings/agent_configuration/create_agent_config_index.ts b/x-pack/plugins/observability_solution/apm/server/routes/settings/agent_configuration/create_agent_config_index.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/settings/agent_configuration/create_agent_config_index.ts rename to x-pack/plugins/observability_solution/apm/server/routes/settings/agent_configuration/create_agent_config_index.ts diff --git a/x-pack/plugins/apm/server/routes/settings/agent_configuration/create_or_update_configuration.ts b/x-pack/plugins/observability_solution/apm/server/routes/settings/agent_configuration/create_or_update_configuration.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/settings/agent_configuration/create_or_update_configuration.ts rename to x-pack/plugins/observability_solution/apm/server/routes/settings/agent_configuration/create_or_update_configuration.ts diff --git a/x-pack/plugins/apm/server/routes/settings/agent_configuration/delete_configuration.ts b/x-pack/plugins/observability_solution/apm/server/routes/settings/agent_configuration/delete_configuration.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/settings/agent_configuration/delete_configuration.ts rename to x-pack/plugins/observability_solution/apm/server/routes/settings/agent_configuration/delete_configuration.ts diff --git a/x-pack/plugins/apm/server/routes/settings/agent_configuration/find_exact_configuration.ts b/x-pack/plugins/observability_solution/apm/server/routes/settings/agent_configuration/find_exact_configuration.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/settings/agent_configuration/find_exact_configuration.ts rename to x-pack/plugins/observability_solution/apm/server/routes/settings/agent_configuration/find_exact_configuration.ts diff --git a/x-pack/plugins/apm/server/routes/settings/agent_configuration/get_agent_config_etag_metrics.ts b/x-pack/plugins/observability_solution/apm/server/routes/settings/agent_configuration/get_agent_config_etag_metrics.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/settings/agent_configuration/get_agent_config_etag_metrics.ts rename to x-pack/plugins/observability_solution/apm/server/routes/settings/agent_configuration/get_agent_config_etag_metrics.ts diff --git a/x-pack/plugins/apm/server/routes/settings/agent_configuration/get_agent_name_by_service.ts b/x-pack/plugins/observability_solution/apm/server/routes/settings/agent_configuration/get_agent_name_by_service.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/settings/agent_configuration/get_agent_name_by_service.ts rename to x-pack/plugins/observability_solution/apm/server/routes/settings/agent_configuration/get_agent_name_by_service.ts diff --git a/x-pack/plugins/apm/server/routes/settings/agent_configuration/get_environments/get_existing_environments_for_service.ts b/x-pack/plugins/observability_solution/apm/server/routes/settings/agent_configuration/get_environments/get_existing_environments_for_service.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/settings/agent_configuration/get_environments/get_existing_environments_for_service.ts rename to x-pack/plugins/observability_solution/apm/server/routes/settings/agent_configuration/get_environments/get_existing_environments_for_service.ts diff --git a/x-pack/plugins/apm/server/routes/settings/agent_configuration/get_environments/index.ts b/x-pack/plugins/observability_solution/apm/server/routes/settings/agent_configuration/get_environments/index.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/settings/agent_configuration/get_environments/index.ts rename to x-pack/plugins/observability_solution/apm/server/routes/settings/agent_configuration/get_environments/index.ts diff --git a/x-pack/plugins/apm/server/routes/settings/agent_configuration/list_configurations.ts b/x-pack/plugins/observability_solution/apm/server/routes/settings/agent_configuration/list_configurations.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/settings/agent_configuration/list_configurations.ts rename to x-pack/plugins/observability_solution/apm/server/routes/settings/agent_configuration/list_configurations.ts diff --git a/x-pack/plugins/apm/server/routes/settings/agent_configuration/mark_applied_by_agent.ts b/x-pack/plugins/observability_solution/apm/server/routes/settings/agent_configuration/mark_applied_by_agent.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/settings/agent_configuration/mark_applied_by_agent.ts rename to x-pack/plugins/observability_solution/apm/server/routes/settings/agent_configuration/mark_applied_by_agent.ts diff --git a/x-pack/plugins/apm/server/routes/settings/agent_configuration/queries.test.ts b/x-pack/plugins/observability_solution/apm/server/routes/settings/agent_configuration/queries.test.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/settings/agent_configuration/queries.test.ts rename to x-pack/plugins/observability_solution/apm/server/routes/settings/agent_configuration/queries.test.ts diff --git a/x-pack/plugins/apm/server/routes/settings/agent_configuration/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/settings/agent_configuration/route.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/settings/agent_configuration/route.ts rename to x-pack/plugins/observability_solution/apm/server/routes/settings/agent_configuration/route.ts diff --git a/x-pack/plugins/apm/server/routes/settings/agent_configuration/search_configurations.ts b/x-pack/plugins/observability_solution/apm/server/routes/settings/agent_configuration/search_configurations.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/settings/agent_configuration/search_configurations.ts rename to x-pack/plugins/observability_solution/apm/server/routes/settings/agent_configuration/search_configurations.ts diff --git a/x-pack/plugins/apm/server/routes/settings/anomaly_detection/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/settings/anomaly_detection/route.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/settings/anomaly_detection/route.ts rename to x-pack/plugins/observability_solution/apm/server/routes/settings/anomaly_detection/route.ts diff --git a/x-pack/plugins/apm/server/routes/settings/anomaly_detection/update_to_v3.ts b/x-pack/plugins/observability_solution/apm/server/routes/settings/anomaly_detection/update_to_v3.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/settings/anomaly_detection/update_to_v3.ts rename to x-pack/plugins/observability_solution/apm/server/routes/settings/anomaly_detection/update_to_v3.ts diff --git a/x-pack/plugins/apm/server/routes/settings/apm_indices/apm_system_index_constants.ts b/x-pack/plugins/observability_solution/apm/server/routes/settings/apm_indices/apm_system_index_constants.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/settings/apm_indices/apm_system_index_constants.ts rename to x-pack/plugins/observability_solution/apm/server/routes/settings/apm_indices/apm_system_index_constants.ts diff --git a/x-pack/plugins/apm/server/routes/settings/apm_indices/get_apm_indices.ts b/x-pack/plugins/observability_solution/apm/server/routes/settings/apm_indices/get_apm_indices.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/settings/apm_indices/get_apm_indices.ts rename to x-pack/plugins/observability_solution/apm/server/routes/settings/apm_indices/get_apm_indices.ts diff --git a/x-pack/plugins/apm/server/routes/settings/apm_indices/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/settings/apm_indices/route.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/settings/apm_indices/route.ts rename to x-pack/plugins/observability_solution/apm/server/routes/settings/apm_indices/route.ts diff --git a/x-pack/plugins/apm/server/routes/settings/custom_link/__snapshots__/get_transaction.test.ts.snap b/x-pack/plugins/observability_solution/apm/server/routes/settings/custom_link/__snapshots__/get_transaction.test.ts.snap similarity index 100% rename from x-pack/plugins/apm/server/routes/settings/custom_link/__snapshots__/get_transaction.test.ts.snap rename to x-pack/plugins/observability_solution/apm/server/routes/settings/custom_link/__snapshots__/get_transaction.test.ts.snap diff --git a/x-pack/plugins/apm/server/routes/settings/custom_link/__snapshots__/list_custom_links.test.ts.snap b/x-pack/plugins/observability_solution/apm/server/routes/settings/custom_link/__snapshots__/list_custom_links.test.ts.snap similarity index 100% rename from x-pack/plugins/apm/server/routes/settings/custom_link/__snapshots__/list_custom_links.test.ts.snap rename to x-pack/plugins/observability_solution/apm/server/routes/settings/custom_link/__snapshots__/list_custom_links.test.ts.snap diff --git a/x-pack/plugins/apm/server/routes/settings/custom_link/create_custom_link_index.ts b/x-pack/plugins/observability_solution/apm/server/routes/settings/custom_link/create_custom_link_index.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/settings/custom_link/create_custom_link_index.ts rename to x-pack/plugins/observability_solution/apm/server/routes/settings/custom_link/create_custom_link_index.ts diff --git a/x-pack/plugins/apm/server/routes/settings/custom_link/create_or_update_custom_link.test.ts b/x-pack/plugins/observability_solution/apm/server/routes/settings/custom_link/create_or_update_custom_link.test.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/settings/custom_link/create_or_update_custom_link.test.ts rename to x-pack/plugins/observability_solution/apm/server/routes/settings/custom_link/create_or_update_custom_link.test.ts diff --git a/x-pack/plugins/apm/server/routes/settings/custom_link/create_or_update_custom_link.ts b/x-pack/plugins/observability_solution/apm/server/routes/settings/custom_link/create_or_update_custom_link.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/settings/custom_link/create_or_update_custom_link.ts rename to x-pack/plugins/observability_solution/apm/server/routes/settings/custom_link/create_or_update_custom_link.ts diff --git a/x-pack/plugins/apm/server/routes/settings/custom_link/custom_link_types.ts b/x-pack/plugins/observability_solution/apm/server/routes/settings/custom_link/custom_link_types.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/settings/custom_link/custom_link_types.ts rename to x-pack/plugins/observability_solution/apm/server/routes/settings/custom_link/custom_link_types.ts diff --git a/x-pack/plugins/apm/server/routes/settings/custom_link/delete_custom_link.ts b/x-pack/plugins/observability_solution/apm/server/routes/settings/custom_link/delete_custom_link.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/settings/custom_link/delete_custom_link.ts rename to x-pack/plugins/observability_solution/apm/server/routes/settings/custom_link/delete_custom_link.ts diff --git a/x-pack/plugins/apm/server/routes/settings/custom_link/get_transaction.test.ts b/x-pack/plugins/observability_solution/apm/server/routes/settings/custom_link/get_transaction.test.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/settings/custom_link/get_transaction.test.ts rename to x-pack/plugins/observability_solution/apm/server/routes/settings/custom_link/get_transaction.test.ts diff --git a/x-pack/plugins/apm/server/routes/settings/custom_link/get_transaction.ts b/x-pack/plugins/observability_solution/apm/server/routes/settings/custom_link/get_transaction.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/settings/custom_link/get_transaction.ts rename to x-pack/plugins/observability_solution/apm/server/routes/settings/custom_link/get_transaction.ts diff --git a/x-pack/plugins/apm/server/routes/settings/custom_link/helper.test.ts b/x-pack/plugins/observability_solution/apm/server/routes/settings/custom_link/helper.test.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/settings/custom_link/helper.test.ts rename to x-pack/plugins/observability_solution/apm/server/routes/settings/custom_link/helper.test.ts diff --git a/x-pack/plugins/apm/server/routes/settings/custom_link/helper.ts b/x-pack/plugins/observability_solution/apm/server/routes/settings/custom_link/helper.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/settings/custom_link/helper.ts rename to x-pack/plugins/observability_solution/apm/server/routes/settings/custom_link/helper.ts diff --git a/x-pack/plugins/apm/server/routes/settings/custom_link/list_custom_links.test.ts b/x-pack/plugins/observability_solution/apm/server/routes/settings/custom_link/list_custom_links.test.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/settings/custom_link/list_custom_links.test.ts rename to x-pack/plugins/observability_solution/apm/server/routes/settings/custom_link/list_custom_links.test.ts diff --git a/x-pack/plugins/apm/server/routes/settings/custom_link/list_custom_links.ts b/x-pack/plugins/observability_solution/apm/server/routes/settings/custom_link/list_custom_links.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/settings/custom_link/list_custom_links.ts rename to x-pack/plugins/observability_solution/apm/server/routes/settings/custom_link/list_custom_links.ts diff --git a/x-pack/plugins/apm/server/routes/settings/custom_link/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/settings/custom_link/route.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/settings/custom_link/route.ts rename to x-pack/plugins/observability_solution/apm/server/routes/settings/custom_link/route.ts diff --git a/x-pack/plugins/apm/server/routes/settings/labs/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/settings/labs/route.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/settings/labs/route.ts rename to x-pack/plugins/observability_solution/apm/server/routes/settings/labs/route.ts diff --git a/x-pack/plugins/apm/server/routes/source_maps/bulk_create_apm_source_maps.ts b/x-pack/plugins/observability_solution/apm/server/routes/source_maps/bulk_create_apm_source_maps.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/source_maps/bulk_create_apm_source_maps.ts rename to x-pack/plugins/observability_solution/apm/server/routes/source_maps/bulk_create_apm_source_maps.ts diff --git a/x-pack/plugins/apm/server/routes/source_maps/create_apm_source_map.ts b/x-pack/plugins/observability_solution/apm/server/routes/source_maps/create_apm_source_map.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/source_maps/create_apm_source_map.ts rename to x-pack/plugins/observability_solution/apm/server/routes/source_maps/create_apm_source_map.ts diff --git a/x-pack/plugins/apm/server/routes/source_maps/create_apm_source_map_index_template.ts b/x-pack/plugins/observability_solution/apm/server/routes/source_maps/create_apm_source_map_index_template.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/source_maps/create_apm_source_map_index_template.ts rename to x-pack/plugins/observability_solution/apm/server/routes/source_maps/create_apm_source_map_index_template.ts diff --git a/x-pack/plugins/apm/server/routes/source_maps/delete_apm_sourcemap.ts b/x-pack/plugins/observability_solution/apm/server/routes/source_maps/delete_apm_sourcemap.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/source_maps/delete_apm_sourcemap.ts rename to x-pack/plugins/observability_solution/apm/server/routes/source_maps/delete_apm_sourcemap.ts diff --git a/x-pack/plugins/apm/server/routes/source_maps/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/source_maps/route.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/source_maps/route.ts rename to x-pack/plugins/observability_solution/apm/server/routes/source_maps/route.ts diff --git a/x-pack/plugins/apm/server/routes/source_maps/schedule_source_map_migration.ts b/x-pack/plugins/observability_solution/apm/server/routes/source_maps/schedule_source_map_migration.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/source_maps/schedule_source_map_migration.ts rename to x-pack/plugins/observability_solution/apm/server/routes/source_maps/schedule_source_map_migration.ts diff --git a/x-pack/plugins/apm/server/routes/source_maps/sourcemap_utils.ts b/x-pack/plugins/observability_solution/apm/server/routes/source_maps/sourcemap_utils.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/source_maps/sourcemap_utils.ts rename to x-pack/plugins/observability_solution/apm/server/routes/source_maps/sourcemap_utils.ts diff --git a/x-pack/plugins/apm/server/routes/span_links/get_linked_children.ts b/x-pack/plugins/observability_solution/apm/server/routes/span_links/get_linked_children.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/span_links/get_linked_children.ts rename to x-pack/plugins/observability_solution/apm/server/routes/span_links/get_linked_children.ts diff --git a/x-pack/plugins/apm/server/routes/span_links/get_linked_parents.ts b/x-pack/plugins/observability_solution/apm/server/routes/span_links/get_linked_parents.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/span_links/get_linked_parents.ts rename to x-pack/plugins/observability_solution/apm/server/routes/span_links/get_linked_parents.ts diff --git a/x-pack/plugins/apm/server/routes/span_links/get_span_links_details.ts b/x-pack/plugins/observability_solution/apm/server/routes/span_links/get_span_links_details.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/span_links/get_span_links_details.ts rename to x-pack/plugins/observability_solution/apm/server/routes/span_links/get_span_links_details.ts diff --git a/x-pack/plugins/apm/server/routes/span_links/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/span_links/route.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/span_links/route.ts rename to x-pack/plugins/observability_solution/apm/server/routes/span_links/route.ts diff --git a/x-pack/plugins/apm/server/routes/span_links/utils.ts b/x-pack/plugins/observability_solution/apm/server/routes/span_links/utils.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/span_links/utils.ts rename to x-pack/plugins/observability_solution/apm/server/routes/span_links/utils.ts diff --git a/x-pack/plugins/apm/server/routes/storage_explorer/get_service_statistics.ts b/x-pack/plugins/observability_solution/apm/server/routes/storage_explorer/get_service_statistics.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/storage_explorer/get_service_statistics.ts rename to x-pack/plugins/observability_solution/apm/server/routes/storage_explorer/get_service_statistics.ts diff --git a/x-pack/plugins/apm/server/routes/storage_explorer/get_size_timeseries.ts b/x-pack/plugins/observability_solution/apm/server/routes/storage_explorer/get_size_timeseries.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/storage_explorer/get_size_timeseries.ts rename to x-pack/plugins/observability_solution/apm/server/routes/storage_explorer/get_size_timeseries.ts diff --git a/x-pack/plugins/apm/server/routes/storage_explorer/get_storage_details.ts b/x-pack/plugins/observability_solution/apm/server/routes/storage_explorer/get_storage_details.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/storage_explorer/get_storage_details.ts rename to x-pack/plugins/observability_solution/apm/server/routes/storage_explorer/get_storage_details.ts diff --git a/x-pack/plugins/apm/server/routes/storage_explorer/get_storage_details_per_service.ts b/x-pack/plugins/observability_solution/apm/server/routes/storage_explorer/get_storage_details_per_service.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/storage_explorer/get_storage_details_per_service.ts rename to x-pack/plugins/observability_solution/apm/server/routes/storage_explorer/get_storage_details_per_service.ts diff --git a/x-pack/plugins/apm/server/routes/storage_explorer/get_summary_statistics.ts b/x-pack/plugins/observability_solution/apm/server/routes/storage_explorer/get_summary_statistics.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/storage_explorer/get_summary_statistics.ts rename to x-pack/plugins/observability_solution/apm/server/routes/storage_explorer/get_summary_statistics.ts diff --git a/x-pack/plugins/apm/server/routes/storage_explorer/get_total_transactions_per_service.ts b/x-pack/plugins/observability_solution/apm/server/routes/storage_explorer/get_total_transactions_per_service.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/storage_explorer/get_total_transactions_per_service.ts rename to x-pack/plugins/observability_solution/apm/server/routes/storage_explorer/get_total_transactions_per_service.ts diff --git a/x-pack/plugins/apm/server/routes/storage_explorer/has_storage_explorer_privileges.ts b/x-pack/plugins/observability_solution/apm/server/routes/storage_explorer/has_storage_explorer_privileges.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/storage_explorer/has_storage_explorer_privileges.ts rename to x-pack/plugins/observability_solution/apm/server/routes/storage_explorer/has_storage_explorer_privileges.ts diff --git a/x-pack/plugins/apm/server/routes/storage_explorer/indices_stats_helpers.ts b/x-pack/plugins/observability_solution/apm/server/routes/storage_explorer/indices_stats_helpers.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/storage_explorer/indices_stats_helpers.ts rename to x-pack/plugins/observability_solution/apm/server/routes/storage_explorer/indices_stats_helpers.ts diff --git a/x-pack/plugins/apm/server/routes/storage_explorer/is_cross_cluster_search.test.ts b/x-pack/plugins/observability_solution/apm/server/routes/storage_explorer/is_cross_cluster_search.test.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/storage_explorer/is_cross_cluster_search.test.ts rename to x-pack/plugins/observability_solution/apm/server/routes/storage_explorer/is_cross_cluster_search.test.ts diff --git a/x-pack/plugins/apm/server/routes/storage_explorer/is_cross_cluster_search.ts b/x-pack/plugins/observability_solution/apm/server/routes/storage_explorer/is_cross_cluster_search.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/storage_explorer/is_cross_cluster_search.ts rename to x-pack/plugins/observability_solution/apm/server/routes/storage_explorer/is_cross_cluster_search.ts diff --git a/x-pack/plugins/apm/server/routes/storage_explorer/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/storage_explorer/route.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/storage_explorer/route.ts rename to x-pack/plugins/observability_solution/apm/server/routes/storage_explorer/route.ts diff --git a/x-pack/plugins/apm/server/routes/suggestions/get_suggestions_with_terms_aggregation.ts b/x-pack/plugins/observability_solution/apm/server/routes/suggestions/get_suggestions_with_terms_aggregation.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/suggestions/get_suggestions_with_terms_aggregation.ts rename to x-pack/plugins/observability_solution/apm/server/routes/suggestions/get_suggestions_with_terms_aggregation.ts diff --git a/x-pack/plugins/apm/server/routes/suggestions/get_suggestions_with_terms_enum.ts b/x-pack/plugins/observability_solution/apm/server/routes/suggestions/get_suggestions_with_terms_enum.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/suggestions/get_suggestions_with_terms_enum.ts rename to x-pack/plugins/observability_solution/apm/server/routes/suggestions/get_suggestions_with_terms_enum.ts diff --git a/x-pack/plugins/apm/server/routes/suggestions/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/suggestions/route.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/suggestions/route.ts rename to x-pack/plugins/observability_solution/apm/server/routes/suggestions/route.ts diff --git a/x-pack/plugins/apm/server/routes/time_range_metadata/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/time_range_metadata/route.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/time_range_metadata/route.ts rename to x-pack/plugins/observability_solution/apm/server/routes/time_range_metadata/route.ts diff --git a/x-pack/plugins/apm/server/routes/traces/__snapshots__/queries.test.ts.snap b/x-pack/plugins/observability_solution/apm/server/routes/traces/__snapshots__/queries.test.ts.snap similarity index 100% rename from x-pack/plugins/apm/server/routes/traces/__snapshots__/queries.test.ts.snap rename to x-pack/plugins/observability_solution/apm/server/routes/traces/__snapshots__/queries.test.ts.snap diff --git a/x-pack/plugins/apm/server/routes/traces/calculate_impact_builder.ts b/x-pack/plugins/observability_solution/apm/server/routes/traces/calculate_impact_builder.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/traces/calculate_impact_builder.ts rename to x-pack/plugins/observability_solution/apm/server/routes/traces/calculate_impact_builder.ts diff --git a/x-pack/plugins/apm/server/routes/traces/get_aggregated_critical_path.ts b/x-pack/plugins/observability_solution/apm/server/routes/traces/get_aggregated_critical_path.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/traces/get_aggregated_critical_path.ts rename to x-pack/plugins/observability_solution/apm/server/routes/traces/get_aggregated_critical_path.ts diff --git a/x-pack/plugins/apm/server/routes/traces/get_top_traces_primary_stats.ts b/x-pack/plugins/observability_solution/apm/server/routes/traces/get_top_traces_primary_stats.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/traces/get_top_traces_primary_stats.ts rename to x-pack/plugins/observability_solution/apm/server/routes/traces/get_top_traces_primary_stats.ts diff --git a/x-pack/plugins/apm/server/routes/traces/get_trace_items.ts b/x-pack/plugins/observability_solution/apm/server/routes/traces/get_trace_items.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/traces/get_trace_items.ts rename to x-pack/plugins/observability_solution/apm/server/routes/traces/get_trace_items.ts diff --git a/x-pack/plugins/apm/server/routes/traces/get_trace_samples_by_query.ts b/x-pack/plugins/observability_solution/apm/server/routes/traces/get_trace_samples_by_query.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/traces/get_trace_samples_by_query.ts rename to x-pack/plugins/observability_solution/apm/server/routes/traces/get_trace_samples_by_query.ts diff --git a/x-pack/plugins/apm/server/routes/traces/queries.test.ts b/x-pack/plugins/observability_solution/apm/server/routes/traces/queries.test.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/traces/queries.test.ts rename to x-pack/plugins/observability_solution/apm/server/routes/traces/queries.test.ts diff --git a/x-pack/plugins/apm/server/routes/traces/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/traces/route.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/traces/route.ts rename to x-pack/plugins/observability_solution/apm/server/routes/traces/route.ts diff --git a/x-pack/plugins/apm/server/routes/transactions/__snapshots__/queries.test.ts.snap b/x-pack/plugins/observability_solution/apm/server/routes/transactions/__snapshots__/queries.test.ts.snap similarity index 100% rename from x-pack/plugins/apm/server/routes/transactions/__snapshots__/queries.test.ts.snap rename to x-pack/plugins/observability_solution/apm/server/routes/transactions/__snapshots__/queries.test.ts.snap diff --git a/x-pack/plugins/apm/server/routes/transactions/breakdown/constants.ts b/x-pack/plugins/observability_solution/apm/server/routes/transactions/breakdown/constants.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/transactions/breakdown/constants.ts rename to x-pack/plugins/observability_solution/apm/server/routes/transactions/breakdown/constants.ts diff --git a/x-pack/plugins/apm/server/routes/transactions/breakdown/index.test.ts b/x-pack/plugins/observability_solution/apm/server/routes/transactions/breakdown/index.test.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/transactions/breakdown/index.test.ts rename to x-pack/plugins/observability_solution/apm/server/routes/transactions/breakdown/index.test.ts diff --git a/x-pack/plugins/apm/server/routes/transactions/breakdown/index.ts b/x-pack/plugins/observability_solution/apm/server/routes/transactions/breakdown/index.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/transactions/breakdown/index.ts rename to x-pack/plugins/observability_solution/apm/server/routes/transactions/breakdown/index.ts diff --git a/x-pack/plugins/apm/server/routes/transactions/breakdown/mock_responses/data.json b/x-pack/plugins/observability_solution/apm/server/routes/transactions/breakdown/mock_responses/data.json similarity index 100% rename from x-pack/plugins/apm/server/routes/transactions/breakdown/mock_responses/data.json rename to x-pack/plugins/observability_solution/apm/server/routes/transactions/breakdown/mock_responses/data.json diff --git a/x-pack/plugins/apm/server/routes/transactions/breakdown/mock_responses/no_data.json b/x-pack/plugins/observability_solution/apm/server/routes/transactions/breakdown/mock_responses/no_data.json similarity index 100% rename from x-pack/plugins/apm/server/routes/transactions/breakdown/mock_responses/no_data.json rename to x-pack/plugins/observability_solution/apm/server/routes/transactions/breakdown/mock_responses/no_data.json diff --git a/x-pack/plugins/apm/server/routes/transactions/constants.ts b/x-pack/plugins/observability_solution/apm/server/routes/transactions/constants.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/transactions/constants.ts rename to x-pack/plugins/observability_solution/apm/server/routes/transactions/constants.ts diff --git a/x-pack/plugins/apm/server/routes/transactions/get_failed_transaction_rate_periods.ts b/x-pack/plugins/observability_solution/apm/server/routes/transactions/get_failed_transaction_rate_periods.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/transactions/get_failed_transaction_rate_periods.ts rename to x-pack/plugins/observability_solution/apm/server/routes/transactions/get_failed_transaction_rate_periods.ts diff --git a/x-pack/plugins/apm/server/routes/transactions/get_latency_charts/index.ts b/x-pack/plugins/observability_solution/apm/server/routes/transactions/get_latency_charts/index.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/transactions/get_latency_charts/index.ts rename to x-pack/plugins/observability_solution/apm/server/routes/transactions/get_latency_charts/index.ts diff --git a/x-pack/plugins/apm/server/routes/transactions/get_span/index.ts b/x-pack/plugins/observability_solution/apm/server/routes/transactions/get_span/index.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/transactions/get_span/index.ts rename to x-pack/plugins/observability_solution/apm/server/routes/transactions/get_span/index.ts diff --git a/x-pack/plugins/apm/server/routes/transactions/get_transaction/index.ts b/x-pack/plugins/observability_solution/apm/server/routes/transactions/get_transaction/index.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/transactions/get_transaction/index.ts rename to x-pack/plugins/observability_solution/apm/server/routes/transactions/get_transaction/index.ts diff --git a/x-pack/plugins/apm/server/routes/transactions/get_transaction_by_trace/index.ts b/x-pack/plugins/observability_solution/apm/server/routes/transactions/get_transaction_by_trace/index.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/transactions/get_transaction_by_trace/index.ts rename to x-pack/plugins/observability_solution/apm/server/routes/transactions/get_transaction_by_trace/index.ts diff --git a/x-pack/plugins/apm/server/routes/transactions/queries.test.ts b/x-pack/plugins/observability_solution/apm/server/routes/transactions/queries.test.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/transactions/queries.test.ts rename to x-pack/plugins/observability_solution/apm/server/routes/transactions/queries.test.ts diff --git a/x-pack/plugins/apm/server/routes/transactions/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/transactions/route.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/transactions/route.ts rename to x-pack/plugins/observability_solution/apm/server/routes/transactions/route.ts diff --git a/x-pack/plugins/apm/server/routes/transactions/trace_samples/index.ts b/x-pack/plugins/observability_solution/apm/server/routes/transactions/trace_samples/index.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/transactions/trace_samples/index.ts rename to x-pack/plugins/observability_solution/apm/server/routes/transactions/trace_samples/index.ts diff --git a/x-pack/plugins/apm/server/routes/typings.ts b/x-pack/plugins/observability_solution/apm/server/routes/typings.ts similarity index 100% rename from x-pack/plugins/apm/server/routes/typings.ts rename to x-pack/plugins/observability_solution/apm/server/routes/typings.ts diff --git a/x-pack/plugins/apm/server/saved_objects/apm_custom_dashboards.ts b/x-pack/plugins/observability_solution/apm/server/saved_objects/apm_custom_dashboards.ts similarity index 100% rename from x-pack/plugins/apm/server/saved_objects/apm_custom_dashboards.ts rename to x-pack/plugins/observability_solution/apm/server/saved_objects/apm_custom_dashboards.ts diff --git a/x-pack/plugins/apm/server/saved_objects/apm_server_settings.ts b/x-pack/plugins/observability_solution/apm/server/saved_objects/apm_server_settings.ts similarity index 100% rename from x-pack/plugins/apm/server/saved_objects/apm_server_settings.ts rename to x-pack/plugins/observability_solution/apm/server/saved_objects/apm_server_settings.ts diff --git a/x-pack/plugins/apm/server/saved_objects/apm_service_groups.ts b/x-pack/plugins/observability_solution/apm/server/saved_objects/apm_service_groups.ts similarity index 100% rename from x-pack/plugins/apm/server/saved_objects/apm_service_groups.ts rename to x-pack/plugins/observability_solution/apm/server/saved_objects/apm_service_groups.ts diff --git a/x-pack/plugins/apm/server/saved_objects/apm_telemetry.ts b/x-pack/plugins/observability_solution/apm/server/saved_objects/apm_telemetry.ts similarity index 100% rename from x-pack/plugins/apm/server/saved_objects/apm_telemetry.ts rename to x-pack/plugins/observability_solution/apm/server/saved_objects/apm_telemetry.ts diff --git a/x-pack/plugins/apm/server/saved_objects/index.ts b/x-pack/plugins/observability_solution/apm/server/saved_objects/index.ts similarity index 100% rename from x-pack/plugins/apm/server/saved_objects/index.ts rename to x-pack/plugins/observability_solution/apm/server/saved_objects/index.ts diff --git a/x-pack/plugins/apm/server/test_helpers/create_apm_users/authentication.ts b/x-pack/plugins/observability_solution/apm/server/test_helpers/create_apm_users/authentication.ts similarity index 100% rename from x-pack/plugins/apm/server/test_helpers/create_apm_users/authentication.ts rename to x-pack/plugins/observability_solution/apm/server/test_helpers/create_apm_users/authentication.ts diff --git a/x-pack/plugins/apm/server/test_helpers/create_apm_users/create_apm_users.ts b/x-pack/plugins/observability_solution/apm/server/test_helpers/create_apm_users/create_apm_users.ts similarity index 100% rename from x-pack/plugins/apm/server/test_helpers/create_apm_users/create_apm_users.ts rename to x-pack/plugins/observability_solution/apm/server/test_helpers/create_apm_users/create_apm_users.ts diff --git a/x-pack/plugins/apm/server/test_helpers/create_apm_users/helpers/call_kibana.ts b/x-pack/plugins/observability_solution/apm/server/test_helpers/create_apm_users/helpers/call_kibana.ts similarity index 100% rename from x-pack/plugins/apm/server/test_helpers/create_apm_users/helpers/call_kibana.ts rename to x-pack/plugins/observability_solution/apm/server/test_helpers/create_apm_users/helpers/call_kibana.ts diff --git a/x-pack/plugins/apm/server/test_helpers/create_apm_users/helpers/create_custom_role.ts b/x-pack/plugins/observability_solution/apm/server/test_helpers/create_apm_users/helpers/create_custom_role.ts similarity index 100% rename from x-pack/plugins/apm/server/test_helpers/create_apm_users/helpers/create_custom_role.ts rename to x-pack/plugins/observability_solution/apm/server/test_helpers/create_apm_users/helpers/create_custom_role.ts diff --git a/x-pack/plugins/apm/server/test_helpers/create_apm_users/helpers/create_or_update_user.ts b/x-pack/plugins/observability_solution/apm/server/test_helpers/create_apm_users/helpers/create_or_update_user.ts similarity index 100% rename from x-pack/plugins/apm/server/test_helpers/create_apm_users/helpers/create_or_update_user.ts rename to x-pack/plugins/observability_solution/apm/server/test_helpers/create_apm_users/helpers/create_or_update_user.ts diff --git a/x-pack/plugins/apm/server/test_helpers/create_apm_users/helpers/get_version.ts b/x-pack/plugins/observability_solution/apm/server/test_helpers/create_apm_users/helpers/get_version.ts similarity index 100% rename from x-pack/plugins/apm/server/test_helpers/create_apm_users/helpers/get_version.ts rename to x-pack/plugins/observability_solution/apm/server/test_helpers/create_apm_users/helpers/get_version.ts diff --git a/x-pack/plugins/apm/server/tutorial/envs/elastic_cloud.ts b/x-pack/plugins/observability_solution/apm/server/tutorial/envs/elastic_cloud.ts similarity index 100% rename from x-pack/plugins/apm/server/tutorial/envs/elastic_cloud.ts rename to x-pack/plugins/observability_solution/apm/server/tutorial/envs/elastic_cloud.ts diff --git a/x-pack/plugins/apm/server/tutorial/envs/on_prem.ts b/x-pack/plugins/observability_solution/apm/server/tutorial/envs/on_prem.ts similarity index 100% rename from x-pack/plugins/apm/server/tutorial/envs/on_prem.ts rename to x-pack/plugins/observability_solution/apm/server/tutorial/envs/on_prem.ts diff --git a/x-pack/plugins/apm/server/tutorial/envs/on_prem_apm_server_instruction_set.ts b/x-pack/plugins/observability_solution/apm/server/tutorial/envs/on_prem_apm_server_instruction_set.ts similarity index 100% rename from x-pack/plugins/apm/server/tutorial/envs/on_prem_apm_server_instruction_set.ts rename to x-pack/plugins/observability_solution/apm/server/tutorial/envs/on_prem_apm_server_instruction_set.ts diff --git a/x-pack/plugins/apm/server/tutorial/index.ts b/x-pack/plugins/observability_solution/apm/server/tutorial/index.ts similarity index 100% rename from x-pack/plugins/apm/server/tutorial/index.ts rename to x-pack/plugins/observability_solution/apm/server/tutorial/index.ts diff --git a/x-pack/plugins/apm/server/types.ts b/x-pack/plugins/observability_solution/apm/server/types.ts similarity index 100% rename from x-pack/plugins/apm/server/types.ts rename to x-pack/plugins/observability_solution/apm/server/types.ts diff --git a/x-pack/plugins/apm/server/utils/non_empty_string_ref.ts b/x-pack/plugins/observability_solution/apm/server/utils/non_empty_string_ref.ts similarity index 100% rename from x-pack/plugins/apm/server/utils/non_empty_string_ref.ts rename to x-pack/plugins/observability_solution/apm/server/utils/non_empty_string_ref.ts diff --git a/x-pack/plugins/apm/server/utils/string_from_buffer_rt.test.ts b/x-pack/plugins/observability_solution/apm/server/utils/string_from_buffer_rt.test.ts similarity index 100% rename from x-pack/plugins/apm/server/utils/string_from_buffer_rt.test.ts rename to x-pack/plugins/observability_solution/apm/server/utils/string_from_buffer_rt.test.ts diff --git a/x-pack/plugins/apm/server/utils/string_from_buffer_rt.ts b/x-pack/plugins/observability_solution/apm/server/utils/string_from_buffer_rt.ts similarity index 100% rename from x-pack/plugins/apm/server/utils/string_from_buffer_rt.ts rename to x-pack/plugins/observability_solution/apm/server/utils/string_from_buffer_rt.ts diff --git a/x-pack/plugins/apm/server/utils/test_helpers.tsx b/x-pack/plugins/observability_solution/apm/server/utils/test_helpers.tsx similarity index 100% rename from x-pack/plugins/apm/server/utils/test_helpers.tsx rename to x-pack/plugins/observability_solution/apm/server/utils/test_helpers.tsx diff --git a/x-pack/plugins/apm/server/utils/with_apm_span.ts b/x-pack/plugins/observability_solution/apm/server/utils/with_apm_span.ts similarity index 100% rename from x-pack/plugins/apm/server/utils/with_apm_span.ts rename to x-pack/plugins/observability_solution/apm/server/utils/with_apm_span.ts diff --git a/x-pack/plugins/apm/tsconfig.json b/x-pack/plugins/observability_solution/apm/tsconfig.json similarity index 96% rename from x-pack/plugins/apm/tsconfig.json rename to x-pack/plugins/observability_solution/apm/tsconfig.json index 9089561dcbe58..5040a167db19d 100644 --- a/x-pack/plugins/apm/tsconfig.json +++ b/x-pack/plugins/observability_solution/apm/tsconfig.json @@ -1,10 +1,10 @@ { - "extends": "../../../tsconfig.base.json", + "extends": "../../../../tsconfig.base.json", "compilerOptions": { "outDir": "target/types" }, "include": [ - "../../../typings/**/*", + "../../../../typings/**/*", "common/**/*", "public/**/*", "scripts/**/*", @@ -111,7 +111,7 @@ "@kbn/shared-svg", "@kbn/shared-ux-utility", "@kbn/management-settings-components-field-row", - "@kbn/shared-ux-markdown", + "@kbn/shared-ux-markdown" ], "exclude": ["target/**/*"] } diff --git a/x-pack/plugins/apm/typings/apm_rum_react.d.ts b/x-pack/plugins/observability_solution/apm/typings/apm_rum_react.d.ts similarity index 100% rename from x-pack/plugins/apm/typings/apm_rum_react.d.ts rename to x-pack/plugins/observability_solution/apm/typings/apm_rum_react.d.ts diff --git a/x-pack/plugins/apm/typings/common.d.ts b/x-pack/plugins/observability_solution/apm/typings/common.d.ts similarity index 100% rename from x-pack/plugins/apm/typings/common.d.ts rename to x-pack/plugins/observability_solution/apm/typings/common.d.ts diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/apm_base_doc.ts b/x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/apm_base_doc.ts similarity index 100% rename from x-pack/plugins/apm/typings/es_schemas/raw/apm_base_doc.ts rename to x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/apm_base_doc.ts diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/error_raw.ts b/x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/error_raw.ts similarity index 100% rename from x-pack/plugins/apm/typings/es_schemas/raw/error_raw.ts rename to x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/error_raw.ts diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/event_raw.ts b/x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/event_raw.ts similarity index 100% rename from x-pack/plugins/apm/typings/es_schemas/raw/event_raw.ts rename to x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/event_raw.ts diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/fields/cloud.ts b/x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/fields/cloud.ts similarity index 100% rename from x-pack/plugins/apm/typings/es_schemas/raw/fields/cloud.ts rename to x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/fields/cloud.ts diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/fields/container.ts b/x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/fields/container.ts similarity index 100% rename from x-pack/plugins/apm/typings/es_schemas/raw/fields/container.ts rename to x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/fields/container.ts diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/fields/event_outcome.ts b/x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/fields/event_outcome.ts similarity index 100% rename from x-pack/plugins/apm/typings/es_schemas/raw/fields/event_outcome.ts rename to x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/fields/event_outcome.ts diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/fields/faas.ts b/x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/fields/faas.ts similarity index 100% rename from x-pack/plugins/apm/typings/es_schemas/raw/fields/faas.ts rename to x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/fields/faas.ts diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/fields/host.ts b/x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/fields/host.ts similarity index 100% rename from x-pack/plugins/apm/typings/es_schemas/raw/fields/host.ts rename to x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/fields/host.ts diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/fields/http.ts b/x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/fields/http.ts similarity index 100% rename from x-pack/plugins/apm/typings/es_schemas/raw/fields/http.ts rename to x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/fields/http.ts diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/fields/kubernetes.ts b/x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/fields/kubernetes.ts similarity index 100% rename from x-pack/plugins/apm/typings/es_schemas/raw/fields/kubernetes.ts rename to x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/fields/kubernetes.ts diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/fields/observer.ts b/x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/fields/observer.ts similarity index 100% rename from x-pack/plugins/apm/typings/es_schemas/raw/fields/observer.ts rename to x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/fields/observer.ts diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/fields/page.ts b/x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/fields/page.ts similarity index 100% rename from x-pack/plugins/apm/typings/es_schemas/raw/fields/page.ts rename to x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/fields/page.ts diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/fields/process.ts b/x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/fields/process.ts similarity index 100% rename from x-pack/plugins/apm/typings/es_schemas/raw/fields/process.ts rename to x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/fields/process.ts diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/fields/service.ts b/x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/fields/service.ts similarity index 100% rename from x-pack/plugins/apm/typings/es_schemas/raw/fields/service.ts rename to x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/fields/service.ts diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/fields/span_links.ts b/x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/fields/span_links.ts similarity index 100% rename from x-pack/plugins/apm/typings/es_schemas/raw/fields/span_links.ts rename to x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/fields/span_links.ts diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/fields/stackframe.ts b/x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/fields/stackframe.ts similarity index 100% rename from x-pack/plugins/apm/typings/es_schemas/raw/fields/stackframe.ts rename to x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/fields/stackframe.ts diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/fields/timestamp_us.ts b/x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/fields/timestamp_us.ts similarity index 100% rename from x-pack/plugins/apm/typings/es_schemas/raw/fields/timestamp_us.ts rename to x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/fields/timestamp_us.ts diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/fields/url.ts b/x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/fields/url.ts similarity index 100% rename from x-pack/plugins/apm/typings/es_schemas/raw/fields/url.ts rename to x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/fields/url.ts diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/fields/user.ts b/x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/fields/user.ts similarity index 100% rename from x-pack/plugins/apm/typings/es_schemas/raw/fields/user.ts rename to x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/fields/user.ts diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/fields/user_agent.ts b/x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/fields/user_agent.ts similarity index 100% rename from x-pack/plugins/apm/typings/es_schemas/raw/fields/user_agent.ts rename to x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/fields/user_agent.ts diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/metric_raw.ts b/x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/metric_raw.ts similarity index 100% rename from x-pack/plugins/apm/typings/es_schemas/raw/metric_raw.ts rename to x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/metric_raw.ts diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/span_raw.ts b/x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/span_raw.ts similarity index 100% rename from x-pack/plugins/apm/typings/es_schemas/raw/span_raw.ts rename to x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/span_raw.ts diff --git a/x-pack/plugins/apm/typings/es_schemas/raw/transaction_raw.ts b/x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/transaction_raw.ts similarity index 100% rename from x-pack/plugins/apm/typings/es_schemas/raw/transaction_raw.ts rename to x-pack/plugins/observability_solution/apm/typings/es_schemas/raw/transaction_raw.ts diff --git a/x-pack/plugins/apm/typings/es_schemas/ui/apm_error.ts b/x-pack/plugins/observability_solution/apm/typings/es_schemas/ui/apm_error.ts similarity index 100% rename from x-pack/plugins/apm/typings/es_schemas/ui/apm_error.ts rename to x-pack/plugins/observability_solution/apm/typings/es_schemas/ui/apm_error.ts diff --git a/x-pack/plugins/apm/typings/es_schemas/ui/event.ts b/x-pack/plugins/observability_solution/apm/typings/es_schemas/ui/event.ts similarity index 100% rename from x-pack/plugins/apm/typings/es_schemas/ui/event.ts rename to x-pack/plugins/observability_solution/apm/typings/es_schemas/ui/event.ts diff --git a/x-pack/plugins/apm/typings/es_schemas/ui/fields/agent.ts b/x-pack/plugins/observability_solution/apm/typings/es_schemas/ui/fields/agent.ts similarity index 100% rename from x-pack/plugins/apm/typings/es_schemas/ui/fields/agent.ts rename to x-pack/plugins/observability_solution/apm/typings/es_schemas/ui/fields/agent.ts diff --git a/x-pack/plugins/apm/typings/es_schemas/ui/metric.ts b/x-pack/plugins/observability_solution/apm/typings/es_schemas/ui/metric.ts similarity index 100% rename from x-pack/plugins/apm/typings/es_schemas/ui/metric.ts rename to x-pack/plugins/observability_solution/apm/typings/es_schemas/ui/metric.ts diff --git a/x-pack/plugins/apm/typings/es_schemas/ui/span.ts b/x-pack/plugins/observability_solution/apm/typings/es_schemas/ui/span.ts similarity index 100% rename from x-pack/plugins/apm/typings/es_schemas/ui/span.ts rename to x-pack/plugins/observability_solution/apm/typings/es_schemas/ui/span.ts diff --git a/x-pack/plugins/apm/typings/es_schemas/ui/transaction.ts b/x-pack/plugins/observability_solution/apm/typings/es_schemas/ui/transaction.ts similarity index 100% rename from x-pack/plugins/apm/typings/es_schemas/ui/transaction.ts rename to x-pack/plugins/observability_solution/apm/typings/es_schemas/ui/transaction.ts diff --git a/x-pack/plugins/apm/typings/timeseries.ts b/x-pack/plugins/observability_solution/apm/typings/timeseries.ts similarity index 100% rename from x-pack/plugins/apm/typings/timeseries.ts rename to x-pack/plugins/observability_solution/apm/typings/timeseries.ts diff --git a/x-pack/plugins/apm_data_access/common/index.ts b/x-pack/plugins/observability_solution/apm_data_access/common/index.ts similarity index 100% rename from x-pack/plugins/apm_data_access/common/index.ts rename to x-pack/plugins/observability_solution/apm_data_access/common/index.ts diff --git a/x-pack/plugins/apm_data_access/jest.config.js b/x-pack/plugins/observability_solution/apm_data_access/jest.config.js similarity index 71% rename from x-pack/plugins/apm_data_access/jest.config.js rename to x-pack/plugins/observability_solution/apm_data_access/jest.config.js index 8fb297afcc48e..569b7beaad8c5 100644 --- a/x-pack/plugins/apm_data_access/jest.config.js +++ b/x-pack/plugins/observability_solution/apm_data_access/jest.config.js @@ -9,6 +9,6 @@ const path = require('path'); module.exports = { preset: '@kbn/test', - rootDir: path.resolve(__dirname, '../../..'), - roots: ['/x-pack/plugins/apm_data_access'], + rootDir: path.resolve(__dirname, '../../../..'), + roots: ['/x-pack/plugins/observability_solution/apm_data_access'], }; diff --git a/x-pack/plugins/apm_data_access/kibana.jsonc b/x-pack/plugins/observability_solution/apm_data_access/kibana.jsonc similarity index 100% rename from x-pack/plugins/apm_data_access/kibana.jsonc rename to x-pack/plugins/observability_solution/apm_data_access/kibana.jsonc diff --git a/x-pack/plugins/apm_data_access/server/index.ts b/x-pack/plugins/observability_solution/apm_data_access/server/index.ts similarity index 100% rename from x-pack/plugins/apm_data_access/server/index.ts rename to x-pack/plugins/observability_solution/apm_data_access/server/index.ts diff --git a/x-pack/plugins/apm_data_access/server/plugin.ts b/x-pack/plugins/observability_solution/apm_data_access/server/plugin.ts similarity index 100% rename from x-pack/plugins/apm_data_access/server/plugin.ts rename to x-pack/plugins/observability_solution/apm_data_access/server/plugin.ts diff --git a/x-pack/plugins/apm_data_access/server/saved_objects/apm_indices.ts b/x-pack/plugins/observability_solution/apm_data_access/server/saved_objects/apm_indices.ts similarity index 100% rename from x-pack/plugins/apm_data_access/server/saved_objects/apm_indices.ts rename to x-pack/plugins/observability_solution/apm_data_access/server/saved_objects/apm_indices.ts diff --git a/x-pack/plugins/apm_data_access/server/saved_objects/migrations/migrate_legacy_apm_indices_to_space_aware.test.ts b/x-pack/plugins/observability_solution/apm_data_access/server/saved_objects/migrations/migrate_legacy_apm_indices_to_space_aware.test.ts similarity index 100% rename from x-pack/plugins/apm_data_access/server/saved_objects/migrations/migrate_legacy_apm_indices_to_space_aware.test.ts rename to x-pack/plugins/observability_solution/apm_data_access/server/saved_objects/migrations/migrate_legacy_apm_indices_to_space_aware.test.ts diff --git a/x-pack/plugins/apm_data_access/server/saved_objects/migrations/migrate_legacy_apm_indices_to_space_aware.ts b/x-pack/plugins/observability_solution/apm_data_access/server/saved_objects/migrations/migrate_legacy_apm_indices_to_space_aware.ts similarity index 100% rename from x-pack/plugins/apm_data_access/server/saved_objects/migrations/migrate_legacy_apm_indices_to_space_aware.ts rename to x-pack/plugins/observability_solution/apm_data_access/server/saved_objects/migrations/migrate_legacy_apm_indices_to_space_aware.ts diff --git a/x-pack/plugins/apm_data_access/server/saved_objects/migrations/update_apm_oss_index_paths.ts b/x-pack/plugins/observability_solution/apm_data_access/server/saved_objects/migrations/update_apm_oss_index_paths.ts similarity index 100% rename from x-pack/plugins/apm_data_access/server/saved_objects/migrations/update_apm_oss_index_paths.ts rename to x-pack/plugins/observability_solution/apm_data_access/server/saved_objects/migrations/update_apm_oss_index_paths.ts diff --git a/x-pack/plugins/apm_data_access/server/saved_objects/save_apm_indices.test.ts b/x-pack/plugins/observability_solution/apm_data_access/server/saved_objects/save_apm_indices.test.ts similarity index 100% rename from x-pack/plugins/apm_data_access/server/saved_objects/save_apm_indices.test.ts rename to x-pack/plugins/observability_solution/apm_data_access/server/saved_objects/save_apm_indices.test.ts diff --git a/x-pack/plugins/apm_data_access/server/types.ts b/x-pack/plugins/observability_solution/apm_data_access/server/types.ts similarity index 100% rename from x-pack/plugins/apm_data_access/server/types.ts rename to x-pack/plugins/observability_solution/apm_data_access/server/types.ts diff --git a/x-pack/plugins/apm_data_access/tsconfig.json b/x-pack/plugins/observability_solution/apm_data_access/tsconfig.json similarity index 75% rename from x-pack/plugins/apm_data_access/tsconfig.json rename to x-pack/plugins/observability_solution/apm_data_access/tsconfig.json index 3a40428cab960..faa5185404fd0 100644 --- a/x-pack/plugins/apm_data_access/tsconfig.json +++ b/x-pack/plugins/observability_solution/apm_data_access/tsconfig.json @@ -1,5 +1,5 @@ { - "extends": "../../../tsconfig.base.json", + "extends": "../../../../tsconfig.base.json", "compilerOptions": { "outDir": "target/types" }, @@ -9,6 +9,6 @@ "@kbn/config-schema", "@kbn/core", "@kbn/i18n", - "@kbn/core-saved-objects-api-server", + "@kbn/core-saved-objects-api-server" ] } diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/components/dataset_quality/filters/filter_bar.tsx b/x-pack/plugins/observability_solution/dataset_quality/public/components/dataset_quality/filters/filter_bar.tsx index da62df7d7bb40..6ed24eaba8c3f 100644 --- a/x-pack/plugins/observability_solution/dataset_quality/public/components/dataset_quality/filters/filter_bar.tsx +++ b/x-pack/plugins/observability_solution/dataset_quality/public/components/dataset_quality/filters/filter_bar.tsx @@ -28,6 +28,7 @@ export const FilterBar = ({ query, onQueryChange }: FilterBarComponentProps) => return ( openFlyout(dataStreamStat as FlyoutDataset)} @@ -264,5 +265,9 @@ const LogsExplorerLink = ({ }) => { const logsExplorerLinkProps = useLinkToLogsExplorer({ dataStreamStat }); - return {title}; + return ( + + {title} + + ); }; diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/components/flyout/flyout.tsx b/x-pack/plugins/observability_solution/dataset_quality/public/components/flyout/flyout.tsx index 480958aa7126c..49479b875e496 100644 --- a/x-pack/plugins/observability_solution/dataset_quality/public/components/flyout/flyout.tsx +++ b/x-pack/plugins/observability_solution/dataset_quality/public/components/flyout/flyout.tsx @@ -54,7 +54,12 @@ export default function Flyout({ dataset, closeFlyout }: FlyoutProps) { - + {flyoutCancelText} diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/components/flyout/header.tsx b/x-pack/plugins/observability_solution/dataset_quality/public/components/flyout/header.tsx index c6f283cb66294..a0474dd8d70fa 100644 --- a/x-pack/plugins/observability_solution/dataset_quality/public/components/flyout/header.tsx +++ b/x-pack/plugins/observability_solution/dataset_quality/public/components/flyout/header.tsx @@ -55,7 +55,12 @@ export function Header({ dataStreamStat }: { dataStreamStat: FlyoutDataset }) { justifyContent="flexEnd" alignItems="center" > - + {flyoutOpenInLogsExplorerText} diff --git a/x-pack/plugins/observability_solution/exploratory_view/common/annotations.ts b/x-pack/plugins/observability_solution/exploratory_view/common/annotations.ts index e9b7c6b77b231..b30b563ccd0b0 100644 --- a/x-pack/plugins/observability_solution/exploratory_view/common/annotations.ts +++ b/x-pack/plugins/observability_solution/exploratory_view/common/annotations.ts @@ -12,7 +12,7 @@ import { either } from 'fp-ts/lib/Either'; * Checks whether a string is a valid ISO timestamp, * but doesn't convert it into a Date object when decoding. * - * Copied from x-pack/plugins/apm/common/runtime_types/date_as_string_rt.ts. + * Copied from x-pack/plugins/observability_solution/apm/common/runtime_types/date_as_string_rt.ts. */ const dateAsStringRt = new t.Type( 'DateAsString', diff --git a/x-pack/plugins/observability_solution/uptime/public/legacy_uptime/components/certificates/fingerprint_col.tsx b/x-pack/plugins/observability_solution/uptime/public/legacy_uptime/components/certificates/fingerprint_col.tsx index 8e6d3c5ad86f9..7dd0449ff06f5 100644 --- a/x-pack/plugins/observability_solution/uptime/public/legacy_uptime/components/certificates/fingerprint_col.tsx +++ b/x-pack/plugins/observability_solution/uptime/public/legacy_uptime/components/certificates/fingerprint_col.tsx @@ -24,11 +24,14 @@ export const FingerprintCol: React.FC = ({ cert }) => { return ( - {text} + + {text}{' '} + {(copy) => ( setIsPopoverOpen((prevState) => !prevState)} diff --git a/x-pack/plugins/observability_solution/uptime/public/legacy_uptime/components/monitor/synthetics/waterfall/components/waterfall_marker_icon.tsx b/x-pack/plugins/observability_solution/uptime/public/legacy_uptime/components/monitor/synthetics/waterfall/components/waterfall_marker_icon.tsx index 4bef5fb041520..1171e1ce0650a 100644 --- a/x-pack/plugins/observability_solution/uptime/public/legacy_uptime/components/monitor/synthetics/waterfall/components/waterfall_marker_icon.tsx +++ b/x-pack/plugins/observability_solution/uptime/public/legacy_uptime/components/monitor/synthetics/waterfall/components/waterfall_marker_icon.tsx @@ -34,6 +34,7 @@ export function WaterfallMarkerIcon({ field, label }: { field: string; label: st zIndex={100} button={ = compactView ? ( | null | undefined, diff --git a/x-pack/plugins/security_solution/server/utils/build_query/calculate_timeseries_interval.ts b/x-pack/plugins/security_solution/server/utils/build_query/calculate_timeseries_interval.ts index 071d1d6b4db2f..1d388465a21fb 100644 --- a/x-pack/plugins/security_solution/server/utils/build_query/calculate_timeseries_interval.ts +++ b/x-pack/plugins/security_solution/server/utils/build_query/calculate_timeseries_interval.ts @@ -7,7 +7,7 @@ /* ** Applying the same logic as: - ** x-pack/plugins/apm/server/lib/helpers/get_bucket_size/calculate_auto.js + ** x-pack/plugins/observability_solution/apm/server/lib/helpers/get_bucket_size/calculate_auto.js */ import moment from 'moment'; diff --git a/yarn.lock b/yarn.lock index e0639ec4bed5f..65462da820d11 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3216,11 +3216,11 @@ version "0.0.0" uid "" -"@kbn/apm-data-access-plugin@link:x-pack/plugins/apm_data_access": +"@kbn/apm-data-access-plugin@link:x-pack/plugins/observability_solution/apm_data_access": version "0.0.0" uid "" -"@kbn/apm-plugin@link:x-pack/plugins/apm": +"@kbn/apm-plugin@link:x-pack/plugins/observability_solution/apm": version "0.0.0" uid ""