From df38e8de748b1af84b7e1aa00d0e620dd2ea96db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20P=C3=A9rez-Aradros=20Herce?= Date: Thu, 15 Mar 2018 10:10:31 +0100 Subject: [PATCH 1/2] Move MongoDB module to GA --- metricbeat/docs/modules/mongodb.asciidoc | 2 -- metricbeat/docs/modules/mongodb/collstats.asciidoc | 2 -- metricbeat/docs/modules/mongodb/dbstats.asciidoc | 2 -- metricbeat/docs/modules/mongodb/status.asciidoc | 2 -- metricbeat/docs/modules_list.asciidoc | 8 ++++---- metricbeat/module/mongodb/_meta/fields.yml | 2 +- metricbeat/module/mongodb/collstats/_meta/fields.yml | 1 + metricbeat/module/mongodb/collstats/collstats.go | 3 --- metricbeat/module/mongodb/dbstats/_meta/fields.yml | 2 +- metricbeat/module/mongodb/dbstats/dbstats.go | 3 --- metricbeat/module/mongodb/status/_meta/fields.yml | 2 +- metricbeat/module/mongodb/status/status.go | 4 ---- 12 files changed, 8 insertions(+), 25 deletions(-) diff --git a/metricbeat/docs/modules/mongodb.asciidoc b/metricbeat/docs/modules/mongodb.asciidoc index 85cfa75bf16..d22da1dd170 100644 --- a/metricbeat/docs/modules/mongodb.asciidoc +++ b/metricbeat/docs/modules/mongodb.asciidoc @@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py [[metricbeat-module-mongodb]] == MongoDB module -beta[] - This module periodically fetches metrics from https://www.mongodb.com[MongoDB] servers. diff --git a/metricbeat/docs/modules/mongodb/collstats.asciidoc b/metricbeat/docs/modules/mongodb/collstats.asciidoc index a8a60a03027..33bf5b06912 100644 --- a/metricbeat/docs/modules/mongodb/collstats.asciidoc +++ b/metricbeat/docs/modules/mongodb/collstats.asciidoc @@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py [[metricbeat-metricset-mongodb-collstats]] === MongoDB collstats metricset -experimental[] - include::../../../module/mongodb/collstats/_meta/docs.asciidoc[] diff --git a/metricbeat/docs/modules/mongodb/dbstats.asciidoc b/metricbeat/docs/modules/mongodb/dbstats.asciidoc index fde85e2424f..52f124ef9b9 100644 --- a/metricbeat/docs/modules/mongodb/dbstats.asciidoc +++ b/metricbeat/docs/modules/mongodb/dbstats.asciidoc @@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py [[metricbeat-metricset-mongodb-dbstats]] === MongoDB dbstats metricset -beta[] - include::../../../module/mongodb/dbstats/_meta/docs.asciidoc[] diff --git a/metricbeat/docs/modules/mongodb/status.asciidoc b/metricbeat/docs/modules/mongodb/status.asciidoc index 77854578b7f..a640b2c2b93 100644 --- a/metricbeat/docs/modules/mongodb/status.asciidoc +++ b/metricbeat/docs/modules/mongodb/status.asciidoc @@ -5,8 +5,6 @@ This file is generated! See scripts/docs_collector.py [[metricbeat-metricset-mongodb-status]] === MongoDB status metricset -beta[] - include::../../../module/mongodb/status/_meta/docs.asciidoc[] diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc index 9f39f66eeb0..a5685a90ba8 100644 --- a/metricbeat/docs/modules_list.asciidoc +++ b/metricbeat/docs/modules_list.asciidoc @@ -75,10 +75,10 @@ This file is generated! See scripts/docs_collector.py |<> experimental[] |<> beta[] | .1+| |<> beta[] -|<> beta[] | -.3+| |<> experimental[] -|<> beta[] -|<> beta[] +|<> | +.3+| |<> +|<> +|<> |<> | .1+| |<> |<> | diff --git a/metricbeat/module/mongodb/_meta/fields.yml b/metricbeat/module/mongodb/_meta/fields.yml index 6a8000ec569..8ed17fb6399 100644 --- a/metricbeat/module/mongodb/_meta/fields.yml +++ b/metricbeat/module/mongodb/_meta/fields.yml @@ -3,7 +3,7 @@ description: > Metrics collected from MongoDB servers. short_config: false - release: beta + release: ga fields: - name: mongodb type: group diff --git a/metricbeat/module/mongodb/collstats/_meta/fields.yml b/metricbeat/module/mongodb/collstats/_meta/fields.yml index 84e0b3be564..5b255dba1e3 100644 --- a/metricbeat/module/mongodb/collstats/_meta/fields.yml +++ b/metricbeat/module/mongodb/collstats/_meta/fields.yml @@ -2,6 +2,7 @@ type: group description: > MongoDB collection statistics metrics. + release: ga fields: - name: db type: keyword diff --git a/metricbeat/module/mongodb/collstats/collstats.go b/metricbeat/module/mongodb/collstats/collstats.go index 7fe951fd706..e51ba471b13 100644 --- a/metricbeat/module/mongodb/collstats/collstats.go +++ b/metricbeat/module/mongodb/collstats/collstats.go @@ -4,7 +4,6 @@ import ( "errors" "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" @@ -33,8 +32,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 %v %v metricset is experimental", base.Module().Name(), base.Name()) - dialInfo, err := mgo.ParseURL(base.HostData().URI) if err != nil { return nil, err diff --git a/metricbeat/module/mongodb/dbstats/_meta/fields.yml b/metricbeat/module/mongodb/dbstats/_meta/fields.yml index ffb5c6fb6bf..b5c0980fac9 100644 --- a/metricbeat/module/mongodb/dbstats/_meta/fields.yml +++ b/metricbeat/module/mongodb/dbstats/_meta/fields.yml @@ -3,7 +3,7 @@ description: > dbstats provides an overview of a particular mongo database. This document is most concerned with data volumes of a database. - release: beta + release: ga fields: - name: avg_obj_size.bytes type: long diff --git a/metricbeat/module/mongodb/dbstats/dbstats.go b/metricbeat/module/mongodb/dbstats/dbstats.go index 19beedb7523..d68b4288d02 100644 --- a/metricbeat/module/mongodb/dbstats/dbstats.go +++ b/metricbeat/module/mongodb/dbstats/dbstats.go @@ -6,7 +6,6 @@ import ( "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" @@ -35,8 +34,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.Beta("The %v %v metricset is Beta", base.Module().Name(), base.Name()) - dialInfo, err := mgo.ParseURL(base.HostData().URI) if err != nil { return nil, err diff --git a/metricbeat/module/mongodb/status/_meta/fields.yml b/metricbeat/module/mongodb/status/_meta/fields.yml index 0d1f296a7b3..c692f345736 100644 --- a/metricbeat/module/mongodb/status/_meta/fields.yml +++ b/metricbeat/module/mongodb/status/_meta/fields.yml @@ -2,7 +2,7 @@ type: group description: > MongoDB server status metrics. - release: beta + release: ga fields: - name: version type: keyword diff --git a/metricbeat/module/mongodb/status/status.go b/metricbeat/module/mongodb/status/status.go index 9d3711d5201..84e3f27f346 100644 --- a/metricbeat/module/mongodb/status/status.go +++ b/metricbeat/module/mongodb/status/status.go @@ -2,7 +2,6 @@ package status 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" @@ -38,9 +37,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.Beta("The %v %v metricset is Beta", base.Module().Name(), base.Name()) - dialInfo, err := mgo.ParseURL(base.HostData().URI) if err != nil { return nil, err From b0476fa0ba14064fbf26d02a5f26e44830c10cd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20P=C3=A9rez-Aradros=20Herce?= Date: Thu, 15 Mar 2018 10:13:49 +0100 Subject: [PATCH 2/2] Update CHANGELOG --- CHANGELOG.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index c0d41e71248..bc8931fc387 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -246,6 +246,7 @@ https://github.com/elastic/beats/compare/v6.0.0-beta2...master[Check the HEAD di - Making the http/json metricset GA. {pull}6471[6471] - Add support for array in http/json metricset. {pull}6480[6480] - Making the jolokia/jmx module GA. {pull}6143[6143] +- Making the MongoDB module GA. {pull}6554[6554] *Packetbeat*