[Metricbeat] Release nats module as GA (#10281)

elastic · Jan 23, 2019 · d55ae55 · d55ae55
1 parent bb535f9
commit d55ae55
Show file tree

Hide file tree

Showing 17 changed files with 12 additions and 30 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -197,15 +197,14 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Release Couchbase module as GA. {pull}10201[10201]
 - Release RabbitMQ module GA. {pull}10165[10165]
 - Release envoyproxy module GA. {pull}10223[10223]
-- Making RabbitMQ Metricbeat module GA. {pull}10165[10165]
 - Release mongodb.metrics and mongodb.replstatus as GA. {pull}10242[10242]
 - Release mysql.galera_status as GA. {pull}10242[10242]
 - Release postgresql.statement as GA. {pull}10242[10242]
 - Release RabbitMQ Metricbeat module GA. {pull}10165[10165]
 - Release Dropwizard module as GA. {pull}10240[10240]
 - Release Graphite module as GA. {pull}10240[10240]
 - Release http.server metricset as GA. {pull}10240[10240]
-- Making RabbitMQ Metricbeat module GA. {pull}10165[10165]
+- Release Nats module as GA. {pull}10281[10281]
 - Release use of xpack.enabled: true flag in Elasticsearch and Kibana modules as GA. {pull}10222[10222]
 
 *Packetbeat*

diff --git a/metricbeat/docs/modules/nats.asciidoc b/metricbeat/docs/modules/nats.asciidoc
@@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py
 [[metricbeat-module-nats]]
 == Nats module
 
-experimental[]
-
 This is the nats module.
 
 This is the Nats Module. The Nats module uses http://localhost:8222 APIs to collect metrics.

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

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

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

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

diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc
@@ -101,11 +101,11 @@ This file is generated! See scripts/docs_collector.py
 |<<metricbeat-module-mysql,MySQL>>     |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
 .2+| .2+|  |<<metricbeat-metricset-mysql-galera_status,galera_status>>   
 |<<metricbeat-metricset-mysql-status,status>>   
-|<<metricbeat-module-nats,Nats>>  experimental[]   |image:./images/icon-no.png[No prebuilt dashboards]    |  
-.4+| .4+|  |<<metricbeat-metricset-nats-connections,connections>> experimental[]  
-|<<metricbeat-metricset-nats-routes,routes>> experimental[]  
-|<<metricbeat-metricset-nats-stats,stats>> experimental[]  
-|<<metricbeat-metricset-nats-subscriptions,subscriptions>> experimental[]  
+|<<metricbeat-module-nats,Nats>>     |image:./images/icon-no.png[No prebuilt dashboards]    |  
+.4+| .4+|  |<<metricbeat-metricset-nats-connections,connections>>   
+|<<metricbeat-metricset-nats-routes,routes>>   
+|<<metricbeat-metricset-nats-stats,stats>>   
+|<<metricbeat-metricset-nats-subscriptions,subscriptions>>   
 |<<metricbeat-module-nginx,Nginx>>     |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
 .1+| .1+|  |<<metricbeat-metricset-nginx-stubstatus,stubstatus>>   
 |<<metricbeat-module-php_fpm,PHP_FPM>>     |image:./images/icon-no.png[No prebuilt dashboards]    |  

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

diff --git a/metricbeat/module/nats/connections/_meta/fields.yml b/metricbeat/module/nats/connections/_meta/fields.yml
@@ -2,6 +2,7 @@
   type: group
   description: >
     Contains nats connection related metrics
+  release: ga
   fields:
     - name: total
       type: integer

diff --git a/metricbeat/module/nats/connections/connections.go b/metricbeat/module/nats/connections/connections.go
@@ -18,7 +18,6 @@
 package connections
 
 import (
-	"github.com/elastic/beats/libbeat/common/cfgwarn"
 	"github.com/elastic/beats/libbeat/logp"
 	"github.com/elastic/beats/metricbeat/helper"
 	"github.com/elastic/beats/metricbeat/helper/elastic"
@@ -63,8 +62,6 @@ type MetricSet struct {
 // New creates a new instance of the MetricSet. New is responsible for unpacking
 // any MetricSet specific configuration options if there are any.
 func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
-	cfgwarn.Experimental("The nats connections metricset is experimental.")
-
 	config := struct{}{}
 	if err := base.Module().UnpackConfig(&config); err != nil {
 		return nil, err

diff --git a/metricbeat/module/nats/fields.go b/metricbeat/module/nats/fields.go
diff --git a/metricbeat/module/nats/routes/_meta/fields.yml b/metricbeat/module/nats/routes/_meta/fields.yml
@@ -2,6 +2,7 @@
   type: group
   description: >
     Contains nats route related metrics
+  release: ga
   fields:
     - name: total
       type: integer

diff --git a/metricbeat/module/nats/routes/routes.go b/metricbeat/module/nats/routes/routes.go
@@ -18,7 +18,6 @@
 package routes
 
 import (
-	"github.com/elastic/beats/libbeat/common/cfgwarn"
 	"github.com/elastic/beats/libbeat/logp"
 	"github.com/elastic/beats/metricbeat/helper"
 	"github.com/elastic/beats/metricbeat/helper/elastic"
@@ -63,8 +62,6 @@ type MetricSet struct {
 // New creates a new instance of the MetricSet. New is responsible for unpacking
 // any MetricSet specific configuration options if there are any.
 func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
-	cfgwarn.Experimental("The nats routes metricset is experimental.")
-
 	config := struct{}{}
 	if err := base.Module().UnpackConfig(&config); err != nil {
 		return nil, err

diff --git a/metricbeat/module/nats/stats/_meta/fields.yml b/metricbeat/module/nats/stats/_meta/fields.yml
@@ -2,6 +2,7 @@
   type: group
   description: >
     Contains nats var related metrics
+  release: ga
   fields:
     - name: uptime
       type: long

diff --git a/metricbeat/module/nats/stats/stats.go b/metricbeat/module/nats/stats/stats.go
@@ -18,7 +18,6 @@
 package stats
 
 import (
-	"github.com/elastic/beats/libbeat/common/cfgwarn"
 	"github.com/elastic/beats/libbeat/logp"
 	"github.com/elastic/beats/metricbeat/helper"
 	"github.com/elastic/beats/metricbeat/helper/elastic"
@@ -63,8 +62,6 @@ type MetricSet struct {
 // New creates a new instance of the MetricSet. New is responsible for unpacking
 // any MetricSet specific configuration options if there are any.
 func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
-	cfgwarn.Experimental("The nats stats metricset is experimental.")
-
 	config := struct{}{}
 	if err := base.Module().UnpackConfig(&config); err != nil {
 		return nil, err

diff --git a/metricbeat/module/nats/subscriptions/_meta/fields.yml b/metricbeat/module/nats/subscriptions/_meta/fields.yml
@@ -2,6 +2,7 @@
   type: group
   description: >
     Contains nats subscriptions related metrics
+  release: ga
   fields:
     - name: total
       type: integer

diff --git a/metricbeat/module/nats/subscriptions/subscriptions.go b/metricbeat/module/nats/subscriptions/subscriptions.go
@@ -18,7 +18,6 @@
 package subscriptions
 
 import (
-	"github.com/elastic/beats/libbeat/common/cfgwarn"
 	"github.com/elastic/beats/libbeat/logp"
 	"github.com/elastic/beats/metricbeat/helper"
 	"github.com/elastic/beats/metricbeat/helper/elastic"
@@ -63,8 +62,6 @@ type MetricSet struct {
 // New creates a new instance of the MetricSet. New is responsible for unpacking
 // any MetricSet specific configuration options if there are any.
 func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
-	cfgwarn.Experimental("The nats subscriptions metricset is experimental.")
-
 	config := struct{}{}
 	if err := base.Module().UnpackConfig(&config); err != nil {
 		return nil, err