elastic · pgayvallet · Dec 25, 2024 · Dec 23, 2024 · Dec 23, 2024 · Dec 23, 2024
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -765,9 +765,6 @@ x-pack/packages/kbn-alerting-state-types @elastic/response-ops
 x-pack/packages/kbn-random-sampling @elastic/kibana-visualizations
 x-pack/packages/kbn-synthetics-private-location @elastic/obs-ux-management-team
 x-pack/packages/maps/vector_tile_utils @elastic/kibana-presentation
-x-pack/packages/observability/observability_utils/observability_utils_browser @elastic/observability-ui
-x-pack/packages/observability/observability_utils/observability_utils_common @elastic/observability-ui
-x-pack/packages/observability/observability_utils/observability_utils_server @elastic/observability-ui
 x-pack/packages/search/shared_ui @elastic/search-kibana
 x-pack/packages/security/api_key_management @elastic/kibana-security
 x-pack/packages/security/authorization_core @elastic/kibana-security
@@ -908,7 +905,6 @@ x-pack/plugins/observability_solution/apm/ftr_e2e @elastic/obs-ux-infra_services
 x-pack/plugins/observability_solution/inventory @elastic/obs-ux-infra_services-team
 x-pack/plugins/observability_solution/inventory/e2e @elastic/obs-ux-infra_services-team
 x-pack/plugins/observability_solution/metrics_data_access @elastic/obs-ux-infra_services-team
-x-pack/plugins/observability_solution/observability_shared @elastic/observability-ui
 x-pack/plugins/observability_solution/profiling @elastic/obs-ux-infra_services-team
 x-pack/plugins/observability_solution/profiling_data_access @elastic/obs-ux-infra_services-team
 x-pack/plugins/reporting @elastic/appex-sharedux
@@ -940,6 +936,9 @@ x-pack/solutions/observability/packages/kbn-investigation-shared @elastic/obs-ux
 x-pack/solutions/observability/packages/observability_ai/observability_ai_common @elastic/obs-ai-assistant
 x-pack/solutions/observability/packages/observability_ai/observability_ai_server @elastic/obs-ai-assistant
 x-pack/solutions/observability/packages/synthetics_test_data @elastic/obs-ux-management-team
+x-pack/solutions/observability/packages/utils_browser @elastic/observability-ui
+x-pack/solutions/observability/packages/utils_common @elastic/observability-ui
+x-pack/solutions/observability/packages/utils_server @elastic/observability-ui
 x-pack/solutions/observability/plugins/exploratory_view @elastic/obs-ux-management-team
 x-pack/solutions/observability/plugins/infra @elastic/obs-ux-logs-team @elastic/obs-ux-infra_services-team
 x-pack/solutions/observability/plugins/investigate @elastic/obs-ux-management-team
@@ -951,6 +950,7 @@ x-pack/solutions/observability/plugins/observability_ai_assistant_management @el
 x-pack/solutions/observability/plugins/observability_logs_explorer @elastic/obs-ux-logs-team
 x-pack/solutions/observability/plugins/observability_onboarding @elastic/obs-ux-logs-team
 x-pack/solutions/observability/plugins/observability_onboarding/e2e @elastic/obs-ux-logs-team
+x-pack/solutions/observability/plugins/observability_shared @elastic/observability-ui
 x-pack/solutions/observability/plugins/observability_solution/entities_data_access @elastic/obs-entities
 x-pack/solutions/observability/plugins/observability_solution/entity_manager_app @elastic/obs-entities
 x-pack/solutions/observability/plugins/serverless_observability @elastic/obs-ux-management-team
@@ -1445,7 +1445,7 @@ packages/kbn-monaco/src/esql @elastic/kibana-esql
 /x-pack/test_serverless/**/test_suites/observability/config.ts @elastic/observability-ui
 
 # Observability onboarding tour
-/x-pack/plugins/observability_solution/observability_shared/public/components/tour @elastic/appex-sharedux
+/x-pack/solutions/observability/plugins/observability_shared/public/components/tour @elastic/appex-sharedux
 /x-pack/test/functional/apps/infra/tour.ts @elastic/appex-sharedux
 
 # Observability settings
@@ -2576,7 +2576,7 @@ x-pack/platform/plugins/private/translations/translations
 x-pack/test/profiling_api_integration @elastic/obs-ux-infra_services-team
 
 # Observability shared profiling
-x-pack/plugins/observability_solution/observability_shared/public/components/profiling @elastic/obs-ux-infra_services-team
+x-pack/solutions/observability/plugins/observability_shared/public/components/profiling @elastic/obs-ux-infra_services-team
 
 # Shared UX
 /x-pack/test_serverless/api_integration/test_suites/common/favorites @elastic/appex-sharedux # Assigned per https://github.com/elastic/kibana/pull/200985

diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc
@@ -764,7 +764,7 @@ Elastic.
 |This plugin provides an onboarding framework for observability solutions: Logs and APM.
 
 
-|{kib-repo}blob/{branch}/x-pack/plugins/observability_solution/observability_shared/README.md[observabilityShared]
+|{kib-repo}blob/{branch}/x-pack/solutions/observability/plugins/observability_shared/README.md[observabilityShared]
 |A plugin that contains components and utilities shared by all Observability plugins.
 
 

diff --git a/package.json b/package.json
@@ -705,11 +705,11 @@
     "@kbn/observability-logs-overview": "link:x-pack/platform/packages/shared/observability/logs_overview",
     "@kbn/observability-onboarding-plugin": "link:x-pack/solutions/observability/plugins/observability_onboarding",
     "@kbn/observability-plugin": "link:x-pack/solutions/observability/plugins/observability",
-    "@kbn/observability-shared-plugin": "link:x-pack/plugins/observability_solution/observability_shared",
+    "@kbn/observability-shared-plugin": "link:x-pack/solutions/observability/plugins/observability_shared",
     "@kbn/observability-synthetics-test-data": "link:x-pack/solutions/observability/packages/synthetics_test_data",
-    "@kbn/observability-utils-browser": "link:x-pack/packages/observability/observability_utils/observability_utils_browser",
-    "@kbn/observability-utils-common": "link:x-pack/packages/observability/observability_utils/observability_utils_common",
-    "@kbn/observability-utils-server": "link:x-pack/packages/observability/observability_utils/observability_utils_server",
+    "@kbn/observability-utils-browser": "link:x-pack/solutions/observability/packages/utils_browser",
+    "@kbn/observability-utils-common": "link:x-pack/solutions/observability/packages/utils_common",
+    "@kbn/observability-utils-server": "link:x-pack/solutions/observability/packages/utils_server",
     "@kbn/oidc-provider-plugin": "link:x-pack/test/security_api_integration/plugins/oidc_provider",
     "@kbn/open-telemetry-instrumented-plugin": "link:test/common/plugins/otel_metrics",
     "@kbn/openapi-common": "link:src/platform/packages/shared/kbn-openapi-common",

@@ -18,8 +18,8 @@ module.exports = {
     /src[\/\\]plugins[\/\\]kibana_react[\/\\]/,
     /x-pack[\/\\]platform[\/\\]packages[\/\\]shared[\/\\]kbn-elastic-assistant[\/\\]/,
     /x-pack[\/\\]plugins[\/\\]fleet[\/\\]/,
-    /x-pack[\/\\]plugins[\/\\]observability_solution[\/\\]observability_shared[\/\\]/,
     /x-pack[\/\\]plugins[\/\\]security_solution[\/\\]/,
+    /x-pack[\/\\]solutions[\/\\]observability[\/\\]plugins[\/\\]observability_shared[\/\\]/,
     /x-pack[\/\\]solutions[\/\\]observability[\/\\]plugins[\/\\]exploratory_view[\/\\]/,
     /x-pack[\/\\]solutions[\/\\]observability[\/\\]plugins[\/\\]observability[\/\\]/,
     /x-pack[\/\\]solutions[\/\\]observability[\/\\]plugins[\/\\]synthetics[\/\\]/,

@@ -59,7 +59,7 @@ export const storybookAliases = {
   observability_ai_assistant_app:
     'x-pack/solutions/observability/plugins/observability_ai_assistant_app/.storybook',
   observability_inventory: 'x-pack/plugins/observability_solution/inventory/.storybook',
-  observability_shared: 'x-pack/plugins/observability_solution/observability_shared/.storybook',
+  observability_shared: 'x-pack/solutions/observability/plugins/observability_shared/.storybook',
   observability_slo: 'x-pack/solutions/observability/plugins/slo/.storybook',
   presentation: 'src/plugins/presentation_util/storybook',
   random_sampling: 'x-pack/packages/kbn-random-sampling/.storybook',

diff --git a/tsconfig.base.json b/tsconfig.base.json
@@ -1346,16 +1346,16 @@
       "@kbn/observability-onboarding-plugin/*": ["x-pack/solutions/observability/plugins/observability_onboarding/*"],
       "@kbn/observability-plugin": ["x-pack/solutions/observability/plugins/observability"],
       "@kbn/observability-plugin/*": ["x-pack/solutions/observability/plugins/observability/*"],
-      "@kbn/observability-shared-plugin": ["x-pack/plugins/observability_solution/observability_shared"],
-      "@kbn/observability-shared-plugin/*": ["x-pack/plugins/observability_solution/observability_shared/*"],
+      "@kbn/observability-shared-plugin": ["x-pack/solutions/observability/plugins/observability_shared"],
+      "@kbn/observability-shared-plugin/*": ["x-pack/solutions/observability/plugins/observability_shared/*"],
       "@kbn/observability-synthetics-test-data": ["x-pack/solutions/observability/packages/synthetics_test_data"],
       "@kbn/observability-synthetics-test-data/*": ["x-pack/solutions/observability/packages/synthetics_test_data/*"],
-      "@kbn/observability-utils-browser": ["x-pack/packages/observability/observability_utils/observability_utils_browser"],
-      "@kbn/observability-utils-browser/*": ["x-pack/packages/observability/observability_utils/observability_utils_browser/*"],
-      "@kbn/observability-utils-common": ["x-pack/packages/observability/observability_utils/observability_utils_common"],
-      "@kbn/observability-utils-common/*": ["x-pack/packages/observability/observability_utils/observability_utils_common/*"],
-      "@kbn/observability-utils-server": ["x-pack/packages/observability/observability_utils/observability_utils_server"],
-      "@kbn/observability-utils-server/*": ["x-pack/packages/observability/observability_utils/observability_utils_server/*"],
+      "@kbn/observability-utils-browser": ["x-pack/solutions/observability/packages/utils_browser"],
+      "@kbn/observability-utils-browser/*": ["x-pack/solutions/observability/packages/utils_browser/*"],
+      "@kbn/observability-utils-common": ["x-pack/solutions/observability/packages/utils_common"],
+      "@kbn/observability-utils-common/*": ["x-pack/solutions/observability/packages/utils_common/*"],
+      "@kbn/observability-utils-server": ["x-pack/solutions/observability/packages/utils_server"],
+      "@kbn/observability-utils-server/*": ["x-pack/solutions/observability/packages/utils_server/*"],
       "@kbn/oidc-provider-plugin": ["x-pack/test/security_api_integration/plugins/oidc_provider"],
       "@kbn/oidc-provider-plugin/*": ["x-pack/test/security_api_integration/plugins/oidc_provider/*"],
       "@kbn/open-telemetry-instrumented-plugin": ["test/common/plugins/otel_metrics"],

diff --git a/x-pack/.i18nrc.json b/x-pack/.i18nrc.json
@@ -108,7 +108,7 @@
     "xpack.observabilityAiAssistantManagement": "solutions/observability/plugins/observability_ai_assistant_management",
     "xpack.observabilityLogsExplorer": "solutions/observability/plugins/observability_logs_explorer",
     "xpack.observability_onboarding": "solutions/observability/plugins/observability_onboarding",
-    "xpack.observabilityShared": "plugins/observability_solution/observability_shared",
+    "xpack.observabilityShared": "solutions/observability/plugins/observability_shared",
     "xpack.observabilityLogsOverview": [
       "platform/packages/shared/observability/logs_overview/src/components"
     ],

diff --git a/x-pack/plugins/observability_solution/observability_shared/jest.config.js b/x-pack/plugins/observability_solution/observability_shared/jest.config.js
@@ -8,5 +8,5 @@
 module.exports = {
   preset: '@kbn/test',
   rootDir: '../../../../..',
-  roots: ['<rootDir>/x-pack/packages/observability/observability_utils/observability_utils_common'],
+  roots: ['<rootDir>/x-pack/solutions/observability/packages/utils_browser'],
 };
@@ -8,5 +8,5 @@
 module.exports = {
   preset: '@kbn/test',
   rootDir: '../../../../..',
-  roots: ['<rootDir>/x-pack/packages/observability/observability_utils/observability_utils_server'],
+  roots: ['<rootDir>/x-pack/solutions/observability/packages/utils_common'],
 };
@@ -8,7 +8,5 @@
 module.exports = {
   preset: '@kbn/test',
   rootDir: '../../../../..',
-  roots: [
-    '<rootDir>/x-pack/packages/observability/observability_utils/observability_utils_browser',
-  ],
+  roots: ['<rootDir>/x-pack/solutions/observability/packages/utils_server'],
 };
@@ -0,0 +1,21 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+module.exports = {
+  preset: '@kbn/test',
+  rootDir: '../../../../..',
+  roots: ['<rootDir>/x-pack/solutions/observability/plugins/observability_shared'],
+  setupFiles: [
+    '<rootDir>/x-pack/solutions/observability/plugins/observability_shared/.storybook/jest_setup.js',
+  ],
+  coverageDirectory:
+    '<rootDir>/target/kibana-coverage/jest/x-pack/solutions/observability/plugins/observability_shared',
+  coverageReporters: ['text', 'html'],
+  collectCoverageFrom: [
+    '<rootDir>/x-pack/solutions/observability/plugins/observability_shared/{common,public,server}/**/*.{js,ts,tsx}',
+  ],
+};
@@ -110,7 +110,6 @@ export const useEsSearch = <DocumentSource extends unknown, TParams extends esty
           });
       });
     }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [...fnDeps]);
 
   const { rawResponse } = response as any;

@@ -1,5 +1,5 @@
 {
-  "extends": "../../../../tsconfig.base.json",
+  "extends": "../../../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "target/types"
   },
@@ -9,7 +9,7 @@
     "public/**/*.json",
     "server/**/*",
     "typings/**/*",
-    "../../../../typings/**/*",
+    "../../../../../typings/**/*",
     ".storybook/**/*"
   ],
   "kbn_references": [

diff --git a/yarn.lock b/yarn.lock
@@ -6509,23 +6509,23 @@
   version "0.0.0"
   uid ""
 
-"@kbn/observability-shared-plugin@link:x-pack/plugins/observability_solution/observability_shared":
+"@kbn/observability-shared-plugin@link:x-pack/solutions/observability/plugins/observability_shared":
   version "0.0.0"
   uid ""
 
 "@kbn/observability-synthetics-test-data@link:x-pack/solutions/observability/packages/synthetics_test_data":
   version "0.0.0"
   uid ""
 
-"@kbn/observability-utils-browser@link:x-pack/packages/observability/observability_utils/observability_utils_browser":
+"@kbn/observability-utils-browser@link:x-pack/solutions/observability/packages/utils_browser":
   version "0.0.0"
   uid ""
 
-"@kbn/observability-utils-common@link:x-pack/packages/observability/observability_utils/observability_utils_common":
+"@kbn/observability-utils-common@link:x-pack/solutions/observability/packages/utils_common":
   version "0.0.0"
   uid ""
 
-"@kbn/observability-utils-server@link:x-pack/packages/observability/observability_utils/observability_utils_server":
+"@kbn/observability-utils-server@link:x-pack/solutions/observability/packages/utils_server":
   version "0.0.0"
   uid ""
-Original file line number
+Diff line change
@@ Expand Up @@
               });
           });
         }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
       }, [...fnDeps]);
       const { rawResponse } = response as any;
@@ Expand Down @@