elastic · sphilipse · Oct 24, 2024 · Oct 15, 2024 · Oct 15, 2024 · Oct 15, 2024
diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc
@@ -744,7 +744,7 @@ Elastic.
 
 
 |{kib-repo}blob/{branch}/x-pack/plugins/observability_solution/observability_ai_assistant_management/README.md[observabilityAiAssistantManagement]
-|The observabilityAiAssistantManagement plugin manages the Ai Assistant for Observability management section.
+|The observabilityAiAssistantManagement plugin manages the Ai Assistant for Observability and Search management section.
 
 
 |{kib-repo}blob/{branch}/x-pack/plugins/observability_solution/observability_logs_explorer/README.md[observabilityLogsExplorer]

diff --git a/src/plugins/ai_assistant_management/selection/common/ui_setting_keys.ts b/src/plugins/ai_assistant_management/selection/common/ui_setting_keys.ts
@@ -8,3 +8,4 @@
  */
 
 export const PREFERRED_AI_ASSISTANT_TYPE_SETTING_KEY = 'aiAssistant:preferredAIAssistantType';
+export const AI_ASSISTANT_DEFAULT_SCOPE_KEY = 'aiAssistant:defaultScope';
diff --git a/src/plugins/ai_assistant_management/selection/public/index.ts b/src/plugins/ai_assistant_management/selection/public/index.ts
@@ -17,6 +17,8 @@ import type {
 
 export { AIAssistantType } from '../common/ai_assistant_type';
 
+export { AI_ASSISTANT_DEFAULT_SCOPE_KEY } from '../common/ui_setting_keys';
+
 export type {
   AIAssistantManagementSelectionPluginPublicSetup,
   AIAssistantManagementSelectionPluginPublicStart,

diff --git a/...i_assistant_management/selection/public/routes/components/ai_assistant_selection_page.tsx b/...i_assistant_management/selection/public/routes/components/ai_assistant_selection_page.tsx
@@ -139,7 +139,7 @@ export function AiAssistantSelectionPage() {
             isDisabled={!observabilityAIAssistantEnabled}
             title={i18n.translate(
               'aiAssistantManagementSelection.aiAssistantSelectionPage.observabilityLabel',
-              { defaultMessage: 'Elastic AI Assistant for Observability' }
+              { defaultMessage: 'Elastic AI Assistant for Observability and Search' }
             )}
             titleSize="xs"
           />

diff --git a/src/plugins/ai_assistant_management/selection/server/plugin.ts b/src/plugins/ai_assistant_management/selection/server/plugin.ts
@@ -26,7 +26,10 @@ import type {
   AIAssistantManagementSelectionPluginServerStart,
 } from './types';
 import { AIAssistantType } from '../common/ai_assistant_type';
-import { PREFERRED_AI_ASSISTANT_TYPE_SETTING_KEY } from '../common/ui_setting_keys';
+import {
+  AI_ASSISTANT_DEFAULT_SCOPE_KEY,
+  PREFERRED_AI_ASSISTANT_TYPE_SETTING_KEY,
+} from '../common/ui_setting_keys';
 
 export class AIAssistantManagementSelectionPlugin
   implements
@@ -50,15 +53,15 @@ export class AIAssistantManagementSelectionPlugin
     core.uiSettings.register({
       [PREFERRED_AI_ASSISTANT_TYPE_SETTING_KEY]: {
         name: i18n.translate('aiAssistantManagementSelection.preferredAIAssistantTypeSettingName', {
-          defaultMessage: 'Observability AI Assistant scope',
+          defaultMessage: 'AI Assistant for Observability and Search visibility',
         }),
         category: [DEFAULT_APP_CATEGORIES.observability.id],
         value: this.config.preferredAIAssistantType,
         description: i18n.translate(
           'aiAssistantManagementSelection.preferredAIAssistantTypeSettingDescription',
           {
             defaultMessage:
-              '<em>[technical preview]</em> Whether to show the Observability AI Assistant menu item in Observability, everywhere, or nowhere.',
+              '<em>[technical preview]</em> Whether to show the AI Assistant menu item in Observability and Search, everywhere, or nowhere.',
             values: {
               em: (chunks) => `<em>${chunks}</em>`,
             },
@@ -77,7 +80,7 @@ export class AIAssistantManagementSelectionPlugin
         optionLabels: {
           [AIAssistantType.Default]: i18n.translate(
             'aiAssistantManagementSelection.preferredAIAssistantTypeSettingValueDefault',
-            { defaultMessage: 'Observability only (default)' }
+            { defaultMessage: 'Observability and Search only (default)' }
           ),
           [AIAssistantType.Observability]: i18n.translate(
             'aiAssistantManagementSelection.preferredAIAssistantTypeSettingValueObservability',
@@ -90,6 +93,35 @@ export class AIAssistantManagementSelectionPlugin
         },
         requiresPageReload: true,
       },
+      [AI_ASSISTANT_DEFAULT_SCOPE_KEY]: {
+        category: ['observability'],
+        name: i18n.translate('aiAssistantManagementSelection.defaultScopeName', {
+          defaultMessage: 'AI assistant default scope',
+        }),
+        value: '',
+        description: i18n.translate(
+          'aiAssistantManagementSelection.settingsPage.defaultScopeDescription',
+          {
+            defaultMessage:
+              'Defines the default behavior of the AI assistant in pages outside Observability and Search. This determines which functions are available to the assistant, and the system prompt it uses.',
+          }
+        ),
+        schema: schema.oneOf([schema.literal('search'), schema.literal('observability')], {
+          defaultValue: 'search',
+        }),
+        options: ['search', 'observability'],
+        type: 'select',
+        optionLabels: {
+          ['observability']: i18n.translate(
+            'aiAssistantManagementSelection.defaultScopeValueObservability',
+            { defaultMessage: 'Observability' }
+          ),
+          ['search']: i18n.translate('aiAssistantManagementSelection.defaultScopeSearch', {
+            defaultMessage: 'Search',
+          }),
+        },
+        requiresPageReload: true,
+      },
     });
 
     core.capabilities.registerProvider(() => {

diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/kibana.jsonc b/x-pack/plugins/observability_solution/observability_ai_assistant/kibana.jsonc
@@ -6,18 +6,30 @@
     "id": "observabilityAIAssistant",
     "server": true,
     "browser": true,
-    "configPath": ["xpack", "observabilityAIAssistant"],
+    "configPath": [
+      "xpack",
+      "observabilityAIAssistant"
+    ],
     "requiredPlugins": [
       "actions",
       "features",
       "licensing",
       "security",
       "taskManager",
       "dataViews",
+      "aiAssistantManagementSelection"
+    ],
+    "requiredBundles": [
+      "kibanaReact",
+      "kibanaUtils"
+    ],
+    "optionalPlugins": [
+      "cloud",
+      "serverless"
     ],
-    "requiredBundles": ["kibanaReact", "kibanaUtils"],
-    "optionalPlugins": ["cloud", "serverless"],
     "extraPublicDirs": [],
-    "runtimePluginDependencies": [ "ml" ]
+    "runtimePluginDependencies": [
+      "ml"
+    ]
   }
 }
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/public/plugin.tsx b/x-pack/plugins/observability_solution/observability_ai_assistant/public/plugin.tsx
@@ -11,6 +11,7 @@ import type { Logger } from '@kbn/logging';
 import { withSuspense } from '@kbn/shared-ux-utility';
 import React, { type ComponentType, lazy, type Ref } from 'react';
 import { AssistantScope } from '@kbn/ai-assistant-common';
+import { AI_ASSISTANT_DEFAULT_SCOPE_KEY } from '@kbn/ai-assistant-management-plugin/public';
 import { registerTelemetryEventTypes } from './analytics';
 import { ObservabilityAIAssistantChatServiceContext } from './context/observability_ai_assistant_chat_service_context';
 import { ObservabilityAIAssistantMultipaneFlyoutContext } from './context/observability_ai_assistant_multipane_flyout_context';
@@ -60,14 +61,15 @@ export class ObservabilityAIAssistantPlugin
     coreStart: CoreStart,
     pluginsStart: ObservabilityAIAssistantPluginStartDependencies
   ): ObservabilityAIAssistantPublicStart {
+    const scopeFromUiSettings = coreStart.uiSettings.get(AI_ASSISTANT_DEFAULT_SCOPE_KEY);
     const service = (this.service = createService({
       analytics: coreStart.analytics,
       coreStart,
       enabled:
         coreStart.application.capabilities.observabilityAIAssistant[
           aiAssistantCapabilities.show
         ] === true,
-      scope: this.scopeFromConfig || 'observability',
+      scope: this.scopeFromConfig || scopeFromUiSettings || 'search',
       scopeIsMutable: !!this.scopeFromConfig,
     }));
 

diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/functions/index.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/server/functions/index.ts
@@ -57,7 +57,7 @@ export const registerFunctions: RegistrationCallback = async ({
 
   DO NOT UNDER ANY CIRCUMSTANCES USE ES|QL syntax (\`service.name == "foo"\`) with "kqlFilter" (\`service.name:"foo"\`).
 
-  The user is able to change the language which they want you to reply in on the settings page of the AI Assistant for Observability, which can be found in the ${
+  The user is able to change the language which they want you to reply in on the settings page of the AI Assistant for Observability and Search, which can be found in the ${
     isServerless ? `Project settings.` : `Stack Management app under the option AI Assistants`
   }.
   If the user asks how to change the language, reply in the same language the user asked in.`,

diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/tsconfig.json b/x-pack/plugins/observability_solution/observability_ai_assistant/tsconfig.json
@@ -46,7 +46,8 @@
     "@kbn/core-ui-settings-server",
     "@kbn/inference-plugin",
     "@kbn/management-settings-ids",
-    "@kbn/ai-assistant-common"
+    "@kbn/ai-assistant-common",
+    "@kbn/ai-assistant-management-plugin"
   ],
   "exclude": ["target/**/*"]
 }
diff --git a/.../plugins/observability_solution/observability_ai_assistant_management/README.md b/.../plugins/observability_solution/observability_ai_assistant_management/README.md
@@ -1,3 +1,3 @@
 # `observabilityAiAssistantManagement` plugin
 
-The `observabilityAiAssistantManagement` plugin manages the `Ai Assistant for Observability` management section.
+The `observabilityAiAssistantManagement` plugin manages the `Ai Assistant for Observability and Search` management section.
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_management/kibana.jsonc b/x-pack/plugins/observability_solution/observability_ai_assistant_management/kibana.jsonc
@@ -6,9 +6,25 @@
     "id": "observabilityAiAssistantManagement",
     "server": true,
     "browser": true,
-    "configPath": ["xpack", "observabilityAiAssistantManagement"],
-    "requiredPlugins": ["management", "observabilityAIAssistant", "observabilityShared"],
-    "optionalPlugins": ["actions", "home", "serverless", "enterpriseSearch"],
-    "requiredBundles": ["kibanaReact", "logsDataAccess"]
+    "configPath": [
+      "xpack",
+      "observabilityAiAssistantManagement"
+    ],
+    "requiredPlugins": [
+      "management",
+      "observabilityAIAssistant",
+      "observabilityShared",
+      "aiAssistantManagementSelection"
+    ],
+    "optionalPlugins": [
+      "actions",
+      "home",
+      "serverless",
+      "enterpriseSearch"
+    ],
+    "requiredBundles": [
+      "kibanaReact",
+      "logsDataAccess"
+    ]
   }
 }
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/app.tsx b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/app.tsx
@@ -35,7 +35,7 @@ export const mountManagementSection = async ({ core, mountParams }: MountParams)
 
   coreStart.chrome.docTitle.change(
     i18n.translate('xpack.observabilityAiAssistantManagement.app.titleBar', {
-      defaultMessage: 'AI Assistant for Observability Settings',
+      defaultMessage: 'AI Assistant for Observability and Search Settings',
     })
   );
 

diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/plugin.ts b/x-pack/plugins/observability_solution/observability_ai_assistant_management/public/plugin.ts
@@ -49,15 +49,15 @@ export class AiAssistantManagementObservabilityPlugin
     { home, management, observabilityAIAssistant }: SetupDependencies
   ): AiAssistantManagementObservabilityPluginSetup {
     const title = i18n.translate('xpack.observabilityAiAssistantManagement.app.title', {
-      defaultMessage: 'AI Assistant for Observability',
+      defaultMessage: 'AI Assistant for Observability and Search',
     });
 
     if (home) {
       home.featureCatalogue.register({
         id: 'ai_assistant_observability',
         title,
         description: i18n.translate('xpack.observabilityAiAssistantManagement.app.description', {
-          defaultMessage: 'Manage your AI Assistant for Observability.',
+          defaultMessage: 'Manage your AI Assistant for Observability and Search.',
         }),
         icon: 'sparkles',
         path: '/app/management/kibana/ai-assistant/observability',

diff --git a/...solution/observability_ai_assistant_management/public/routes/components/settings_page.tsx b/...solution/observability_ai_assistant_management/public/routes/components/settings_page.tsx
@@ -40,7 +40,7 @@ export function SettingsPage() {
           text: i18n.translate(
             'xpack.observabilityAiAssistantManagement.breadcrumb.serverless.observability',
             {
-              defaultMessage: 'AI Assistant for Observability Settings',
+              defaultMessage: 'AI Assistant for Observability and Search Settings',
             }
           ),
         },

diff --git a/...ervability_ai_assistant_management/public/routes/components/settings_tab/settings_tab.tsx b/...ervability_ai_assistant_management/public/routes/components/settings_tab/settings_tab.tsx
@@ -85,7 +85,7 @@ export function SettingsTab() {
           'xpack.observabilityAiAssistantManagement.settingsPage.euiDescribedFormGroup.inOrderToUseLabel',
           {
             defaultMessage:
-              'In order to use the Observability AI Assistant you must set up a Generative AI connector.',
+              'In order to use the AI Assistant you must set up a Generative AI connector.',
           }
         )}
       >

diff --git a/...servability_ai_assistant_management/public/routes/components/settings_tab/ui_settings.tsx b/...servability_ai_assistant_management/public/routes/components/settings_tab/ui_settings.tsx
@@ -18,12 +18,14 @@ import { EuiSpacer } from '@elastic/eui';
 import { isEmpty } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { LogSourcesSettingSynchronisationInfo } from '@kbn/logs-data-access-plugin/public';
+import { AI_ASSISTANT_DEFAULT_SCOPE_KEY } from '@kbn/ai-assistant-management-plugin/public';
 import { useKibana } from '../../../hooks/use_kibana';
 
 const settingsKeys = [
   aiAssistantSimulatedFunctionCalling,
   aiAssistantSearchConnectorIndexPattern,
   aiAssistantPreferredAIAssistantType,
+  AI_ASSISTANT_DEFAULT_SCOPE_KEY,
 ];
 
 export function UISettings() {

diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_management/tsconfig.json b/x-pack/plugins/observability_solution/observability_ai_assistant_management/tsconfig.json
@@ -21,7 +21,8 @@
     "@kbn/observability-shared-plugin",
     "@kbn/config-schema",
     "@kbn/core-ui-settings-common",
-    "@kbn/logs-data-access-plugin"
+    "@kbn/logs-data-access-plugin",
+    "@kbn/ai-assistant-management-plugin"
   ],
   "exclude": ["target/**/*"]
 }
diff --git a/x-pack/plugins/search_assistant/server/functions/index.ts b/x-pack/plugins/search_assistant/server/functions/index.ts
@@ -27,7 +27,7 @@ export const registerFunctions: (isServerless: boolean) => RegistrationCallback
   If you want to call a function or tool, only call it a single time per message. Wait until the function has been executed and its results
   returned to you, before executing the same tool or another tool again if needed.
 
-  The user is able to change the language which they want you to reply in on the settings page of the AI Assistant for Observability, which can be found in the ${
+  The user is able to change the language which they want you to reply in on the settings page of the AI Assistant for Observability and Search, which can be found in the ${
     isServerless ? `Project settings.` : `Stack Management app under the option AI Assistants`
   }.
   If the user asks how to change the language, reply in the same language the user asked in.`,

diff --git a/x-pack/plugins/serverless_observability/public/plugin.ts b/x-pack/plugins/serverless_observability/public/plugin.ts
@@ -59,7 +59,7 @@ export class ServerlessObservabilityPlugin
           observabilityAiAssistantManagement: {
             category: appCategories.OTHER,
             title: i18n.translate('xpack.serverlessObservability.aiAssistantManagementTitle', {
-              defaultMessage: 'AI Assistant for Observability Settings',
+              defaultMessage: 'AI Assistant for Observability and Search Settings',
             }),
             description: i18n.translate(
               'xpack.serverlessObservability.aiAssistantManagementDescription',
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,3 +8,4 @@
		*/

		export const PREFERRED_AI_ASSISTANT_TYPE_SETTING_KEY = 'aiAssistant:preferredAIAssistantType';
		export const AI_ASSISTANT_DEFAULT_SCOPE_KEY = 'aiAssistant:defaultScope';