[Security Assistant] Enables automatic setup of Knowledge Base and LangGraph code paths for 8.15

.buildkite/scripts/steps/cloud/deploy.json

@@ -141,7 +141,7 @@
               ],
               "id": "ml",
               "size": {
-                "value": 1024,
+                "value": 4096,
                 "resource": "memory"
               }
             }

x-pack/packages/kbn-elastic-assistant-common/impl/schemas/actions_connector/post_actions_connector_execute_route.gen.ts

@@ -38,8 +38,6 @@ export const ExecuteConnectorRequestBody = z.object({
   alertsIndexPattern: z.string().optional(),
   allow: z.array(z.string()).optional(),
   allowReplacement: z.array(z.string()).optional(),
-  isEnabledKnowledgeBase: z.boolean().optional(),
-  isEnabledRAGAlerts: z.boolean().optional(),
   replacements: Replacements,
   size: z.number().optional(),
   langSmithProject: z.string().optional(),

x-pack/packages/kbn-elastic-assistant-common/impl/schemas/actions_connector/post_actions_connector_execute_route.schema.yaml

@@ -53,10 +53,6 @@ paths:
                   type: array
                   items:
                     type: string
-                isEnabledKnowledgeBase:
-                  type: boolean
-                isEnabledRAGAlerts:
-                  type: boolean
                 replacements:
                   $ref: '../conversations/common_attributes.schema.yaml#/components/schemas/Replacements'
                 size:

x-pack/packages/kbn-elastic-assistant/impl/alerts/settings/alerts_settings.test.tsx

@@ -17,31 +17,6 @@ describe('AlertsSettings', () => {
     jest.clearAllMocks();
   });
 
-  it('updates the knowledgeBase settings when the switch is toggled', () => {
-    const knowledgeBase: KnowledgeBaseConfig = {
-      isEnabledRAGAlerts: false,
-      isEnabledKnowledgeBase: false,
-      latestAlerts: DEFAULT_LATEST_ALERTS,
-    };
-    const setUpdatedKnowledgeBaseSettings = jest.fn();
-
-    render(
-      <AlertsSettings
-        knowledgeBase={knowledgeBase}
-        setUpdatedKnowledgeBaseSettings={setUpdatedKnowledgeBaseSettings}
-      />
-    );
-
-    const alertsSwitch = screen.getByTestId('alertsSwitch');
-    fireEvent.click(alertsSwitch);
-
-    expect(setUpdatedKnowledgeBaseSettings).toHaveBeenCalledWith({
-      isEnabledRAGAlerts: true,
-      isEnabledKnowledgeBase: false,
-      latestAlerts: DEFAULT_LATEST_ALERTS,
-    });
-  });
-
   it('updates the knowledgeBase settings when the alerts range slider is changed', () => {
     const setUpdatedKnowledgeBaseSettings = jest.fn();
     const knowledgeBase: KnowledgeBaseConfig = {
@@ -66,22 +41,4 @@ describe('AlertsSettings', () => {
       latestAlerts: 10,
     });
   });
-
-  it('enables the alerts range slider when knowledgeBase.isEnabledRAGAlerts is true', () => {
-    const setUpdatedKnowledgeBaseSettings = jest.fn();
-    const knowledgeBase: KnowledgeBaseConfig = {
-      isEnabledRAGAlerts: true, // <-- true
-      isEnabledKnowledgeBase: false,
-      latestAlerts: DEFAULT_LATEST_ALERTS,
-    };
-
-    render(
-      <AlertsSettings
-        knowledgeBase={knowledgeBase}
-        setUpdatedKnowledgeBaseSettings={setUpdatedKnowledgeBaseSettings}
-      />
-    );
-
-    expect(screen.getByTestId('alertsRange')).not.toBeDisabled();
-  });
 });

x-pack/packages/kbn-elastic-assistant/impl/alerts/settings/alerts_settings.tsx

@@ -11,13 +11,11 @@ import {
   EuiFormRow,
   EuiRange,
   EuiSpacer,
-  EuiSwitch,
-  EuiSwitchEvent,
   EuiText,
   useGeneratedHtmlId,
 } from '@elastic/eui';
 import { css } from '@emotion/react';
-import React, { useCallback } from 'react';
+import React from 'react';
 
 import { KnowledgeBaseConfig } from '../../assistant/types';
 import * as i18n from '../../knowledge_base/translations';
@@ -36,16 +34,6 @@ interface Props {
 const AlertsSettingsComponent = ({ knowledgeBase, setUpdatedKnowledgeBaseSettings }: Props) => {
   const inputRangeSliderId = useGeneratedHtmlId({ prefix: 'inputRangeSlider' });
 
-  const onEnableAlertsChange = useCallback(
-    (event: EuiSwitchEvent) => {
-      setUpdatedKnowledgeBaseSettings({
-        ...knowledgeBase,
-        isEnabledRAGAlerts: event.target.checked,
-      });
-    },
-    [knowledgeBase, setUpdatedKnowledgeBaseSettings]
-  );
-
   return (
     <>
       <EuiFormRow
@@ -57,14 +45,7 @@ const AlertsSettingsComponent = ({ knowledgeBase, setUpdatedKnowledgeBaseSetting
           }
         `}
       >
-        <EuiSwitch
-          checked={knowledgeBase.isEnabledRAGAlerts}
-          compressed
-          data-test-subj="alertsSwitch"
-          label={i18n.ALERTS_LABEL}
-          onChange={onEnableAlertsChange}
-          showLabel={false}
-        />
+        <></>
       </EuiFormRow>
 
       <EuiSpacer size="xs" />

x-pack/packages/kbn-elastic-assistant/impl/assistant/api/index.test.tsx

@@ -36,9 +36,7 @@ const apiConfig: Record<'openai' | 'bedrock' | 'gemini', ApiConfig> = {
 };
 
 const fetchConnectorArgs: FetchConnectorExecuteAction = {
-  isEnabledRAGAlerts: false,
   apiConfig: apiConfig.openai,
-  isEnabledKnowledgeBase: true,
   assistantStreamingEnabled: true,
   http: mockHttp,
   message: 'This is a test',
@@ -75,7 +73,7 @@ describe('API tests', () => {
         '/internal/elastic_assistant/actions/connector/foo/_execute',
         {
           ...staticDefaults,
-          body: '{"model":"gpt-4","message":"This is a test","subAction":"invokeAI","conversationId":"test","actionTypeId":".gen-ai","replacements":{},"isEnabledKnowledgeBase":true,"isEnabledRAGAlerts":false}',
+          body: '{"model":"gpt-4","message":"This is a test","subAction":"invokeAI","conversationId":"test","actionTypeId":".gen-ai","replacements":{}}',
         }
       );
     });
@@ -87,12 +85,12 @@ describe('API tests', () => {
         '/internal/elastic_assistant/actions/connector/foo/_execute',
         {
           ...streamingDefaults,
-          body: '{"model":"gpt-4","message":"This is a test","subAction":"invokeStream","conversationId":"test","actionTypeId":".gen-ai","replacements":{},"isEnabledKnowledgeBase":true,"isEnabledRAGAlerts":false}',
+          body: '{"model":"gpt-4","message":"This is a test","subAction":"invokeStream","conversationId":"test","actionTypeId":".gen-ai","replacements":{}}',
         }
       );
     });
 
-    it('calls the stream API when assistantStreamingEnabled is true and actionTypeId is bedrock and isEnabledKnowledgeBase is true', async () => {
+    it('calls the stream API when assistantStreamingEnabled is true and actionTypeId is bedrock', async () => {
       const testProps: FetchConnectorExecuteAction = {
         ...fetchConnectorArgs,
         apiConfig: apiConfig.bedrock,
@@ -104,53 +102,15 @@ describe('API tests', () => {
         '/internal/elastic_assistant/actions/connector/foo/_execute',
         {
           ...streamingDefaults,
-          body: '{"message":"This is a test","subAction":"invokeStream","conversationId":"test","actionTypeId":".bedrock","replacements":{},"isEnabledKnowledgeBase":true,"isEnabledRAGAlerts":false}',
+          body: '{"message":"This is a test","subAction":"invokeStream","conversationId":"test","actionTypeId":".bedrock","replacements":{}}',
         }
       );
     });
 
-    it('calls the stream API when assistantStreamingEnabled is true and actionTypeId is bedrock and isEnabledKnowledgeBase is false and isEnabledRAGAlerts is true', async () => {
-      const testProps: FetchConnectorExecuteAction = {
-        ...fetchConnectorArgs,
-        apiConfig: apiConfig.bedrock,
-        isEnabledKnowledgeBase: false,
-        isEnabledRAGAlerts: true,
-      };
-
-      await fetchConnectorExecuteAction(testProps);
-
-      expect(mockHttp.fetch).toHaveBeenCalledWith(
-        '/internal/elastic_assistant/actions/connector/foo/_execute',
-        {
-          ...streamingDefaults,
-          body: '{"message":"This is a test","subAction":"invokeStream","conversationId":"test","actionTypeId":".bedrock","replacements":{},"isEnabledKnowledgeBase":false,"isEnabledRAGAlerts":true}',
-        }
-      );
-    });
-
-    it('calls the stream API when assistantStreamingEnabled is true and actionTypeId is gemini and isEnabledKnowledgeBase is true', async () => {
-      const testProps: FetchConnectorExecuteAction = {
-        ...fetchConnectorArgs,
-        apiConfig: apiConfig.gemini,
-      };
-
-      await fetchConnectorExecuteAction(testProps);
-
-      expect(mockHttp.fetch).toHaveBeenCalledWith(
-        '/internal/elastic_assistant/actions/connector/foo/_execute',
-        {
-          ...streamingDefaults,
-          body: '{"message":"This is a test","subAction":"invokeStream","conversationId":"test","actionTypeId":".gemini","replacements":{},"isEnabledKnowledgeBase":true,"isEnabledRAGAlerts":false}',
-        }
-      );
-    });
-
-    it('calls the stream API when assistantStreamingEnabled is true and actionTypeId is gemini and isEnabledKnowledgeBase is false and isEnabledRAGAlerts is true', async () => {
+    it('calls the stream API when assistantStreamingEnabled is true and actionTypeId is gemini', async () => {
       const testProps: FetchConnectorExecuteAction = {
         ...fetchConnectorArgs,
         apiConfig: apiConfig.gemini,
-        isEnabledKnowledgeBase: false,
-        isEnabledRAGAlerts: true,
       };
 
       await fetchConnectorExecuteAction(testProps);
@@ -159,16 +119,15 @@ describe('API tests', () => {
         '/internal/elastic_assistant/actions/connector/foo/_execute',
         {
           ...streamingDefaults,
-          body: '{"message":"This is a test","subAction":"invokeStream","conversationId":"test","actionTypeId":".gemini","replacements":{},"isEnabledKnowledgeBase":false,"isEnabledRAGAlerts":true}',
+          body: '{"message":"This is a test","subAction":"invokeStream","conversationId":"test","actionTypeId":".gemini","replacements":{}}',
         }
       );
     });
 
-    it('calls the stream API when assistantStreamingEnabled is true and actionTypeId is .bedrock and isEnabledKnowledgeBase is false', async () => {
+    it('calls the stream API when assistantStreamingEnabled is true and actionTypeId is .bedrock', async () => {
       const testProps: FetchConnectorExecuteAction = {
         ...fetchConnectorArgs,
         apiConfig: apiConfig.bedrock,
-        isEnabledKnowledgeBase: false,
       };
 
       await fetchConnectorExecuteAction(testProps);
@@ -177,15 +136,14 @@ describe('API tests', () => {
         '/internal/elastic_assistant/actions/connector/foo/_execute',
         {
           ...streamingDefaults,
-          body: '{"message":"This is a test","subAction":"invokeStream","conversationId":"test","actionTypeId":".bedrock","replacements":{},"isEnabledKnowledgeBase":false,"isEnabledRAGAlerts":false}',
+          body: '{"message":"This is a test","subAction":"invokeStream","conversationId":"test","actionTypeId":".bedrock","replacements":{}}',
         }
       );
     });
 
     it('calls the api with the expected optional request parameters', async () => {
       const testProps: FetchConnectorExecuteAction = {
         ...fetchConnectorArgs,
-        isEnabledRAGAlerts: true,
         assistantStreamingEnabled: false,
         alertsIndexPattern: '.alerts-security.alerts-default',
         replacements: { auuid: 'real.hostname' },
@@ -198,7 +156,7 @@ describe('API tests', () => {
         '/internal/elastic_assistant/actions/connector/foo/_execute',
         {
           ...staticDefaults,
-          body: '{"model":"gpt-4","message":"This is a test","subAction":"invokeAI","conversationId":"test","actionTypeId":".gen-ai","replacements":{"auuid":"real.hostname"},"isEnabledKnowledgeBase":true,"isEnabledRAGAlerts":true,"alertsIndexPattern":".alerts-security.alerts-default","size":30}',
+          body: '{"model":"gpt-4","message":"This is a test","subAction":"invokeAI","conversationId":"test","actionTypeId":".gen-ai","replacements":{"auuid":"real.hostname"},"alertsIndexPattern":".alerts-security.alerts-default","size":30}',
         }
       );
     });
@@ -239,7 +197,6 @@ describe('API tests', () => {
 
       const testProps: FetchConnectorExecuteAction = {
         ...fetchConnectorArgs,
-        isEnabledKnowledgeBase: false,
       };
 
       const result = await fetchConnectorExecuteAction(testProps);
@@ -258,7 +215,6 @@ describe('API tests', () => {
       });
       const testProps: FetchConnectorExecuteAction = {
         ...fetchConnectorArgs,
-        isEnabledKnowledgeBase: false,
       };
 
       const result = await fetchConnectorExecuteAction(testProps);
@@ -281,7 +237,7 @@ describe('API tests', () => {
       expect(result).toEqual({ response: API_ERROR, isStream: false, isError: true });
     });
 
-    it('returns the original when isEnabledKnowledgeBase is true, and `content` is not JSON', async () => {
+    it('returns the original when `content` is not JSON', async () => {
       const response = 'plain text content';
 
       (mockHttp.fetch as jest.Mock).mockResolvedValue({

x-pack/packages/kbn-elastic-assistant/impl/assistant/api/index.tsx

@@ -15,9 +15,7 @@ export * from './prompts';
 
 export interface FetchConnectorExecuteAction {
   conversationId: string;
-  isEnabledRAGAlerts: boolean;
   alertsIndexPattern?: string;
-  isEnabledKnowledgeBase: boolean;
   assistantStreamingEnabled: boolean;
   apiConfig: ApiConfig;
   http: HttpSetup;
@@ -40,9 +38,7 @@ export interface FetchConnectorExecuteResponse {
 
 export const fetchConnectorExecuteAction = async ({
   conversationId,
-  isEnabledRAGAlerts,
   alertsIndexPattern,
-  isEnabledKnowledgeBase,
   assistantStreamingEnabled,
   http,
   message,
@@ -56,7 +52,6 @@ export const fetchConnectorExecuteAction = async ({
   const isStream = assistantStreamingEnabled;
 
   const optionalRequestParams = getOptionalRequestParams({
-    isEnabledRAGAlerts,
     alertsIndexPattern,
     size,
   });
@@ -68,8 +63,6 @@ export const fetchConnectorExecuteAction = async ({
     conversationId,
     actionTypeId: apiConfig.actionTypeId,
     replacements,
-    isEnabledKnowledgeBase,
-    isEnabledRAGAlerts,
     langSmithProject:
       traceOptions?.langSmithProject === '' ? undefined : traceOptions?.langSmithProject,
     langSmithApiKey:

x-pack/packages/kbn-elastic-assistant/impl/assistant/helpers.test.ts

@@ -163,21 +163,8 @@ describe('helpers', () => {
   });
 
   describe('getOptionalRequestParams', () => {
-    it('should return an empty object when alerts is false', () => {
-      const params = {
-        isEnabledRAGAlerts: false, // <-- false
-        alertsIndexPattern: 'indexPattern',
-        size: 10,
-      };
-
-      const result = getOptionalRequestParams(params);
-
-      expect(result).toEqual({});
-    });
-
     it('should return the optional request params when alerts is true', () => {
       const params = {
-        isEnabledRAGAlerts: true,
         alertsIndexPattern: 'indexPattern',
         size: 10,
       };

x-pack/packages/kbn-elastic-assistant/impl/assistant/helpers.ts

@@ -100,22 +100,15 @@ interface OptionalRequestParams {
 }
 
 export const getOptionalRequestParams = ({
-  isEnabledRAGAlerts,
   alertsIndexPattern,
   size,
 }: {
-  isEnabledRAGAlerts: boolean;
   alertsIndexPattern?: string;
   size?: number;
 }): OptionalRequestParams => {
   const optionalAlertsIndexPattern = alertsIndexPattern ? { alertsIndexPattern } : undefined;
   const optionalSize = size ? { size } : undefined;
 
-  // the settings toggle must be enabled:
-  if (!isEnabledRAGAlerts) {
-    return {}; // don't send any optional params
-  }
-
   return {
     ...optionalAlertsIndexPattern,
     ...optionalSize,

x-pack/packages/kbn-elastic-assistant/impl/assistant/index.tsx

@@ -79,7 +79,7 @@ import { Conversation } from '../assistant_context/types';
 import { getGenAiConfig } from '../connectorland/helpers';
 import { AssistantAnimatedIcon } from './assistant_animated_icon';
 import { useFetchAnonymizationFields } from './api/anonymization_fields/use_fetch_anonymization_fields';
-import { InstallKnowledgeBaseButton } from '../knowledge_base/install_knowledge_base_button';
+import { SetupKnowledgeBaseButton } from '../knowledge_base/setup_knowledge_base_button';
 import { useFetchPrompts } from './api/prompts/use_fetch_prompts';
 
 export interface Props {
@@ -778,7 +778,7 @@ const AssistantComponent: React.FC<Props> = ({
                   />
                 </EuiFlexItem>
                 <EuiFlexItem grow={false}>
-                  <InstallKnowledgeBaseButton />
+                  <SetupKnowledgeBaseButton />
                 </EuiFlexItem>
               </EuiFlexGroup>
             </EuiPanel>