elastic
diff --git a/‎packages/kbn-optimizer/limits.yml‎
Lines changed: 1 addition & 1 deletion b/‎packages/kbn-optimizer/limits.yml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎x-pack/platform/packages/shared/kbn-ai-assistant/src/chat/chat_body.tsx‎
Lines changed: 7 additions & 1 deletion b/‎x-pack/platform/packages/shared/kbn-ai-assistant/src/chat/chat_body.tsx‎
Lines changed: 7 additions & 1 deletion
diff --git a/‎x-pack/platform/packages/shared/kbn-ai-assistant/src/chat/chat_header.test.tsx‎
Lines changed: 4 additions & 0 deletions b/‎x-pack/platform/packages/shared/kbn-ai-assistant/src/chat/chat_header.test.tsx‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎x-pack/platform/packages/shared/kbn-ai-assistant/src/chat/welcome_message.test.tsx‎
Lines changed: 1 addition & 0 deletions b/‎x-pack/platform/packages/shared/kbn-ai-assistant/src/chat/welcome_message.test.tsx‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎x-pack/platform/packages/shared/kbn-ai-assistant/src/hooks/__storybook_mocks__/use_genai_connectors.ts‎
Lines changed: 1 addition & 0 deletions b/‎x-pack/platform/packages/shared/kbn-ai-assistant/src/hooks/__storybook_mocks__/use_genai_connectors.ts‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎x-pack/platform/packages/shared/kbn-ai-assistant/src/prompt_editor/prompt_editor.tsx‎
Lines changed: 8 additions & 2 deletions b/‎x-pack/platform/packages/shared/kbn-ai-assistant/src/prompt_editor/prompt_editor.tsx‎
Lines changed: 8 additions & 2 deletions
diff --git a/‎x-pack/platform/plugins/shared/actions/server/index.ts‎
Lines changed: 4 additions & 1 deletion b/‎x-pack/platform/plugins/shared/actions/server/index.ts‎
Lines changed: 4 additions & 1 deletion
diff --git a/‎x-pack/platform/plugins/shared/observability_ai_assistant/common/analytics/index.ts‎
Lines changed: 9 additions & 0 deletions b/‎x-pack/platform/plugins/shared/observability_ai_assistant/common/analytics/index.ts‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎x-pack/platform/plugins/shared/observability_ai_assistant/common/analytics/schemas/connector.ts‎
Lines changed: 53 additions & 0 deletions b/‎x-pack/platform/plugins/shared/observability_ai_assistant/common/analytics/schemas/connector.ts‎
Lines changed: 53 additions & 0 deletions
diff --git a/‎x-pack/platform/plugins/shared/observability_ai_assistant/common/analytics/schemas/scope.ts‎
Lines changed: 23 additions & 0 deletions b/‎x-pack/platform/plugins/shared/observability_ai_assistant/common/analytics/schemas/scope.ts‎
Lines changed: 23 additions & 0 deletions
@@ -106,7 +106,7 @@ pageLoadAssetSize:
   newsfeed: 12371
   noDataPage: 1749
   observability: 107869
-  observabilityAIAssistant: 46941
+  observabilityAIAssistant: 52565
   observabilityAIAssistantApp: 18553
   observabilityAiAssistantManagement: 6438
   observabilityLogsExplorer: 4918
 
@@ -57,7 +57,7 @@ import { useLicense } from '../hooks/use_license';
 import { PromptEditor } from '../prompt_editor/prompt_editor';
 import { useKibana } from '../hooks/use_kibana';
 import { ChatBanner } from './chat_banner';
-import { useConversationContextMenu } from '../hooks';
+import { useConversationContextMenu, useScopes } from '../hooks';
 
 const fullHeightClassName = css`
   height: 100%;
@@ -167,6 +167,8 @@ export function ChatBody({
     false
   );
 
+  const scopes = useScopes();
+
   const {
     conversation,
     conversationId,
@@ -247,11 +249,15 @@ export function ChatBody({
         conversation: { id, last_updated: lastUpdated },
       };
 
+      const connector = connectors.getConnector(connectors.selectedConnector || '');
+
       chatService.sendAnalyticsEvent({
         type: ObservabilityAIAssistantTelemetryEventType.ChatFeedback,
         payload: {
           feedback,
           conversation: conversationWithoutMessagesAndTitle,
+          connector,
+          scopes,
         },
       });
     }
 
@@ -104,6 +104,7 @@ describe('ChatHeader', () => {
           error: undefined,
           selectConnector: (id: string) => {},
           reloadConnectors: () => {},
+          getConnector: () => undefined,
         }}
       />
     );
@@ -126,6 +127,7 @@ describe('ChatHeader', () => {
           error: undefined,
           selectConnector: (id: string) => {},
           reloadConnectors: () => {},
+          getConnector: () => undefined,
         }}
       />
     );
@@ -152,6 +154,7 @@ describe('ChatHeader', () => {
           error: undefined,
           selectConnector: (id: string) => {},
           reloadConnectors: () => {},
+          getConnector: () => undefined,
         }}
       />
     );
@@ -178,6 +181,7 @@ describe('ChatHeader', () => {
           error: undefined,
           selectConnector: (id: string) => {},
           reloadConnectors: () => {},
+          getConnector: () => undefined,
         }}
       />
     );
 
@@ -28,6 +28,7 @@ const mockConnectors: UseGenAIConnectorsResult = {
   selectedConnector: 'test-connector',
   selectConnector: jest.fn(),
   reloadConnectors: jest.fn(),
+  getConnector: jest.fn(),
 };
 
 jest.mock('@kbn/kibana-react-plugin/public', () => ({
 
@@ -15,5 +15,6 @@ export function useGenAIConnectors(): UseGenAIConnectorsResult {
     selectedConnector: 'foo',
     selectConnector: (id: string) => {},
     reloadConnectors: () => {},
+    getConnector: () => undefined,
   };
 }
@@ -17,6 +17,7 @@ import { useLastUsedPrompts } from '../hooks/use_last_used_prompts';
 import { PromptEditorFunction } from './prompt_editor_function';
 import { PromptEditorNaturalLanguage } from './prompt_editor_natural_language';
 import { useScopes } from '../hooks/use_scopes';
+import { useGenAIConnectors } from '../hooks';
 
 export interface PromptEditorProps {
   disabled: boolean;
@@ -42,6 +43,7 @@ export function PromptEditor({
   onSubmit,
 }: PromptEditorProps) {
   const scopes = useScopes();
+  const connectors = useGenAIConnectors();
   const containerRef = useRef<HTMLDivElement>(null);
 
   const [mode, setMode] = useState<'prompt' | 'function'>(
@@ -102,15 +104,19 @@ export function PromptEditor({
 
       setInnerMessage(undefined);
       setMode('prompt');
+      const connector = connectors.getConnector(connectors.selectedConnector || '');
       onSendTelemetry({
         type: ObservabilityAIAssistantTelemetryEventType.UserSentPromptInChat,
-        payload: { scopes },
+        payload: {
+          scopes,
+          connector,
+        },
       });
     } catch (_) {
       setInnerMessage(oldMessage);
       setMode(oldMessage.function_call?.name ? 'function' : 'prompt');
     }
-  }, [addLastUsedPrompt, innerMessage, loading, onSendTelemetry, onSubmit, scopes]);
+  }, [addLastUsedPrompt, innerMessage, loading, onSendTelemetry, onSubmit, scopes, connectors]);
 
   // Submit on Enter
   useEffect(() => {
 
@@ -26,7 +26,10 @@ export type {
   SSLSettings,
 } from './types';
 
-export type { ConnectorWithExtraFindData as FindActionResult } from './application/connector/types';
+export type {
+  ConnectorWithExtraFindData as FindActionResult,
+  Connector,
+} from './application/connector/types';
 
 export type { PluginSetupContract, PluginStartContract } from './plugin';
 
 
@@ -0,0 +1,9 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export { type Connector, connectorSchema } from './schemas/connector';
+export { type Scope, scopeSchema } from './schemas/scope';
@@ -0,0 +1,53 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { RootSchema } from '@kbn/core/public';
+import type { InferenceConnector } from '../../utils/get_inference_connector';
+
+export interface Connector {
+  connector: InferenceConnector | undefined;
+}
+
+export const connectorSchema: RootSchema<Connector['connector']> = {
+  connectorId: {
+    type: 'text',
+    _meta: {
+      description: 'The id of the connector.',
+    },
+  },
+  name: {
+    type: 'text',
+    _meta: {
+      description: 'The name of the connector.',
+    },
+  },
+  type: {
+    type: 'text',
+    _meta: {
+      description: 'The action type id of the connector.',
+    },
+  },
+  modelFamily: {
+    type: 'text',
+    _meta: {
+      description: 'The model family of the connector.',
+    },
+  },
+  modelProvider: {
+    type: 'text',
+    _meta: {
+      description: 'The model provider of the connector.',
+    },
+  },
+  modelId: {
+    type: 'text',
+    _meta: {
+      description: 'The model id of the connector, if applicable.',
+      optional: true,
+    },
+  },
+};
@@ -0,0 +1,23 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { SchemaValue } from '@kbn/core/public';
+import type { AssistantScope } from '@kbn/ai-assistant-common';
+
+export interface Scope {
+  scopes: AssistantScope[];
+}
+
+export const scopeSchema: SchemaValue<AssistantScope[]> = {
+  type: 'array',
+  items: {
+    type: 'text',
+    _meta: {
+      description: 'Scope of the AI Assistant',
+    },
+  },
+};
Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,6 @@ export function useGenAIConnectors(): UseGenAIConnectorsResult {`
`15`	`15`	`selectedConnector: 'foo',`
`16`	`16`	`selectConnector: (id: string) => {},`
`17`	`17`	`reloadConnectors: () => {},`
	`18`	`+ getConnector: () => undefined,`
`18`	`19`	`};`
`19`	`20`	`}`