Merge branch 'main' into 165807-cpu-usage-stacked-area-chart

src/plugins/discover/public/index.ts

@@ -15,6 +15,7 @@ export function plugin(initializerContext: PluginInitializerContext) {
 }
 
 export type { ISearchEmbeddable, SearchInput } from './embeddable';
+export type { DiscoverAppState } from './application/main/services/discover_app_state_container';
 export type { DiscoverStateContainer } from './application/main/services/discover_state';
 export type { DiscoverContainerProps } from './components/discover_container';
 export type {

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

@@ -8,4 +8,5 @@
 export const LOG_EXPLORER_PROFILE_ID = 'log-explorer';
 
 // Fields constants
+export const TIMESTAMP_FIELD = '@timestamp';
 export const MESSAGE_FIELD = 'message';

x-pack/plugins/log_explorer/common/datasets/models/dataset.ts

@@ -8,6 +8,7 @@
 import { IconType } from '@elastic/eui';
 import { DataViewSpec } from '@kbn/data-views-plugin/common';
 import { IndexPattern } from '@kbn/io-ts-utils';
+import { TIMESTAMP_FIELD } from '../../constants';
 import { DatasetId, DatasetType, IntegrationType } from '../types';
 
 type IntegrationBase = Pick<IntegrationType, 'name' | 'title' | 'icons' | 'version'>;
@@ -53,6 +54,7 @@ export class Dataset {
     return {
       id: this.id,
       name: this.getFullTitle(),
+      timeFieldName: TIMESTAMP_FIELD,
       title: this.name as string,
     };
   }

x-pack/plugins/log_explorer/public/components/log_explorer/log_explorer.tsx

@@ -5,36 +5,47 @@
  * 2.0.
  */
 
+import React, { useMemo } from 'react';
 import { ScopedHistory } from '@kbn/core-application-browser';
 import { DataPublicPluginStart } from '@kbn/data-plugin/public';
-import { DiscoverStart } from '@kbn/discover-plugin/public';
-import React from 'react';
+import { DiscoverAppState, DiscoverStart } from '@kbn/discover-plugin/public';
+import type { BehaviorSubject } from 'rxjs';
 import {
   createLogExplorerProfileCustomizations,
   CreateLogExplorerProfileCustomizationsDeps,
 } from '../../customizations/log_explorer_profile';
 import { createPropertyGetProxy } from '../../utils/proxies';
+import { LogExplorerProfileContext } from '../../state_machines/log_explorer_profile';
 
 export interface CreateLogExplorerArgs extends CreateLogExplorerProfileCustomizationsDeps {
   discover: DiscoverStart;
 }
 
+export interface LogExplorerStateContainer {
+  appState?: DiscoverAppState;
+  logExplorerState?: Partial<LogExplorerProfileContext>;
+}
+
 export interface LogExplorerProps {
   scopedHistory: ScopedHistory;
+  state$?: BehaviorSubject<LogExplorerStateContainer>;
 }
 
 export const createLogExplorer = ({
   core,
   data,
   discover: { DiscoverContainer },
 }: CreateLogExplorerArgs) => {
-  const logExplorerCustomizations = [createLogExplorerProfileCustomizations({ core, data })];
-
   const overrideServices = {
     data: createDataServiceProxy(data),
   };
 
-  return ({ scopedHistory }: LogExplorerProps) => {
+  return ({ scopedHistory, state$ }: LogExplorerProps) => {
+    const logExplorerCustomizations = useMemo(
+      () => [createLogExplorerProfileCustomizations({ core, data, state$ })],
+      [state$]
+    );
+
     return (
       <DiscoverContainer
         customizationCallbacks={logExplorerCustomizations}

x-pack/plugins/log_explorer/public/customizations/log_explorer_profile.tsx

@@ -7,20 +7,24 @@
 
 import { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import type { CoreStart } from '@kbn/core/public';
-import { CustomizationCallback } from '@kbn/discover-plugin/public';
+import { CustomizationCallback, DiscoverStateContainer } from '@kbn/discover-plugin/public';
 import React from 'react';
+import { type BehaviorSubject, combineLatest, from, map, Subscription } from 'rxjs';
 import { dynamic } from '../utils/dynamic';
+import { LogExplorerProfileStateService } from '../state_machines/log_explorer_profile';
+import { LogExplorerStateContainer } from '../components/log_explorer';
 
 const LazyCustomDatasetSelector = dynamic(() => import('./custom_dataset_selector'));
 const LazyCustomDatasetFilters = dynamic(() => import('./custom_dataset_filters'));
 
 export interface CreateLogExplorerProfileCustomizationsDeps {
   core: CoreStart;
   data: DataPublicPluginStart;
+  state$?: BehaviorSubject<LogExplorerStateContainer>;
 }
 
 export const createLogExplorerProfileCustomizations =
-  ({ core, data }: CreateLogExplorerProfileCustomizationsDeps): CustomizationCallback =>
+  ({ core, data, state$ }: CreateLogExplorerProfileCustomizationsDeps): CustomizationCallback =>
   async ({ customizations, stateContainer }) => {
     // Lazy load dependencies
     const datasetServiceModuleLoadable = import('../services/datasets');
@@ -38,13 +42,26 @@ export const createLogExplorerProfileCustomizations =
       toasts: core.notifications.toasts,
     });
 
-    //
     /**
      * Wait for the machine to be fully initialized to set the restored selection
      * create the DataView and set it in the stateContainer from Discover
      */
     await waitForState(logExplorerProfileStateService, 'initialized');
 
+    /**
+     * Subscribe the state$ BehaviorSubject when the consumer app wants to react to state changes.
+     * It emits a combined state of:
+     * - log explorer state machine context
+     * - appState from the discover stateContainer
+     */
+    let stateSubscription: Subscription;
+    if (state$) {
+      stateSubscription = createStateUpdater({
+        logExplorerProfileStateService,
+        stateContainer,
+      }).subscribe(state$);
+    }
+
     /**
      * Replace the DataViewPicker with a custom `DatasetSelector` to pick integrations streams
      * Prepend the search bar with custom filter control groups depending on the selected dataset
@@ -76,4 +93,25 @@ export const createLogExplorerProfileCustomizations =
         saveItem: { disabled: true },
       },
     });
+
+    return () => {
+      if (stateSubscription) {
+        stateSubscription.unsubscribe();
+      }
+    };
   };
+
+const createStateUpdater = ({
+  logExplorerProfileStateService,
+  stateContainer,
+}: {
+  logExplorerProfileStateService: LogExplorerProfileStateService;
+  stateContainer: DiscoverStateContainer;
+}) => {
+  return combineLatest([from(logExplorerProfileStateService), stateContainer.appState.state$]).pipe(
+    map(([logExplorerState, appState]) => ({
+      logExplorerState: logExplorerState.context,
+      appState,
+    }))
+  );
+};

x-pack/plugins/log_explorer/public/index.ts

@@ -9,6 +9,7 @@ import type { PluginInitializerContext } from '@kbn/core/public';
 import type { LogExplorerConfig } from '../common/plugin_config';
 import { LogExplorerPlugin } from './plugin';
 export type { LogExplorerPluginSetup, LogExplorerPluginStart } from './types';
+export type { LogExplorerStateContainer } from './components/log_explorer';
 
 export function plugin(context: PluginInitializerContext<LogExplorerConfig>) {
   return new LogExplorerPlugin(context);

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

@@ -0,0 +1,8 @@
+/*
+ * 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.
+ */
+
+export const OBSERVABILITY_LOG_EXPLORER_APP_ID = 'observability-log-explorer';

x-pack/plugins/observability_log_explorer/common/translations.ts

@@ -21,3 +21,10 @@ export const betaBadgeDescription = i18n.translate(
     defaultMessage: 'This application is in beta and therefore subject to change.',
   }
 );
+
+export const discoverLinkTitle = i18n.translate(
+  'xpack.observabilityLogExplorer.discoverLinkTitle',
+  {
+    defaultMessage: 'Discover',
+  }
+);

x-pack/plugins/observability_log_explorer/kibana.jsonc

@@ -13,12 +13,13 @@
     ],
     "requiredPlugins": [
       "data",
+      "discover",
       "logExplorer",
       "observabilityShared"
     ],
     "optionalPlugins": [
       "serverless"
     ],
-    "requiredBundles": []
+    "requiredBundles": ["kibanaReact"]
   }
 }

x-pack/plugins/observability_log_explorer/public/applications/observability_log_explorer.tsx

@@ -5,69 +5,81 @@
  * 2.0.
  */
 
-import { AppMountParameters, CoreStart, ScopedHistory } from '@kbn/core/public';
+import { AppMountParameters, CoreStart } from '@kbn/core/public';
 import { KibanaRenderContextProvider } from '@kbn/react-kibana-context-render';
 import { Route, Router, Routes } from '@kbn/shared-ux-router';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { ObservablityLogExplorerMainRoute } from '../routes/main';
 import { ObservabilityLogExplorerPluginStart, ObservabilityLogExplorerStartDeps } from '../types';
+import { useKibanaContextForPluginProvider } from '../utils/use_kibana';
 
 export const renderObservabilityLogExplorer = (
   core: CoreStart,
   pluginsStart: ObservabilityLogExplorerStartDeps,
   ownPluginStart: ObservabilityLogExplorerPluginStart,
-  { element, history }: AppMountParameters
+  appParams: AppMountParameters
 ) => {
   ReactDOM.render(
     <ObservabilityLogExplorerApp
+      appParams={appParams}
       core={core}
-      history={history}
       plugins={pluginsStart}
       pluginStart={ownPluginStart}
     />,
-    element
+    appParams.element
   );
 
   return () => {
     // work around race condition between unmount effect and current app id
     // observable in the search session service
     pluginsStart.data.search.session.clear();
 
-    ReactDOM.unmountComponentAtNode(element);
+    ReactDOM.unmountComponentAtNode(appParams.element);
   };
 };
 
 export interface ObservabilityLogExplorerAppProps {
+  appParams: AppMountParameters;
   core: CoreStart;
   plugins: ObservabilityLogExplorerStartDeps;
   pluginStart: ObservabilityLogExplorerPluginStart;
-  history: ScopedHistory;
 }
 
 export const ObservabilityLogExplorerApp = ({
+  appParams,
   core,
-  plugins: { logExplorer, observabilityShared, serverless },
+  plugins,
   pluginStart,
-  history,
-}: ObservabilityLogExplorerAppProps) => (
-  <KibanaRenderContextProvider i18n={core.i18n} theme={core.theme}>
-    <Router history={history}>
-      <Routes>
-        <Route
-          path="/"
-          exact={true}
-          render={() => (
-            <ObservablityLogExplorerMainRoute
-              core={core}
-              history={history}
-              logExplorer={logExplorer}
-              observabilityShared={observabilityShared}
-              serverless={serverless}
+}: ObservabilityLogExplorerAppProps) => {
+  const { logExplorer, observabilityShared, serverless } = plugins;
+  const KibanaContextProviderForPlugin = useKibanaContextForPluginProvider(
+    core,
+    plugins,
+    pluginStart
+  );
+
+  return (
+    <KibanaRenderContextProvider i18n={core.i18n} theme={core.theme}>
+      <KibanaContextProviderForPlugin>
+        <Router history={appParams.history}>
+          <Routes>
+            <Route
+              path="/"
+              exact={true}
+              render={() => (
+                <ObservablityLogExplorerMainRoute
+                  appParams={appParams}
+                  core={core}
+                  logExplorer={logExplorer}
+                  observabilityShared={observabilityShared}
+                  serverless={serverless}
+                />
+              )}
             />
-          )}
-        />
-      </Routes>
-    </Router>
-  </KibanaRenderContextProvider>
-);
+          </Routes>
+        </Router>
+      </KibanaContextProviderForPlugin>
+    </KibanaRenderContextProvider>
+  );
+};