Skip to content

[9.1] [Security solution] Fix .inference model for telemetry (#217250) #226268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kibanamachine merged 1 commit into from
Jul 2, 2025
Merged

[9.1] [Security solution] Fix .inference model for telemetry (#217250) #226268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions x-pack/platform/packages/shared/kbn-elastic-assistant/impl/connectorland/helpers.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import {
getGenAiConfig,
getActionTypeTitle,
getConnectorTypeTitle,
GenAiConfig,
OpenAiProviderType,
AiConfigCatchAll,
} from './helpers';
import { PRECONFIGURED_CONNECTOR } from './translations';
import {
Expand All @@ -19,7 +19,7 @@ import {
type ActionTypeRegistryContract,
} from '@kbn/alerts-ui-shared';

const mockConnector = (config: GenAiConfig, isPreconfigured = false) => ({
const mockConnector = (config: AiConfigCatchAll, isPreconfigured = false) => ({
isPreconfigured,
config,
actionTypeId: 'test-action',
Expand All @@ -43,6 +43,17 @@ describe('getGenAiConfig', () => {
});
});

test('extracts defaultModel from inference config', () => {
const connector = mockConnector({
providerConfig: {
model_id: 'rainbow-sprinkles',
},
}) as ActionConnector;
expect(getGenAiConfig(connector)).toEqual({
defaultModel: 'rainbow-sprinkles',
});
});

test('extracts api-version from Azure API URL', () => {
const connector = mockConnector({
apiProvider: OpenAiProviderType.AzureAi,
Expand Down
32 changes: 27 additions & 5 deletions x-pack/platform/packages/shared/kbn-elastic-assistant/impl/connectorland/helpers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,44 @@ export interface GenAiConfig {
defaultModel?: string;
}

export interface AiConfigCatchAll {
apiProvider?: OpenAiProviderType;
apiUrl?: string;
defaultModel?: string;
// inference fields
providerConfig?: {
model_id?: string;
};
model_id?: string;
url?: string;
}

/**
* Returns the GenAiConfig for a given ActionConnector. Note that if the connector is preconfigured,
* the config MAY be undefined if exposeConfig: true is absent
*
* @param connector
*/
export const getGenAiConfig = (connector: ActionConnector | undefined): GenAiConfig => {
const config = (connector as ActionConnectorProps<GenAiConfig, unknown>)?.config;
const { apiProvider, apiUrl, defaultModel } = config ?? {};
return {
const config = (connector as ActionConnectorProps<AiConfigCatchAll, unknown>)?.config;
const {
apiProvider,
apiUrl,
defaultModel,
providerConfig,
model_id: modelId,
url,
} = config ?? {};

return {
apiProvider,
apiUrl: apiUrl ?? url,
defaultModel:
apiProvider === OpenAiProviderType.AzureAi
(apiProvider === OpenAiProviderType.AzureAi
? getAzureApiVersionParameter(apiUrl ?? '')
: defaultModel,
: defaultModel) ??
providerConfig?.model_id ??
modelId,
};
};

Expand Down