Skip to content

Commit

Permalink
[APM] Use observer.hostname instead of observer.name (elastic#76074)
Browse files Browse the repository at this point in the history
# Conflicts:
#	x-pack/plugins/apm/server/lib/apm_telemetry/index.ts
#	x-pack/plugins/apm/typings/elasticsearch/aggregations.ts
  • Loading branch information
dgieselaar committed Sep 7, 2020
1 parent 2521bd0 commit 7ef15ae
Show file tree
Hide file tree
Showing 10 changed files with 419 additions and 226 deletions.
56 changes: 30 additions & 26 deletions x-pack/plugins/apm/common/__snapshots__/apm_telemetry.test.ts.snap

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 10 additions & 4 deletions x-pack/plugins/apm/common/apm_telemetry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ export function getApmTelemetryMapping() {
properties: {
expected_metric_document_count: long,
transaction_count: long,
ratio: long,
},
};

Expand All @@ -102,10 +103,14 @@ export function getApmTelemetryMapping() {
properties: {
current_implementation: aggregatedTransactionsProperties,
no_observer_name: aggregatedTransactionsProperties,
no_rum: aggregatedTransactionsProperties,
no_rum_no_observer_name: aggregatedTransactionsProperties,
only_rum: aggregatedTransactionsProperties,
only_rum_no_observer_name: aggregatedTransactionsProperties,
with_country: aggregatedTransactionsProperties,
},
},
environments: {
properties: {
services_without_environment: long,
services_with_multiple_environments: long,
top_enviroments: keyword,
},
},
cloud: {
Expand Down Expand Up @@ -227,6 +232,7 @@ export function getApmTelemetryMapping() {
agents: tookProperties,
cardinality: tookProperties,
cloud: tookProperties,
environments: tookProperties,
groupings: tookProperties,
indices_stats: tookProperties,
integrations: tookProperties,
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/apm/common/elasticsearch_fieldnames.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export const USER_AGENT_NAME = 'user_agent.name';

export const DESTINATION_ADDRESS = 'destination.address';

export const OBSERVER_NAME = 'observer.name';
export const OBSERVER_HOSTNAME = 'observer.hostname';
export const OBSERVER_VERSION_MAJOR = 'observer.version_major';
export const OBSERVER_LISTENING = 'observer.listening';
export const PROCESSOR_EVENT = 'processor.event';
Expand Down
Loading

0 comments on commit 7ef15ae

Please sign in to comment.