pr comments

.github/CODEOWNERS

@@ -2507,6 +2507,8 @@ x-pack/platform/packages/shared/kbn-elastic-assistant-common/impl/schemas/defend
 x-pack/plugins/elastic_assistant/server/__mocks__/defend_insights_schema.mock.ts @elastic/security-defend-workflows
 x-pack/plugins/elastic_assistant/server/ai_assistant_data_clients/defend_insights @elastic/security-defend-workflows
 x-pack/plugins/elastic_assistant/server/routes/defend_insights @elastic/security-defend-workflows
+x-pack/solutions/security/plugins/elastic_assistant/server/lib/defend_insights @elastic/security-defend-workflows
+x-pack/solutions/security/plugins/elastic_assistant/server/routes/defend_insights @elastic/security-defend-workflows
 /x-pack/solutions/security/plugins/security_solution/public/common/components/response_actions @elastic/security-defend-workflows
 /x-pack/solutions/security/plugins/security_solution_serverless/public/upselling/pages/osquery_automated_response_actions.tsx @elastic/security-defend-workflows
 

x-pack/platform/packages/shared/kbn-elastic-assistant-common/constants.ts

@@ -57,6 +57,6 @@ export const ELASTIC_AI_ASSISTANT_EVALUATE_URL =
   `${ELASTIC_AI_ASSISTANT_INTERNAL_URL}/evaluate` as const;
 
 // Defend insights
-export const DEFEND_INSIGHTS_TOOL_ID = 'defend-insights';
+export const DEFEND_INSIGHTS_ID = 'defend-insights';
 export const DEFEND_INSIGHTS = `${ELASTIC_AI_ASSISTANT_INTERNAL_URL}/defend_insights`;
 export const DEFEND_INSIGHTS_BY_ID = `${DEFEND_INSIGHTS}/{id}`;

x-pack/platform/packages/shared/kbn-elastic-assistant-common/impl/alerts/helpers/get_raw_data_or_default/index.ts

@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { isRawDataValid } from '../is_raw_data_valid';
 import type { MaybeRawData } from '../types';
+import { isRawDataValid } from '../is_raw_data_valid';
 
 /** Returns the raw data if it valid, or a default if it's not */
 export const getRawDataOrDefault = (rawData: MaybeRawData): Record<string, unknown[]> =>

x-pack/solutions/security/plugins/elastic_assistant/server/__mocks__/defend_insights_schema.mock.ts

@@ -8,7 +8,7 @@
 import type { estypes } from '@elastic/elasticsearch';
 import { DefendInsightStatus, DefendInsightType } from '@kbn/elastic-assistant-common';
 
-import type { EsDefendInsightSchema } from '../ai_assistant_data_clients/defend_insights/types';
+import type { EsDefendInsightSchema } from '../lib/defend_insights/persistence/types';
 
 export const getDefendInsightsSearchEsMock = () => {
   const searchResponse: estypes.SearchResponse<EsDefendInsightSchema> = {

x-pack/solutions/security/plugins/elastic_assistant/server/__mocks__/raw_defend_insights.ts

@@ -7,7 +7,7 @@
 
 import { DefendInsightStatus, DefendInsightType } from '@kbn/elastic-assistant-common';
 
-import type { EsDefendInsightSchema } from '../ai_assistant_data_clients/defend_insights/types';
+import type { EsDefendInsightSchema } from '../lib/defend_insights/persistence/types';
 
 export const getParsedDefendInsightsMock = (timestamp: string): EsDefendInsightSchema[] => [
   {

x-pack/solutions/security/plugins/elastic_assistant/server/__mocks__/request_context.ts

@@ -29,7 +29,7 @@ import {
 } from '../ai_assistant_data_clients/knowledge_base';
 import { defaultAssistantFeatures } from '@kbn/elastic-assistant-common';
 import { AttackDiscoveryDataClient } from '../lib/attack_discovery/persistence';
-import { DefendInsightsDataClient } from '../ai_assistant_data_clients/defend_insights';
+import { DefendInsightsDataClient } from '../lib/defend_insights/persistence';
 import { authenticatedUser } from './user';
 
 export const createMockClients = () => {