elastic · ruflin · Jan 21, 2019 · Jan 21, 2019 · Jan 21, 2019
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -171,6 +171,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Release Elastic stack modules (Elasticsearch, Logstash, and Kibana) as GA. {pull}10094[10094]
 - Release Ceph module as GA. {pull}10202[10202]
 - Release aerospike module as GA. {pull}10203[10203]
+- Release Couchbase module as GA. {pull}10201[10201]
 
 *Packetbeat*
 

diff --git a/metricbeat/docs/modules/couchbase.asciidoc b/metricbeat/docs/modules/couchbase.asciidoc
@@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py
 [[metricbeat-module-couchbase]]
 == Couchbase module
 
-beta[]
-
 This module periodically fetches metrics from https://www.couchbase.com/[Couchbase]
 servers. The default metricsets are `bucket`, `cluster`, `node`.
 

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

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

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

diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc
@@ -17,10 +17,10 @@ This file is generated! See scripts/docs_collector.py
 |<<metricbeat-metricset-ceph-osd_df,osd_df>>   
 |<<metricbeat-metricset-ceph-osd_tree,osd_tree>>   
 |<<metricbeat-metricset-ceph-pool_disk,pool_disk>>   
-|<<metricbeat-module-couchbase,Couchbase>>  beta[]   |image:./images/icon-no.png[No prebuilt dashboards]    |  
-.3+| .3+|  |<<metricbeat-metricset-couchbase-bucket,bucket>> beta[]  
-|<<metricbeat-metricset-couchbase-cluster,cluster>> beta[]  
-|<<metricbeat-metricset-couchbase-node,node>> beta[]  
+|<<metricbeat-module-couchbase,Couchbase>>     |image:./images/icon-no.png[No prebuilt dashboards]    |  
+.3+| .3+|  |<<metricbeat-metricset-couchbase-bucket,bucket>>   
+|<<metricbeat-metricset-couchbase-cluster,cluster>>   
+|<<metricbeat-metricset-couchbase-node,node>>   
 |<<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/couchbase/_meta/fields.yml b/metricbeat/module/couchbase/_meta/fields.yml
@@ -3,7 +3,7 @@
   description: >
     Metrics collected from Couchbase servers.
   short_config: false
-  release: beta
+  release: ga
   settings: ["ssl", "http"]
   fields:
     - name: couchbase

diff --git a/metricbeat/module/couchbase/bucket/_meta/fields.yml b/metricbeat/module/couchbase/bucket/_meta/fields.yml
@@ -2,7 +2,7 @@
   type: group
   description: >
     Couchbase bucket metrics.
-  release: beta
+  release: ga
   fields:
     - name: name
       type: keyword

diff --git a/metricbeat/module/couchbase/bucket/bucket.go b/metricbeat/module/couchbase/bucket/bucket.go
@@ -19,7 +19,6 @@ package bucket
 
 import (
 	"github.com/elastic/beats/libbeat/common"
-	"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"
@@ -54,8 +53,6 @@ type MetricSet struct {
 
 // New create a new instance of the MetricSet
 func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
-	cfgwarn.Beta("The couchbase bucket metricset is beta")
-
 	http, err := helper.NewHTTP(base)
 	if err != nil {
 		return nil, err

diff --git a/metricbeat/module/couchbase/cluster/_meta/fields.yml b/metricbeat/module/couchbase/cluster/_meta/fields.yml
@@ -2,7 +2,7 @@
   type: group
   description: >
     Couchbase cluster metrics.
-  release: beta
+  release: ga
   fields:
     - name: hdd.free.bytes
       format: bytes

diff --git a/metricbeat/module/couchbase/cluster/cluster.go b/metricbeat/module/couchbase/cluster/cluster.go
@@ -19,7 +19,6 @@ package cluster
 
 import (
 	"github.com/elastic/beats/libbeat/common"
-	"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"
@@ -54,8 +53,6 @@ type MetricSet struct {
 
 // New create a new instance of the MetricSet
 func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
-	cfgwarn.Beta("The couchbase cluster metricset is beta")
-
 	http, err := helper.NewHTTP(base)
 	if err != nil {
 		return nil, err

diff --git a/metricbeat/module/couchbase/fields.go b/metricbeat/module/couchbase/fields.go
diff --git a/metricbeat/module/couchbase/node/_meta/fields.yml b/metricbeat/module/couchbase/node/_meta/fields.yml
@@ -2,7 +2,7 @@
   type: group
   description: >
     Couchbase node metrics.
-  release: beta
+  release: ga
   fields:
     - name: cmd_get
       type: long

diff --git a/metricbeat/module/couchbase/node/node.go b/metricbeat/module/couchbase/node/node.go
@@ -19,7 +19,6 @@ package node
 
 import (
 	"github.com/elastic/beats/libbeat/common"
-	"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"
@@ -54,8 +53,6 @@ type MetricSet struct {
 
 // New create a new instance of the MetricSet
 func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
-	cfgwarn.Beta("The couchbase node metricset is beta")
-
 	http, err := helper.NewHTTP(base)
 	if err != nil {
 		return nil, err
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py @@
     [[metricbeat-metricset-couchbase-bucket]]
     === Couchbase bucket metricset
-    beta[]
     include::../../../module/couchbase/bucket/_meta/docs.asciidoc[]
@@ Expand Down @@