Skip to content

Commit 0653c21

Browse files
mergify[bot]mergify[bot]
authored
[7.x] Add system network fields (backport #5436) (#5467)
1 parent e9f865c commit 0653c21

File tree

26 files changed

+883
-12
lines changed

26 files changed

+883
-12
lines changed

‎apmpackage/apm/data_stream/app_metrics/fields/fields.yml

+20
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,26 @@
3434
type: long
3535
description: Current data collection period for this event in milliseconds.
3636
unit: ms
37+
- name: network.carrier.icc
38+
type: keyword
39+
description: |
40+
ISO country code, eg. US
41+
- name: network.carrier.mcc
42+
type: keyword
43+
description: |
44+
Mobile country code
45+
- name: network.carrier.mnc
46+
type: keyword
47+
description: |
48+
Mobile network code
49+
- name: network.carrier.name
50+
type: keyword
51+
description: |
52+
Carrier name, eg. Vodafone, T-Mobile, etc.
53+
- name: network.connection_type
54+
type: keyword
55+
description: |
56+
Cellular network technology, eg. 4G
3757
- name: observer.listening
3858
type: keyword
3959
description: |

‎apmpackage/apm/data_stream/error_logs/fields/fields.yml

+20
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,26 @@
7575
type: keyword
7676
description: |
7777
Kubernetes Pod UID
78+
- name: network.carrier.icc
79+
type: keyword
80+
description: |
81+
ISO country code, eg. US
82+
- name: network.carrier.mcc
83+
type: keyword
84+
description: |
85+
Mobile country code
86+
- name: network.carrier.mnc
87+
type: keyword
88+
description: |
89+
Mobile network code
90+
- name: network.carrier.name
91+
type: keyword
92+
description: |
93+
Carrier name, eg. Vodafone, T-Mobile, etc.
94+
- name: network.connection_type
95+
type: keyword
96+
description: |
97+
Cellular network technology, eg. 4G
7898
- name: observer.listening
7999
type: keyword
80100
description: |

‎apmpackage/apm/data_stream/internal_metrics/fields/fields.yml

+20
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,26 @@
3434
type: long
3535
description: Current data collection period for this event in milliseconds.
3636
unit: ms
37+
- name: network.carrier.icc
38+
type: keyword
39+
description: |
40+
ISO country code, eg. US
41+
- name: network.carrier.mcc
42+
type: keyword
43+
description: |
44+
Mobile country code
45+
- name: network.carrier.mnc
46+
type: keyword
47+
description: |
48+
Mobile network code
49+
- name: network.carrier.name
50+
type: keyword
51+
description: |
52+
Carrier name, eg. Vodafone, T-Mobile, etc.
53+
- name: network.connection_type
54+
type: keyword
55+
description: |
56+
Cellular network technology, eg. 4G
3757
- name: observer.listening
3858
type: keyword
3959
description: |

‎apmpackage/apm/data_stream/profile_metrics/fields/fields.yml

+20
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,26 @@
2424
type: keyword
2525
description: |
2626
Kubernetes Pod UID
27+
- name: network.carrier.icc
28+
type: keyword
29+
description: |
30+
ISO country code, eg. US
31+
- name: network.carrier.mcc
32+
type: keyword
33+
description: |
34+
Mobile country code
35+
- name: network.carrier.mnc
36+
type: keyword
37+
description: |
38+
Mobile network code
39+
- name: network.carrier.name
40+
type: keyword
41+
description: |
42+
Carrier name, eg. Vodafone, T-Mobile, etc.
43+
- name: network.connection_type
44+
type: keyword
45+
description: |
46+
Cellular network technology, eg. 4G
2747
- name: observer.listening
2848
type: keyword
2949
description: |

‎apmpackage/apm/data_stream/traces/fields/fields.yml

+20
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,26 @@
4040
type: keyword
4141
description: |
4242
Kubernetes Pod UID
43+
- name: network.carrier.icc
44+
type: keyword
45+
description: |
46+
ISO country code, eg. US
47+
- name: network.carrier.mcc
48+
type: keyword
49+
description: |
50+
Mobile country code
51+
- name: network.carrier.mnc
52+
type: keyword
53+
description: |
54+
Mobile network code
55+
- name: network.carrier.name
56+
type: keyword
57+
description: |
58+
Carrier name, eg. Vodafone, T-Mobile, etc.
59+
- name: network.connection_type
60+
type: keyword
61+
description: |
62+
Cellular network technology, eg. 4G
4363
- name: observer.listening
4464
type: keyword
4565
description: |

‎apmpackage/apm/docs/README.md

+15
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,11 @@ Traces are written to `traces-apm.*` indices.
106106
|kubernetes.pod.name|Kubernetes pod name|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
107107
|kubernetes.pod.uid|Kubernetes Pod UID|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
108108
|labels|A flat mapping of user-defined labels with string, boolean or number values.|object| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-yes.png) |
109+
|network.carrier.icc|ISO country code, eg. US|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
110+
|network.carrier.mcc|Mobile country code|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
111+
|network.carrier.mnc|Mobile network code|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
112+
|network.carrier.name|Carrier name, eg. Vodafone, T-Mobile, etc.|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
113+
|network.connection\_type|Cellular network technology, eg. 4G|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
109114
|observer.hostname|Hostname of the APM Server.|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-yes.png) |
110115
|observer.listening|Address the server is listening on.|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
111116
|observer.type|The type will be set to \`apm-server\`.|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-yes.png) |
@@ -454,6 +459,11 @@ Metrics are written to `metrics-apm.app.*`, `metrics-apm.internal.*`, and `metri
454459
|labels|A flat mapping of user-defined labels with string, boolean or number values.|object| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-yes.png) |
455460
|metricset.name|Name of the set of metrics.|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
456461
|metricset.period|Current data collection period for this event in milliseconds.|long| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
462+
|network.carrier.icc|ISO country code, eg. US|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
463+
|network.carrier.mcc|Mobile country code|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
464+
|network.carrier.mnc|Mobile network code|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
465+
|network.carrier.name|Carrier name, eg. Vodafone, T-Mobile, etc.|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
466+
|network.connection\_type|Cellular network technology, eg. 4G|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
457467
|observer.hostname|Hostname of the APM Server.|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-yes.png) |
458468
|observer.listening|Address the server is listening on.|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
459469
|observer.type|The type will be set to \`apm-server\`.|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-yes.png) |
@@ -639,6 +649,11 @@ Logs are written to `logs-apm.error.*` indices.
639649
|kubernetes.pod.name|Kubernetes pod name|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
640650
|kubernetes.pod.uid|Kubernetes Pod UID|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
641651
|labels|A flat mapping of user-defined labels with string, boolean or number values.|object| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-yes.png) |
652+
|network.carrier.icc|ISO country code, eg. US|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
653+
|network.carrier.mcc|Mobile country code|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
654+
|network.carrier.mnc|Mobile network code|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
655+
|network.carrier.name|Carrier name, eg. Vodafone, T-Mobile, etc.|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
656+
|network.connection\_type|Cellular network technology, eg. 4G|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
642657
|observer.hostname|Hostname of the APM Server.|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-yes.png) |
643658
|observer.listening|Address the server is listening on.|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
644659
|observer.type|The type will be set to \`apm-server\`.|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-yes.png) |

‎changelogs/head.asciidoc

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
[[release-notes-head]]
2+
== APM Server version HEAD
3+
4+
https://github.com/elastic/apm-server/compare/7.13\...master[View commits]
5+
6+
[float]
7+
==== Breaking Changes
8+
* Removed monitoring counters `apm-server.processor.stream.errors.{queue,server,closed}` {pull}5453[5453]
9+
10+
[float]
11+
==== Bug fixes
12+
* Fix panic due to misaligned 64-bit access on 32-bit architectures {pull}5277[5277]
13+
* Fixed tail-based sampling pubsub to use _seq_no correctly {pull}5126[5126]
14+
* Removed service name from dataset {pull}5451[5451]
15+
16+
[float]
17+
==== Intake API Changes
18+
19+
[float]
20+
==== Added
21+
* Support setting agent configuration from apm-server.yml {pull}5177[5177]
22+
* Add metric_type and unit to field metadata of system metrics {pull}5230[5230]
23+
* Display apm-server url in fleet ui's apm-server integration {pull}4895[4895]
24+
* Translate otel messaging.* semantic conventions to ECS {pull}5334[5334]
25+
* Add support for dynamic histogram metrics {pull}5239[5239]
26+
* Tail-sampling processor now resumes subscription from previous position after restart {pull}5350[5350]
27+
* Add support for histograms to metrics intake {pull}5360[5360]
28+
* Upgrade Go to 1.16.4 {pull}5381[5381]
29+
* Add units to metric fields {pull}5395[5395]
30+
* Add support for adjusting OTel event timestamps using `telemetry.sdk.elastic_export_timestamp` {pull}5433[5433]
31+
* Add support for OpenTelemetry labels describing mobile connectivity {pull}5436[5436]
32+
33+
[float]
34+
==== Deprecated

0 commit comments

Comments
 (0)