Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[System] Add dimensions to system package metrics data_streams only, except core data_streams #6118

Merged
merged 17 commits into from
May 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions packages/system/changelog.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# newer versions go on top
- version: "1.30.0"
changes:
- description: Add dimension fields to metrics all data_streams, except core, network and process to support TSDS migration
type: enhancement
link: https://github.com/elastic/integrations/pull/6118
- version: "1.29.0"
changes:
- description: support ip or domain in sshd messages
Expand Down
14 changes: 4 additions & 10 deletions packages/system/data_stream/cpu/fields/agent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,14 @@

Examples: AWS account id, Google Cloud ORG Id, or other unique identifier.'
example: 666777888999
dimension: true
- name: availability_zone
level: extended
type: keyword
ignore_above: 1024
description: Availability zone in which this host is running.
example: us-east-1c
dimension: true
- name: instance.id
level: extended
type: keyword
Expand Down Expand Up @@ -50,10 +52,10 @@
ignore_above: 1024
description: Region in which this host is running.
example: us-east-1
dimension: true
- name: project.id
type: keyword
description: Name of the project in Google Cloud.
dimension: true
- name: image.id
type: keyword
description: Image ID for the cloud instance.
Expand Down Expand Up @@ -138,10 +140,10 @@
level: core
type: keyword
ignore_above: 1024
dimension: true
description: 'Name of the host.

It can contain what `hostname` returns on Unix systems, the fully qualified domain name, or a name specified by the user. The sender decides which value to use.'
dimension: true
- name: os.family
level: extended
type: keyword
Expand Down Expand Up @@ -201,11 +203,3 @@
description: >
OS codename, if any.

- name: agent
title: Agent
type: group
fields:
- name: id
type: keyword
ignore_above: 1024
dimension: true
3 changes: 3 additions & 0 deletions packages/system/data_stream/cpu/fields/ecs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,6 @@
name: host.os.version
- external: ecs
name: host.type
- external: ecs
name: agent.id
dimension: true
18 changes: 7 additions & 11 deletions packages/system/data_stream/diskio/fields/agent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
- name: account.id
level: extended
type: keyword
dimension: true
ignore_above: 1024
description: 'The cloud account or organization id used to identify different entities in a multi-tenant environment.

Expand All @@ -16,12 +17,14 @@
- name: availability_zone
level: extended
type: keyword
dimension: true
ignore_above: 1024
description: Availability zone in which this host is running.
example: us-east-1c
- name: instance.id
level: extended
type: keyword
dimension: true
ignore_above: 1024
description: Instance ID of the host machine.
example: i-1234567890abcdef0
Expand All @@ -39,12 +42,14 @@
- name: provider
level: extended
type: keyword
dimension: true
ignore_above: 1024
description: Name of the cloud provider. Example values are aws, azure, gcp, or digitalocean.
example: aws
- name: region
level: extended
type: keyword
dimension: true
ignore_above: 1024
description: Region in which this host is running.
example: us-east-1
Expand All @@ -67,6 +72,7 @@
type: keyword
ignore_above: 1024
description: Unique container id.
dimension: true
- name: image.name
level: extended
type: keyword
Expand Down Expand Up @@ -133,6 +139,7 @@
- name: name
level: core
type: keyword
dimension: true
ignore_above: 1024
description: 'Name of the host.

Expand All @@ -149,17 +156,6 @@
ignore_above: 1024
description: Operating system kernel version as a raw string.
example: 4.4.0-112-generic
- name: os.name
leehinman marked this conversation as resolved.
Show resolved Hide resolved
level: extended
type: keyword
ignore_above: 1024
multi_fields:
- name: text
type: text
norms: false
default_field: false
description: Operating system name, without the version.
example: Mac OS X
- name: os.platform
level: extended
type: keyword
Expand Down
3 changes: 3 additions & 0 deletions packages/system/data_stream/diskio/fields/ecs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,6 @@
name: host.os.version
- external: ecs
name: host.type
- external: ecs
name: agent.id
dimension: true
1 change: 1 addition & 0 deletions packages/system/data_stream/diskio/fields/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
fields:
- name: name
type: keyword
dimension: true
description: |
The disk name.
- name: serial_number
Expand Down
7 changes: 7 additions & 0 deletions packages/system/data_stream/filesystem/fields/agent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,22 @@
level: extended
type: keyword
ignore_above: 1024
dimension: true
description: 'The cloud account or organization id used to identify different entities in a multi-tenant environment.

Examples: AWS account id, Google Cloud ORG Id, or other unique identifier.'
example: 666777888999
- name: availability_zone
level: extended
type: keyword
dimension: true
ignore_above: 1024
description: Availability zone in which this host is running.
example: us-east-1c
- name: instance.id
level: extended
type: keyword
dimension: true
ignore_above: 1024
description: Instance ID of the host machine.
example: i-1234567890abcdef0
Expand All @@ -39,12 +42,14 @@
- name: provider
level: extended
type: keyword
dimension: true
ignore_above: 1024
description: Name of the cloud provider. Example values are aws, azure, gcp, or digitalocean.
example: aws
- name: region
level: extended
type: keyword
dimension: true
ignore_above: 1024
description: Region in which this host is running.
example: us-east-1
Expand All @@ -66,6 +71,7 @@
level: core
type: keyword
ignore_above: 1024
dimension: true
description: Unique container id.
- name: image.name
level: extended
Expand Down Expand Up @@ -134,6 +140,7 @@
level: core
type: keyword
ignore_above: 1024
dimension: true
description: 'Name of the host.

It can contain what `hostname` returns on Unix systems, the fully qualified domain name, or a name specified by the user. The sender decides which value to use.'
Expand Down
3 changes: 3 additions & 0 deletions packages/system/data_stream/filesystem/fields/ecs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- external: ecs
name: agent.id
dimension: true
2 changes: 2 additions & 0 deletions packages/system/data_stream/filesystem/fields/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
The disk space available to an unprivileged user in bytes.
- name: device_name
type: keyword
dimension: true
description: |
The disk name. For example: `/dev/disk1`
- name: type
Expand All @@ -18,6 +19,7 @@
The disk type. For example: `ext4`
- name: mount_point
type: keyword
dimension: true
description: |
The mounting point. For example: `/`
- name: files
Expand Down
7 changes: 7 additions & 0 deletions packages/system/data_stream/fsstat/fields/agent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
- name: account.id
level: extended
type: keyword
dimension: true
ignore_above: 1024
description: 'The cloud account or organization id used to identify different entities in a multi-tenant environment.

Expand All @@ -16,12 +17,14 @@
- name: availability_zone
level: extended
type: keyword
dimension: true
ignore_above: 1024
description: Availability zone in which this host is running.
example: us-east-1c
- name: instance.id
level: extended
type: keyword
dimension: true
ignore_above: 1024
description: Instance ID of the host machine.
example: i-1234567890abcdef0
Expand All @@ -39,12 +42,14 @@
- name: provider
level: extended
type: keyword
dimension: true
ignore_above: 1024
description: Name of the cloud provider. Example values are aws, azure, gcp, or digitalocean.
example: aws
- name: region
level: extended
type: keyword
dimension: true
ignore_above: 1024
description: Region in which this host is running.
example: us-east-1
Expand All @@ -65,6 +70,7 @@
- name: id
level: core
type: keyword
dimension: true
ignore_above: 1024
description: Unique container id.
- name: image.name
Expand Down Expand Up @@ -133,6 +139,7 @@
- name: name
level: core
type: keyword
dimension: true
ignore_above: 1024
description: 'Name of the host.

Expand Down
3 changes: 3 additions & 0 deletions packages/system/data_stream/fsstat/fields/ecs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,6 @@
name: host.os.version
- external: ecs
name: host.type
- external: ecs
name: agent.id
dimension: true
23 changes: 3 additions & 20 deletions packages/system/data_stream/load/fields/agent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
- name: account.id
level: extended
type: keyword
dimension: true
ignore_above: 1024
description: 'The cloud account or organization id used to identify different entities in a multi-tenant environment.

Expand All @@ -16,6 +17,7 @@
- name: availability_zone
level: extended
type: keyword
dimension: true
ignore_above: 1024
description: Availability zone in which this host is running.
example: us-east-1c
Expand Down Expand Up @@ -47,13 +49,13 @@
- name: region
level: extended
type: keyword
dimension: true
ignore_above: 1024
description: Region in which this host is running.
example: us-east-1
- name: project.id
type: keyword
description: Name of the project in Google Cloud.
dimension: true
- name: image.id
type: keyword
description: Image ID for the cloud instance.
Expand Down Expand Up @@ -154,17 +156,6 @@
ignore_above: 1024
description: Operating system kernel version as a raw string.
example: 4.4.0-112-generic
- name: os.name
level: extended
type: keyword
ignore_above: 1024
multi_fields:
- name: text
type: text
norms: false
default_field: false
description: Operating system name, without the version.
example: Mac OS X
- name: os.platform
level: extended
type: keyword
Expand Down Expand Up @@ -201,11 +192,3 @@
description: >
OS codename, if any.

- name: agent
title: Agent
type: group
fields:
- name: id
type: keyword
ignore_above: 1024
dimension: true
3 changes: 3 additions & 0 deletions packages/system/data_stream/load/fields/ecs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,6 @@
name: host.os.version
- external: ecs
name: host.type
- external: ecs
name: agent.id
dimension: true
12 changes: 3 additions & 9 deletions packages/system/data_stream/memory/fields/agent.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,14 @@

Examples: AWS account id, Google Cloud ORG Id, or other unique identifier.'
example: 666777888999
dimension: true
- name: availability_zone
level: extended
type: keyword
ignore_above: 1024
description: Availability zone in which this host is running.
example: us-east-1c
dimension: true
- name: instance.id
level: extended
type: keyword
Expand Down Expand Up @@ -50,10 +52,10 @@
ignore_above: 1024
description: Region in which this host is running.
example: us-east-1
dimension: true
- name: project.id
type: keyword
description: Name of the project in Google Cloud.
dimension: true
- name: image.id
type: keyword
description: Image ID for the cloud instance.
Expand Down Expand Up @@ -201,11 +203,3 @@
description: >
OS codename, if any.

- name: agent
title: Agent
type: group
fields:
- name: id
type: keyword
ignore_above: 1024
dimension: true
Loading