Add system network fields (#5436)

(cherry picked from commit 01a12f2) # Conflicts: # changelogs/head.asciidoc # include/fields.go
elastic · Jun 16, 2021 · b2fefc4 · b2fefc4
1 parent 1bc6537
commit b2fefc4
Show file tree

Hide file tree

Showing 26 changed files with 886 additions and 11 deletions.
diff --git a/apmpackage/apm/data_stream/app_metrics/fields/fields.yml b/apmpackage/apm/data_stream/app_metrics/fields/fields.yml
@@ -34,6 +34,26 @@
  type: long
  description: Current data collection period for this event in milliseconds.
  unit: ms
+- name: network.carrier.icc
+ type: keyword
+ description: |
+ ISO country code, eg. US
+- name: network.carrier.mcc
+ type: keyword
+ description: |
+ Mobile country code
+- name: network.carrier.mnc
+ type: keyword
+ description: |
+ Mobile network code
+- name: network.carrier.name
+ type: keyword
+ description: |
+ Carrier name, eg. Vodafone, T-Mobile, etc.
+- name: network.connection_type
+ type: keyword
+ description: |
+ Cellular network technology, eg. 4G
 - name: observer.listening
  type: keyword
  description: |

diff --git a/apmpackage/apm/data_stream/error_logs/fields/fields.yml b/apmpackage/apm/data_stream/error_logs/fields/fields.yml
@@ -75,6 +75,26 @@
  type: keyword
  description: |
  Kubernetes Pod UID
+- name: network.carrier.icc
+ type: keyword
+ description: |
+ ISO country code, eg. US
+- name: network.carrier.mcc
+ type: keyword
+ description: |
+ Mobile country code
+- name: network.carrier.mnc
+ type: keyword
+ description: |
+ Mobile network code
+- name: network.carrier.name
+ type: keyword
+ description: |
+ Carrier name, eg. Vodafone, T-Mobile, etc.
+- name: network.connection_type
+ type: keyword
+ description: |
+ Cellular network technology, eg. 4G
 - name: observer.listening
  type: keyword
  description: |

diff --git a/apmpackage/apm/data_stream/internal_metrics/fields/fields.yml b/apmpackage/apm/data_stream/internal_metrics/fields/fields.yml
@@ -34,6 +34,26 @@
  type: long
  description: Current data collection period for this event in milliseconds.
  unit: ms
+- name: network.carrier.icc
+ type: keyword
+ description: |
+ ISO country code, eg. US
+- name: network.carrier.mcc
+ type: keyword
+ description: |
+ Mobile country code
+- name: network.carrier.mnc
+ type: keyword
+ description: |
+ Mobile network code
+- name: network.carrier.name
+ type: keyword
+ description: |
+ Carrier name, eg. Vodafone, T-Mobile, etc.
+- name: network.connection_type
+ type: keyword
+ description: |
+ Cellular network technology, eg. 4G
 - name: observer.listening
  type: keyword
  description: |

diff --git a/apmpackage/apm/data_stream/profile_metrics/fields/fields.yml b/apmpackage/apm/data_stream/profile_metrics/fields/fields.yml
@@ -24,6 +24,26 @@
  type: keyword
  description: |
  Kubernetes Pod UID
+- name: network.carrier.icc
+ type: keyword
+ description: |
+ ISO country code, eg. US
+- name: network.carrier.mcc
+ type: keyword
+ description: |
+ Mobile country code
+- name: network.carrier.mnc
+ type: keyword
+ description: |
+ Mobile network code
+- name: network.carrier.name
+ type: keyword
+ description: |
+ Carrier name, eg. Vodafone, T-Mobile, etc.
+- name: network.connection_type
+ type: keyword
+ description: |
+ Cellular network technology, eg. 4G
 - name: observer.listening
  type: keyword
  description: |

diff --git a/apmpackage/apm/data_stream/traces/fields/fields.yml b/apmpackage/apm/data_stream/traces/fields/fields.yml
@@ -40,6 +40,26 @@
  type: keyword
  description: |
  Kubernetes Pod UID
+- name: network.carrier.icc
+ type: keyword
+ description: |
+ ISO country code, eg. US
+- name: network.carrier.mcc
+ type: keyword
+ description: |
+ Mobile country code
+- name: network.carrier.mnc
+ type: keyword
+ description: |
+ Mobile network code
+- name: network.carrier.name
+ type: keyword
+ description: |
+ Carrier name, eg. Vodafone, T-Mobile, etc.
+- name: network.connection_type
+ type: keyword
+ description: |
+ Cellular network technology, eg. 4G
 - name: observer.listening
  type: keyword
  description: |

diff --git a/apmpackage/apm/docs/README.md b/apmpackage/apm/docs/README.md
@@ -106,6 +106,11 @@ Traces are written to `traces-apm.*` indices.
 |kubernetes.pod.name|Kubernetes pod name|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
 |kubernetes.pod.uid|Kubernetes Pod UID|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
 |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) |
+|network.carrier.icc|ISO country code, eg. US|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
+|network.carrier.mcc|Mobile country code|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
+|network.carrier.mnc|Mobile network code|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
+|network.carrier.name|Carrier name, eg. Vodafone, T-Mobile, etc.|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
+|network.connection\_type|Cellular network technology, eg. 4G|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
 |observer.hostname|Hostname of the APM Server.|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-yes.png) |
 |observer.listening|Address the server is listening on.|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
 |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
 |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) |
 |metricset.name|Name of the set of metrics.|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
 |metricset.period|Current data collection period for this event in milliseconds.|long| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
+|network.carrier.icc|ISO country code, eg. US|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
+|network.carrier.mcc|Mobile country code|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
+|network.carrier.mnc|Mobile network code|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
+|network.carrier.name|Carrier name, eg. Vodafone, T-Mobile, etc.|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
+|network.connection\_type|Cellular network technology, eg. 4G|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
 |observer.hostname|Hostname of the APM Server.|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-yes.png) |
 |observer.listening|Address the server is listening on.|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
 |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.
 |kubernetes.pod.name|Kubernetes pod name|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
 |kubernetes.pod.uid|Kubernetes Pod UID|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
 |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) |
+|network.carrier.icc|ISO country code, eg. US|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
+|network.carrier.mcc|Mobile country code|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
+|network.carrier.mnc|Mobile network code|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
+|network.carrier.name|Carrier name, eg. Vodafone, T-Mobile, etc.|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
+|network.connection\_type|Cellular network technology, eg. 4G|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
 |observer.hostname|Hostname of the APM Server.|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-yes.png) |
 |observer.listening|Address the server is listening on.|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-no.png) |
 |observer.type|The type will be set to \`apm-server\`.|keyword| ![](https://doc-icons.s3.us-east-2.amazonaws.com/icon-yes.png) |

diff --git a/changelogs/head.asciidoc b/changelogs/head.asciidoc
@@ -0,0 +1,34 @@
+[[release-notes-head]]
+== APM Server version HEAD
+
+https:/elastic/apm-server/compare/7.13\...master[View commits]
+
+[float]
+==== Breaking Changes
+* Removed monitoring counters `apm-server.processor.stream.errors.{queue,server,closed}` {pull}5453[5453]
+
+[float]
+==== Bug fixes
+* Fix panic due to misaligned 64-bit access on 32-bit architectures {pull}5277[5277]
+* Fixed tail-based sampling pubsub to use _seq_no correctly {pull}5126[5126]
+* Removed service name from dataset {pull}5451[5451]
+
+[float]
+==== Intake API Changes
+
+[float]
+==== Added
+* Support setting agent configuration from apm-server.yml {pull}5177[5177]
+* Add metric_type and unit to field metadata of system metrics {pull}5230[5230]
+* Display apm-server url in fleet ui's apm-server integration {pull}4895[4895]
+* Translate otel messaging.* semantic conventions to ECS {pull}5334[5334]
+* Add support for dynamic histogram metrics {pull}5239[5239]
+* Tail-sampling processor now resumes subscription from previous position after restart {pull}5350[5350]
+* Add support for histograms to metrics intake {pull}5360[5360]
+* Upgrade Go to 1.16.4 {pull}5381[5381]
+* Add units to metric fields {pull}5395[5395]
+* Add support for adjusting OTel event timestamps using `telemetry.sdk.elastic_export_timestamp` {pull}5433[5433]
+* Add support for OpenTelemetry labels describing mobile connectivity {pull}5436[5436]
+
+[float]
+==== Deprecated