Skip to content

Commit

Permalink
[Metricbeat] Add vpc metricset for aws module (elastic#16111)
Browse files Browse the repository at this point in the history
* Add vpn into vpc metricset
* Add NATGateway and TrasitGateway
  • Loading branch information
kaiyan-sheng authored and blakerouse committed Feb 28, 2020
1 parent 421fd91 commit 6e79791
Show file tree
Hide file tree
Showing 13 changed files with 333 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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*

Expand Down
6 changes: 6 additions & 0 deletions metricbeat/docs/fields.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions metricbeat/docs/modules/aws.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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[]
Expand All @@ -356,3 +358,5 @@ include::aws/sqs.asciidoc[]

include::aws/usage.asciidoc[]

include::aws/vpc.asciidoc[]

24 changes: 24 additions & 0 deletions metricbeat/docs/modules/aws/vpc.asciidoc
Original file line number Diff line number Diff line change
@@ -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[]
----
3 changes: 2 additions & 1 deletion metricbeat/docs/modules_list.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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>>
Expand All @@ -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[]
Expand Down
2 changes: 1 addition & 1 deletion x-pack/metricbeat/module/aws/fields.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions x-pack/metricbeat/module/aws/module.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ metricsets:
- sns
- lambda
- dynamodb
- vpc
74 changes: 74 additions & 0 deletions x-pack/metricbeat/module/aws/vpc/_meta/data.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
Loading

0 comments on commit 6e79791

Please sign in to comment.