Change type from scaled_float to long and add format (#11982)

* Change type from scaled_float to long and add format

Author: kaiyan-sheng

CHANGELOG.next.asciidoc

@@ -36,6 +36,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Add new option `OpMultiplyBuckets` to scale histogram buckets to avoid decimal points in final events {pull}10994[10994]
 - Change cloud.provider from ec2 to aws and from gce to gcp in add_cloud_metadata to align with ECS. {issue}10775[10775] {pull}11687[11687]
 - system/raid metricset now uses /sys/block instead of /proc/mdstat for data. {pull}11613[11613]
+- Change some field type from scaled_float to long in aws module. {pull}11982[11982]
 
 *Packetbeat*
 

metricbeat/docs/fields.asciidoc

@@ -887,7 +887,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.
 
@@ -897,7 +897,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.
 
@@ -907,7 +907,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.
 
@@ -917,7 +917,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.
 
@@ -927,7 +927,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.
 
@@ -937,7 +937,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.
 
@@ -947,7 +947,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.
 
@@ -957,7 +959,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.
 
@@ -967,7 +971,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.
 
@@ -977,7 +983,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.
 
@@ -987,7 +995,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.
 
@@ -997,7 +1005,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.
 
@@ -1154,7 +1162,9 @@ Name of a S3 bucket.
 *`aws.s3_daily_storage.bucket.size.bytes`*::
 +
 --
-type: scaled_float
+type: long
+
+format: bytes
 
 The amount of data in bytes stored in a bucket.
 
@@ -1164,7 +1174,7 @@ The amount of data in bytes stored in a bucket.
 *`aws.s3_daily_storage.number_of_objects`*::
 +
 --
-type: scaled_float
+type: long
 
 The total number of objects stored in a bucket for all storage classes.
 
@@ -1261,7 +1271,9 @@ The number of Amazon S3 SELECT Object Content requests made for objects in an Am
 *`aws.s3_request.requests.select_scanned.bytes`*::
 +
 --
-type: scaled_float
+type: long
+
+format: bytes
 
 The number of bytes of data scanned with Amazon S3 SELECT Object Content requests in an Amazon S3 bucket.
 
@@ -1271,7 +1283,9 @@ The number of bytes of data scanned with Amazon S3 SELECT Object Content request
 *`aws.s3_request.requests.select_returned.bytes`*::
 +
 --
-type: scaled_float
+type: long
+
+format: bytes
 
 The number of bytes of data returned with Amazon S3 SELECT Object Content requests in an Amazon S3 bucket.
 
@@ -1291,7 +1305,9 @@ The number of HTTP requests that list the contents of a bucket.
 *`aws.s3_request.downloaded.bytes`*::
 +
 --
-type: scaled_float
+type: long
+
+format: bytes
 
 The number bytes downloaded for requests made to an Amazon S3 bucket, where the response includes a body.
 
@@ -1301,7 +1317,9 @@ The number bytes downloaded for requests made to an Amazon S3 bucket, where the
 *`aws.s3_request.uploaded.bytes`*::
 +
 --
-type: scaled_float
+type: long
+
+format: bytes
 
 The number bytes uploaded that contain a request body, made to an Amazon S3 bucket.
 
@@ -1333,6 +1351,8 @@ The number of HTTP 5xx server error status code requests made to an Amazon S3 bu
 --
 type: long
 
+format: duration
+
 The per-request time from the complete request being received by an Amazon S3 bucket to when the response starts to be returned.
 
 
@@ -1343,6 +1363,8 @@ The per-request time from the complete request being received by an Amazon S3 bu
 --
 type: long
 
+format: duration
+
 The elapsed per-request time from the first byte received to the last byte sent to an Amazon S3 bucket.
 
 
@@ -1360,6 +1382,8 @@ The elapsed per-request time from the first byte received to the last byte sent
 --
 type: long
 
+format: duration
+
 The approximate age of the oldest non-deleted message in the queue.
 
 

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

x-pack/metricbeat/module/aws/fields.go

@@ -9,10 +9,11 @@
       description: >
         Name of a S3 bucket.
     - name: bucket.size.bytes
-      type: scaled_float
+      type: long
+      format: bytes
       description: >
         The amount of data in bytes stored in a bucket.
     - name: number_of_objects
-      type: scaled_float
+      type: long
       description: >
         The total number of objects stored in a bucket for all storage classes.

x-pack/metricbeat/module/aws/s3_daily_storage/_meta/fields.yml

@@ -37,23 +37,27 @@
       description: >
         The number of Amazon S3 SELECT Object Content requests made for objects in an Amazon S3 bucket.
     - name: requests.select_scanned.bytes
-      type: scaled_float
+      type: long
+      format: bytes
       description: >
         The number of bytes of data scanned with Amazon S3 SELECT Object Content requests in an Amazon S3 bucket.
     - name: requests.select_returned.bytes
-      type: scaled_float
+      type: long
+      format: bytes
       description: >
         The number of bytes of data returned with Amazon S3 SELECT Object Content requests in an Amazon S3 bucket.
     - name: requests.list
       type: long
       description: >
         The number of HTTP requests that list the contents of a bucket.
     - name: downloaded.bytes
-      type: scaled_float
+      type: long
+      format: bytes
       description: >
         The number bytes downloaded for requests made to an Amazon S3 bucket, where the response includes a body.
     - name: uploaded.bytes
-      type: scaled_float
+      type: long
+      format: bytes
       description: >
         The number bytes uploaded that contain a request body, made to an Amazon S3 bucket.
     - name: errors.4xx
@@ -66,9 +70,11 @@
         The number of HTTP 5xx server error status code requests made to an Amazon S3 bucket with a value of either 0 or 1.
     - name: latency.first_byte.ms
       type: long
+      format: duration
       description: >
         The per-request time from the complete request being received by an Amazon S3 bucket to when the response starts to be returned.
     - name: latency.total_request.ms
       type: long
+      format: duration
       description: >
         The elapsed per-request time from the first byte received to the last byte sent to an Amazon S3 bucket.

x-pack/metricbeat/module/aws/s3_request/_meta/fields.yml

@@ -6,6 +6,7 @@
   fields:
     - name: oldest_message_age.sec
       type: long
+      format: duration
       description: >
         The approximate age of the oldest non-deleted message in the queue.
     - name: messages.delayed