Release CouchDB metricbeat module as GA (#14300)

elastic · Oct 29, 2019 · 859661c · 859661c
1 parent 6c6b396
commit 859661c
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 12 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -455,6 +455,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Add ability to filter by tags for cloudwatch metricset. {pull}13758[13758] {issue}13145[13145]
 - Release cloudwatch, s3_daily_storage, s3_request, sqs and rds metricset as GA. {pull}14114[14114] {issue}14059[14059]
 - Add Oracle overview dashboard {pull}14021[14021]
+- Release CouchDB module as GA. {pull}14300[14300]
 - Add `elasticsearch/enrich` metricset. {pull}14243[14243] {issue}14221[14221]
 
 *Packetbeat*

diff --git a/metricbeat/docs/modules/couchdb.asciidoc b/metricbeat/docs/modules/couchdb.asciidoc
@@ -5,8 +5,6 @@ This file is generated! See scripts/mage/docs_collector.go
 [[metricbeat-module-couchdb]]
 == couchdb module
 
-beta[]
-
 This is the couchdb module.
 
 The default metricset is `server`.

diff --git a/metricbeat/docs/modules/couchdb/server.asciidoc b/metricbeat/docs/modules/couchdb/server.asciidoc
@@ -5,8 +5,6 @@ This file is generated! See scripts/mage/docs_collector.go
 [[metricbeat-metricset-couchdb-server]]
 === couchdb server metricset
 
-beta[]
-
 include::../../../module/couchdb/server/_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
@@ -45,8 +45,8 @@ This file is generated! See scripts/mage/docs_collector.go
 .3+| .3+|  |<<metricbeat-metricset-couchbase-bucket,bucket>>   
 |<<metricbeat-metricset-couchbase-cluster,cluster>>   
 |<<metricbeat-metricset-couchbase-node,node>>   
-|<<metricbeat-module-couchdb,couchdb>>  beta[]   |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
-.1+| .1+|  |<<metricbeat-metricset-couchdb-server,server>> beta[]  
+|<<metricbeat-module-couchdb,couchdb>>     |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
+.1+| .1+|  |<<metricbeat-metricset-couchdb-server,server>>   
 |<<metricbeat-module-docker,Docker>>     |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
 .9+| .9+|  |<<metricbeat-metricset-docker-container,container>>   
 |<<metricbeat-metricset-docker-cpu,cpu>>   

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

diff --git a/metricbeat/module/couchdb/fields.go b/metricbeat/module/couchdb/fields.go
diff --git a/metricbeat/module/couchdb/server/_meta/fields.yml b/metricbeat/module/couchdb/server/_meta/fields.yml
@@ -2,7 +2,7 @@
   type: group
   description: >
     Contains CouchDB server stats
-  release: beta  
+  release: ga
   fields:
     - name: httpd
       type: group

diff --git a/metricbeat/module/couchdb/server/server.go b/metricbeat/module/couchdb/server/server.go
@@ -20,7 +20,6 @@ package server
 import (
 	"github.com/pkg/errors"
 
-	"github.com/elastic/beats/libbeat/common/cfgwarn"
 	"github.com/elastic/beats/metricbeat/helper"
 	"github.com/elastic/beats/metricbeat/mb"
 	"github.com/elastic/beats/metricbeat/mb/parse"
@@ -53,8 +52,6 @@ type MetricSet struct {
 
 // New creates a new instance of the MetricSet.
 func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
-	cfgwarn.Beta("The couchdb server metricset is beta.")
-
 	config := struct{}{}
 	if err := base.Module().UnpackConfig(&config); err != nil {
 		return nil, err