[Metricbeat] Release aerospike module as GA (elastic#10203)

(cherry picked from commit 48e21af)
ruflin · Jan 21, 2019 · bdff82b · bdff82b
1 parent 0f6e918
commit bdff82b
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 13 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -167,6 +167,7 @@ https://github.com/elastic/beats/compare/v6.6.0...6.x[Check the HEAD diff]
 - Release php_fpm module as GA. {pull}10198[10198]
 - Release Memcached module as GA. {pull}10199[10199]
 - Release etcd module as GA. {pull}10200[10200]
+- Release aerospike module as GA. {pull}10203[10203]
 
 *Packetbeat*
 

diff --git a/metricbeat/docs/modules/aerospike.asciidoc b/metricbeat/docs/modules/aerospike.asciidoc
@@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py
 [[metricbeat-module-aerospike]]
 == Aerospike module
 
-beta[]
-
 The Aerospike module uses the http://www.aerospike.com/docs/reference/info[Info command] to collect metrics. The default metricset is `namespace`.
 
 [float]

diff --git a/metricbeat/docs/modules/aerospike/namespace.asciidoc b/metricbeat/docs/modules/aerospike/namespace.asciidoc
@@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py
 [[metricbeat-metricset-aerospike-namespace]]
 === Aerospike namespace metricset
 
-beta[]
-
 include::../../../module/aerospike/namespace/_meta/docs.asciidoc[]
 
 

diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc
@@ -5,8 +5,8 @@ This file is generated! See scripts/docs_collector.py
 [options="header"]
 |===================================
 |Modules   |Dashboards   |Metricsets   
-|<<metricbeat-module-aerospike,Aerospike>>  beta[]   |image:./images/icon-no.png[No prebuilt dashboards]    |  
-.1+| .1+|  |<<metricbeat-metricset-aerospike-namespace,namespace>> beta[]  
+|<<metricbeat-module-aerospike,Aerospike>>     |image:./images/icon-no.png[No prebuilt dashboards]    |  
+.1+| .1+|  |<<metricbeat-metricset-aerospike-namespace,namespace>>   
 |<<metricbeat-module-apache,Apache>>     |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
 .1+| .1+|  |<<metricbeat-metricset-apache-status,status>>   
 |<<metricbeat-module-ceph,Ceph>>     |image:./images/icon-no.png[No prebuilt dashboards]    |  

diff --git a/metricbeat/module/aerospike/_meta/fields.yml b/metricbeat/module/aerospike/_meta/fields.yml
@@ -2,7 +2,7 @@
   title: "Aerospike"
   description: >
     Aerospike module
-  release: beta
+  release: ga
   fields:
     - name: aerospike
       type: group

diff --git a/metricbeat/module/aerospike/fields.go b/metricbeat/module/aerospike/fields.go
diff --git a/metricbeat/module/aerospike/namespace/_meta/fields.yml b/metricbeat/module/aerospike/namespace/_meta/fields.yml
@@ -2,7 +2,7 @@
   type: group
   description: >
     namespace
-  release: beta
+  release: ga
   fields:
     - name: client
       type: group

diff --git a/metricbeat/module/aerospike/namespace/namespace.go b/metricbeat/module/aerospike/namespace/namespace.go
@@ -24,7 +24,6 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/elastic/beats/libbeat/common"
-	"github.com/elastic/beats/libbeat/common/cfgwarn"
 	"github.com/elastic/beats/libbeat/logp"
 	"github.com/elastic/beats/metricbeat/mb"
 	"github.com/elastic/beats/metricbeat/module/aerospike"
@@ -53,9 +52,6 @@ type MetricSet struct {
 // configuration entries if needed.
 func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
 	config := struct{}{}
-
-	cfgwarn.Beta("The aerospike namespace metricset is beta")
-
 	if err := base.Module().UnpackConfig(&config); err != nil {
 		return nil, err
 	}