[Inventory] Use observability:entitycentricexperience to enable + side nav adjustments

src/plugins/kibana_usage_collection/server/collectors/application_usage/schema.ts

@@ -152,6 +152,7 @@ export const applicationUsageSchema = {
   fleet: commonSchema,
   integrations: commonSchema,
   ingestManager: commonSchema,
+  inventory: commonSchema,
   lens: commonSchema,
   maps: commonSchema,
   ml: commonSchema,

src/plugins/telemetry/schema/oss_plugins.json

@@ -4194,6 +4194,137 @@
             }
           }
         },
+        "inventory": {
+          "properties": {
+            "appId": {
+              "type": "keyword",
+              "_meta": {
+                "description": "The application being tracked"
+              }
+            },
+            "viewId": {
+              "type": "keyword",
+              "_meta": {
+                "description": "Always `main`"
+              }
+            },
+            "clicks_total": {
+              "type": "long",
+              "_meta": {
+                "description": "General number of clicks in the application since we started counting them"
+              }
+            },
+            "clicks_7_days": {
+              "type": "long",
+              "_meta": {
+                "description": "General number of clicks in the application over the last 7 days"
+              }
+            },
+            "clicks_30_days": {
+              "type": "long",
+              "_meta": {
+                "description": "General number of clicks in the application over the last 30 days"
+              }
+            },
+            "clicks_90_days": {
+              "type": "long",
+              "_meta": {
+                "description": "General number of clicks in the application over the last 90 days"
+              }
+            },
+            "minutes_on_screen_total": {
+              "type": "float",
+              "_meta": {
+                "description": "Minutes the application is active and on-screen since we started counting them."
+              }
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float",
+              "_meta": {
+                "description": "Minutes the application is active and on-screen over the last 7 days"
+              }
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float",
+              "_meta": {
+                "description": "Minutes the application is active and on-screen over the last 30 days"
+              }
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float",
+              "_meta": {
+                "description": "Minutes the application is active and on-screen over the last 90 days"
+              }
+            },
+            "views": {
+              "type": "array",
+              "items": {
+                "properties": {
+                  "appId": {
+                    "type": "keyword",
+                    "_meta": {
+                      "description": "The application being tracked"
+                    }
+                  },
+                  "viewId": {
+                    "type": "keyword",
+                    "_meta": {
+                      "description": "The application view being tracked"
+                    }
+                  },
+                  "clicks_total": {
+                    "type": "long",
+                    "_meta": {
+                      "description": "General number of clicks in the application sub view since we started counting them"
+                    }
+                  },
+                  "clicks_7_days": {
+                    "type": "long",
+                    "_meta": {
+                      "description": "General number of clicks in the active application sub view over the last 7 days"
+                    }
+                  },
+                  "clicks_30_days": {
+                    "type": "long",
+                    "_meta": {
+                      "description": "General number of clicks in the active application sub view over the last 30 days"
+                    }
+                  },
+                  "clicks_90_days": {
+                    "type": "long",
+                    "_meta": {
+                      "description": "General number of clicks in the active application sub view over the last 90 days"
+                    }
+                  },
+                  "minutes_on_screen_total": {
+                    "type": "float",
+                    "_meta": {
+                      "description": "Minutes the application sub view is active and on-screen since we started counting them."
+                    }
+                  },
+                  "minutes_on_screen_7_days": {
+                    "type": "float",
+                    "_meta": {
+                      "description": "Minutes the application is active and on-screen active application sub view over the last 7 days"
+                    }
+                  },
+                  "minutes_on_screen_30_days": {
+                    "type": "float",
+                    "_meta": {
+                      "description": "Minutes the application is active and on-screen active application sub view over the last 30 days"
+                    }
+                  },
+                  "minutes_on_screen_90_days": {
+                    "type": "float",
+                    "_meta": {
+                      "description": "Minutes the application is active and on-screen active application sub view over the last 90 days"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
         "lens": {
           "properties": {
             "appId": {

x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/deep_links.cy.ts

@@ -16,7 +16,7 @@ describe('APM deep links', () => {
       .type('APM', { force: true, delay: 100 })
       .focus();
     cy.contains('APM');
-    cy.contains('APM / Services');
+    cy.contains('APM / Service Inventory');
     cy.contains('APM / Service groups');
     cy.contains('APM / Traces');
     cy.contains('APM / Service Map');
@@ -33,7 +33,7 @@ describe('APM deep links', () => {
       .should('be.visible')
       .type('APM', { force: true, delay: 100 });
     // navigates to services page
-    cy.contains('APM / Services').click({ force: true });
+    cy.contains('APM / Service Inventory').click({ force: true });
     cy.url().should('include', '/apm/services');
 
     cy.getByTestSubj('nav-search-input')

x-pack/plugins/observability_solution/apm/public/plugin.ts

@@ -156,7 +156,7 @@ const applicationsTitle = i18n.translate('xpack.apm.navigation.rootTitle', {
 });
 
 const servicesTitle = i18n.translate('xpack.apm.navigation.servicesTitle', {
-  defaultMessage: 'Services',
+  defaultMessage: 'Service Inventory',
 });
 
 const serviceGroupsTitle = i18n.translate('xpack.apm.navigation.serviceGroupsTitle', {

x-pack/plugins/observability_solution/inventory/kibana.jsonc

@@ -12,13 +12,13 @@
       "entityManager",
       "inference",
       "dataViews",
+      "share",
+      "features",
       "unifiedSearch",
       "data",
       "share"
     ],
-    "requiredBundles": [
-      "kibanaReact"
-    ],
+    "requiredBundles": ["kibanaReact"],
     "optionalPlugins": [],
     "extraPublicDirs": []
   }

x-pack/plugins/observability_solution/inventory/public/components/inventory_page_template/index.tsx

@@ -4,10 +4,10 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { EuiEmptyPrompt, EuiLoadingLogo } from '@elastic/eui';
+import { EuiFlexGroup, EuiFlexItem, EuiEmptyPrompt, EuiLoadingLogo } from '@elastic/eui';
+import { TechnicalPreviewBadge } from '@kbn/observability-shared-plugin/public';
 import { useKibana } from '../../hooks/use_kibana';
 import { SearchBar } from '../search_bar';
 import { getEntityManagerEnablement } from './no_data_config';
@@ -16,11 +16,18 @@ import { Welcome } from '../entity_enablement/welcome_modal';
 import { useInventoryAbortableAsync } from '../../hooks/use_inventory_abortable_async';
 import { EmptyState } from '../empty_states/empty_state';
 
-const pageTitle = {
-  pageTitle: i18n.translate('xpack.inventory.inventoryPageHeaderLabel', {
-    defaultMessage: 'Inventory',
-  }),
-};
+const pageTitle = (
+  <EuiFlexGroup gutterSize="s">
+    <EuiFlexItem grow={false}>
+      {i18n.translate('xpack.inventory.inventoryPageHeaderLabel', {
+        defaultMessage: 'Inventory',
+      })}
+    </EuiFlexItem>
+    <EuiFlexItem grow={false}>
+      <TechnicalPreviewBadge />
+    </EuiFlexItem>
+  </EuiFlexGroup>
+);
 
 export function InventoryPageTemplate({ children }: { children: React.ReactNode }) {
   const {
@@ -52,20 +59,26 @@ export function InventoryPageTemplate({ children }: { children: React.ReactNode
 
   if (isEnablementLoading || hasDataLoading) {
     return (
-      <ObservabilityPageTemplate pageHeader={pageTitle}>
+      <ObservabilityPageTemplate
+        pageHeader={{
+          pageTitle,
+        }}
+      >
         <EuiEmptyPrompt icon={<EuiLoadingLogo logo="logoObservability" size="xl" />} />
       </ObservabilityPageTemplate>
     );
   }
 
   return (
     <ObservabilityPageTemplate
+      pageHeader={{
+        pageTitle,
+      }}
       noDataConfig={getEntityManagerEnablement({
         enabled: isEntityManagerEnabled,
         loading: isEnablementLoading,
         onSuccess: handleSuccess,
       })}
-      pageHeader={pageTitle}
     >
       {value.hasData ? (
         <EuiFlexGroup direction="column">

x-pack/plugins/observability_solution/inventory/public/plugin.ts

@@ -12,6 +12,7 @@ import {
   DEFAULT_APP_CATEGORIES,
   Plugin,
   PluginInitializerContext,
+  AppStatus,
 } from '@kbn/core/public';
 import { INVENTORY_APP_ID } from '@kbn/deeplinks-observability/constants';
 import { i18n } from '@kbn/i18n';
@@ -49,33 +50,39 @@ export class InventoryPlugin
     pluginsSetup: InventorySetupDependencies
   ): InventoryPublicSetup {
     const inventoryAPIClient = createCallInventoryAPI(coreSetup);
-    this.telemetry.setup({ analytics: coreSetup.analytics });
-
-    pluginsSetup.observabilityShared.navigation.registerSections(
-      from(coreSetup.getStartServices()).pipe(
-        map(([coreStart, pluginsStart]) => {
-          return [
-            {
-              label: '',
-              sortKey: 101,
-              entries: [
-                {
-                  label: i18n.translate('xpack.inventory.inventoryLinkTitle', {
-                    defaultMessage: 'Inventory',
-                  }),
-                  app: INVENTORY_APP_ID,
-                  path: '/',
-                  matchPath(currentPath: string) {
-                    return ['/', ''].some((testPath) => currentPath.startsWith(testPath));
-                  },
-                },
-              ],
-            },
-          ];
-        })
-      )
+    const isEntityCentricExperienceSettingEnabled = coreSetup.uiSettings.get<boolean>(
+      'observability:entityCentricExperience',
+      true
     );
 
+    if (isEntityCentricExperienceSettingEnabled) {
+      pluginsSetup.observabilityShared.navigation.registerSections(
+        from(coreSetup.getStartServices()).pipe(
+          map(([coreStart, pluginsStart]) => {
+            return [
+              {
+                label: '',
+                sortKey: 300,
+                entries: [
+                  {
+                    label: i18n.translate('xpack.inventory.inventoryLinkTitle', {
+                      defaultMessage: 'Inventory',
+                    }),
+                    app: INVENTORY_APP_ID,
+                    path: '/',
+                    matchPath(currentPath: string) {
+                      return ['/', ''].some((testPath) => currentPath.startsWith(testPath));
+                    },
+                    isTechnicalPreview: true,
+                  },
+                ],
+              },
+            ];
+          })
+        )
+      );
+    }
+    this.telemetry.setup({ analytics: coreSetup.analytics });
     const telemetry = this.telemetry.start();
 
     coreSetup.application.register({
@@ -86,17 +93,11 @@ export class InventoryPlugin
       euiIconType: 'logoObservability',
       appRoute: '/app/observability/inventory',
       category: DEFAULT_APP_CATEGORIES.observability,
-      visibleIn: ['sideNav'],
-      order: 8001,
-      deepLinks: [
-        {
-          id: 'inventory',
-          title: i18n.translate('xpack.inventory.inventoryDeepLinkTitle', {
-            defaultMessage: 'Inventory',
-          }),
-          path: '/',
-        },
-      ],
+      visibleIn: ['sideNav', 'globalSearch'],
+      order: 8200,
+      status: isEntityCentricExperienceSettingEnabled
+        ? AppStatus.accessible
+        : AppStatus.inaccessible,
       mount: async (appMountParameters: AppMountParameters<unknown>) => {
         // Load application bundle and Get start services
         const [{ renderApp }, [coreStart, pluginsStart]] = await Promise.all([

x-pack/plugins/observability_solution/inventory/server/config.ts

@@ -8,7 +8,7 @@
 import { schema, type TypeOf } from '@kbn/config-schema';
 
 export const config = schema.object({
-  enabled: schema.boolean({ defaultValue: false }),
+  enabled: schema.boolean({ defaultValue: true }),
 });
 
 export type InventoryConfig = TypeOf<typeof config>;