Merge branch 'main' into feat/monitoring-visual-refresh

elastic · Jan 2, 2025 · 7b3b9dd · 7b3b9dd
2 parents 13e889d + 1be2c06
commit 7b3b9dd
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 14 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -3324,7 +3324,7 @@ x-pack/solutions/observability/plugins/observability @elastic/obs-ux-management-
 x-pack/solutions/observability/plugins/observability_ai_assistant_app @elastic/obs-ai-assistant
 x-pack/solutions/observability/plugins/observability_ai_assistant_management @elastic/obs-ai-assistant
 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 @elastic/obs-ux-onboarding-team
+x-pack/solutions/observability/plugins/observability_onboarding @elastic/obs-ux-logs-team
 x-pack/solutions/observability/plugins/observability_shared @elastic/observability-ui
 x-pack/solutions/observability/plugins/profiling @elastic/obs-ux-infra_services-team
 x-pack/solutions/observability/plugins/profiling_data_access @elastic/obs-ux-infra_services-team

diff --git a/packages/kbn-code-owners/src/code_owner_areas.ts b/packages/kbn-code-owners/src/code_owner_areas.ts
@@ -54,7 +54,6 @@ export const CODE_OWNER_AREA_MAPPINGS: { [area in CodeOwnerArea]: string[] } = {
     'elastic/obs-ux-infra_services-team',
     'elastic/obs-ux-logs-team',
     'elastic/obs-ux-management-team',
-    'elastic/obs-ux-onboarding-team',
     'elastic/observability-design',
     'elastic/observability-ui',
     'elastic/observablt-robots',

diff --git a/packages/kbn-react-mute-legacy-root-warning/kibana.jsonc b/packages/kbn-react-mute-legacy-root-warning/kibana.jsonc
@@ -1,5 +1,7 @@
 {
   "type": "shared-common",
   "id": "@kbn/react-mute-legacy-root-warning",
-  "owner": "@elastic/appex-sharedux"
+  "owner": "@elastic/appex-sharedux",
+  "visibility": "private",
+  "group": "platform"
 }
diff --git a/packages/shared-ux/router/mocks/kibana.jsonc b/packages/shared-ux/router/mocks/kibana.jsonc
@@ -1,5 +1,7 @@
 {
   "type": "shared-common",
   "id": "@kbn/shared-ux-router-mocks",
-  "owner": "@elastic/appex-sharedux"
+  "owner": "@elastic/appex-sharedux",
+  "group": "platform",
+  "visibility": "shared"
 }
diff --git a/packages/shared-ux/router/types/kibana.jsonc b/packages/shared-ux/router/types/kibana.jsonc
@@ -1,5 +1,7 @@
 {
   "type": "shared-common",
   "id": "@kbn/shared-ux-router-types",
-  "owner": "@elastic/appex-sharedux"
+  "owner": "@elastic/appex-sharedux",
+  "group": "platform",
+  "visibility": "shared"
 }
diff --git a/packages/shared-ux/storybook/config/kibana.jsonc b/packages/shared-ux/storybook/config/kibana.jsonc
@@ -1,5 +1,7 @@
 {
   "type": "shared-common",
   "id": "@kbn/shared-ux-storybook-config",
-  "owner": "@elastic/appex-sharedux"
+  "owner": "@elastic/appex-sharedux",
+  "visibility": "private",
+  "group": "platform"
 }
diff --git a/x-pack/examples/screenshotting_example/kibana.jsonc b/x-pack/examples/screenshotting_example/kibana.jsonc
@@ -2,10 +2,6 @@
   "type": "plugin",
   "id": "@kbn/screenshotting-example-plugin",
   "owner": "@elastic/appex-sharedux",
-  // This plugin is not meant to be referenced or imported
-  "visibility": "private",
-  // If cloned / used as an inspiration, please bear in mind that your plugin might belong to a specific solution group
-  "group": "platform",
   "description": "An example integration with the screenshotting plugin.",
   "plugin": {
     "id": "screenshottingExample",

diff --git a/x-pack/solutions/security/plugins/security_solution/common/experimental_features.ts b/x-pack/solutions/security/plugins/security_solution/common/experimental_features.ts
@@ -271,7 +271,7 @@ export const allowedExperimentalValues = Object.freeze({
   /**
    * Enables the Asset Inventory feature
    */
-  assetInventoryStoreEnabled: false,
+  assetInventoryUXEnabled: false,
 });
 
 type ExperimentalConfigKeys = Array<keyof ExperimentalFeatures>;

diff --git a/x-pack/solutions/security/plugins/security_solution/public/asset_inventory/links.ts b/x-pack/solutions/security/plugins/security_solution/public/asset_inventory/links.ts
@@ -19,7 +19,7 @@ export const links: LinkItem = {
       defaultMessage: 'Inventory',
     }),
   ],
-  experimentalKey: 'assetInventoryStoreEnabled',
+  experimentalKey: 'assetInventoryUXEnabled',
   id: SecurityPageName.assetInventory,
   path: ASSET_INVENTORY_PATH,
   title: INVENTORY,

diff --git a/x-pack/solutions/security/plugins/security_solution/public/asset_inventory/routes.tsx b/x-pack/solutions/security/plugins/security_solution/public/asset_inventory/routes.tsx
@@ -11,7 +11,6 @@ import { SecurityPageName } from '../app/types';
 import { ASSET_INVENTORY_PATH } from '../../common/constants';
 import { PluginTemplateWrapper } from '../common/components/plugin_template_wrapper';
 import { SecurityRoutePageWrapper } from '../common/components/security_route_page_wrapper';
-import { ExperimentalFeaturesService } from '../common/experimental_features_service';
 import { AssetInventoryContainer } from './pages';
 
 export const AssetInventoryRoutes = () => (
@@ -24,7 +23,7 @@ export const AssetInventoryRoutes = () => (
 
 export const routes: SecuritySubPluginRoutes = [
   {
-    path: ExperimentalFeaturesService.get().assetInventoryStoreEnabled ? ASSET_INVENTORY_PATH : [],
+    path: ASSET_INVENTORY_PATH,
     component: AssetInventoryRoutes,
   },
 ];