only count shard if it's non-empty

closes #1221
This commit is contained in:
Cameron Sparr 2016-05-24 21:05:30 +01:00
parent 9966099d1a
commit 6351aa5167
3 changed files with 6 additions and 5 deletions

View File

@ -9,6 +9,7 @@
### Bugfixes ### Bugfixes
- [#1252](https://github.com/influxdata/telegraf/pull/1252): Fix systemd service. Thanks @zbindenren! - [#1252](https://github.com/influxdata/telegraf/pull/1252): Fix systemd service. Thanks @zbindenren!
- [#1221](https://github.com/influxdata/telegraf/pull/1221): Fix influxdb n_shards counter.
## v0.13.1 [2016-05-24] ## v0.13.1 [2016-05-24]

View File

@ -204,16 +204,16 @@ func (i *InfluxDB) gatherURL(
continue continue
} }
if p.Name == "shard" {
shardCounter++
}
// If the object was a point, but was not fully initialized, // If the object was a point, but was not fully initialized,
// ignore it and move on. // ignore it and move on.
if p.Name == "" || p.Tags == nil || p.Values == nil || len(p.Values) == 0 { if p.Name == "" || p.Tags == nil || p.Values == nil || len(p.Values) == 0 {
continue continue
} }
if p.Name == "shard" {
shardCounter++
}
// Add a tag to indicate the source of the data. // Add a tag to indicate the source of the data.
p.Tags["url"] = url p.Tags["url"] = url

View File

@ -112,7 +112,7 @@ func TestInfluxDB(t *testing.T) {
acc.AssertContainsTaggedFields(t, "influxdb", acc.AssertContainsTaggedFields(t, "influxdb",
map[string]interface{}{ map[string]interface{}{
"n_shards": 2, "n_shards": 1,
}, map[string]string{}) }, map[string]string{})
} }