Skip to content
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

[Obs AI Assistant] Move alert context from apm to obs api #182243

Merged
merged 6 commits into from
May 2, 2024
Merged

[Obs AI Assistant] Move alert context from apm to obs api #182243

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b4ab511
[AI Assistant] Move alert details context from APM api to Obs api
sorenlouv May 1, 2024
7ffe81f
Rename `synthtraceEsClient` to `apmSynthtraceEsClient`
sorenlouv May 1, 2024
98ac418
Rename `SynthtraceKibanaClient` back to `ApmSynthtraceKibanaClient`
sorenlouv May 1, 2024
c37675d
Simplify return
sorenlouv May 1, 2024
483bcbc
return instead of await
sorenlouv May 2, 2024
fef3a8c
Code nits
sorenlouv May 2, 2024
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
2 changes: 1 addition & 1 deletion x-pack/plugins/observability_solution/apm/server/plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ import { createApmSourceMapIndexTemplate } from './routes/source_maps/create_apm
import { addApiKeysToEveryPackagePolicyIfMissing } from './routes/fleet/api_keys/add_api_keys_to_policies_if_missing';
import { apmTutorialCustomIntegration } from '../common/tutorial/tutorials';
import { registerAssistantFunctions } from './assistant_functions';
import { getAlertDetailsContextHandler } from './routes/assistant_functions/get_observability_alert_details_context/get_alert_details_context_handler';
import { getAlertDetailsContextHandler } from './routes/assistant_functions/get_observability_alert_details_context';

export class APMPlugin
implements Plugin<APMPluginSetup, void, APMPluginSetupDependencies, APMPluginStartDependencies>
Expand Down
21 changes: 12 additions & 9 deletions ...ns/observability_solution/apm/server/routes/assistant_functions/get_changepoints/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* 2.0.
*/

import moment from 'moment';
import { LatencyAggregationType } from '../../../../common/latency_aggregation_types';
import { APMEventClient } from '../../../lib/helpers/create_es_client/create_apm_event_client';
import { ApmTimeseriesType, getApmTimeseries, TimeseriesChangePoint } from '../get_apm_timeseries';
Expand All @@ -18,14 +17,16 @@ export interface ChangePointGrouping {

export async function getServiceChangePoints({
apmEventClient,
alertStartedAt,
start,
end,
serviceName,
serviceEnvironment,
transactionType,
transactionName,
}: {
apmEventClient: APMEventClient;
alertStartedAt: string;
start: string;
end: string;
serviceName: string | undefined;
serviceEnvironment: string | undefined;
transactionType: string | undefined;
Expand All @@ -38,8 +39,8 @@ export async function getServiceChangePoints({
const res = await getApmTimeseries({
apmEventClient,
arguments: {
start: moment(alertStartedAt).subtract(12, 'hours').toISOString(),
end: alertStartedAt,
start,
end,
stats: [
{
title: 'Latency',
Expand Down Expand Up @@ -95,12 +96,14 @@ export async function getServiceChangePoints({

export async function getExitSpanChangePoints({
apmEventClient,
alertStartedAt,
start,
end,
serviceName,
serviceEnvironment,
}: {
apmEventClient: APMEventClient;
alertStartedAt: string;
start: string;
end: string;
serviceName: string | undefined;
serviceEnvironment: string | undefined;
}): Promise<ChangePointGrouping[]> {
Expand All @@ -111,8 +114,8 @@ export async function getExitSpanChangePoints({
const res = await getApmTimeseries({
apmEventClient,
arguments: {
start: moment(alertStartedAt).subtract(30, 'minute').toISOString(),
end: alertStartedAt,
start,
end,
stats: [
{
title: 'Exit span latency',
Expand Down
14 changes: 6 additions & 8 deletions .../observability_solution/apm/server/routes/assistant_functions/get_log_categories/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,11 @@ import {
} from '../../../../common/es_fields/apm';
import { getTypedSearch } from '../../../utils/create_typed_es_client';

export type LogCategories =
| Array<{
errorCategory: string;
docCount: number;
sampleMessage: string;
}>
| undefined;
export interface LogCategory {
errorCategory: string;
docCount: number;
sampleMessage: string;
}

export async function getLogCategories({
esClient,
Expand All @@ -40,7 +38,7 @@ export async function getLogCategories({
'container.id'?: string;
'kubernetes.pod.name'?: string;
};
}): Promise<LogCategories> {
}): Promise<LogCategory[] | undefined> {
const start = datemath.parse(args.start)?.valueOf()!;
const end = datemath.parse(args.end)?.valueOf()!;

Expand Down
85 changes: 0 additions & 85 deletions ...nt_functions/get_observability_alert_details_context/get_alert_details_context_handler.ts
View file
Open in desktop

This file was deleted.

85 changes: 0 additions & 85 deletions ...functions/get_observability_alert_details_context/get_apm_alert_details_context_prompt.ts
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...istant_functions/get_observability_alert_details_context/get_container_id_from_signals.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { rangeQuery, typedSearch } from '@kbn/observability-plugin/server/utils/
import * as t from 'io-ts';
import moment from 'moment';
import { ESSearchRequest } from '@kbn/es-types';
import { observabilityAlertDetailsContextRt } from '@kbn/observability-plugin/server/services';
import { alertDetailsContextRt } from '@kbn/observability-plugin/server/services';
import { ApmDocumentType } from '../../../../common/document_type';
import {
APMEventClient,
Expand All @@ -26,7 +26,7 @@ export async function getContainerIdFromSignals({
coreContext,
apmEventClient,
}: {
query: t.TypeOf<typeof observabilityAlertDetailsContextRt>;
query: t.TypeOf<typeof alertDetailsContextRt>;
esClient: ElasticsearchClient;
coreContext: Pick<CoreRequestHandlerContext, 'uiSettings'>;
apmEventClient: APMEventClient;
Expand Down
4 changes: 2 additions & 2 deletions ...istant_functions/get_observability_alert_details_context/get_service_name_from_signals.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { rangeQuery, termQuery, typedSearch } from '@kbn/observability-plugin/se
import * as t from 'io-ts';
import moment from 'moment';
import { ESSearchRequest } from '@kbn/es-types';
import { observabilityAlertDetailsContextRt } from '@kbn/observability-plugin/server/services';
import { alertDetailsContextRt } from '@kbn/observability-plugin/server/services';
import { ApmDocumentType } from '../../../../common/document_type';
import {
APMEventClient,
Expand All @@ -26,7 +26,7 @@ export async function getServiceNameFromSignals({
coreContext,
apmEventClient,
}: {
query: t.TypeOf<typeof observabilityAlertDetailsContextRt>;
query: t.TypeOf<typeof alertDetailsContextRt>;
esClient: ElasticsearchClient;
coreContext: Pick<CoreRequestHandlerContext, 'uiSettings'>;
apmEventClient: APMEventClient;
Expand Down
Loading