add system network fields

elastic · Jun 10, 2021 · b58556b · b58556b
1 parent 7f0fafe
commit b58556b
Show file tree

Hide file tree

Showing 28 changed files with 1,060 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
@@ -98,6 +98,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) |
@@ -446,6 +451,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) |
@@ -631,6 +641,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/beater/test_approved_es_documents/TestPublishIntegrationTransactions.approved.json b/beater/test_approved_es_documents/TestPublishIntegrationTransactions.approved.json
@@ -62,6 +62,15 @@
  "tag2": 2,
  "wrapped_reporter": true
  },
+ "network": {
+ "carrier": {
+ "icc": "dk",
+ "mcc": "100",
+ "mnc": "200",
+ "name": "Three"
+ },
+ "connection_type": "wifi"
+ },
  "observer": {
  "ephemeral_id": "00000000-0000-0000-0000-000000000000",
  "hostname": "",
@@ -258,6 +267,15 @@
  "tag4": false,
  "wrapped_reporter": true
  },
+ "network": {
+ "carrier": {
+ "icc": "dk",
+ "mcc": "100",
+ "mnc": "200",
+ "name": "Three"
+ },
+ "connection_type": "wifi"
+ },
  "observer": {
  "ephemeral_id": "00000000-0000-0000-0000-000000000000",
  "hostname": "",
@@ -426,6 +444,15 @@
  "tag2": 2,
  "wrapped_reporter": true
  },
+ "network": {
+ "carrier": {
+ "icc": "dk",
+ "mcc": "100",
+ "mnc": "200",
+ "name": "Three"
+ },
+ "connection_type": "wifi"
+ },
  "observer": {
  "ephemeral_id": "00000000-0000-0000-0000-000000000000",
  "hostname": "",
@@ -573,6 +600,15 @@
  "tag2": 2,
  "wrapped_reporter": true
  },
+ "network": {
+ "carrier": {
+ "icc": "dk",
+ "mcc": "100",
+ "mnc": "200",
+ "name": "Three"
+ },
+ "connection_type": "wifi"
+ },
  "observer": {
  "ephemeral_id": "00000000-0000-0000-0000-000000000000",
  "hostname": "",