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.

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

Jump to bottom

[1.x] Apply the RFC 0005 stage 2 (host metrics) changes in the experimental artifacts (#1159) #1184

Merged
merged 2 commits into from
Dec 10, 2020
Merged

[1.x] Apply the RFC 0005 stage 2 (host metrics) changes in the experimental artifacts (#1159) #1184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3cbcad
Apply the RFC 0005 stage 2 (host metrics) changes in the experimental…
Dec 4, 2020
534b213
update artifacts
ebeahan Dec 10, 2020
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
46 changes: 46 additions & 0 deletions experimental/generated/beats/fields.ecs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2047,6 +2047,28 @@
ignore_above: 1024
description: Operating system architecture.
example: x86_64
- name: cpu.usage
level: extended
type: scaled_float
description: 'Percent CPU used which is normalized by the number of CPU cores
and it ranges from 0 to 1. Scaling factor: 1000.

For example: For a two core host, this value should be the average of the
two cores, between 0 and 1.'
scaling_factor: 1000
default_field: false
- name: disk.read.bytes
level: extended
type: long
description: The total number of bytes (gauge) read successfully (aggregated
from all disks) since the last metric collection.
default_field: false
- name: disk.write.bytes
level: extended
type: long
description: The total number of bytes (gauge) written successfully (aggregated
from all disks) since the last metric collection.
default_field: false
- name: domain
level: extended
type: keyword
Expand Down Expand Up @@ -2143,6 +2165,30 @@
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.'
- name: network.egress.bytes
level: extended
type: long
description: The number of bytes (gauge) sent out on all network interfaces
by the host since the last metric collection.
default_field: false
- name: network.egress.packets
level: extended
type: long
description: The number of packets (gauge) sent out on all network interfaces
by the host since the last metric collection.
default_field: false
- name: network.ingress.bytes
level: extended
type: long
description: The number of bytes received (gauge) on all network interfaces
by the host since the last metric collection.
default_field: false
- name: network.ingress.packets
level: extended
type: long
description: The number of packets (gauge) received on all network interfaces
by the host since the last metric collection.
default_field: false
- name: os.family
level: extended
type: keyword
Expand Down
7 changes: 7 additions & 0 deletions experimental/generated/csv/fields.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,9 @@ ECS_Version,Indexed,Field_Set,Field,Type,Level,Normalization,Example,Description
1.8.0-dev+exp,true,group,group.id,keyword,extended,,,Unique identifier for the group on the system/platform.
1.8.0-dev+exp,true,group,group.name,keyword,extended,,,Name of the group.
1.8.0-dev+exp,true,host,host.architecture,keyword,core,,x86_64,Operating system architecture.
1.8.0-dev+exp,true,host,host.cpu.usage,scaled_float,extended,,,"Percent CPU used, between 0 and 1."
1.8.0-dev+exp,true,host,host.disk.read.bytes,long,extended,,,The number of bytes read by all disks.
1.8.0-dev+exp,true,host,host.disk.write.bytes,long,extended,,,The number of bytes written on all disks.
1.8.0-dev+exp,true,host,host.domain,keyword,extended,,CONTOSO,Name of the directory the group is a member of.
1.8.0-dev+exp,true,host,host.geo.city_name,keyword,core,,Montreal,City name.
1.8.0-dev+exp,true,host,host.geo.continent_name,keyword,core,,North America,Name of the continent.
Expand All @@ -244,6 +247,10 @@ ECS_Version,Indexed,Field_Set,Field,Type,Level,Normalization,Example,Description
1.8.0-dev+exp,true,host,host.ip,ip,core,array,,Host ip addresses.
1.8.0-dev+exp,true,host,host.mac,keyword,core,array,,Host mac addresses.
1.8.0-dev+exp,true,host,host.name,keyword,core,,,Name of the host.
1.8.0-dev+exp,true,host,host.network.egress.bytes,long,extended,,,The number of bytes sent on all network interfaces.
1.8.0-dev+exp,true,host,host.network.egress.packets,long,extended,,,The number of packets sent on all network interfaces.
1.8.0-dev+exp,true,host,host.network.ingress.bytes,long,extended,,,The number of bytes received on all network interfaces.
1.8.0-dev+exp,true,host,host.network.ingress.packets,long,extended,,,The number of packets received on all network interfaces.
1.8.0-dev+exp,true,host,host.os.family,keyword,extended,,debian,"OS family (such as redhat, debian, freebsd, windows)."
1.8.0-dev+exp,true,host,host.os.full,wildcard,extended,,Mac OS Mojave,"Operating system name, including the version or code name."
1.8.0-dev+exp,true,host,host.os.full.text,text,extended,,Mac OS Mojave,"Operating system name, including the version or code name."
Expand Down
74 changes: 74 additions & 0 deletions experimental/generated/ecs/ecs_flat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3182,6 +3182,40 @@ host.architecture:
normalize: []
short: Operating system architecture.
type: keyword
host.cpu.usage:
dashed_name: host-cpu-usage
description: 'Percent CPU used which is normalized by the number of CPU cores and
it ranges from 0 to 1. Scaling factor: 1000.

For example: For a two core host, this value should be the average of the two
cores, between 0 and 1.'
flat_name: host.cpu.usage
level: extended
name: cpu.usage
normalize: []
scaling_factor: 1000
short: Percent CPU used, between 0 and 1.
type: scaled_float
host.disk.read.bytes:
dashed_name: host-disk-read-bytes
description: The total number of bytes (gauge) read successfully (aggregated from
all disks) since the last metric collection.
flat_name: host.disk.read.bytes
level: extended
name: disk.read.bytes
normalize: []
short: The number of bytes read by all disks.
type: long
host.disk.write.bytes:
dashed_name: host-disk-write-bytes
description: The total number of bytes (gauge) written successfully (aggregated
from all disks) since the last metric collection.
flat_name: host.disk.write.bytes
level: extended
name: disk.write.bytes
normalize: []
short: The number of bytes written on all disks.
type: long
host.domain:
dashed_name: host-domain
description: 'Name of the domain of which the host is a member.
Expand Down Expand Up @@ -3355,6 +3389,46 @@ host.name:
normalize: []
short: Name of the host.
type: keyword
host.network.egress.bytes:
dashed_name: host-network-egress-bytes
description: The number of bytes (gauge) sent out on all network interfaces by the
host since the last metric collection.
flat_name: host.network.egress.bytes
level: extended
name: network.egress.bytes
normalize: []
short: The number of bytes sent on all network interfaces.
type: long
host.network.egress.packets:
dashed_name: host-network-egress-packets
description: The number of packets (gauge) sent out on all network interfaces by
the host since the last metric collection.
flat_name: host.network.egress.packets
level: extended
name: network.egress.packets
normalize: []
short: The number of packets sent on all network interfaces.
type: long
host.network.ingress.bytes:
dashed_name: host-network-ingress-bytes
description: The number of bytes received (gauge) on all network interfaces by the
host since the last metric collection.
flat_name: host.network.ingress.bytes
level: extended
name: network.ingress.bytes
normalize: []
short: The number of bytes received on all network interfaces.
type: long
host.network.ingress.packets:
dashed_name: host-network-ingress-packets
description: The number of packets (gauge) received on all network interfaces by
the host since the last metric collection.
flat_name: host.network.ingress.packets
level: extended
name: network.ingress.packets
normalize: []
short: The number of packets received on all network interfaces.
type: long
host.os.family:
dashed_name: host-os-family
description: OS family (such as redhat, debian, freebsd, windows).
Expand Down
74 changes: 74 additions & 0 deletions experimental/generated/ecs/ecs_nested.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3843,6 +3843,40 @@ host:
normalize: []
short: Operating system architecture.
type: keyword
host.cpu.usage:
dashed_name: host-cpu-usage
description: 'Percent CPU used which is normalized by the number of CPU cores
and it ranges from 0 to 1. Scaling factor: 1000.

For example: For a two core host, this value should be the average of the
two cores, between 0 and 1.'
flat_name: host.cpu.usage
level: extended
name: cpu.usage
normalize: []
scaling_factor: 1000
short: Percent CPU used, between 0 and 1.
type: scaled_float
host.disk.read.bytes:
dashed_name: host-disk-read-bytes
description: The total number of bytes (gauge) read successfully (aggregated
from all disks) since the last metric collection.
flat_name: host.disk.read.bytes
level: extended
name: disk.read.bytes
normalize: []
short: The number of bytes read by all disks.
type: long
host.disk.write.bytes:
dashed_name: host-disk-write-bytes
description: The total number of bytes (gauge) written successfully (aggregated
from all disks) since the last metric collection.
flat_name: host.disk.write.bytes
level: extended
name: disk.write.bytes
normalize: []
short: The number of bytes written on all disks.
type: long
host.domain:
dashed_name: host-domain
description: 'Name of the domain of which the host is a member.
Expand Down Expand Up @@ -4018,6 +4052,46 @@ host:
normalize: []
short: Name of the host.
type: keyword
host.network.egress.bytes:
dashed_name: host-network-egress-bytes
description: The number of bytes (gauge) sent out on all network interfaces
by the host since the last metric collection.
flat_name: host.network.egress.bytes
level: extended
name: network.egress.bytes
normalize: []
short: The number of bytes sent on all network interfaces.
type: long
host.network.egress.packets:
dashed_name: host-network-egress-packets
description: The number of packets (gauge) sent out on all network interfaces
by the host since the last metric collection.
flat_name: host.network.egress.packets
level: extended
name: network.egress.packets
normalize: []
short: The number of packets sent on all network interfaces.
type: long
host.network.ingress.bytes:
dashed_name: host-network-ingress-bytes
description: The number of bytes received (gauge) on all network interfaces
by the host since the last metric collection.
flat_name: host.network.ingress.bytes
level: extended
name: network.ingress.bytes
normalize: []
short: The number of bytes received on all network interfaces.
type: long
host.network.ingress.packets:
dashed_name: host-network-ingress-packets
description: The number of packets (gauge) received on all network interfaces
by the host since the last metric collection.
flat_name: host.network.ingress.packets
level: extended
name: network.ingress.packets
normalize: []
short: The number of packets received on all network interfaces.
type: long
host.os.family:
dashed_name: host-os-family
description: OS family (such as redhat, debian, freebsd, windows).
Expand Down
50 changes: 50 additions & 0 deletions experimental/generated/elasticsearch/7/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1046,6 +1046,32 @@
"ignore_above": 1024,
"type": "keyword"
},
"cpu": {
"properties": {
"usage": {
"scaling_factor": 1000,
"type": "scaled_float"
}
}
},
"disk": {
"properties": {
"read": {
"properties": {
"bytes": {
"type": "long"
}
}
},
"write": {
"properties": {
"bytes": {
"type": "long"
}
}
}
}
},
"domain": {
"ignore_above": 1024,
"type": "keyword"
Expand Down Expand Up @@ -1102,6 +1128,30 @@
"ignore_above": 1024,
"type": "keyword"
},
"network": {
"properties": {
"egress": {
"properties": {
"bytes": {
"type": "long"
},
"packets": {
"type": "long"
}
}
},
"ingress": {
"properties": {
"bytes": {
"type": "long"
},
"packets": {
"type": "long"
}
}
}
}
},
"os": {
"properties": {
"family": {
Expand Down
50 changes: 50 additions & 0 deletions experimental/generated/elasticsearch/component/host.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,32 @@
"ignore_above": 1024,
"type": "keyword"
},
"cpu": {
"properties": {
"usage": {
"scaling_factor": 1000,
"type": "scaled_float"
}
}
},
"disk": {
"properties": {
"read": {
"properties": {
"bytes": {
"type": "long"
}
}
},
"write": {
"properties": {
"bytes": {
"type": "long"
}
}
}
}
},
"domain": {
"ignore_above": 1024,
"type": "keyword"
Expand Down Expand Up @@ -68,6 +94,30 @@
"ignore_above": 1024,
"type": "keyword"
},
"network": {
"properties": {
"egress": {
"properties": {
"bytes": {
"type": "long"
},
"packets": {
"type": "long"
}
}
},
"ingress": {
"properties": {
"bytes": {
"type": "long"
},
"packets": {
"type": "long"
}
}
}
}
},
"os": {
"properties": {
"family": {
Expand Down
Loading