Skip collection stats when disabled in mongodb input (#6364)

This commit is contained in:
Daniel Nelson 2019-09-09 15:55:46 -07:00 committed by GitHub
parent 23cddef30a
commit a4078da648
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 21 deletions

View File

@ -13,8 +13,10 @@
## When true, collect per database stats
# gather_perdb_stats = false
## When true, collect per collection stats
# gather_col_stats = false
## List of db where collections stats are collected
## If empty, all db are concerned
# col_stats_dbs = ["local"]

View File

@ -42,8 +42,10 @@ var sampleConfig = `
## When true, collect per database stats
# gather_perdb_stats = false
## When true, collect per collection stats
# gather_col_stats = false
## List of db where collections stats are collected
## If empty, all db are concerned
# col_stats_dbs = ["local"]
@ -177,6 +179,7 @@ func (m *MongoDB) gatherServer(server *Server, acc telegraf.Accumulator) error {
func init() {
inputs.Add("mongodb", func() telegraf.Input {
return &MongoDB{
ColStatsDbs: []string{"local"},
mongos: make(map[string]*Server),
}
})

View File

@ -227,10 +227,14 @@ func (s *Server) gatherData(acc telegraf.Accumulator, gatherDbStats bool, gather
authLogLevel(err), err)
}
collectionStats, err := s.gatherCollectionStats(colStatsDbs)
var collectionStats *ColStats
if gatherColStats {
stats, err := s.gatherCollectionStats(colStatsDbs)
if err != nil {
return err
}
collectionStats = stats
}
dbStats := &DbStats{}
if gatherDbStats {

View File

@ -961,8 +961,8 @@ func NewStatLine(oldMongo, newMongo MongoStatus, key string, all bool, sampleSec
}
}
newColStats := *newMongo.ColStats
for _, col := range newColStats.Collections {
if newMongo.ColStats != nil {
for _, col := range newMongo.ColStats.Collections {
colStatsData := col.ColStatsData
// mongos doesn't have the db key, so setting the db name
if colStatsData.Collection == "" {
@ -980,6 +980,7 @@ func NewStatLine(oldMongo, newMongo MongoStatus, key string, all bool, sampleSec
}
returnVal.ColStatsLines = append(returnVal.ColStatsLines, *colStatLine)
}
}
// Set shard stats
newShardStats := *newMongo.ShardStats