Skip to content

Commit

Permalink
don't overwrite host tags in plugins
Browse files Browse the repository at this point in the history
closes #1227
closes #1210
  • Loading branch information
sparrc committed May 19, 2016
1 parent 35eb654 commit 2e68bd1
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

- [#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!
- [#1228](https://github.com/influxdata/telegraf/pull/1228): Fix service plugin host tag overwrite.

## v0.13 [2016-05-11]

Expand Down
14 changes: 9 additions & 5 deletions agent/accumulator.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,13 +84,17 @@ func (ac *accumulator) AddFields(
if tags == nil {
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
for k, v := range ac.inputConfig.Tags {
tags[k] = v
if _, ok := tags[k]; !ok {
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)

Expand Down

0 comments on commit 2e68bd1

Please sign in to comment.