[Metricbeat] Add vpc metricset for aws module (elastic#16111)

* Add vpn into vpc metricset * Add NATGateway and TrasitGateway
blakerouse · Feb 28, 2020 · 6e79791 · 6e79791
1 parent 421fd91
commit 6e79791
Show file tree

Hide file tree

Showing 13 changed files with 333 additions and 2 deletions.
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
@@ -179,6 +179,7 @@ processing events. (CVE-2019-17596) See https://www.elastic.co/community/securit
 - Release cloudwatch, s3_daily_storage, s3_request, sqs and rds metricset as GA. {pull}14114[14114] {issue}14059[14059]
 - Add `elasticsearch/enrich` metricset. {pull}14243[14243] {issue}14221[14221]
 - Add new dashboards for Azure vms, vm guest metrics, vm scale sets {pull}14000[14000]
+- Add vpc metricset for aws module. {pull}16111[16111] {issue}14854[14854]
 
 *Functionbeat*
 

diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
@@ -3085,6 +3085,12 @@ type: keyword
 `usage` contains the metrics from Cloudwatch to track usage of some AWS resources.
 
 
+[float]
+=== vpc
+
+`vpc` contains the metrics from Cloudwatch to track usage of VPC related resources.
+
+
 [[exported-fields-azure]]
 == azure fields
 

diff --git a/metricbeat/docs/modules/aws.asciidoc b/metricbeat/docs/modules/aws.asciidoc
@@ -330,6 +330,8 @@ The following metricsets are available:
 
 * <<metricbeat-metricset-aws-usage,usage>>
 
+* <<metricbeat-metricset-aws-vpc,vpc>>
+
 include::aws/billing.asciidoc[]
 
 include::aws/cloudwatch.asciidoc[]
@@ -356,3 +358,5 @@ include::aws/sqs.asciidoc[]
 
 include::aws/usage.asciidoc[]
 
+include::aws/vpc.asciidoc[]
+
diff --git a/metricbeat/docs/modules/aws/vpc.asciidoc b/metricbeat/docs/modules/aws/vpc.asciidoc
@@ -0,0 +1,24 @@
+////
+This file is generated! See scripts/mage/docs_collector.go
+////
+
+[[metricbeat-metricset-aws-vpc]]
+=== aws vpc metricset
+
+beta[]
+
+include::../../../../x-pack/metricbeat/module/aws/vpc/_meta/docs.asciidoc[]
+
+This is a default metricset. If the host module is unconfigured, this metricset is enabled by default.
+
+==== Fields
+
+For a description of each field in the metricset, see the
+<<exported-fields-aws,exported fields>> section.
+
+Here is an example document generated by this metricset:
+
+[source,json]
+----
+include::../../../../x-pack/metricbeat/module/aws/vpc/_meta/data.json[]
+----
diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc
@@ -16,7 +16,7 @@ This file is generated! See scripts/mage/docs_collector.go
 |<<metricbeat-module-appsearch,App Search>>  beta[]   |image:./images/icon-no.png[No prebuilt dashboards]    |  
 .1+| .1+|  |<<metricbeat-metricset-appsearch-stats,stats>> beta[]  
 |<<metricbeat-module-aws,aws>>     |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
-.13+| .13+|  |<<metricbeat-metricset-aws-billing,billing>> beta[]  
+.14+| .14+|  |<<metricbeat-metricset-aws-billing,billing>> beta[]  
 |<<metricbeat-metricset-aws-cloudwatch,cloudwatch>>   
 |<<metricbeat-metricset-aws-dynamodb,dynamodb>> beta[]  
 |<<metricbeat-metricset-aws-ebs,ebs>>   
@@ -29,6 +29,7 @@ This file is generated! See scripts/mage/docs_collector.go
 |<<metricbeat-metricset-aws-sns,sns>> beta[]  
 |<<metricbeat-metricset-aws-sqs,sqs>>   
 |<<metricbeat-metricset-aws-usage,usage>> beta[]  
+|<<metricbeat-metricset-aws-vpc,vpc>> beta[]  
 |<<metricbeat-module-azure,azure>>  beta[]   |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
 .5+| .5+|  |<<metricbeat-metricset-azure-compute_vm,compute_vm>> beta[]  
 |<<metricbeat-metricset-azure-compute_vm_scaleset,compute_vm_scaleset>> beta[]  

diff --git a/x-pack/metricbeat/module/aws/fields.go b/x-pack/metricbeat/module/aws/fields.go
diff --git a/x-pack/metricbeat/module/aws/module.yml b/x-pack/metricbeat/module/aws/module.yml
@@ -7,3 +7,4 @@ metricsets:
   - sns
   - lambda
   - dynamodb
+  - vpc
diff --git a/x-pack/metricbeat/module/aws/vpc/_meta/data.json b/x-pack/metricbeat/module/aws/vpc/_meta/data.json
@@ -0,0 +1,74 @@
+{
+    "@timestamp": "2017-10-12T08:05:34.853Z",
+    "aws": {
+        "cloudwatch": {
+            "namespace": "AWS/NATGateway"
+        },
+        "dimensions": {
+            "NatGatewayId": "nat-0a5cb7b9807908cc0"
+        },
+        "natgateway": {
+            "metrics": {
+                "ActiveConnectionCount": {
+                    "max": 0
+                },
+                "BytesInFromDestination": {
+                    "sum": 0
+                },
+                "BytesInFromSource": {
+                    "sum": 0
+                },
+                "BytesOutToDestination": {
+                    "sum": 0
+                },
+                "BytesOutToSource": {
+                    "sum": 0
+                },
+                "ConnectionAttemptCount": {
+                    "sum": 0
+                },
+                "ConnectionEstablishedCount": {
+                    "sum": 0
+                },
+                "ErrorPortAllocation": {
+                    "sum": 0
+                },
+                "PacketsDropCount": {
+                    "sum": 0
+                },
+                "PacketsInFromDestination": {
+                    "sum": 0
+                },
+                "PacketsInFromSource": {
+                    "sum": 0
+                },
+                "PacketsOutToDestination": {
+                    "sum": 0
+                },
+                "PacketsOutToSource": {
+                    "sum": 0
+                }
+            }
+        }
+    },
+    "cloud": {
+        "account": {
+            "id": "627959692251",
+            "name": "elastic-test"
+        },
+        "provider": "aws",
+        "region": "us-west-2"
+    },
+    "event": {
+        "dataset": "aws.vpc",
+        "duration": 115000,
+        "module": "aws"
+    },
+    "metricset": {
+        "name": "vpc",
+        "period": 10000
+    },
+    "service": {
+        "type": "aws"
+    }
+}