maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[APM] Update ML job ID in data telemetry tasks (#71044)

Browse source 
* [APM] Update ML job ID in data telemetry tasks

Use "apm-*" to match the new job IDs added in #70560.

* additional fix

* Remove unused import
This commit is contained in:
Nathan L Smith 2020-07-08 19:59:53 -05:00 committed by GitHub
parent a0b47cae85
commit 1f5a1fe66c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 49 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.test.ts
View file

@ -65,4 +65,40 @@ describe('data telemetry collection tasks', () => {
});
});
});
describe('integrations', () => {
const integrationsTask = tasks.find((task) => task.name === 'integrations');
it('returns the count of ML jobs', async () => {
const transportRequest = jest
.fn()
.mockResolvedValueOnce({ body: { count: 1 } });
expect(
await integrationsTask?.executor({ indices, transportRequest } as any)
).toEqual({
integrations: {
ml: {
all_jobs_count: 1,
},
},
});
});
describe('with no data', () => {
it('returns a count of 0', async () => {
const transportRequest = jest.fn().mockResolvedValueOnce({});
expect(
await integrationsTask?.executor({ indices, transportRequest } as any)
).toEqual({
integrations: {
ml: {
all_jobs_count: 0,
},
},
});
});
});
});
});

26
x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts
View file

@ -4,31 +4,31 @@
* you may not use this file except in compliance with the Elastic License.
*/
import { flatten, merge, sortBy, sum } from 'lodash';
import { AgentName } from '../../../../typings/es_schemas/ui/fields/agent';
import { TelemetryTask } from '.';
import { AGENT_NAMES } from '../../../../common/agent_name';
import { Transaction } from '../../../../typings/es_schemas/ui/transaction';
import {
PROCESSOR_EVENT,
SERVICE_NAME,
AGENT_NAME,
AGENT_VERSION,
CLOUD_AVAILABILITY_ZONE,
CLOUD_PROVIDER,
CLOUD_REGION,
ERROR_GROUP_ID,
TRANSACTION_NAME,
PARENT_ID,
PROCESSOR_EVENT,
SERVICE_FRAMEWORK_NAME,
SERVICE_FRAMEWORK_VERSION,
SERVICE_LANGUAGE_NAME,
SERVICE_LANGUAGE_VERSION,
SERVICE_NAME,
SERVICE_RUNTIME_NAME,
SERVICE_RUNTIME_VERSION,
TRANSACTION_NAME,
USER_AGENT_ORIGINAL,
CLOUD_AVAILABILITY_ZONE,
CLOUD_PROVIDER,
CLOUD_REGION,
} from '../../../../common/elasticsearch_fieldnames';
import { Span } from '../../../../typings/es_schemas/ui/span';
import { APMError } from '../../../../typings/es_schemas/ui/apm_error';
import { TelemetryTask } from '.';
import { AgentName } from '../../../../typings/es_schemas/ui/fields/agent';
import { Span } from '../../../../typings/es_schemas/ui/span';
import { Transaction } from '../../../../typings/es_schemas/ui/transaction';
import { APMTelemetry } from '../types';
const TIME_RANGES = ['1d', 'all'] as const;
@ -465,17 +465,17 @@ export const tasks: TelemetryTask[] = [
{
name: 'integrations',
executor: async ({ transportRequest }) => {
const apmJobs = ['*-high_mean_response_time'];
const apmJobs = ['apm-*', '*-high_mean_response_time'];
const response = (await transportRequest({
method: 'get',
path: `/_ml/anomaly_detectors/${apmJobs.join(',')}`,
})) as { data?: { count: number } };
})) as { body?: { count: number } };
return {
integrations: {
ml: {
all_jobs_count: response.data?.count ?? 0,
all_jobs_count: response.body?.count ?? 0,
},
},
};