Skip to content

Commit

Permalink
Cherry-pick to 7.0: Add instance.state.name into fields.yml (#11221) (#…
Browse files Browse the repository at this point in the history
…11228)

* Add instance.state.name into fields.yml (#11221)

* Add instance.state.name into fields.yml

* Rebase and regenerate fields.yml

* Update changelog

(cherry picked from commit efcf034)

* Rerun mage update
  • Loading branch information
kaiyan-sheng authored Mar 13, 2019
1 parent a8fcb61 commit 781be04
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ https://github.com/elastic/beats/compare/v7.0.0-beta1...master[Check the HEAD di
- Fix issue in kubernetes module preventing usage percentages to be properly calculated. {pull}10946[10946]
- Fix parsing error using GET in Jolokia module. {pull}11075[11075] {issue}11071[11071]
- Add documentation about jolokia autodiscover fields. {issue}10925[10925] {pull}10979[10979]
- Add missing aws.ec2.instance.state.name into fields.yml. {issue}11219[11219] {pull}11221[11221]

*Packetbeat*

Expand Down
12 changes: 11 additions & 1 deletion metricbeat/docs/fields.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -1072,14 +1072,24 @@ type: integer
The state of the instance, as a 16-bit unsigned integer.
--
*`aws.ec2.instance.state.name`*::
+
--
type: keyword
The state of the instance (pending | running | shutting-down | terminated | stopping | stopped).
--
*`aws.ec2.instance.threads_per_core`*::
+
--
type: integer
The state of the instance (pending | running | shutting-down | terminated | stopping | stopped).
The number of threads per CPU core.
--
Expand Down
6 changes: 5 additions & 1 deletion x-pack/metricbeat/module/aws/ec2/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,11 @@
type: integer
description: >
The state of the instance, as a 16-bit unsigned integer.
- name: instance.state.name
type: keyword
description: >
The state of the instance (pending | running | shutting-down | terminated | stopping | stopped).
- name: instance.threads_per_core
type: integer
description: >
The state of the instance (pending | running | shutting-down | terminated | stopping | stopped).
The number of threads per CPU core.
2 changes: 1 addition & 1 deletion x-pack/metricbeat/module/aws/fields.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 781be04

Please sign in to comment.