elastic · kaiyan-sheng · Aug 5, 2019 · Jul 8, 2019 · Jul 17, 2019 · Jul 17, 2019
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -300,6 +300,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Add support to load default aws config file to get credentials. {pull}12727[12727] {issue}12708[12708]
 - Add statistic option into cloudwatch metricset. {issue}12370[12370] {pull}12840[12840]
 - Add cgroup memory stats to docker/memory metricset {pull}12916[12916]
+- Add AWS elb metricset. {pull}12952[12952] {issue}11701[11701]
 
 *Packetbeat*
 

diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
@@ -1155,6 +1155,12 @@ type: integer
 
 --
 
+[float]
+=== elb
+
+`elb` contains the metrics that were scraped from AWS CloudWatch which contains monitoring metrics sent by AWS ELB.
+
+
 [float]
 === rds
 

diff --git a/metricbeat/docs/images/metricbeat-aws-elb-overview.png b/metricbeat/docs/images/metricbeat-aws-elb-overview.png
diff --git a/metricbeat/docs/modules/aws.asciidoc b/metricbeat/docs/modules/aws.asciidoc
@@ -163,6 +163,8 @@ The following metricsets are available:
 
 * <<metricbeat-metricset-aws-ec2,ec2>>
 
+* <<metricbeat-metricset-aws-elb,elb>>
+
 * <<metricbeat-metricset-aws-rds,rds>>
 
 * <<metricbeat-metricset-aws-s3_daily_storage,s3_daily_storage>>
@@ -175,6 +177,8 @@ include::aws/cloudwatch.asciidoc[]
 
 include::aws/ec2.asciidoc[]
 
+include::aws/elb.asciidoc[]
+
 include::aws/rds.asciidoc[]
 
 include::aws/s3_daily_storage.asciidoc[]

diff --git a/metricbeat/docs/modules/aws/elb.asciidoc b/metricbeat/docs/modules/aws/elb.asciidoc
@@ -0,0 +1,23 @@
+////
+This file is generated! See scripts/mage/docs_collector.go
+////
+
+[[metricbeat-metricset-aws-elb]]
+=== aws elb metricset
+
+beta[]
+
+include::../../../../x-pack/metricbeat/module/aws/elb/_meta/docs.asciidoc[]
+
+
+==== 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/elb/_meta/data.json[]
+----
diff --git a/metricbeat/docs/modules/cockroachdb/status.asciidoc b/metricbeat/docs/modules/cockroachdb/status.asciidoc
@@ -15,3 +15,9 @@ include::../../../../x-pack/metricbeat/module/cockroachdb/status/_meta/docs.asci
 For a description of each field in the metricset, see the
 <<exported-fields-cockroachdb,exported fields>> section.
 
+Here is an example document generated by this metricset:
+
+[source,json]
+----
+include::../../../../x-pack/metricbeat/module/cockroachdb/status/_meta/data.json[]
+----
diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc
@@ -10,8 +10,9 @@ This file is generated! See scripts/mage/docs_collector.go
 |<<metricbeat-module-apache,Apache>>     |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
 .1+| .1+|  |<<metricbeat-metricset-apache-status,status>>   
 |<<metricbeat-module-aws,aws>>     |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
-.6+| .6+|  |<<metricbeat-metricset-aws-cloudwatch,cloudwatch>> beta[]  
+.7+| .7+|  |<<metricbeat-metricset-aws-cloudwatch,cloudwatch>> beta[]  
 |<<metricbeat-metricset-aws-ec2,ec2>>   
+|<<metricbeat-metricset-aws-elb,elb>> beta[]  
 |<<metricbeat-metricset-aws-rds,rds>> beta[]  
 |<<metricbeat-metricset-aws-s3_daily_storage,s3_daily_storage>> beta[]  
 |<<metricbeat-metricset-aws-s3_request,s3_request>> beta[]  

diff --git a/x-pack/metricbeat/magefile.go b/x-pack/metricbeat/magefile.go
@@ -90,7 +90,7 @@ func TestPackages() error {
 		devtools.WithModules(),
 
 		// To be increased or removed when more light modules are added
-		devtools.MinModules(1))
+		devtools.MinModules(2))
 }
 
 // Fields generates a fields.yml and fields.go for each module.
-Original file line number
+Diff line change
@@ Expand Up / @@ -1155,6 +1155,12 @@ type: integer @@
     --
+    [float]
+    === elb
+    `elb` contains the metrics that were scraped from AWS CloudWatch which contains monitoring metrics sent by AWS ELB.
     [float]
     === rds
@@ Expand Down @@