Skip to content

Commit

Permalink
Move MongoDB module to GA (#6554)
Browse files Browse the repository at this point in the history
  • Loading branch information
exekias authored and ruflin committed Mar 15, 2018
1 parent 9a6a3d3 commit 4aebadc
Show file tree
Hide file tree
Showing 13 changed files with 9 additions and 25 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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*

Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/mongodb.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/mongodb/collstats.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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[]


Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/mongodb/dbstats.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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[]


Expand Down
2 changes: 0 additions & 2 deletions metricbeat/docs/modules/mongodb/status.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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[]


Expand Down
8 changes: 4 additions & 4 deletions metricbeat/docs/modules_list.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@ This file is generated! See scripts/docs_collector.py
|<<metricbeat-metricset-logstash-node_stats,node_stats>> experimental[]
|<<metricbeat-module-memcached,Memcached>> beta[] |
.1+| |<<metricbeat-metricset-memcached-stats,stats>> beta[]
|<<metricbeat-module-mongodb,MongoDB>> beta[] |
.3+| |<<metricbeat-metricset-mongodb-collstats,collstats>> experimental[]
|<<metricbeat-metricset-mongodb-dbstats,dbstats>> beta[]
|<<metricbeat-metricset-mongodb-status,status>> beta[]
|<<metricbeat-module-mongodb,MongoDB>> |
.3+| |<<metricbeat-metricset-mongodb-collstats,collstats>>
|<<metricbeat-metricset-mongodb-dbstats,dbstats>>
|<<metricbeat-metricset-mongodb-status,status>>
|<<metricbeat-module-mysql,MySQL>> |
.1+| |<<metricbeat-metricset-mysql-status,status>>
|<<metricbeat-module-nginx,Nginx>> |
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/mongodb/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
description: >
Metrics collected from MongoDB servers.
short_config: false
release: beta
release: ga
fields:
- name: mongodb
type: group
Expand Down
1 change: 1 addition & 0 deletions metricbeat/module/mongodb/collstats/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
type: group
description: >
MongoDB collection statistics metrics.
release: ga
fields:
- name: db
type: keyword
Expand Down
3 changes: 0 additions & 3 deletions metricbeat/module/mongodb/collstats/collstats.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/mongodb/dbstats/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions metricbeat/module/mongodb/dbstats/dbstats.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/mongodb/status/_meta/fields.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
type: group
description: >
MongoDB server status metrics.
release: beta
release: ga
fields:
- name: version
type: keyword
Expand Down
4 changes: 0 additions & 4 deletions metricbeat/module/mongodb/status/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 4aebadc

Please sign in to comment.