Remove network and diskio metrics from ec2 metricset (elastic#28316)

Icedroid · Nov 1, 2021 · 65c5501 · 65c5501
1 parent 264a289
commit 65c5501
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 54 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -118,6 +118,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Remove deprecated fields in Docker module. {issue}11835[11835] {pull}27933[27933]
 - Remove deprecated fields in Kafka module. {pull}27938[27938]
 - Remove deprecated config option default_region from aws module. {pull}28120[28120]
+- Remove network and diskio metrics from ec2 metricset. {pull}28316[28316]
 - Rename read/write_io.ops_per_sec to read/write.iops in rds metricset. {pull}28350[28350]
 - Remove linux-only metrics from diskio, memory {pull}28292[28292]
 - Remove deprecated config option perfmon.counters from windows/perfmon metricset. {pull}28282[28282]

diff --git a/x-pack/metricbeat/module/aws/ec2/_meta/data.json b/x-pack/metricbeat/module/aws/ec2/_meta/data.json
@@ -5,29 +5,22 @@
             "namespace": "AWS/EC2"
         },
         "dimensions": {
-            "InstanceId": "i-0830bfecfa7173cbe"
+            "InstanceId": "i-05b6228ff8d8c5d49"
         },
         "ec2": {
             "cpu": {
                 "credit_balance": 144,
-                "credit_usage": 0.032965,
+                "credit_usage": 0.007318,
                 "surplus_credit_balance": 0,
-                "surplus_credits_charged": 0,
-                "total": {
-                    "pct": 0.6973418542208679
-                }
+                "surplus_credits_charged": 0
             },
             "diskio": {
                 "read": {
-                    "bytes": 0,
                     "bytes_per_sec": 0,
-                    "count": 0,
                     "count_per_sec": 0
                 },
                 "write": {
-                    "bytes": 0,
                     "bytes_per_sec": 0,
-                    "count": 0,
                     "count_per_sec": 0
                 }
             },
@@ -36,18 +29,18 @@
                     "count": 1
                 },
                 "image": {
-                    "id": "ami-0ce21b51cb31a48b8"
+                    "id": "ami-058b1b7fe545997ae"
                 },
                 "monitoring": {
                     "state": "disabled"
                 },
                 "private": {
-                    "dns_name": "ip-172-31-22-253.us-west-2.compute.internal",
-                    "ip": "172.31.22.253"
+                    "dns_name": "ip-172-31-31-247.eu-west-1.compute.internal",
+                    "ip": "172.31.31.247"
                 },
                 "public": {
-                    "dns_name": "ec2-54-202-50-183.us-west-2.compute.amazonaws.com",
-                    "ip": "54.202.50.183"
+                    "dns_name": "ec2-54-194-39-129.eu-west-1.compute.amazonaws.com",
+                    "ip": "54.194.39.129"
                 },
                 "state": {
                     "code": 16,
@@ -57,42 +50,35 @@
             },
             "network": {
                 "in": {
-                    "bytes": 18805,
-                    "bytes_per_sec": 62.68333333333333,
-                    "packets": 122,
-                    "packets_per_sec": 0.4066666666666667
+                    "bytes_per_sec": 18.343333333333334,
+                    "packets_per_sec": 0.15666666666666668
                 },
                 "out": {
-                    "bytes": 37121,
-                    "bytes_per_sec": 123.73666666666666,
-                    "packets": 119,
-                    "packets_per_sec": 0.39666666666666667
+                    "bytes_per_sec": 15.326666666666666,
+                    "packets_per_sec": 0.16
                 }
             },
             "status": {
                 "check_failed": 0,
                 "check_failed_instance": 0,
                 "check_failed_system": 0
             }
-        },
-        "tags": {
-            "platform": "amazon_linux"
         }
     },
     "cloud": {
         "account": {
             "id": "428152502467",
             "name": "elastic-beats"
         },
-        "availability_zone": "us-west-2b",
+        "availability_zone": "eu-west-1a",
         "instance": {
-            "id": "i-0830bfecfa7173cbe"
+            "id": "i-05b6228ff8d8c5d49"
         },
         "machine": {
             "type": "t2.micro"
         },
         "provider": "aws",
-        "region": "us-west-2"
+        "region": "eu-west-1"
     },
     "event": {
         "dataset": "aws.ec2",
@@ -101,7 +87,7 @@
     },
     "host": {
         "cpu": {
-            "usage": 0.6973418542208679
+            "usage": 0.1005649717511616
         },
         "disk": {
             "read": {
@@ -111,16 +97,16 @@
                 "bytes": 0
             }
         },
-        "id": "i-0830bfecfa7173cbe",
-        "name": "i-0830bfecfa7173cbe",
+        "id": "i-05b6228ff8d8c5d49",
+        "name": "i-05b6228ff8d8c5d49",
         "network": {
             "egress": {
-                "bytes": 37121,
-                "packets": 119
+                "bytes": 4598,
+                "packets": 48
             },
             "ingress": {
-                "bytes": 18805,
-                "packets": 122
+                "bytes": 5503,
+                "packets": 47
             }
         }
     },

diff --git a/x-pack/metricbeat/module/aws/ec2/manifest.yml b/x-pack/metricbeat/module/aws/ec2/manifest.yml
@@ -32,8 +32,6 @@ processors:
   - rename:
       ignore_missing: true
       fields:
-        - from: "aws.ec2.metrics.CPUUtilization.avg"
-          to: "aws.ec2.cpu.total.pct"
         - from: "aws.ec2.metrics.CPUCreditUsage.avg"
           to: "aws.ec2.cpu.credit_usage"
         - from: "aws.ec2.metrics.CPUCreditBalance.avg"
@@ -48,22 +46,6 @@ processors:
           to: "aws.ec2.status.check_failed_instance"
         - from: "aws.ec2.metrics.StatusCheckFailed_System.avg"
           to: "aws.ec2.status.check_failed_system"
-        - from: "aws.ec2.metrics.DiskReadBytes.sum"
-          to: "aws.ec2.diskio.read.bytes"
-        - from: "aws.ec2.metrics.DiskReadOps.sum"
-          to: "aws.ec2.diskio.read.count"
-        - from: "aws.ec2.metrics.DiskWriteBytes.sum"
-          to: "aws.ec2.diskio.write.bytes"
-        - from: "aws.ec2.metrics.DiskWriteOps.sum"
-          to: "aws.ec2.diskio.write.count"
-        - from: "aws.ec2.metrics.NetworkIn.sum"
-          to: "aws.ec2.network.in.bytes"
-        - from: "aws.ec2.metrics.NetworkPacketsIn.sum"
-          to: "aws.ec2.network.in.packets"
-        - from: "aws.ec2.metrics.NetworkOut.sum"
-          to: "aws.ec2.network.out.bytes"
-        - from: "aws.ec2.metrics.NetworkPacketsOut.sum"
-          to: "aws.ec2.network.out.packets"
         - from: "aws.ec2.metrics.NetworkIn.rate"
           to: "aws.ec2.network.in.bytes_per_sec"
         - from: "aws.ec2.metrics.NetworkOut.rate"
@@ -85,3 +67,12 @@ processors:
       ignore_missing: true
       fields:
         - "aws.ec2.metrics"
+        - "aws.ec2.cpu.total.pct"
+        - "aws.ec2.diskio.read.bytes"
+        - "aws.ec2.diskio.read.count"
+        - "aws.ec2.diskio.write.bytes"
+        - "aws.ec2.diskio.write.count"
+        - "aws.ec2.network.in.bytes"
+        - "aws.ec2.network.in.packets"
+        - "aws.ec2.network.out.bytes"
+        - "aws.ec2.network.out.packets"