Cherry-pick #14312 to 7.x: [Metricbeat] Release ebs as GA (#14559)

* [Metricbeat] Release ebs as GA (#14312) * [Metricbeat] Release ebs as GA (cherry picked from commit fc2ac4d) * update changelog
elastic · Nov 18, 2019 · d8d70c3 · d8d70c3
1 parent c003f9b
commit d8d70c3
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 5 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -473,6 +473,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Release CoreDNS module as GA. {pull}14308[14308]
 - Release CouchDB module as GA. {pull}14300[14300]
 - Add `elasticsearch/enrich` metricset. {pull}14243[14243] {issue}14221[14221]
+- Release aws ebs metricset as GA. {pull}14312[14312] {issue}14060[14060]
 - Add metrics to envoyproxy server metricset and support for envoy proxy 1.12. {pull}14416[14416] {issue}13642[13642]
 
 *Packetbeat*

diff --git a/metricbeat/docs/modules/aws/ebs.asciidoc b/metricbeat/docs/modules/aws/ebs.asciidoc
@@ -5,8 +5,6 @@ This file is generated! See scripts/mage/docs_collector.go
 [[metricbeat-metricset-aws-ebs]]
 === aws ebs metricset
 
-beta[]
-
 include::../../../../x-pack/metricbeat/module/aws/ebs/_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
@@ -13,7 +13,7 @@ This file is generated! See scripts/mage/docs_collector.go
 .1+| .1+|  |<<metricbeat-metricset-appsearch-stats,stats>> beta[]  
 |<<metricbeat-module-aws,aws>>     |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
 .8+| .8+|  |<<metricbeat-metricset-aws-cloudwatch,cloudwatch>>   
-|<<metricbeat-metricset-aws-ebs,ebs>> beta[]  
+|<<metricbeat-metricset-aws-ebs,ebs>>   
 |<<metricbeat-metricset-aws-ec2,ec2>>   
 |<<metricbeat-metricset-aws-elb,elb>> beta[]  
 |<<metricbeat-metricset-aws-rds,rds>>   

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