diff --git a/.eslintrc.js b/.eslintrc.js
index 76479aa1c1f32..5fb122e5ea4cc 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -917,7 +917,7 @@ module.exports = {
'x-pack/plugins/observability/**/*.tsx',
'x-pack/plugins/observability_shared/observability_ai_assistant/**/*.tsx',
'x-pack/plugins/observability_onboarding/**/*.tsx',
- 'x-pack/plugins/observability_shared/**/*.tsx',
+ 'x-pack/plugins/observability_solution/observability_shared/**/*.tsx',
'x-pack/plugins/observability_solution/profiling/**/*.tsx',
'x-pack/plugins/synthetics/**/*.tsx',
'x-pack/plugins/observability_solution/ux/**/*.tsx',
@@ -935,7 +935,7 @@ module.exports = {
'x-pack/plugins/observability/**/!(*.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_onboarding/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
- 'x-pack/plugins/observability_shared/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
+ 'x-pack/plugins/observability_solution/observability_shared/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
'x-pack/plugins/observability_solution/profiling/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
'x-pack/plugins/synthetics/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
'x-pack/plugins/observability_solution/ux/**/!(*.stories.tsx|*.test.tsx|*.storybook_decorator.tsx|*.mock.tsx)',
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 479315375606c..864cac9c9e809 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -577,7 +577,7 @@ x-pack/packages/observability/get_padded_alert_time_range_util @elastic/obs-ux-m
x-pack/plugins/observability_solution/observability_logs_explorer @elastic/obs-ux-logs-team
x-pack/plugins/observability_onboarding @elastic/obs-ux-logs-team
x-pack/plugins/observability @elastic/obs-ux-management-team
-x-pack/plugins/observability_shared @elastic/observability-ui
+x-pack/plugins/observability_solution/observability_shared @elastic/observability-ui
x-pack/test/security_api_integration/plugins/oidc_provider @elastic/kibana-security
test/common/plugins/otel_metrics @elastic/obs-ux-infra_services-team
packages/kbn-openapi-bundler @elastic/security-detection-rule-management
@@ -1093,7 +1093,7 @@ x-pack/plugins/infra/server/lib/alerting @elastic/obs-ux-management-team
/x-pack/test/functional/apps/observability_logs_explorer @elastic/obs-ux-logs-team
# Observability onboarding tour
-/x-pack/plugins/observability_shared/public/components/tour @elastic/platform-onboarding
+/x-pack/plugins/observability_solution/observability_shared/public/components/tour @elastic/platform-onboarding
/x-pack/test/functional/apps/infra/tour.ts @elastic/platform-onboarding
# Observability settings
@@ -1570,7 +1570,7 @@ x-pack/plugins/translations/translations
x-pack/test/profiling_api_integration @elastic/obs-ux-infra_services-team
# Observability shared profiling
-x-pack/plugins/observability_shared/public/components/profiling @elastic/obs-ux-infra_services-team
+x-pack/plugins/observability_solution/observability_shared/public/components/profiling @elastic/obs-ux-infra_services-team
# Shared UX
packages/react @elastic/appex-sharedux
diff --git a/api_docs/deprecations_by_plugin.mdx b/api_docs/deprecations_by_plugin.mdx
index 4489a12d380b0..4a06c9a1045c5 100644
--- a/api_docs/deprecations_by_plugin.mdx
+++ b/api_docs/deprecations_by_plugin.mdx
@@ -1221,7 +1221,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
| Deprecated API | Reference location(s) | Remove By |
| ---------------|-----------|-----------|
-| | [header_menu_portal.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_shared/public/components/header_menu/header_menu_portal.tsx#:~:text=toMountPoint), [header_menu_portal.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_shared/public/components/header_menu/header_menu_portal.tsx#:~:text=toMountPoint) | - |
+| | [header_menu_portal.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/observability_shared/public/components/header_menu/header_menu_portal.tsx#:~:text=toMountPoint), [header_menu_portal.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/observability_solution/observability_shared/public/components/header_menu/header_menu_portal.tsx#:~:text=toMountPoint) | - |
diff --git a/api_docs/kibana_react.devdocs.json b/api_docs/kibana_react.devdocs.json
index e80aa303a365a..5578e82bf7f5d 100644
--- a/api_docs/kibana_react.devdocs.json
+++ b/api_docs/kibana_react.devdocs.json
@@ -2722,11 +2722,11 @@
},
{
"plugin": "observabilityShared",
- "path": "x-pack/plugins/observability_shared/public/components/header_menu/header_menu_portal.tsx"
+ "path": "x-pack/plugins/observability_solution/observability_shared/public/components/header_menu/header_menu_portal.tsx"
},
{
"plugin": "observabilityShared",
- "path": "x-pack/plugins/observability_shared/public/components/header_menu/header_menu_portal.tsx"
+ "path": "x-pack/plugins/observability_solution/observability_shared/public/components/header_menu/header_menu_portal.tsx"
},
{
"plugin": "telemetry",
diff --git a/api_docs/observability_shared.devdocs.json b/api_docs/observability_shared.devdocs.json
index 66c1c2ba2bcc4..3f7f79f8f872d 100644
--- a/api_docs/observability_shared.devdocs.json
+++ b/api_docs/observability_shared.devdocs.json
@@ -27,7 +27,7 @@
},
""
],
- "path": "x-pack/plugins/observability_shared/public/plugin.ts",
+ "path": "x-pack/plugins/observability_solution/observability_shared/public/plugin.ts",
"deprecated": false,
"trackAdoption": false,
"children": [
@@ -38,10 +38,8 @@
"tags": [],
"label": "Constructor",
"description": [],
- "signature": [
- "any"
- ],
- "path": "x-pack/plugins/observability_shared/public/plugin.ts",
+ "signature": ["any"],
+ "path": "x-pack/plugins/observability_solution/observability_shared/public/plugin.ts",
"deprecated": false,
"trackAdoption": false,
"children": [],
@@ -77,7 +75,7 @@
},
"[]>) => void; }; }"
],
- "path": "x-pack/plugins/observability_shared/public/plugin.ts",
+ "path": "x-pack/plugins/observability_solution/observability_shared/public/plugin.ts",
"deprecated": false,
"trackAdoption": false,
"children": [
@@ -98,7 +96,7 @@
},
"