From 964856eb5f2a2ce2ee886f92a4dfc255532e99d3 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel@wavesofdawn.com>
Date: Mon, 30 Apr 2018 17:48:45 -0700
Subject: [PATCH] Fix win_perf_counters to collect counters per instance
 (#4036)

---
 .../win_perf_counters/win_perf_counters.go    | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/plugins/inputs/win_perf_counters/win_perf_counters.go b/plugins/inputs/win_perf_counters/win_perf_counters.go
index 7e3991d19..9a9e6b413 100644
--- a/plugins/inputs/win_perf_counters/win_perf_counters.go
+++ b/plugins/inputs/win_perf_counters/win_perf_counters.go
@@ -192,6 +192,14 @@ func (m *Win_PerfCounters) Gather(acc telegraf.Accumulator) error {
 	var size uint32 = uint32(unsafe.Sizeof(PDH_FMT_COUNTERVALUE_ITEM_DOUBLE{}))
 	var emptyBuf [1]PDH_FMT_COUNTERVALUE_ITEM_DOUBLE // need at least 1 addressable null ptr.
 
+	type InstanceGrouping struct {
+		name       string
+		instance   string
+		objectname string
+	}
+
+	var collectFields = make(map[InstanceGrouping]map[string]interface{})
+
 	// For iterate over the known metrics and get the samples.
 	for _, metric := range m.itemCache {
 		// collect
@@ -231,20 +239,22 @@ func (m *Win_PerfCounters) Gather(acc telegraf.Accumulator) error {
 					}
 
 					if add {
-						fields := make(map[string]interface{})
 						tags := make(map[string]string)
 						if s != "" {
 							tags["instance"] = s
 						}
 						tags["objectname"] = metric.objectName
-						fields[sanitizedChars.Replace(metric.counter)] =
-							float32(c.FmtValue.DoubleValue)
 
 						measurement := sanitizedChars.Replace(metric.measurement)
 						if measurement == "" {
 							measurement = "win_perf_counters"
 						}
-						acc.AddFields(measurement, fields, tags)
+						var instance = InstanceGrouping{measurement, s, metric.objectName}
+
+						if collectFields[instance] == nil {
+							collectFields[instance] = make(map[string]interface{})
+						}
+						collectFields[instance][sanitizedChars.Replace(metric.counter)] = float32(c.FmtValue.DoubleValue)
 					}
 				}
 
@@ -257,6 +267,14 @@ func (m *Win_PerfCounters) Gather(acc telegraf.Accumulator) error {
 		}
 	}
 
+	for instance, fields := range collectFields {
+		var tags = map[string]string{
+			"instance":   instance.instance,
+			"objectname": instance.objectname,
+		}
+		acc.AddFields(instance.name, fields, tags)
+	}
+
 	return nil
 }