From d7e88167fa151d2571b98814289446aa1758d796 Mon Sep 17 00:00:00 2001
From: Kerry Gallagher <kerry.gallagher@elastic.co>
Date: Wed, 27 Sep 2023 12:01:36 +0100
Subject: [PATCH] [Logs+] Improve observability log explorer global search
 behaviour (#167164)

## Summary

- Closes https://github.com/elastic/kibana/issues/166854 by disabling
the Observability Log Explorer plugin in the es and security serverless
projects.

- Closes https://github.com/elastic/kibana/issues/166912 by expanding
results with `keywords`.

---------

Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
---
 config/serverless.es.yml                                   | 1 +
 config/serverless.security.yml                             | 1 +
 x-pack/plugins/observability_log_explorer/public/plugin.ts | 1 +
 x-pack/plugins/observability_log_explorer/server/config.ts | 1 +
 4 files changed, 4 insertions(+)

diff --git a/config/serverless.es.yml b/config/serverless.es.yml
index 7e4e5547efb1..01a9129ce7e8 100644
--- 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
index 7a186ac9e70b..19927adb5866 100644
--- 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/observability_log_explorer/public/plugin.ts b/x-pack/plugins/observability_log_explorer/public/plugin.ts
index e82d863727a6..0bf10b5fab5b 100644
--- 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
index 1977c5e625c1..9718345a72a2 100644
--- 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({