From 2fe427b3b34ddc35a83d01b1bde3b5addd6b5ac8 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Tue, 6 Sep 2016 11:34:57 +0100
Subject: [PATCH] mongodb input: fix version 2.2 panic
closes #1628
---
CHANGELOG.md | 1 +
internal/internal_test.go | 2 +-
plugins/inputs/kafka_consumer/kafka_consumer_test.go | 10 +++++-----
plugins/inputs/mongodb/mongostat.go | 2 +-
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fcab261d..e8dee517 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@
### Bugfixes
+- [#1628](https://github.com/influxdata/telegraf/issues/1628): Fix mongodb input panic on version 2.2.
## v1.0 [unreleased]
diff --git a/internal/internal_test.go b/internal/internal_test.go
index 213e94d3..c18991c2 100644
--- a/internal/internal_test.go
+++ b/internal/internal_test.go
@@ -118,7 +118,7 @@ func TestRandomSleep(t *testing.T) {
s = time.Now()
RandomSleep(time.Millisecond*50, make(chan struct{}))
elapsed = time.Since(s)
- assert.True(t, elapsed < time.Millisecond*50)
+ assert.True(t, elapsed < time.Millisecond*100)
// test that shutdown is respected
s = time.Now()
diff --git a/plugins/inputs/kafka_consumer/kafka_consumer_test.go b/plugins/inputs/kafka_consumer/kafka_consumer_test.go
index e631f670..609dc6a3 100644
--- a/plugins/inputs/kafka_consumer/kafka_consumer_test.go
+++ b/plugins/inputs/kafka_consumer/kafka_consumer_test.go
@@ -43,7 +43,7 @@ func TestRunParser(t *testing.T) {
k.parser, _ = parsers.NewInfluxParser()
go k.receiver()
in <- saramaMsg(testMsg)
- time.Sleep(time.Millisecond)
+ time.Sleep(time.Millisecond * 5)
assert.Equal(t, acc.NFields(), 1)
}
@@ -58,7 +58,7 @@ func TestRunParserInvalidMsg(t *testing.T) {
k.parser, _ = parsers.NewInfluxParser()
go k.receiver()
in <- saramaMsg(invalidMsg)
- time.Sleep(time.Millisecond)
+ time.Sleep(time.Millisecond * 5)
assert.Equal(t, acc.NFields(), 0)
}
@@ -73,7 +73,7 @@ func TestRunParserAndGather(t *testing.T) {
k.parser, _ = parsers.NewInfluxParser()
go k.receiver()
in <- saramaMsg(testMsg)
- time.Sleep(time.Millisecond)
+ time.Sleep(time.Millisecond * 5)
k.Gather(&acc)
@@ -92,7 +92,7 @@ func TestRunParserAndGatherGraphite(t *testing.T) {
k.parser, _ = parsers.NewGraphiteParser("_", []string{}, nil)
go k.receiver()
in <- saramaMsg(testMsgGraphite)
- time.Sleep(time.Millisecond)
+ time.Sleep(time.Millisecond * 5)
k.Gather(&acc)
@@ -111,7 +111,7 @@ func TestRunParserAndGatherJSON(t *testing.T) {
k.parser, _ = parsers.NewJSONParser("kafka_json_test", []string{}, nil)
go k.receiver()
in <- saramaMsg(testMsgJSON)
- time.Sleep(time.Millisecond)
+ time.Sleep(time.Millisecond * 5)
k.Gather(&acc)
diff --git a/plugins/inputs/mongodb/mongostat.go b/plugins/inputs/mongodb/mongostat.go
index 50f65333..da539f8a 100644
--- a/plugins/inputs/mongodb/mongostat.go
+++ b/plugins/inputs/mongodb/mongostat.go
@@ -514,7 +514,7 @@ func NewStatLine(oldMongo, newMongo MongoStatus, key string, all bool, sampleSec
returnVal.Command = diff(newStat.Opcounters.Command, oldStat.Opcounters.Command, sampleSecs)
}
- if newStat.Metrics.TTL != nil && oldStat.Metrics.TTL != nil {
+ if newStat.Metrics != nil && newStat.Metrics.TTL != nil && oldStat.Metrics.TTL != nil {
returnVal.Passes = diff(newStat.Metrics.TTL.Passes, oldStat.Metrics.TTL.Passes, sampleSecs)
returnVal.DeletedDocuments = diff(newStat.Metrics.TTL.DeletedDocuments, oldStat.Metrics.TTL.DeletedDocuments, sampleSecs)
}
--
GitLab