Making RabbitMQ Metricbeat module GA. (#10165) (#10220)

(cherry picked from commit 68bd655)
elastic · Jan 22, 2019 · 78d6e3f · 78d6e3f
1 parent 563e422
commit 78d6e3f
Show file tree

Hide file tree

Showing 18 changed files with 12 additions and 35 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -172,6 +172,7 @@ https://github.com/elastic/beats/compare/v6.6.0...6.x[Check the HEAD diff]
 - Release etcd module as GA. {pull}10200[10200]
 - Release Couchbase module as GA. {pull}10201[10201]
 - Release aerospike module as GA. {pull}10203[10203]
+- Making RabbitMQ Metricbeat module GA. {pull}10165[10165]
 
 *Packetbeat*
 

diff --git a/metricbeat/docs/modules/rabbitmq.asciidoc b/metricbeat/docs/modules/rabbitmq.asciidoc
@@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py
 [[metricbeat-module-rabbitmq]]
 == RabbitMQ module
 
-beta[]
-
 The RabbitMQ module uses http://www.rabbitmq.com/management.html[HTTP API] created by the management plugin to collect metrics.
 
 The default metricsets are `connection`, `node`, `queue` and `exchange`.

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

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

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

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

diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc
@@ -113,11 +113,11 @@ This file is generated! See scripts/docs_collector.py
 |<<metricbeat-module-prometheus,Prometheus>>     |image:./images/icon-no.png[No prebuilt dashboards]    |  
 .2+| .2+|  |<<metricbeat-metricset-prometheus-collector,collector>>   
 |<<metricbeat-metricset-prometheus-stats,stats>> beta[]  
-|<<metricbeat-module-rabbitmq,RabbitMQ>>  beta[]   |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
-.4+| .4+|  |<<metricbeat-metricset-rabbitmq-connection,connection>> beta[]  
-|<<metricbeat-metricset-rabbitmq-exchange,exchange>> beta[]  
-|<<metricbeat-metricset-rabbitmq-node,node>> beta[]  
-|<<metricbeat-metricset-rabbitmq-queue,queue>> beta[]  
+|<<metricbeat-module-rabbitmq,RabbitMQ>>     |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
+.4+| .4+|  |<<metricbeat-metricset-rabbitmq-connection,connection>>   
+|<<metricbeat-metricset-rabbitmq-exchange,exchange>>   
+|<<metricbeat-metricset-rabbitmq-node,node>>   
+|<<metricbeat-metricset-rabbitmq-queue,queue>>   
 |<<metricbeat-module-redis,Redis>>     |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
 .3+| .3+|  |<<metricbeat-metricset-redis-info,info>>   
 |<<metricbeat-metricset-redis-key,key>>   

diff --git a/metricbeat/module/rabbitmq/_meta/fields.yml b/metricbeat/module/rabbitmq/_meta/fields.yml
@@ -2,7 +2,7 @@
   title: "RabbitMQ"
   description: >
     RabbitMQ module
-  release: beta
+  release: ga
   settings: ["ssl", "http"]
   fields:
     - name: rabbitmq

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

diff --git a/metricbeat/module/rabbitmq/connection/connection.go b/metricbeat/module/rabbitmq/connection/connection.go
@@ -19,7 +19,6 @@ package connection
 
 import (
 	"github.com/elastic/beats/libbeat/common"
-	"github.com/elastic/beats/libbeat/common/cfgwarn"
 	"github.com/elastic/beats/metricbeat/mb"
 	"github.com/elastic/beats/metricbeat/module/rabbitmq"
 )
@@ -38,8 +37,6 @@ type MetricSet struct {
 
 // New creates new instance of MetricSet
 func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
-	cfgwarn.Beta("The rabbitmq connection metricset is beta")
-
 	ms, err := rabbitmq.NewMetricSet(base, rabbitmq.ConnectionsPath)
 	if err != nil {
 		return nil, err

diff --git a/metricbeat/module/rabbitmq/exchange/_meta/docs.asciidoc b/metricbeat/module/rabbitmq/exchange/_meta/docs.asciidoc
@@ -1,3 +1 @@
-=== rabbitmq exchange MetricSet
-
 This is the exchange metricset of the module rabbitmq.
diff --git a/metricbeat/module/rabbitmq/exchange/_meta/fields.yml b/metricbeat/module/rabbitmq/exchange/_meta/fields.yml
@@ -2,7 +2,7 @@
   type: group
   description: >
     exchange
-  release: beta
+  release: ga
   fields:
     - name: name
       type: keyword

diff --git a/metricbeat/module/rabbitmq/exchange/exchange.go b/metricbeat/module/rabbitmq/exchange/exchange.go
@@ -19,7 +19,6 @@ package exchange
 
 import (
 	"github.com/elastic/beats/libbeat/common"
-	"github.com/elastic/beats/libbeat/common/cfgwarn"
 	"github.com/elastic/beats/metricbeat/mb"
 	"github.com/elastic/beats/metricbeat/module/rabbitmq"
 )
@@ -38,8 +37,6 @@ type MetricSet struct {
 
 // New creates new instance of MetricSet
 func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
-	cfgwarn.Beta("The rabbitmq exchange metricset is beta")
-
 	ms, err := rabbitmq.NewMetricSet(base, rabbitmq.ExchangesPath)
 	if err != nil {
 		return nil, err

diff --git a/metricbeat/module/rabbitmq/fields.go b/metricbeat/module/rabbitmq/fields.go
diff --git a/metricbeat/module/rabbitmq/node/_meta/fields.yml b/metricbeat/module/rabbitmq/node/_meta/fields.yml
@@ -2,7 +2,7 @@
   type: group
   description: >
     node
-  release: beta
+  release: ga
   fields:
     - name: disk.free.bytes
       type: long

diff --git a/metricbeat/module/rabbitmq/node/node.go b/metricbeat/module/rabbitmq/node/node.go
@@ -22,7 +22,6 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/elastic/beats/libbeat/common/cfgwarn"
 	"github.com/elastic/beats/metricbeat/mb"
 	"github.com/elastic/beats/metricbeat/module/rabbitmq"
 )
@@ -46,8 +45,6 @@ type ClusterMetricSet struct {
 
 // New creates new instance of MetricSet
 func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
-	cfgwarn.Beta("The rabbitmq node metricset is beta")
-
 	config := defaultConfig
 	if err := base.Module().UnpackConfig(&config); err != nil {
 		return nil, err

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

diff --git a/metricbeat/module/rabbitmq/queue/queue.go b/metricbeat/module/rabbitmq/queue/queue.go
@@ -19,7 +19,6 @@ package queue
 
 import (
 	"github.com/elastic/beats/libbeat/common"
-	"github.com/elastic/beats/libbeat/common/cfgwarn"
 	"github.com/elastic/beats/metricbeat/mb"
 	"github.com/elastic/beats/metricbeat/module/rabbitmq"
 )
@@ -38,8 +37,6 @@ type MetricSet struct {
 
 // New creates new instance of MetricSet
 func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
-	cfgwarn.Beta("The rabbitmq queue metricset is beta")
-
 	ms, err := rabbitmq.NewMetricSet(base, rabbitmq.QueuesPath)
 	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-rabbitmq-connection]]
     === RabbitMQ connection metricset
-    beta[]
     include::../../../module/rabbitmq/connection/_meta/docs.asciidoc[]
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1 @@
		=== rabbitmq exchange MetricSet

		This is the exchange metricset of the module rabbitmq.