diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 693f3962353..b2c1cb901ee 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -46,6 +46,7 @@ https://github.com/elastic/beats/compare/v7.0.0...7.0[Check the HEAD diff] *Metricbeat* - Update documentation with cloudwatch:ListMetrics permission. {pull}11987[11987] +- Change some field type from scaled_float to long in aws module. {pull}11982[11982] *Packetbeat* diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc index 9e5ad51558c..20c1eea2801 100644 --- a/metricbeat/docs/fields.asciidoc +++ b/metricbeat/docs/fields.asciidoc @@ -847,7 +847,7 @@ The percentage of allocated EC2 compute units that are currently in use on the i *`aws.ec2.cpu.credit_usage`*:: + -- -type: scaled_float +type: long The number of CPU credits spent by the instance for CPU utilization. @@ -857,7 +857,7 @@ The number of CPU credits spent by the instance for CPU utilization. *`aws.ec2.cpu.credit_balance`*:: + -- -type: scaled_float +type: long The number of earned CPU credits that an instance has accrued since it was launched or started. @@ -867,7 +867,7 @@ The number of earned CPU credits that an instance has accrued since it was launc *`aws.ec2.cpu.surplus_credit_balance`*:: + -- -type: scaled_float +type: long The number of surplus credits that have been spent by an unlimited instance when its CPUCreditBalance value is zero. @@ -877,7 +877,7 @@ The number of surplus credits that have been spent by an unlimited instance when *`aws.ec2.cpu.surplus_credits_charged`*:: + -- -type: scaled_float +type: long The number of spent surplus credits that are not paid down by earned CPU credits, and which thus incur an additional charge. @@ -887,7 +887,7 @@ The number of spent surplus credits that are not paid down by earned CPU credits *`aws.ec2.network.in.packets`*:: + -- -type: scaled_float +type: long The number of packets received on all network interfaces by the instance. @@ -897,7 +897,7 @@ The number of packets received on all network interfaces by the instance. *`aws.ec2.network.out.packets`*:: + -- -type: scaled_float +type: long The number of packets sent out on all network interfaces by the instance. @@ -907,7 +907,9 @@ The number of packets sent out on all network interfaces by the instance. *`aws.ec2.network.in.bytes`*:: + -- -type: scaled_float +type: long + +format: bytes The number of bytes received on all network interfaces by the instance. @@ -917,7 +919,9 @@ The number of bytes received on all network interfaces by the instance. *`aws.ec2.network.out.bytes`*:: + -- -type: scaled_float +type: long + +format: bytes The number of bytes sent out on all network interfaces by the instance. @@ -927,7 +931,9 @@ The number of bytes sent out on all network interfaces by the instance. *`aws.ec2.diskio.read.bytes`*:: + -- -type: scaled_float +type: long + +format: bytes Bytes read from all instance store volumes available to the instance. @@ -937,7 +943,9 @@ Bytes read from all instance store volumes available to the instance. *`aws.ec2.diskio.write.bytes`*:: + -- -type: scaled_float +type: long + +format: bytes Bytes written to all instance store volumes available to the instance. @@ -947,7 +955,7 @@ Bytes written to all instance store volumes available to the instance. *`aws.ec2.diskio.read.ops`*:: + -- -type: scaled_float +type: long Completed read operations from all instance store volumes available to the instance in a specified period of time. @@ -957,7 +965,7 @@ Completed read operations from all instance store volumes available to the insta *`aws.ec2.diskio.write.ops`*:: + -- -type: scaled_float +type: long Completed write operations to all instance store volumes available to the instance in a specified period of time. diff --git a/x-pack/metricbeat/module/aws/ec2/_meta/fields.yml b/x-pack/metricbeat/module/aws/ec2/_meta/fields.yml index 45c76e7ac2f..34e6686d24f 100644 --- a/x-pack/metricbeat/module/aws/ec2/_meta/fields.yml +++ b/x-pack/metricbeat/module/aws/ec2/_meta/fields.yml @@ -9,51 +9,55 @@ description: > The percentage of allocated EC2 compute units that are currently in use on the instance. - name: cpu.credit_usage - type: scaled_float + type: long description: > The number of CPU credits spent by the instance for CPU utilization. - name: cpu.credit_balance - type: scaled_float + type: long description: > The number of earned CPU credits that an instance has accrued since it was launched or started. - name: cpu.surplus_credit_balance - type: scaled_float + type: long description: > The number of surplus credits that have been spent by an unlimited instance when its CPUCreditBalance value is zero. - name: cpu.surplus_credits_charged - type: scaled_float + type: long description: > The number of spent surplus credits that are not paid down by earned CPU credits, and which thus incur an additional charge. - name: network.in.packets - type: scaled_float + type: long description: > The number of packets received on all network interfaces by the instance. - name: network.out.packets - type: scaled_float + type: long description: > The number of packets sent out on all network interfaces by the instance. - name: network.in.bytes - type: scaled_float + type: long + format: bytes description: > The number of bytes received on all network interfaces by the instance. - name: network.out.bytes - type: scaled_float + type: long + format: bytes description: > The number of bytes sent out on all network interfaces by the instance. - name: diskio.read.bytes - type: scaled_float + type: long + format: bytes description: > Bytes read from all instance store volumes available to the instance. - name: diskio.write.bytes - type: scaled_float + type: long + format: bytes description: > Bytes written to all instance store volumes available to the instance. - name: diskio.read.ops - type: scaled_float + type: long description: > Completed read operations from all instance store volumes available to the instance in a specified period of time. - name: diskio.write.ops - type: scaled_float + type: long description: > Completed write operations to all instance store volumes available to the instance in a specified period of time. - name: status.check_failed diff --git a/x-pack/metricbeat/module/aws/fields.go b/x-pack/metricbeat/module/aws/fields.go index 0b62f6763e9..1157bdfb9d0 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 "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=" + return "eJzEl1GPGjkMx9/5FFafWqk70lWne+DhpCvtw76cVter+siaxDAWmWQUO4yo+uFPCQML7GwX9mA7DwhNMs7/ZyeOfQNLWo8BOxkBKKujMbzBTt6MACyJidwqBz+GP0cAAPfYyT00wSZHYIJzZFTgr29foAmeNUT2C2hIIxuBeQxNGZu4kGyHaupqBBDJEQqNYYEjgDmTszIu1m/AY0NbNfnRdZsnxpDa/s2AqEMj+4bIfNi9GzL2pMHNc0/mwz2Y4BXZC2hNOzatUaGjSCAmYkv2iPZbpoWuZlM/GBjwkZBXmK3Lh58nH6q99Q/9tH2OUfdxTZsqDYquao0ezNjCi0FHdjp3AY8n/MQP+fm3JmgpGvKKC4IwB3QuGFSyWTiY0LRJCZJn7d2DkcCkGMmrWwN7SEIQfPEje1H0hqonQUwkyzpNggsaZHHBL85n8KmZUcz6J3dfYbOIgLR9HPa1wTzEMispO/6O2eyzemfo8rdXUUwYPdkD4RtH+wfNNQqgMTGRBeH8hhU6FHCYvKnJQoggilHJPg0jKbYuyfQVoPqlDolqXBHMiPxDZNBD8o4bzjtuh9vV5CF/Nrn7OikWPm60wgpdImCB7xTDqaQyNTXGBdnroBaWQeB8VnxQaJEt2ND5jPw43u8Bve3TitZJgL1JMfsGreWsAh1sEIaRPWkX4rJiX7VolqRyFdLeNkQyxKu86XzOF9vlgb1SnKMhOT50P5cdkr6K7pKWQ9JL6WZfzdZKJ4ueh9igjmHoo7OAioGrhOFX8lwqPJZlyaGKhPbVeD72EcG+ZMj6d+lMNESCVXCpIQFcITucOQINp9N0kZVeGSevqeSzzovzlOiE9lIHfhKa1lG+REoMQkux3Ozy8nDk2gZzdjc8Z7K5TuJg83ZVbk4J1jXoiuV9vBfG5iVwoqhJKlOTWU7nyO5iF+o/1Iaoku99rSkeKs21T4siZGEWtD4c3GiCoqnconlU1qLUHI7xpkJ1KAoN+6SnQ0439l6Z9Rog23V+AcpwxE6F2aUUE2L+SX64E8pXxYLi/24gQiQpjcLz+Ww3yg0uqOLhM7GkdRfi8dgJwm4/lUOZZWT7uduy+TBvCv9z9D30qVWOwfAmeJHOW28594wPO8GSlh233xyzAPmci57oUHZC28grVKqsl2keuqxDe+vw6e8vZeGtex9VGyeq5HZ4Jx6/PkPa7d3q91z6RxIBFAmGS0fecZ/+ztaaZo7NtRxajD/y54m7spd2QS9uHdfr+JyTCxu4vduNvM0OfgezkLzdXoznurQcocoEO+zNFyeiYvfYh+8h9//w2x83M1ZIXnjhS79cFjlJ6eXjPqgU3rbkbT7uPyAm7zf/pE6q7Bc3pQf+AUqxYV/29I9csbRtPy//JfvuGSKtc5En05biNKfqa10F/Tq5ONpdC9XovwAAAP//1jUszg==" }