[Logs UI] Redirect Logs UI to Discover when in serverless mode

config/serverless.oblt.yml

@@ -0,0 +1 @@
+xpack.infra.logs.app_target: discover

test/plugin_functional/test_suites/core_plugins/rendering.ts

@@ -201,6 +201,7 @@ export default function ({ getService }: PluginFunctionalProviderContext) {
         'xpack.graph.savePolicy (alternatives)',
         'xpack.ilm.ui.enabled (boolean)',
         'xpack.index_management.ui.enabled (boolean)',
+        'xpack.infra.logs.app_target (alternatives)',
         'xpack.infra.sources.default.fields.message (array)',
         'xpack.license_management.ui.enabled (boolean)',
         'xpack.maps.preserveDrawingBuffer (boolean)',

x-pack/plugins/infra/common/constants.ts

@@ -16,6 +16,7 @@ export const LOGS_FEATURE_ID = 'logs';
 export type InfraFeatureId = typeof METRICS_FEATURE_ID | typeof LOGS_FEATURE_ID;
 
 export const TIMESTAMP_FIELD = '@timestamp';
+export const MESSAGE_FIELD = 'message';
 export const TIEBREAKER_FIELD = '_doc';
 export const HOST_FIELD = 'host.name';
 export const CONTAINER_FIELD = 'container.id';

x-pack/plugins/infra/common/plugin_config_types.ts

@@ -17,6 +17,9 @@ export interface InfraConfig {
   inventory: {
     compositeSize: number;
   };
+  logs: {
+    app_target: 'logs-ui' | 'discover';
+  };
   sources?: {
     default?: {
       fields?: {
@@ -28,6 +31,7 @@ export interface InfraConfig {
 
 export const publicConfigKeys = {
   sources: true,
+  logs: true,
 } as const;
 
 export type InfraPublicConfigKey = keyof {

x-pack/plugins/infra/kibana.jsonc

@@ -17,6 +17,7 @@
       "charts",
       "data",
       "dataViews",
+      "discover",
       "embeddable",
       "features",
       "lens",

x-pack/plugins/infra/public/apps/discover_app.tsx

@@ -0,0 +1,76 @@
+/*
+ * 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.
+ */
+import { interpret } from 'xstate';
+import type { DiscoverStart } from '@kbn/discover-plugin/public';
+import type { InfraClientStartDeps, InfraClientStartExports } from '../types';
+import type { LogViewColumnConfiguration, ResolvedLogView } from '../../common/log_views';
+import { createLogViewStateMachine, DEFAULT_LOG_VIEW } from '../observability_logs/log_view_state';
+import { MESSAGE_FIELD, TIMESTAMP_FIELD } from '../../common/constants';
+
+export const renderApp = (plugins: InfraClientStartDeps, pluginStart: InfraClientStartExports) => {
+  const { discover } = plugins;
+  const { logViews } = pluginStart;
+
+  const machine = createLogViewStateMachine({
+    initialContext: { logViewReference: DEFAULT_LOG_VIEW },
+    logViews: logViews.client,
+  });
+
+  const service = interpret(machine)
+    .onTransition((state) => {
+      if (
+        state.matches('checkingStatus') ||
+        state.matches('resolvedPersistedLogView') ||
+        state.matches('resolvedInlineLogView')
+      ) {
+        return redirectToDiscover(discover, state.context.resolvedLogView);
+      } else if (
+        state.matches('loadingFailed') ||
+        state.matches('resolutionFailed') ||
+        state.matches('checkingStatusFailed')
+      ) {
+        return redirectToDiscover(discover);
+      }
+    })
+    .start();
+
+  return () => {
+    // Stop machine interpreter after navigation
+    service.stop();
+  };
+};
+
+const redirectToDiscover = (discover: DiscoverStart, resolvedLogView?: ResolvedLogView) => {
+  if (!resolvedLogView) {
+    return discover.locator?.navigate({});
+  }
+
+  const columns = parseColumns(resolvedLogView.columns);
+  const dataViewSpec = resolvedLogView.dataViewReference.toSpec();
+
+  return discover.locator?.navigate({
+    columns,
+    dataViewId: dataViewSpec.id,
+    dataViewSpec,
+  });
+};
+
+/**
+ * Helpers
+ */
+
+const parseColumns = (columns: ResolvedLogView['columns']) => {
+  return columns.map(getColumnValue).filter(Boolean) as string[];
+};
+
+const getColumnValue = (column: LogViewColumnConfiguration) => {
+  if ('messageColumn' in column) return MESSAGE_FIELD;
+  if ('timestampColumn' in column) return TIMESTAMP_FIELD;
+  if ('fieldColumn' in column) return column.fieldColumn.field;
+
+  return null;
+};

x-pack/plugins/infra/public/plugin.ts

@@ -7,6 +7,7 @@
 
 import {
   AppMountParameters,
+  AppNavLinkStatus,
   AppUpdater,
   CoreStart,
   DEFAULT_APP_CATEGORIES,
@@ -136,54 +137,73 @@ export class Plugin implements InfraClientPluginClass {
       new LogStreamEmbeddableFactoryDefinition(core.getStartServices)
     );
 
-    core.application.register({
-      id: 'logs',
-      title: i18n.translate('xpack.infra.logs.pluginTitle', {
-        defaultMessage: 'Logs',
-      }),
-      euiIconType: 'logoObservability',
-      order: 8100,
-      appRoute: '/app/logs',
-      // !! Need to be kept in sync with the routes in x-pack/plugins/infra/public/pages/logs/page_content.tsx
-      deepLinks: [
-        {
-          id: 'stream',
-          title: i18n.translate('xpack.infra.logs.index.streamTabTitle', {
-            defaultMessage: 'Stream',
-          }),
-          path: '/stream',
-        },
-        {
-          id: 'anomalies',
-          title: i18n.translate('xpack.infra.logs.index.anomaliesTabTitle', {
-            defaultMessage: 'Anomalies',
-          }),
-          path: '/anomalies',
-        },
-        {
-          id: 'log-categories',
-          title: i18n.translate('xpack.infra.logs.index.logCategoriesBetaBadgeTitle', {
-            defaultMessage: 'Categories',
-          }),
-          path: '/log-categories',
-        },
-        {
-          id: 'settings',
-          title: i18n.translate('xpack.infra.logs.index.settingsTabTitle', {
-            defaultMessage: 'Settings',
-          }),
-          path: '/settings',
+    if (this.config.logs.app_target === 'discover') {
+      core.application.register({
+        id: 'logs-to-discover',
+        title: '',
+        navLinkStatus: AppNavLinkStatus.hidden,
+        appRoute: '/app/logs',
+        mount: async () => {
+          // mount callback should not use setup dependencies, get start dependencies instead
+          const [_coreStart, plugins, pluginStart] = await core.getStartServices();
+
+          const { renderApp } = await import('./apps/discover_app');
+
+          return renderApp(plugins, pluginStart);
         },
-      ],
-      category: DEFAULT_APP_CATEGORIES.observability,
-      mount: async (params: AppMountParameters) => {
-        // mount callback should not use setup dependencies, get start dependencies instead
-        const [coreStart, pluginsStart, pluginStart] = await core.getStartServices();
-        const { renderApp } = await import('./apps/logs_app');
+      });
+    }
 
-        return renderApp(coreStart, pluginsStart, pluginStart, params);
-      },
-    });
+    if (this.config.logs.app_target === 'logs-ui') {
+      core.application.register({
+        id: 'logs',
+        title: i18n.translate('xpack.infra.logs.pluginTitle', {
+          defaultMessage: 'Logs',
+        }),
+        euiIconType: 'logoObservability',
+        order: 8100,
+        appRoute: '/app/logs',
+        // !! Need to be kept in sync with the routes in x-pack/plugins/infra/public/pages/logs/page_content.tsx
+        deepLinks: [
+          {
+            id: 'stream',
+            title: i18n.translate('xpack.infra.logs.index.streamTabTitle', {
+              defaultMessage: 'Stream',
+            }),
+            path: '/stream',
+          },
+          {
+            id: 'anomalies',
+            title: i18n.translate('xpack.infra.logs.index.anomaliesTabTitle', {
+              defaultMessage: 'Anomalies',
+            }),
+            path: '/anomalies',
+          },
+          {
+            id: 'log-categories',
+            title: i18n.translate('xpack.infra.logs.index.logCategoriesBetaBadgeTitle', {
+              defaultMessage: 'Categories',
+            }),
+            path: '/log-categories',
+          },
+          {
+            id: 'settings',
+            title: i18n.translate('xpack.infra.logs.index.settingsTabTitle', {
+              defaultMessage: 'Settings',
+            }),
+            path: '/settings',
+          },
+        ],
+        category: DEFAULT_APP_CATEGORIES.observability,
+        mount: async (params: AppMountParameters) => {
+          // mount callback should not use setup dependencies, get start dependencies instead
+          const [coreStart, plugins, pluginStart] = await core.getStartServices();
+
+          const { renderApp } = await import('./apps/logs_app');
+          return renderApp(coreStart, plugins, pluginStart, params);
+        },
+      });
+    }
 
     // !! Need to be kept in sync with the routes in x-pack/plugins/infra/public/pages/metrics/index.tsx
     const infraDeepLinks = [

x-pack/plugins/infra/public/types.ts

@@ -33,6 +33,7 @@ import type { IStorageWrapper } from '@kbn/kibana-utils-plugin/public';
 import { type TypedLensByValueInput, LensPublicStart } from '@kbn/lens-plugin/public';
 import type { ChartsPluginStart } from '@kbn/charts-plugin/public';
 import { CasesUiStart } from '@kbn/cases-plugin/public';
+import { DiscoverStart } from '@kbn/discover-plugin/public';
 import type { UnwrapPromise } from '../common/utility_types';
 import type {
   SourceProviderProps,
@@ -74,6 +75,7 @@ export interface InfraClientStartDeps {
   charts: ChartsPluginStart;
   data: DataPublicPluginStart;
   dataViews: DataViewsPublicPluginStart;
+  discover: DiscoverStart;
   embeddable?: EmbeddableStart;
   lens: LensPublicStart;
   ml: MlPluginStart;

x-pack/plugins/infra/server/lib/alerting/inventory_metric_threshold/inventory_metric_threshold_executor.test.ts

@@ -99,6 +99,9 @@ const createMockStaticConfiguration = (sources: any) => ({
   inventory: {
     compositeSize: 2000,
   },
+  logs: {
+    app_target: 'logs-ui',
+  },
   sources,
 });
 

x-pack/plugins/infra/server/lib/alerting/metric_threshold/metric_threshold_executor.test.ts

@@ -34,6 +34,7 @@ import {
 import { Evaluation } from './lib/evaluate_rule';
 import type { LogMeta, Logger } from '@kbn/logging';
 import { DEFAULT_FLAPPING_SETTINGS } from '@kbn/alerting-plugin/common';
+import { InfraConfig } from '../../../../common/plugin_config_types';
 
 jest.mock('./lib/evaluate_rule', () => ({ evaluateRule: jest.fn() }));
 
@@ -1818,7 +1819,7 @@ describe('The metric threshold alert type', () => {
   });
 });
 
-const createMockStaticConfiguration = (sources: any) => ({
+const createMockStaticConfiguration = (sources: any): InfraConfig => ({
   alerting: {
     inventory_threshold: {
       group_by_page_size: 100,
@@ -1830,6 +1831,9 @@ const createMockStaticConfiguration = (sources: any) => ({
   inventory: {
     compositeSize: 2000,
   },
+  logs: {
+    app_target: 'logs-ui',
+  },
   sources,
 });
 

x-pack/plugins/infra/server/lib/sources/sources.test.ts

@@ -6,6 +6,7 @@
  */
 
 import { SavedObject } from '@kbn/core/server';
+import { InfraConfig } from '../../types';
 import { infraSourceConfigurationSavedObjectName } from './saved_object_type';
 import { InfraSources } from './sources';
 
@@ -108,7 +109,7 @@ describe('the InfraSources lib', () => {
   });
 });
 
-const createMockStaticConfiguration = (sources: any) => ({
+const createMockStaticConfiguration = (sources: any): InfraConfig => ({
   alerting: {
     inventory_threshold: {
       group_by_page_size: 10000,
@@ -117,10 +118,12 @@ const createMockStaticConfiguration = (sources: any) => ({
       group_by_page_size: 10000,
     },
   },
-  enabled: true,
   inventory: {
     compositeSize: 2000,
   },
+  logs: {
+    app_target: 'logs-ui',
+  },
   sources,
 });
 

x-pack/plugins/infra/server/plugin.ts

@@ -58,6 +58,11 @@ import { UsageCollector } from './usage/usage_collector';
 
 export const config: PluginConfigDescriptor<InfraConfig> = {
   schema: schema.object({
+    logs: schema.object({
+      app_target: schema.oneOf([schema.literal('logs-ui'), schema.literal('discover')], {
+        defaultValue: 'logs-ui',
+      }),
+    }),
     alerting: schema.object({
       inventory_threshold: schema.object({
         group_by_page_size: schema.number({ defaultValue: 5_000 }),

x-pack/plugins/infra/tsconfig.json

@@ -59,6 +59,7 @@
     "@kbn/shared-ux-prompt-not-found",
     "@kbn/shared-ux-router",
     "@kbn/shared-ux-link-redirect-app",
+    "@kbn/discover-plugin",
     "@kbn/observability-alert-details",
     "@kbn/ui-theme"
   ],