[aws] Add missing fields definition for ec2 data stream (#7425)

elastic · Sep 5, 2023 · 1529ca6 · 1529ca6
1 parent 39d54c5
commit 1529ca6
Show file tree

Hide file tree

Showing 7 changed files with 298 additions and 230 deletions.
diff --git a/packages/aws/changelog.yml b/packages/aws/changelog.yml
@@ -1,4 +1,9 @@
 # newer versions go on top
+- version: "1.53.3"
+  changes:
+    - description: Add missing fields definition for ec2
+      type: enhancement
+      link: https://github.com/elastic/integrations/pull/7425
 - version: "1.53.2"
   changes:
     - description: Remove the remove processor since rename processor removes old field already.

diff --git a/packages/aws/data_stream/ec2_metrics/fields/fields.yml b/packages/aws/data_stream/ec2_metrics/fields/fields.yml
@@ -19,66 +19,105 @@
     - name: ec2
       type: group
       fields:
-        - name: cpu.credit_usage
-          type: long
-          description: |
-            The number of CPU credits spent by the instance for CPU utilization.
-        - name: cpu.credit_balance
-          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: 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: 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_per_sec
-          type: long
-          description: |
-            The number of packets per second sent out on all network interfaces by the instance.
-        - name: network.out.packets_per_sec
-          type: long
-          description: |
-            The number of packets per second sent out on all network interfaces by the instance.
-        - name: network.in.bytes_per_sec
-          type: long
-          description: |
-            The number of bytes per second received on all network interfaces by the instance.
-        - name: network.out.bytes_per_sec
-          type: long
-          description: |
-            The number of bytes per second sent out on all network interfaces by the instance.
-        - name: diskio.read.bytes_per_sec
-          type: long
-          description: |
-            Bytes read per second from all instance store volumes available to the instance.
-        - name: diskio.write.bytes_per_sec
-          type: long
-          description: |
-            Bytes written per second to all instance store volumes available to the instance.
-        - name: diskio.read.count_per_sec
-          type: long
-          description: |
-            Completed read operations per second from all instance store volumes available to the instance in a specified period of time.
-        - name: diskio.write.count_per_sec
-          type: long
-          description: |
-            Completed write operations per second to all instance store volumes available to the instance in a specified period of time.
-        - name: status.check_failed
-          type: long
-          description: |
-            Reports whether the instance has passed both the instance status check and the system status check in the last minute.
-        - name: status.check_failed_system
-          type: long
-          description: |
-            Reports whether the instance has passed the system status check in the last minute.
-        - name: status.check_failed_instance
-          type: long
-          description: |
-            Reports whether the instance has passed the instance status check in the last minute.
+        - name: metrics
+          type: group
+          fields:
+            - name: CPUCreditUsage.avg
+              type: long
+              description: |
+                The number of CPU credits spent by the instance for CPU utilization.
+            - name: CPUCreditBalance.avg
+              type: long
+              description: |
+                The number of earned CPU credits that an instance has accrued since it was launched or started.
+            - name: CPUSurplusCreditBalance.avg
+              type: long
+              description: |
+                The number of surplus credits that have been spent by an unlimited instance when its CPUCreditBalance value is zero.
+            - name: CPUSurplusCreditsCharged.avg
+              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: CPUUtilization.avg
+              type: long
+              description: |
+                The average percentage of physical CPU time that Amazon EC2 uses to run the EC2 instance.
+            - name: NetworkPacketsIn.rate
+              type: long
+              description: |
+                The number of packets per second sent out on all network interfaces by the instance.
+            - name: NetworkPacketsIn.sum
+              type: long
+              description: |
+                The number of packets total sent out on all network interfaces by the instance.
+            - name: NetworkPacketsOut.rate
+              type: long
+              description: |
+                The number of packets per second sent out on all network interfaces by the instance.
+            - name: NetworkPacketsOut.sum
+              type: long
+              description: |
+                The number of packets total sent out on all network interfaces by the instance.
+            - name: NetworkIn.rate
+              type: long
+              description: |
+                The number of bytes per second received on all network interfaces by the instance.
+            - name: NetworkIn.sum
+              type: long
+              description: |
+                The number of bytes total received on all network interfaces by the instance.
+            - name: NetworkOut.rate
+              type: long
+              description: |
+                The number of bytes per second sent out on all network interfaces by the instance.
+            - name: NetworkOut.sum
+              type: long
+              description: |
+                The number of bytes total sent out on all network interfaces by the instance.
+            - name: DiskReadBytes.rate
+              type: long
+              description: |
+                Bytes read per second from all instance store volumes available to the instance.
+            - name: DiskReadBytes.sum
+              type: long
+              description: |
+                Total bytes read from all instance store volumes available to the instance.
+            - name: DiskWriteBytes.rate
+              type: long
+              description: |
+                Bytes written per second to all instance store volumes available to the instance.
+            - name: DiskWriteBytes.sum
+              type: long
+              description: |
+                Total bytes written to all instance store volumes available to the instance.
+            - name: DiskReadOps.rate
+              type: long
+              description: |
+                Completed read operations per second from all instance store volumes available to the instance in a specified period of time.
+            - name: DiskReadOps.sum
+              type: long
+              description: |
+                Total completed read operations from all instance store volumes available to the instance in a specified period of time.
+            - name: DiskWriteOps.rate
+              type: long
+              description: |
+                Completed write operations per second to all instance store volumes available to the instance in a specified period of time.
+            - name: DiskWriteOps.sum
+              type: long
+              description: |
+                Total completed write operations to all instance store volumes available to the instance in a specified period of time.
+            - name: StatusCheckFailed.avg
+              type: long
+              description: |
+                Reports whether the instance has passed both the instance status check and the system status check in the last minute.
+            - name: StatusCheckFailed_System.avg
+              type: long
+              description: |
+                Reports whether the instance has passed the system status check in the last minute.
+            - name: StatusCheckFailed_Instance.avg
+              type: long
+              description: |
+                Reports whether the instance has passed the instance status check in the last minute.
         - name: instance.core.count
           type: integer
           description: |

diff --git a/packages/aws/data_stream/ec2_metrics/fields/package-fields.yml b/packages/aws/data_stream/ec2_metrics/fields/package-fields.yml
@@ -9,7 +9,3 @@
       type: keyword
       description: |
         Name of a S3 bucket.
-    - name: '*.metrics.*.*'
-      type: object
-      description: |
-        Metrics that returned from Cloudwatch API query.