Skip to content

[System] Update cpu, load, memory dataset with dimensions #5160

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.

Sign up for GitHub

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

Merged
ruflin merged 5 commits into from
Feb 2, 2023
Merged

[System] Update cpu, load, memory dataset with dimensions #5160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c4863d6
[System] Update cpu, load, memory dataset with dimensions
ruflin Feb 1, 2023
111a88c
add cloud.project.id and cloud.provider to the dimension list
ruflin Feb 1, 2023
cede0ab
added 2 missing updates for the dimensions
ruflin Feb 1, 2023
be6fb56
Update packages/system/changelog.yml
ruflin Feb 2, 2023
54ce00a
increment version number
ruflin Feb 2, 2023
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# newer versions go on top
- version: "1.24.0"
changes:
- description: Add basic dimension fields for cpu, load and memory
type: enhancement
link: https://github.com/elastic/integrations/pull/1234
- version: "1.23.1"
changes:
- description: Mark datasets as ga
Expand Down
19 changes: 13 additions & 6 deletions packages/system/data_stream/cpu/fields/agent.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
ignore_above: 1024
description: Instance ID of the host machine.
example: i-1234567890abcdef0
dimension: true
- name: instance.name
level: extended
type: keyword
Expand All @@ -42,6 +43,7 @@
ignore_above: 1024
description: Name of the cloud provider. Example values are aws, azure, gcp, or digitalocean.
example: aws
dimension: true
- name: region
level: extended
type: keyword
Expand All @@ -51,6 +53,7 @@
- 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 All @@ -67,6 +70,7 @@
type: keyword
ignore_above: 1024
description: Unique container id.
dimension: true
- name: image.name
level: extended
type: keyword
Expand Down Expand Up @@ -134,6 +138,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 Expand Up @@ -196,9 +201,11 @@
description: >
OS codename, if any.

- name: cpu.pct
Copy link
Copy Markdown
Contributor Author

@ruflin ruflin Feb 1, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This field also exists in fields.yml, seems it was a duplicate.

type: scaled_float
format: percent
description: >
Percent CPU used. This value is normalized by the number of CPU cores and it ranges from 0 to 1.

- name: agent
title: Agent
type: group
fields:
- name: id
type: keyword
ignore_above: 1024
dimension: true
13 changes: 13 additions & 0 deletions packages/system/data_stream/load/fields/agent.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
ignore_above: 1024
description: Instance ID of the host machine.
example: i-1234567890abcdef0
dimension: true
- name: instance.name
level: extended
type: keyword
Expand All @@ -42,6 +43,7 @@
ignore_above: 1024
description: Name of the cloud provider. Example values are aws, azure, gcp, or digitalocean.
example: aws
dimension: true
- name: region
level: extended
type: keyword
Expand All @@ -51,6 +53,7 @@
- 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 All @@ -67,6 +70,7 @@
type: keyword
ignore_above: 1024
description: Unique container id.
dimension: true
- name: image.name
level: extended
type: keyword
Expand Down Expand Up @@ -134,6 +138,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 Expand Up @@ -196,3 +201,11 @@
description: >
OS codename, if any.

- name: agent
title: Agent
type: group
fields:
- name: id
type: keyword
ignore_above: 1024
dimension: true
13 changes: 13 additions & 0 deletions packages/system/data_stream/memory/fields/agent.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
ignore_above: 1024
description: Instance ID of the host machine.
example: i-1234567890abcdef0
dimension: true
- name: instance.name
level: extended
type: keyword
Expand All @@ -42,6 +43,7 @@
ignore_above: 1024
description: Name of the cloud provider. Example values are aws, azure, gcp, or digitalocean.
example: aws
dimension: true
- name: region
level: extended
type: keyword
Expand All @@ -51,6 +53,7 @@
- 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 All @@ -67,6 +70,7 @@
type: keyword
ignore_above: 1024
description: Unique container id.
dimension: true
- name: image.name
level: extended
type: keyword
Expand Down Expand Up @@ -134,6 +138,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 Expand Up @@ -196,3 +201,11 @@
description: >
OS codename, if any.

- name: agent
title: Agent
type: group
fields:
- name: id
type: keyword
ignore_above: 1024
dimension: true
5 changes: 4 additions & 1 deletion packages/system/docs/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1202,6 +1202,7 @@ This data should be available without elevated permissions.
| Field | Description | Type | Unit | Metric Type |
|---|---|---|---|---|
| @timestamp | Event timestamp. | date | | |
| agent.id | | keyword | | |
| cloud.account.id | 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. | keyword | | |
| cloud.availability_zone | Availability zone in which this host is running. | keyword | | |
| cloud.image.id | Image ID for the cloud instance. | keyword | | |
Expand All @@ -1223,7 +1224,7 @@ This data should be available without elevated permissions.
| host | A host is defined as a general computing instance. ECS host.\* fields should be populated with details about the host on which the event happened, or from which the measurement was taken. Host types include hardware, virtual machines, Docker containers, and Kubernetes nodes. | group | | |
| host.architecture | Operating system architecture. | keyword | | |
| host.containerized | If the host is a container. | boolean | | |
| host.cpu.pct | Percent CPU used. This value is normalized by the number of CPU cores and it ranges from 0 to 1. | scaled_float | | |
| host.cpu.pct | Percent CPU used. This value is normalized by the number of CPU cores and it ranges from 0 to 1. | scaled_float | percent | gauge |
| host.domain | Name of the domain of which the host is a member. For example, on Windows this could be the host's Active Directory domain or NetBIOS domain name. For Linux this could be the domain of the host's LDAP provider. | keyword | | |
| host.hostname | Hostname of the host. It normally contains what the `hostname` command returns on the host machine. | keyword | | |
| host.id | Unique host id. As hostname is not always unique, use values that are meaningful in your environment. Example: The current usage of `beat.name`. | keyword | | |
Expand Down Expand Up @@ -1510,6 +1511,7 @@ This data should be available without elevated permissions.
| Field | Description | Type | Metric Type |
|---|---|---|---|
| @timestamp | Event timestamp. | date | |
| agent.id | | keyword | |
| cloud.account.id | 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. | keyword | |
| cloud.availability_zone | Availability zone in which this host is running. | keyword | |
| cloud.image.id | Image ID for the cloud instance. | keyword | |
Expand Down Expand Up @@ -1578,6 +1580,7 @@ This data should be available without elevated permissions.
| Field | Description | Type | Unit | Metric Type |
|---|---|---|---|---|
| @timestamp | Event timestamp. | date | | |
| agent.id | | keyword | | |
| cloud.account.id | 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. | keyword | | |
| cloud.availability_zone | Availability zone in which this host is running. | keyword | | |
| cloud.image.id | Image ID for the cloud instance. | keyword | | |
Expand Down
2 changes: 1 addition & 1 deletion packages/system/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
format_version: 1.0.0
name: system
title: System
version: 1.23.1
version: 1.24.0
license: basic
description: Collect system logs and metrics from your servers with Elastic Agent.
type: integration
Expand Down