Multi instances in win_perf_counters (#2352)

This commit is contained in:
Oskar 2017-03-22 20:04:58 +01:00 committed by Daniel Nelson
parent 70a0a84882
commit 616b66f5cb
2 changed files with 7 additions and 0 deletions

View File

@ -82,6 +82,8 @@ be deprecated eventually.
- [#2520](https://github.com/influxdata/telegraf/pull/2520): Update default value for Cloudwatch rate limit - [#2520](https://github.com/influxdata/telegraf/pull/2520): Update default value for Cloudwatch rate limit
- [#2513](https://github.com/influxdata/telegraf/issues/2513): create /etc/telegraf/telegraf.d directory in tarball. - [#2513](https://github.com/influxdata/telegraf/issues/2513): create /etc/telegraf/telegraf.d directory in tarball.
- [#2541](https://github.com/influxdata/telegraf/issues/2541): Return error on unsupported serializer data format. - [#2541](https://github.com/influxdata/telegraf/issues/2541): Return error on unsupported serializer data format.
- [#1827](https://github.com/influxdata/telegraf/issues/1827): Fix Windows Performance Counters multi instance identifier
## v1.2.1 [2017-02-01] ## v1.2.1 [2017-02-01]

View File

@ -265,6 +265,11 @@ func (m *Win_PerfCounters) Gather(acc telegraf.Accumulator) error {
} else if metric.instance == s { } else if metric.instance == s {
// Catch if we set it to total or some form of it // Catch if we set it to total or some form of it
add = true add = true
} else if strings.Contains(metric.instance, "#") && strings.HasPrefix(metric.instance, s) {
// If you are using a multiple instance identifier such as "w3wp#1"
// phd.dll returns only the first 2 characters of the identifier.
add = true
s = metric.instance
} else if metric.instance == "------" { } else if metric.instance == "------" {
add = true add = true
} }