[Metricbeat] Release mongodb,mysql,postgresql metricsets as GA (elast…

…ic#10242) - Release mongodb.metrics and mongodb.replstatus as GA. - Release mysql.galera_status as GA - Release postgresql.statement as GA
ruflin · Jan 22, 2019 · 19bbe2b · 19bbe2b
1 parent 4f826ed
commit 19bbe2b
Show file tree

Hide file tree

Showing 17 changed files with 17 additions and 30 deletions.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -192,6 +192,10 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Release aerospike module as GA. {pull}10203[10203]
 - Release kubernetes apiserver and event metricsets as GA {pull}10212[10212]
 - Release Couchbase module as GA. {pull}10201[10201]
+- 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]

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

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

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

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

diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc
@@ -93,13 +93,13 @@ This file is generated! See scripts/docs_collector.py
 |<<metricbeat-module-mongodb,MongoDB>>     |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
 .5+| .5+|  |<<metricbeat-metricset-mongodb-collstats,collstats>>   
 |<<metricbeat-metricset-mongodb-dbstats,dbstats>>   
-|<<metricbeat-metricset-mongodb-metrics,metrics>> experimental[]  
-|<<metricbeat-metricset-mongodb-replstatus,replstatus>> experimental[]  
+|<<metricbeat-metricset-mongodb-metrics,metrics>>   
+|<<metricbeat-metricset-mongodb-replstatus,replstatus>>   
 |<<metricbeat-metricset-mongodb-status,status>>   
 |<<metricbeat-module-munin,Munin>>  beta[]   |image:./images/icon-no.png[No prebuilt dashboards]    |  
 .1+| .1+|  |<<metricbeat-metricset-munin-node,node>> beta[]  
 |<<metricbeat-module-mysql,MySQL>>     |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
-.2+| .2+|  |<<metricbeat-metricset-mysql-galera_status,galera_status>> experimental[]  
+.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[]  
@@ -115,7 +115,7 @@ This file is generated! See scripts/docs_collector.py
 .4+| .4+|  |<<metricbeat-metricset-postgresql-activity,activity>>   
 |<<metricbeat-metricset-postgresql-bgwriter,bgwriter>>   
 |<<metricbeat-metricset-postgresql-database,database>>   
-|<<metricbeat-metricset-postgresql-statement,statement>> beta[]  
+|<<metricbeat-metricset-postgresql-statement,statement>>   
 |<<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[]  

diff --git a/metricbeat/module/mongodb/fields.go b/metricbeat/module/mongodb/fields.go
diff --git a/metricbeat/module/mongodb/metrics/_meta/fields.yml b/metricbeat/module/mongodb/metrics/_meta/fields.yml
@@ -1,5 +1,6 @@
 - name: metrics
   type: group
+  release: ga
   description: >
     Statistics that reflect the current use and state of a running `mongod` instance
     for more information, take a look at https://docs.mongodb.com/manual/reference/command/serverStatus/#serverstatus.metrics

diff --git a/metricbeat/module/mongodb/metrics/metrics.go b/metricbeat/module/mongodb/metrics/metrics.go
@@ -19,7 +19,6 @@ package metrics
 
 import (
 	"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/mongodb"
@@ -48,7 +47,6 @@ type MetricSet struct {
 // Part of new is also setting up the configuration by processing additional
 // configuration entries if needed.
 func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
-	cfgwarn.Experimental("The mongodb metrics metricset is experimental.")
 	ms, err := mongodb.NewMetricSet(base)
 	if err != nil {
 		return nil, err

diff --git a/metricbeat/module/mongodb/replstatus/_meta/fields.yml b/metricbeat/module/mongodb/replstatus/_meta/fields.yml
@@ -1,5 +1,6 @@
 - name: replstatus
   type: group
+  release: ga
   description: >
     replstatus provides an overview of replica set status.
   fields:

diff --git a/metricbeat/module/mongodb/replstatus/replstatus.go b/metricbeat/module/mongodb/replstatus/replstatus.go
@@ -18,10 +18,9 @@
 package replstatus
 
 import (
-	mgo "gopkg.in/mgo.v2"
+	"gopkg.in/mgo.v2"
 
 	"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/mongodb"
@@ -46,8 +45,6 @@ type MetricSet struct {
 // Part of new is also setting up the configuration by processing additional
 // configuration entries if needed.
 func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
-	cfgwarn.Experimental("The mongodb replstatus metricset is experimental.")
-
 	ms, err := mongodb.NewMetricSet(base)
 	if err != nil {
 		return nil, err

diff --git a/metricbeat/module/mysql/fields.go b/metricbeat/module/mysql/fields.go
diff --git a/metricbeat/module/mysql/galera_status/_meta/fields.yml b/metricbeat/module/mysql/galera_status/_meta/fields.yml
@@ -1,6 +1,6 @@
 - name: galera_status
   type: group
-  release: experimental
+  release: ga
   description: >
     `galera_status` contains the metrics that were obtained by the status SQL query on Galera.
   fields:

diff --git a/metricbeat/module/mysql/galera_status/status.go b/metricbeat/module/mysql/galera_status/status.go
@@ -28,7 +28,6 @@ import (
 	"database/sql"
 
 	"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/mysql"
@@ -56,8 +55,6 @@ type MetricSet struct {
 // New create a new instance of the MetricSet
 // Loads query_mode config setting from the config file
 func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
-	cfgwarn.Experimental("The mysql galera_status metricset is experimental")
-
 	return &MetricSet{BaseMetricSet: base}, nil
 }
 

diff --git a/metricbeat/module/postgresql/fields.go b/metricbeat/module/postgresql/fields.go
diff --git a/metricbeat/module/postgresql/statement/_meta/fields.yml b/metricbeat/module/postgresql/statement/_meta/fields.yml
@@ -4,7 +4,7 @@
     One document per query per user per database, showing information related
     invocation of that query, such as cpu usage and total time. Collected by
     querying pg_stat_statements.
-  release: beta
+  release: ga
   fields:
     - name: user.id
       type: long
@@ -88,4 +88,4 @@
     - name: memory.temp.written
       type: long
       description: >
-        Total number of temp block cache written by the query.
+        Total number of temp block cache written by the query.
diff --git a/metricbeat/module/postgresql/statement/statement.go b/metricbeat/module/postgresql/statement/statement.go
@@ -23,7 +23,6 @@ import (
 	"github.com/pkg/errors"
 
 	"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/postgresql"
 
@@ -52,8 +51,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.Beta("The statement metricset is beta")
-
 	config := struct{}{}
 	if err := base.Module().UnpackConfig(&config); err != nil {
 		return nil, err