Merge branch 'main' into fix/x-pack-test-serverless-types

kibanamachine · web-flow · commit d66f3fc7bac3 · 2023-09-27T07:08:47.000-04:00
diff --git a/config/serverless.es.yml b/config/serverless.es.yml
@@ -5,6 +5,7 @@ xpack.apm.enabled: false
 
 xpack.cloudSecurityPosture.enabled: false
 xpack.infra.enabled: false
+xpack.observabilityLogExplorer.enabled: false
 xpack.observability.enabled: false
 xpack.securitySolution.enabled: false
 xpack.serverless.observability.enabled: false
diff --git a/config/serverless.security.yml b/config/serverless.security.yml
@@ -4,6 +4,7 @@
 enterpriseSearch.enabled: false
 xpack.apm.enabled: false
 xpack.infra.enabled: false
+xpack.observabilityLogExplorer.enabled: false
 xpack.observability.enabled: false
 xpack.uptime.enabled: false
 xpack.legacy_uptime.enabled: false
diff --git a/x-pack/plugins/ml/public/mocks.ts b/x-pack/plugins/ml/public/mocks.ts
@@ -9,30 +9,33 @@ import { sharePluginMock } from '@kbn/share-plugin/public/mocks';
 import { type ElasticModels } from './application/services/elastic_models_service';
 import type { MlPluginSetup, MlPluginStart } from './plugin';
 
+const createElasticModelsMock = (): jest.Mocked<ElasticModels> => {
+  return {
+    getELSER: jest.fn().mockResolvedValue({
+      version: 2,
+      default: true,
+      config: {
+        input: {
+          field_names: ['text_field'],
+        },
+      },
+      description: 'Elastic Learned Sparse EncodeR v2 (Tech Preview)',
+      name: '.elser_model_2',
+    }),
+  } as unknown as jest.Mocked<ElasticModels>;
+};
+
 const createSetupContract = (): jest.Mocked<MlPluginSetup> => {
   return {
     locator: sharePluginMock.createLocator(),
+    elasticModels: createElasticModelsMock(),
   };
 };
 
 const createStartContract = (): jest.Mocked<MlPluginStart> => {
   return {
     locator: sharePluginMock.createLocator(),
-    elasticModels: {
-      getELSER: jest.fn(() =>
-        Promise.resolve({
-          version: 2,
-          default: true,
-          config: {
-            input: {
-              field_names: ['text_field'],
-            },
-          },
-          description: 'Elastic Learned Sparse EncodeR v2 (Tech Preview)',
-          name: '.elser_model_2',
-        })
-      ),
-    } as unknown as jest.Mocked<ElasticModels>,
+    elasticModels: createElasticModelsMock(),
   };
 };
 
diff --git a/x-pack/plugins/ml/public/plugin.ts b/x-pack/plugins/ml/public/plugin.ts
@@ -18,7 +18,7 @@ import { take } from 'rxjs/operators';
 
 import type { UnifiedSearchPublicPluginStart } from '@kbn/unified-search-plugin/public';
 import type { ManagementSetup } from '@kbn/management-plugin/public';
-import type { SharePluginSetup, SharePluginStart } from '@kbn/share-plugin/public';
+import type { LocatorPublic, SharePluginSetup, SharePluginStart } from '@kbn/share-plugin/public';
 import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
 import type { EmbeddableSetup, EmbeddableStart } from '@kbn/embeddable-plugin/public';
@@ -54,7 +54,7 @@ import {
   MlSharedServices,
 } from './application/services/get_shared_ml_services';
 import { registerManagementSection } from './application/management';
-import { MlLocatorDefinition, type MlLocator } from './locator';
+import { MlLocatorDefinition, MlLocatorParams, type MlLocator } from './locator';
 import { setDependencyCache } from './application/util/dependency_cache';
 import { registerHomeFeature } from './register_home_feature';
 import { isFullLicense, isMlEnabled } from '../common/license';
@@ -67,6 +67,7 @@ import {
   type ConfigSchema,
 } from '../common/constants/app';
 import type { MlCapabilities } from './shared';
+import { ElasticModels } from './application/services/elastic_models_service';
 
 export interface MlStartDependencies {
   dataViewEditor: DataViewEditorStart;
@@ -131,7 +132,10 @@ export class MlPlugin implements Plugin<MlPluginSetup, MlPluginStart> {
     initEnabledFeatures(this.enabledFeatures, initializerContext.config.get());
   }
 
-  setup(core: MlCoreSetup, pluginsSetup: MlSetupDependencies) {
+  setup(
+    core: MlCoreSetup,
+    pluginsSetup: MlSetupDependencies
+  ): { locator?: LocatorPublic<MlLocatorParams>; elasticModels?: ElasticModels } {
     this.sharedMlServices = getMlSharedServices(core.http);
 
     core.application.register({
@@ -262,10 +266,14 @@ export class MlPlugin implements Plugin<MlPluginSetup, MlPluginStart> {
 
     return {
       locator: this.locator,
+      elasticModels: this.sharedMlServices.elasticModels,
     };
   }
 
-  start(core: CoreStart, deps: MlStartDependencies) {
+  start(
+    core: CoreStart,
+    deps: MlStartDependencies
+  ): { locator?: LocatorPublic<MlLocatorParams>; elasticModels?: ElasticModels } {
     setDependencyCache({
       docLinks: core.docLinks!,
       basePath: core.http.basePath,
diff --git a/x-pack/plugins/observability_log_explorer/public/components/log_explorer_top_nav_menu.tsx b/x-pack/plugins/observability_log_explorer/public/components/log_explorer_top_nav_menu.tsx
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import React, { useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
 import deepEqual from 'fast-deep-equal';
 import useObservable from 'react-use/lib/useObservable';
-import { type BehaviorSubject, distinctUntilChanged } from 'rxjs';
+import { type BehaviorSubject, distinctUntilChanged, filter, take } from 'rxjs';
 import { HeaderMenuPortal } from '@kbn/observability-shared-plugin/public';
 import { AppMountParameters } from '@kbn/core-application-browser';
 import {
@@ -111,6 +111,16 @@ const StatefulTopNav = ({
 }: LogExplorerTopNavMenuProps) => {
   const { euiTheme } = useEuiTheme();
 
+  /**
+   * Since the breadcrumbsAppendExtension might be set only during a plugin start (e.g. search session)
+   * we retrieve the latest valid extension in order to restore it once we unmount the beta badge.
+   */
+  const [previousAppendExtension$] = useState(() =>
+    services.chrome.getBreadcrumbsAppendExtension$().pipe(filter(Boolean), take(1))
+  );
+
+  const previousAppendExtension = useObservable(previousAppendExtension$);
+
   useEffect(() => {
     const { chrome, i18n, theme } = services;
 
@@ -137,7 +147,13 @@ const StatefulTopNav = ({
         ),
       });
     }
-  }, [euiTheme, services]);
+
+    return () => {
+      if (chrome) {
+        chrome.setBreadcrumbsAppendExtension(previousAppendExtension);
+      }
+    };
+  }, [euiTheme, services, previousAppendExtension]);
 
   return (
     <HeaderMenuPortal setHeaderActionMenu={setHeaderActionMenu} theme$={theme$}>
diff --git a/x-pack/plugins/observability_log_explorer/public/plugin.ts b/x-pack/plugins/observability_log_explorer/public/plugin.ts
@@ -55,6 +55,7 @@ export class ObservabilityLogExplorerPlugin
         ? AppNavLinkStatus.visible
         : AppNavLinkStatus.hidden,
       searchable: true,
+      keywords: ['logs', 'log', 'explorer', 'logs explorer'],
       mount: async (appMountParams) => {
         const [coreStart, pluginsStart, ownPluginStart] = await core.getStartServices();
 
diff --git a/x-pack/plugins/observability_log_explorer/server/config.ts b/x-pack/plugins/observability_log_explorer/server/config.ts
@@ -10,6 +10,7 @@ import { PluginConfigDescriptor } from '@kbn/core/server';
 import { ObservabilityLogExplorerConfig } from '../common/plugin_config';
 
 export const configSchema = schema.object({
+  enabled: schema.boolean({ defaultValue: true }),
   navigation: schema.object({
     showAppLink: offeringBasedSchema({
       serverless: schema.boolean({
