[AI Assistant] Add assistant to Serverless Search

config/serverless.es.yml

@@ -10,7 +10,6 @@ xpack.observability.enabled: false
 xpack.securitySolution.enabled: false
 xpack.serverless.observability.enabled: false
 enterpriseSearch.enabled: false
-xpack.observabilityAIAssistant.enabled: false
 xpack.osquery.enabled: false
 
 # Enable fleet on search projects for agentless features
@@ -120,4 +119,16 @@ xpack.searchInferenceEndpoints.ui.enabled: false
 xpack.search.notebooks.catalog.url: https://elastic-enterprise-search.s3.us-east-2.amazonaws.com/serverless/catalog.json
 
 # Semantic text UI
+
 xpack.index_management.dev.enableSemanticText: true
+
+# AI Assistant config
+xpack.observabilityAIAssistant.enabled: true
+xpack.searchAssistant.enabled: true
+xpack.searchAssistant.ui.enabled: true
+xpack.observabilityAIAssistant.scope: "search"
+xpack.observabilityAIAssistant.enableKnowledgeBase: false
+aiAssistantManagementSelection.preferredAIAssistantType: "observability"
+xpack.observabilityAiAssistantManagement.logSourcesEnabled: false
+xpack.observabilityAiAssistantManagement.spacesEnabled: false
+xpack.observabilityAiAssistantManagement.visibilityEnabled: false

config/serverless.oblt.yml

@@ -183,6 +183,7 @@ xpack.apm.featureFlags.storageExplorerAvailable: false
 
 ## Set the AI Assistant type
 aiAssistantManagementSelection.preferredAIAssistantType: "observability"
+xpack.observabilityAIAssistant.scope: "observability"
 
 # Specify in telemetry the project type
 telemetry.labels.serverless: observability

test/plugin_functional/test_suites/core_plugins/rendering.ts

@@ -362,6 +362,9 @@ export default function ({ getService }: PluginFunctionalProviderContext) {
         'xpack.observability_onboarding.ui.enabled (boolean?)',
         'xpack.observabilityLogsExplorer.navigation.showAppLink (boolean?|never)',
         'xpack.observabilityAIAssistant.scope (observability?|search?)',
+        'xpack.observabilityAiAssistantManagement.logSourcesEnabled (boolean?)',
+        'xpack.observabilityAiAssistantManagement.spacesEnabled (boolean?)',
+        'xpack.observabilityAiAssistantManagement.visibilityEnabled (boolean?)',
         'share.new_version.enabled (boolean?)',
         'aiAssistantManagementSelection.preferredAIAssistantType (default?|never?|observability?)',
         /**

x-pack/packages/kbn-ai-assistant/src/chat/chat_actions_menu.tsx

@@ -18,6 +18,7 @@ import {
 import { ConnectorSelectorBase } from '@kbn/observability-ai-assistant-plugin/public';
 import type { UseGenAIConnectorsResult } from '../hooks/use_genai_connectors';
 import { useKibana } from '../hooks/use_kibana';
+import { useKnowledgeBase } from '../hooks';
 
 export function ChatActionsMenu({
   connectors,
@@ -31,6 +32,7 @@ export function ChatActionsMenu({
   onCopyConversationClick: () => void;
 }) {
   const { application, http } = useKibana().services;
+  const knowledgeBase = useKnowledgeBase();
   const [isOpen, setIsOpen] = useState(false);
 
   const handleNavigateToConnectors = () => {
@@ -91,15 +93,19 @@ export function ChatActionsMenu({
               defaultMessage: 'Actions',
             }),
             items: [
-              {
-                name: i18n.translate('xpack.aiAssistant.chatHeader.actions.knowledgeBase', {
-                  defaultMessage: 'Manage knowledge base',
-                }),
-                onClick: () => {
-                  toggleActionsMenu();
-                  handleNavigateToSettingsKnowledgeBase();
-                },
-              },
+              ...(knowledgeBase?.status.value?.enabled
+                ? [
+                    {
+                      name: i18n.translate('xpack.aiAssistant.chatHeader.actions.knowledgeBase', {
+                        defaultMessage: 'Manage knowledge base',
+                      }),
+                      onClick: () => {
+                        toggleActionsMenu();
+                        handleNavigateToSettingsKnowledgeBase();
+                      },
+                    },
+                  ]
+                : []),
               {
                 name: i18n.translate('xpack.aiAssistant.chatHeader.actions.settings', {
                   defaultMessage: 'AI Assistant Settings',

x-pack/packages/kbn-ai-assistant/src/chat/chat_body.stories.tsx

@@ -37,6 +37,7 @@ const defaultProps: ComponentStoryObj<typeof Component> = {
         loading: false,
         value: {
           ready: true,
+          enabled: true,
         },
         refresh: () => {},
       },

x-pack/packages/kbn-ai-assistant/src/chat/chat_body.tsx

@@ -123,7 +123,7 @@ export function ChatBody({
   showLinkToConversationsApp: boolean;
   onConversationUpdate: (conversation: { conversation: Conversation['conversation'] }) => void;
   onToggleFlyoutPositionMode?: (flyoutPositionMode: FlyoutPositionMode) => void;
-  navigateToConversation: (conversationId?: string) => void;
+  navigateToConversation?: (conversationId?: string) => void;
 }) {
   const license = useLicense();
   const hasCorrectLicense = license?.hasAtLeast('enterprise');

x-pack/packages/kbn-ai-assistant/src/chat/chat_flyout.tsx

@@ -53,7 +53,7 @@ export function ChatFlyout({
   initialFlyoutPositionMode?: FlyoutPositionMode;
   isOpen: boolean;
   onClose: () => void;
-  navigateToConversation(conversationId?: string): void;
+  navigateToConversation?: (conversationId?: string) => void;
 }) {
   const { euiTheme } = useEuiTheme();
   const breakpoint = useCurrentEuiBreakpoint();
@@ -272,10 +272,14 @@ export function ChatFlyout({
                 conversationList.conversations.refresh();
               }}
               onToggleFlyoutPositionMode={handleToggleFlyoutPositionMode}
-              navigateToConversation={(newConversationId?: string) => {
-                if (onClose) onClose();
-                navigateToConversation(newConversationId);
-              }}
+              navigateToConversation={
+                navigateToConversation
+                  ? (newConversationId?: string) => {
+                      if (onClose) onClose();
+                      navigateToConversation(newConversationId);
+                    }
+                  : undefined
+              }
             />
           </EuiFlexItem>
 

x-pack/packages/kbn-ai-assistant/src/chat/chat_header.tsx

@@ -60,7 +60,7 @@ export function ChatHeader({
   onCopyConversation: () => void;
   onSaveTitle: (title: string) => void;
   onToggleFlyoutPositionMode?: (newFlyoutPositionMode: FlyoutPositionMode) => void;
-  navigateToConversation: (nextConversationId?: string) => void;
+  navigateToConversation?: (nextConversationId?: string) => void;
 }) {
   const theme = useEuiTheme();
   const breakpoint = useCurrentEuiBreakpoint();
@@ -164,31 +164,32 @@ export function ChatHeader({
                     }
                   />
                 </EuiFlexItem>
-
-                <EuiFlexItem grow={false}>
-                  <EuiPopover
-                    anchorPosition="downLeft"
-                    button={
-                      <EuiToolTip
-                        content={i18n.translate(
-                          'xpack.aiAssistant.chatHeader.euiToolTip.navigateToConversationsLabel',
-                          { defaultMessage: 'Navigate to conversations' }
-                        )}
-                        display="block"
-                      >
-                        <EuiButtonIcon
-                          aria-label={i18n.translate(
-                            'xpack.aiAssistant.chatHeader.euiButtonIcon.navigateToConversationsLabel',
+                {navigateToConversation ? (
+                  <EuiFlexItem grow={false}>
+                    <EuiPopover
+                      anchorPosition="downLeft"
+                      button={
+                        <EuiToolTip
+                          content={i18n.translate(
+                            'xpack.aiAssistant.chatHeader.euiToolTip.navigateToConversationsLabel',
                             { defaultMessage: 'Navigate to conversations' }
                           )}
-                          data-test-subj="observabilityAiAssistantChatHeaderButton"
-                          iconType="discuss"
-                          onClick={() => navigateToConversation(conversationId)}
-                        />
-                      </EuiToolTip>
-                    }
-                  />
-                </EuiFlexItem>
+                          display="block"
+                        >
+                          <EuiButtonIcon
+                            aria-label={i18n.translate(
+                              'xpack.aiAssistant.chatHeader.euiButtonIcon.navigateToConversationsLabel',
+                              { defaultMessage: 'Navigate to conversations' }
+                            )}
+                            data-test-subj="observabilityAiAssistantChatHeaderButton"
+                            iconType="discuss"
+                            onClick={() => navigateToConversation(conversationId)}
+                          />
+                        </EuiToolTip>
+                      }
+                    />
+                  </EuiFlexItem>
+                ) : null}
               </>
             ) : null}
 

x-pack/packages/kbn-ai-assistant/src/chat/chat_timeline.stories.tsx

@@ -58,6 +58,7 @@ const defaultProps: ComponentProps<typeof Component> = {
       loading: false,
       value: {
         ready: true,
+        enabled: true,
       },
       refresh: () => {},
     },

x-pack/packages/kbn-ai-assistant/src/chat/knowledge_base_callout.stories.tsx

@@ -24,6 +24,7 @@ const defaultProps: ComponentStoryObj<typeof Component> = {
         loading: false,
         value: {
           ready: false,
+          enabled: true,
         },
         refresh: () => {},
       },
@@ -43,12 +44,15 @@ export const Loading: ComponentStoryObj<typeof Component> = merge({}, defaultPro
 });
 
 export const NotInstalled: ComponentStoryObj<typeof Component> = merge({}, defaultProps, {
-  args: { knowledgeBase: { status: { loading: false, value: { ready: false } } } },
+  args: { knowledgeBase: { status: { loading: false, value: { ready: false, enabled: true } } } },
 });
 
 export const Installing: ComponentStoryObj<typeof Component> = merge({}, defaultProps, {
   args: {
-    knowledgeBase: { status: { loading: false, value: { ready: false } }, isInstalling: true },
+    knowledgeBase: {
+      status: { loading: false, value: { ready: false, enabled: true } },
+      isInstalling: true,
+    },
   },
 });
 
@@ -57,7 +61,7 @@ export const InstallError: ComponentStoryObj<typeof Component> = merge({}, defau
     knowledgeBase: {
       status: {
         loading: false,
-        value: { ready: false },
+        value: { ready: false, enabled: true },
       },
       isInstalling: false,
       installError: new Error(),
@@ -66,5 +70,5 @@ export const InstallError: ComponentStoryObj<typeof Component> = merge({}, defau
 });
 
 export const Installed: ComponentStoryObj<typeof Component> = merge({}, defaultProps, {
-  args: { knowledgeBase: { status: { loading: false, value: { ready: true } } } },
+  args: { knowledgeBase: { status: { loading: false, value: { ready: true, enabled: true } } } },
 });

x-pack/packages/kbn-ai-assistant/src/chat/welcome_message.tsx

@@ -85,8 +85,9 @@ export function WelcomeMessage({
             connectors={connectors}
             onSetupConnectorClick={handleConnectorClick}
           />
-
-          <WelcomeMessageKnowledgeBase connectors={connectors} knowledgeBase={knowledgeBase} />
+          {knowledgeBase.status.value?.enabled ? (
+            <WelcomeMessageKnowledgeBase connectors={connectors} knowledgeBase={knowledgeBase} />
+          ) : null}
         </EuiFlexItem>
 
         <EuiFlexItem grow={false}>

x-pack/packages/kbn-ai-assistant/src/conversation/conversation_view.tsx

@@ -25,7 +25,7 @@ const SECOND_SLOT_CONTAINER_WIDTH = 400;
 
 interface ConversationViewProps {
   conversationId?: string;
-  navigateToConversation: (nextConversationId?: string) => void;
+  navigateToConversation?: (nextConversationId?: string) => void;
   getConversationHref?: (conversationId: string) => string;
   newConversationHref?: string;
   scopes?: AssistantScope[];
@@ -81,7 +81,9 @@ export const ConversationView: React.FC<ConversationViewProps> = ({
   const handleConversationUpdate = (conversation: { conversation: { id: string } }) => {
     if (!conversationId) {
       updateConversationIdInPlace(conversation.conversation.id);
-      navigateToConversation(conversation.conversation.id);
+      if (navigateToConversation) {
+        navigateToConversation(conversation.conversation.id);
+      }
     }
     handleRefreshConversations();
   };
@@ -143,7 +145,7 @@ export const ConversationView: React.FC<ConversationViewProps> = ({
           isLoading={conversationList.isLoading}
           onConversationDeleteClick={(deletedConversationId) => {
             conversationList.deleteConversation(deletedConversationId).then(() => {
-              if (deletedConversationId === conversationId) {
+              if (deletedConversationId === conversationId && navigateToConversation) {
                 navigateToConversation(undefined);
               }
             });

x-pack/packages/kbn-ai-assistant/src/hooks/__storybook_mocks__/use_knowledge_base.ts

@@ -17,6 +17,7 @@ export function useKnowledgeBase(): UseKnowledgeBaseResult {
       error: undefined,
       value: {
         ready: true,
+        enabled: true,
       },
     },
   };

x-pack/packages/kbn-ai-assistant/src/hooks/use_knowledge_base.tsx

@@ -20,6 +20,7 @@ import { useAIAssistantAppService } from './use_ai_assistant_app_service';
 export interface UseKnowledgeBaseResult {
   status: AbortableAsyncState<{
     ready: boolean;
+    enabled: boolean;
     error?: any;
     deployment_state?: MlDeploymentState;
     allocation_state?: MlDeploymentAllocationState;

x-pack/plugins/observability_solution/observability_ai_assistant/server/config.ts

@@ -11,6 +11,7 @@ export const config = schema.object({
   enabled: schema.boolean({ defaultValue: true }),
   modelId: schema.maybe(schema.string()),
   scope: schema.maybe(schema.oneOf([schema.literal('observability'), schema.literal('search')])),
+  enableKnowledgeBase: schema.boolean({ defaultValue: true }),
 });
 
 export type ObservabilityAIAssistantConfig = TypeOf<typeof config>;

x-pack/plugins/observability_solution/observability_ai_assistant/server/plugin.ts

@@ -159,11 +159,14 @@ export class ObservabilityAIAssistantPlugin
       core,
       taskManager: plugins.taskManager,
       getModelId,
+      enableKnowledgeBase: this.config.enableKnowledgeBase,
     }));
 
     service.register(registerFunctions);
 
-    addLensDocsToKb({ service, logger: this.logger.get('kb').get('lens') });
+    if (this.config.enableKnowledgeBase) {
+      addLensDocsToKb({ service, logger: this.logger.get('kb').get('lens') });
+    }
 
     registerServerRoutes({
       core,

x-pack/plugins/observability_solution/observability_ai_assistant/server/routes/knowledge_base/route.ts

@@ -28,6 +28,7 @@ const getKnowledgeBaseStatus = createObservabilityAIAssistantServerRoute({
   handler: async (
     resources
   ): Promise<{
+    enabled: boolean;
     ready: boolean;
     error?: any;
     deployment_state?: MlDeploymentState;

x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/index.ts

@@ -707,14 +707,16 @@ export class ObservabilityAIAssistantClient {
     queries: Array<{ text: string; boost?: number }>;
     categories?: string[];
   }): Promise<{ entries: RecalledEntry[] }> => {
-    return this.dependencies.knowledgeBaseService.recall({
-      namespace: this.dependencies.namespace,
-      user: this.dependencies.user,
-      queries,
-      categories,
-      esClient: this.dependencies.esClient,
-      uiSettingsClient: this.dependencies.uiSettingsClient,
-    });
+    return (
+      this.dependencies.knowledgeBaseService?.recall({
+        namespace: this.dependencies.namespace,
+        user: this.dependencies.user,
+        queries,
+        categories,
+        esClient: this.dependencies.esClient,
+        uiSettingsClient: this.dependencies.uiSettingsClient,
+      }) || { entries: [] }
+    );
   };
 
   getKnowledgeBaseStatus = () => {