diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index a3d5b1ad3bbd..e02ebd2742b3 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -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* diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index 4892209455bd..d5728122dd49 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -1072,6 +1072,16 @@ 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`*:: @@ -1079,7 +1089,7 @@ The state of the instance, as a 16-bit unsigned integer. -- type: integer -The state of the instance (pending | running | shutting-down | terminated | stopping | stopped). +The number of threads per CPU core. -- diff --git a/x-pack/metricbeat/module/aws/ec2/_meta/fields.yml b/x-pack/metricbeat/module/aws/ec2/_meta/fields.yml index 1aaefab58f71..45c76e7ac2fd 100644 --- a/x-pack/metricbeat/module/aws/ec2/_meta/fields.yml +++ b/x-pack/metricbeat/module/aws/ec2/_meta/fields.yml @@ -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. diff --git a/x-pack/metricbeat/module/aws/fields.go b/x-pack/metricbeat/module/aws/fields.go index 36cc75e590f1..0b62f6763e9d 100644 --- a/x-pack/metricbeat/module/aws/fields.go +++ b/x-pack/metricbeat/module/aws/fields.go @@ -19,5 +19,5 @@ func init() { // AssetAws returns asset data. // This is the base64 encoded gzipped contents of module/aws. func AssetAws() string { - return "eJzEl0FvGzkPhu/5FURPLdAM8BUf9pDDAtu0h1wWwXaLHh1aoj1ENNJApDxw0R+/oDx2bNdpnKydnYNhjDTU876SKPES7ml5BTjIBYCyBrqCNzjImwsAT+Iy98opXsHvFwAAdzjIHXTJl0DgUgjkVOCPb1+gS5E1ZY5z6EgzO4FZTl1tuw6p+AHVtc0FQKZAKHQFc7wAmDEFL1c1+iVE7GhNY48ue+uYU+nHNwegdoNsByL3YfPuULBHA66eO3If7sClqMhRQFvaaNMWFQbKBOIy9uT31H4ztTC07NqHAAc8EooK02X98PP1h2Zr/F2f1s++1G25ri+NJsXQ9E53eqzFi8NAfjILCfc7/MIHe/5uCXrKjqLinCDNAENIDpW8gYNLXV+UoETW0R7MBK7kTFHDEjhCEYIUq48cRTE6ah4V4jJ51kkRnNMZtMTSTSmbjuvbr7AaTED6cT62GWGWcu1VlAN/Rwv7JPcUg317VnLCHMnvCFgZHx/YWxRA53IhD8L2hhUGFAhYomvJQ8ogilnJPy5KSu5DkckrihuH3FXW4oJgShQfZgojlBi4Y1uJG9lDSxHss+vbr9c1wscVMywwFAIW+E45HatYJq7FPCd/XslV00HhtpdiUuiRPfg0RJP+8/y/B4x+TDvaFgGOrmTzCL1no8AAKymHpUfSIeX7hmPTo7snlbMqHseATI54YYsxWl5ZYwBHpTxDR7K/KX+Nn4q+Kn9N46noqfg5NtOl0nnh6whnsf612E9lu2e559RkQn8W9o+j0zheE4x1k6pEUyZYpFA6EsAFcsBpINB0PPmQWemM6BZfKRrTydmr66k/Nfh16vpAdihU31NPuZ7c8vIpsDsMWpZ2PGPydh/i5G05KnfHTNA5VdYRtmW+cK5eIlIUtUjjWnL3kxlyeOSgDCnOn6fvL+pTVrHzXFvKu6R2t+lRhDxMk7a7jSsmqEz1VLRWWYpSt9vGqxtpQFHoOBY9XuRkFe+VtZ5DyHqc/0DK4Rk7VswmxbiU7afEw5WPHQlzyv+6UEiZpBYET+e3TSt3OKeGD++Je1oOKe+3HQF286luSsOw+FZdedvMq4v9c/ge6tLG5uDwIngR5030bDXiw0rwpHXFbRfDLEDRctEjFcgGtM+8QKXGR5lY02kNHaPDpz+/1IHX9v50qziSkvvDK3H/9TPQbm4X/7erfCYRQJHkuFbgA4/p79msZRrYncvQGvwnP49clSPaCV1cGzdyfLbkwg5ubjctb83gdzBNJfr1wfhcS+sWalzyh918cSKqcfc9fA9W38P/frucskKJwvNY6+A6yBOk2trVSCY95Ykltlfghbc9RW+b/gfkEuPqn7RFleP8sla2P0Apdxzryv5h95a+H/vZX/Lvmot/AgAA//+h+RBa" + return "eJzEV09vG7kPvedTED21QDPAr/hhDzkssE17yGURbLfo0aEl2kNEIw1EygMX/fALymPHdp3GydrZORjGSEO+90TxzyXc0/IKcJALAGUNdAVvcJA3FwCexGXulVO8gt8vAADucJA76JIvgcClEMipwB/fvkCXImvKHOfQkWZ2ArOcurp2HVLxA6prmwuATIFQ6ArmeAEwYwperqr1S4jY0RqNPbrsbWNOpR/fHAC1a2TbELkPm3eHjD1qcPXckftwBy5FRY4C2tKGm7aoMFAmEJexJ7/H9puxhaFl1z4YOKCRUFSYLuuHn68/NFv+d3VaP/tUt+m6vjSaFEPTO93ZsSYvDgP5ySwk3N/wCx3s+bsl6Ck7iopzgjQDDCE5VPIGHFzq+qIEJbKO8mAmcCVnihqWwBGKEKRYdeQoitFR8ygRl8mzTorgnM7AJZZuStl4XN9+hZUzAenH89jGCLOU666iHPg7mtkncU8x2LdnRU6YI/kdAivh4wP2FgXQuVzIg7C9YYUBBQKW6FrykDKIYlbyj5OSkvtQZPKK5EaXu8xaXBBMieLDSWGEEgN3bJG4oT20FME+u779el0tfFxhhgWGQsAC3ymnYxnLxLWY5+TPS7lyOkjc7lJMCj2yB5+GaNR/Pv/3gNGPaUfbIsDRlWwaofdsKDDAisph6pF0SPm+4dj06O5J5ayMRx+QyREvLBij5ZU1DOColGfoSPYv5a/hp6Kvir+m8VT0VPg5NtOl0nnBVw9nkf61sJ9Kds9yz6nJhP4s2D+OSuPYJhjWTaoSTZlgkULpSAAXyAGngUDT8ciHzEpnhG72laJhOjn2qnrqTw38OnV9ICsKVffUU66VW15+BNbDoGVpxzMmb/0QJ2/hqNwdc0DnZFk9bNN84Vm9hKQoapHGteTuJzPk8EihDCnOn8fvL+pTVrF6ri3lXaTW2/QoQh6mSdvdxRUmqJhqVbRVWYpSt7vGq440oCh0HIseT3KysvfKXM9BZO3nP6By+MSOJbNJMS5l+ynx8ORjJWFO+V8PCimT1IHg6fy2WeUO59Tw4TtxT8sh5f21I4DdfKqX0mCYfZuuvF3mVWP/HHwPc2ljZ3A4CF6E8yZ6thnxIRI8aY247WGYBShaLnpkAtkA7TMvUKnxUSa2dFpBR+vw6c8v1fFa3p+6iiNRcn84EvdfPwPaze3i/9bKZxIBFEmO6wQ+8Jj+no21TAO7cwlajf+k55FROUI7oYpr4UYcny25sIOb283KWxP4HUxTiX5dGJ8rab1CjUv+sJovTkTV7r6G78Hme/jfb5dTVihReB7rHFydHIX09Od+ECm87Sl6u+4/IJcYV/+kLaoc55d1pv0BSrnjWGP6h3UsfT/us7/k3z3BSFtr9mTSU55Yqj5XKRj9WHO0KQvNxT8BAAD//5gGN8o=" }