Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into enforce_yamllint
Browse files Browse the repository at this point in the history
  • Loading branch information
mjwolf committed Sep 11, 2024
2 parents 3f2a71c + 71d285d commit 0686d91
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 27 deletions.
22 changes: 12 additions & 10 deletions experimental/generated/beats/fields.ecs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1183,9 +1183,9 @@
- name: device
title: Device
group: 2
description: 'Fields that describe a device instance and its characteristics. Data
collected for applications and processes running on a (mobile) device can be
enriched with these fields to describe the identity, type and other characteristics
description: 'Fields that describe a device instance and its characteristics.
Data collected for applications and processes running on a (mobile) device can
be enriched with these fields to describe the identity, type and other characteristics
of the device.
This field group definition is based on the Device namespace of the OpenTelemetry
Expand All @@ -1197,13 +1197,15 @@
level: extended
type: keyword
ignore_above: 1024
description: "The unique identifier of a device. The identifier must not change\
\ across application sessions but stay fixed for an instance of a (mobile)\
\ device. \nOn iOS, this value must be equal to the vendor identifier (https://developer.apple.com/documentation/uikit/uidevice/1620059-identifierforvendor).\
\ On Android, this value must be equal to the Firebase Installation ID or\
\ a globally unique UUID which is persisted across sessions in your application.\n\
For GDPR and data protection law reasons this identifier should not carry\
\ information that would allow to identify a user."
description: 'The unique identifier of a device. The identifier must not change
across application sessions but stay fixed for an instance of a (mobile) device.
On iOS, this value must be equal to the vendor identifier (https://developer.apple.com/documentation/uikit/uidevice/1620059-identifierforvendor).
On Android, this value must be equal to the Firebase Installation ID or a
globally unique UUID which is persisted across sessions in your application.
For GDPR and data protection law reasons this identifier should not carry
information that would allow to identify a user.'
example: 00000000-54b3-e7c7-0000-000046bffd97
default_field: false
- name: manufacturer
Expand Down
16 changes: 9 additions & 7 deletions experimental/generated/ecs/ecs_flat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1711,13 +1711,15 @@ destination.user.roles:
type: keyword
device.id:
dashed_name: device-id
description: "The unique identifier of a device. The identifier must not change\
\ across application sessions but stay fixed for an instance of a (mobile) device.\
\ \nOn iOS, this value must be equal to the vendor identifier (https://developer.apple.com/documentation/uikit/uidevice/1620059-identifierforvendor).\
\ On Android, this value must be equal to the Firebase Installation ID or a globally\
\ unique UUID which is persisted across sessions in your application.\nFor GDPR\
\ and data protection law reasons this identifier should not carry information\
\ that would allow to identify a user."
description: 'The unique identifier of a device. The identifier must not change
across application sessions but stay fixed for an instance of a (mobile) device.

On iOS, this value must be equal to the vendor identifier (https://developer.apple.com/documentation/uikit/uidevice/1620059-identifierforvendor).
On Android, this value must be equal to the Firebase Installation ID or a globally
unique UUID which is persisted across sessions in your application.

For GDPR and data protection law reasons this identifier should not carry information
that would allow to identify a user.'
example: 00000000-54b3-e7c7-0000-000046bffd97
flat_name: device.id
ignore_above: 1024
Expand Down
22 changes: 12 additions & 10 deletions experimental/generated/ecs/ecs_nested.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2164,7 +2164,7 @@ destination:
type: group
device:
beta: These fields are in beta and are subject to change.
description: 'Fields that describe a device instance and its characteristics. Data
description: 'Fields that describe a device instance and its characteristics. Data
collected for applications and processes running on a (mobile) device can be enriched
with these fields to describe the identity, type and other characteristics of
the device.
Expand All @@ -2174,13 +2174,15 @@ device:
fields:
device.id:
dashed_name: device-id
description: "The unique identifier of a device. The identifier must not change\
\ across application sessions but stay fixed for an instance of a (mobile)\
\ device. \nOn iOS, this value must be equal to the vendor identifier (https://developer.apple.com/documentation/uikit/uidevice/1620059-identifierforvendor).\
\ On Android, this value must be equal to the Firebase Installation ID or\
\ a globally unique UUID which is persisted across sessions in your application.\n\
For GDPR and data protection law reasons this identifier should not carry\
\ information that would allow to identify a user."
description: 'The unique identifier of a device. The identifier must not change
across application sessions but stay fixed for an instance of a (mobile) device.

On iOS, this value must be equal to the vendor identifier (https://developer.apple.com/documentation/uikit/uidevice/1620059-identifierforvendor).
On Android, this value must be equal to the Firebase Installation ID or a
globally unique UUID which is persisted across sessions in your application.

For GDPR and data protection law reasons this identifier should not carry
information that would allow to identify a user.'
example: 00000000-54b3-e7c7-0000-000046bffd97
flat_name: device.id
ignore_above: 1024
Expand Down Expand Up @@ -15448,8 +15450,8 @@ related:
risk:
beta: These fields are in beta and are subject to change.
description: Fields for describing risk score and risk level of entities such as
hosts and users. These fields are not allowed to be nested under `event.*`. Please
continue to use `event.risk_score` and `event.risk_score_norm` for event risk.
hosts and users. These fields are not allowed to be nested under `event.*`. Please
continue to use `event.risk_score` and `event.risk_score_norm` for event risk.
fields:
risk.calculated_level:
dashed_name: risk-calculated-level
Expand Down

0 comments on commit 0686d91

Please sign in to comment.