[Metricbeat] Move elb metricset to ga (#15485) (#15501)

* Move elb metricset to ga * update changelog (cherry picked from commit d7aa7f9)
elastic · Jan 13, 2020 · a6d6e21 · a6d6e21
1 parent 90afa71
commit a6d6e21
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 6 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -141,6 +141,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 *Metricbeat*
 
 - Add cost warnings for the azure module. {pull}15356[15356]
+- Release elb module as GA. {pull}15485[15485]
 
 *Packetbeat*
 

diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
@@ -1728,7 +1728,7 @@ Metrics that returned from Cloudwatch API query. - name: billing
   type: group
   description: >
     `elb` contains the metrics that were scraped from AWS CloudWatch which contains monitoring metrics sent by AWS ELB.
-  release: beta
+  release: ga
   fields:
 - name: rds
   type: group

diff --git a/metricbeat/docs/modules/aws/elb.asciidoc b/metricbeat/docs/modules/aws/elb.asciidoc
@@ -5,8 +5,6 @@ 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[]
 
 This is a default metricset. If the host module is unconfigured, this metricset is enabled by default.

diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc
@@ -20,7 +20,7 @@ This file is generated! See scripts/mage/docs_collector.go
 |<<metricbeat-metricset-aws-cloudwatch,cloudwatch>>   
 |<<metricbeat-metricset-aws-ebs,ebs>>   
 |<<metricbeat-metricset-aws-ec2,ec2>>   
-|<<metricbeat-metricset-aws-elb,elb>> beta[]  
+|<<metricbeat-metricset-aws-elb,elb>>   
 |<<metricbeat-metricset-aws-rds,rds>>   
 |<<metricbeat-metricset-aws-s3_daily_storage,s3_daily_storage>>   
 |<<metricbeat-metricset-aws-s3_request,s3_request>>   

diff --git a/x-pack/metricbeat/module/aws/elb/_meta/fields.yml b/x-pack/metricbeat/module/aws/elb/_meta/fields.yml
@@ -2,5 +2,5 @@
   type: group
   description: >
     `elb` contains the metrics that were scraped from AWS CloudWatch which contains monitoring metrics sent by AWS ELB.
-  release: beta
+  release: ga
   fields:
diff --git a/x-pack/metricbeat/module/aws/fields.go b/x-pack/metricbeat/module/aws/fields.go