-
Notifications
You must be signed in to change notification settings - Fork 8.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into 154929-logs-onboarding-system-logs-server-ro…
…utes
- Loading branch information
Showing
21 changed files
with
698 additions
and
492 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
83 changes: 0 additions & 83 deletions
83
packages/kbn-apm-synthtrace/src/lib/apm/client/elastic_apm_http_client.d.ts
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
83 changes: 83 additions & 0 deletions
83
x-pack/plugins/apm/server/routes/mobile/get_device_os_app.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| /* | ||
| * 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 { | ||
| termQuery, | ||
| kqlQuery, | ||
| rangeQuery, | ||
| } from '@kbn/observability-plugin/server'; | ||
| import { ProcessorEvent } from '@kbn/observability-plugin/common'; | ||
| import { | ||
| DEVICE_MODEL_IDENTIFIER, | ||
| HOST_OS_VERSION, | ||
| SERVICE_NAME, | ||
| SERVICE_VERSION, | ||
| TRANSACTION_TYPE, | ||
| } from '../../../common/es_fields/apm'; | ||
| import { environmentQuery } from '../../../common/utils/environment_query'; | ||
| import { APMEventClient } from '../../lib/helpers/create_es_client/create_apm_event_client'; | ||
|
|
||
| export async function getDeviceOSApp({ | ||
| kuery, | ||
| apmEventClient, | ||
| serviceName, | ||
| transactionType, | ||
| environment, | ||
| start, | ||
| end, | ||
| size, | ||
| }: { | ||
| kuery: string; | ||
| apmEventClient: APMEventClient; | ||
| serviceName: string; | ||
| transactionType?: string; | ||
| environment: string; | ||
| start: number; | ||
| end: number; | ||
| size: number; | ||
| }) { | ||
| return await apmEventClient.search('get_mobile_device_os_app', { | ||
| apm: { | ||
| events: [ProcessorEvent.transaction], | ||
| }, | ||
| body: { | ||
| track_total_hits: false, | ||
| size: 0, | ||
| query: { | ||
| bool: { | ||
| filter: [ | ||
| ...termQuery(SERVICE_NAME, serviceName), | ||
| ...termQuery(TRANSACTION_TYPE, transactionType), | ||
| ...rangeQuery(start, end), | ||
| ...environmentQuery(environment), | ||
| ...kqlQuery(kuery), | ||
| ], | ||
| }, | ||
| }, | ||
| aggs: { | ||
| devices: { | ||
| terms: { | ||
| field: DEVICE_MODEL_IDENTIFIER, | ||
| size, | ||
| }, | ||
| }, | ||
| osVersions: { | ||
| terms: { | ||
| field: HOST_OS_VERSION, | ||
| size, | ||
| }, | ||
| }, | ||
| appVersions: { | ||
| terms: { | ||
| field: SERVICE_VERSION, | ||
| size, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }); | ||
| } |
Oops, something went wrong.