dom
/
telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

don't overwrite host tags in plugins 

closes #1227
closes #1210
This commit is contained in:
Cameron Sparr 2016-05-19 10:01:19 +01:00
parent 35eb65460d
commit 2e68bd1412
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -10,6 +10,7 @@
- [#1195](https://github.com/influxdata/telegraf/pull/1195): Docker panic on timeout. Thanks @zstyblik! - [#1195](https://github.com/influxdata/telegraf/pull/1195): Docker panic on timeout. Thanks @zstyblik!
- [#1211](https://github.com/influxdata/telegraf/pull/1211): mongodb input. Fix possible panic. Thanks @kols! - [#1211](https://github.com/influxdata/telegraf/pull/1211): mongodb input. Fix possible panic. Thanks @kols!
- [#1228](https://github.com/influxdata/telegraf/pull/1228): Fix service plugin host tag overwrite.
## v0.13 [2016-05-11] ## v0.13 [2016-05-11]

12
agent/accumulator.go
View File

@ -84,14 +84,18 @@ func (ac *accumulator) AddFields(
if tags == nil { if tags == nil {
tags = make(map[string]string) tags = make(map[string]string)
} }
// Apply daemon-wide tags if set
for k, v := range ac.defaultTags {
tags[k] = v
}
// Apply plugin-wide tags if set // Apply plugin-wide tags if set
for k, v := range ac.inputConfig.Tags { for k, v := range ac.inputConfig.Tags {
if _, ok := tags[k]; !ok {
tags[k] = v tags[k] = v
} }
}
// Apply daemon-wide tags if set
for k, v := range ac.defaultTags {
if _, ok := tags[k]; !ok {
tags[k] = v
}
}
ac.inputConfig.Filter.FilterTags(tags) ac.inputConfig.Filter.FilterTags(tags)
result := make(map[string]interface{}) result := make(map[string]interface{})