From 23b21ca86a9e8e94107a7f9fb0a36ec62ee28720 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Tue, 15 Dec 2015 12:36:45 -0600
Subject: [PATCH] 0.3.0: trig and twemproxy

---
 plugins/trig/trig.go           |  1 -
 plugins/twemproxy/twemproxy.go | 18 +++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/plugins/trig/trig.go b/plugins/trig/trig.go
index e966cbd46..7ed2bf3d9 100644
--- a/plugins/trig/trig.go
+++ b/plugins/trig/trig.go
@@ -41,6 +41,5 @@ func (s *Trig) Gather(acc plugins.Accumulator) error {
 }
 
 func init() {
-
 	plugins.Add("Trig", func() plugins.Plugin { return &Trig{x: 0.0} })
 }
diff --git a/plugins/twemproxy/twemproxy.go b/plugins/twemproxy/twemproxy.go
index 0b1f6139e..1933e8d0d 100644
--- a/plugins/twemproxy/twemproxy.go
+++ b/plugins/twemproxy/twemproxy.go
@@ -100,21 +100,23 @@ func (ti *TwemproxyInstance) processStat(
 		}
 	}
 
+	fields := make(map[string]interface{})
 	metrics := []string{"total_connections", "curr_connections", "timestamp"}
 	for _, m := range metrics {
 		if value, ok := data[m]; ok {
 			if val, ok := value.(float64); ok {
-				acc.Add(m, val, tags)
+				fields[m] = val
 			}
 		}
 	}
+	acc.AddFields("twemproxy", fields, tags)
 
 	for _, pool := range ti.Pools {
 		if poolStat, ok := data[pool]; ok {
 			if data, ok := poolStat.(map[string]interface{}); ok {
 				poolTags := copyTags(tags)
 				poolTags["pool"] = pool
-				ti.processPool(acc, poolTags, pool+"_", data)
+				ti.processPool(acc, poolTags, data)
 			}
 		}
 	}
@@ -124,16 +126,16 @@ func (ti *TwemproxyInstance) processStat(
 func (ti *TwemproxyInstance) processPool(
 	acc plugins.Accumulator,
 	tags map[string]string,
-	prefix string,
 	data map[string]interface{},
 ) {
 	serverTags := make(map[string]map[string]string)
 
+	fields := make(map[string]interface{})
 	for key, value := range data {
 		switch key {
 		case "client_connections", "forward_error", "client_err", "server_ejects", "fragments", "client_eof":
 			if val, ok := value.(float64); ok {
-				acc.Add(prefix+key, val, tags)
+				fields[key] = val
 			}
 		default:
 			if data, ok := value.(map[string]interface{}); ok {
@@ -141,27 +143,29 @@ func (ti *TwemproxyInstance) processPool(
 					serverTags[key] = copyTags(tags)
 					serverTags[key]["server"] = key
 				}
-				ti.processServer(acc, serverTags[key], prefix, data)
+				ti.processServer(acc, serverTags[key], data)
 			}
 		}
 	}
+	acc.AddFields("twemproxy_pool", fields, tags)
 }
 
 // Process backend server(redis/memcached) stats
 func (ti *TwemproxyInstance) processServer(
 	acc plugins.Accumulator,
 	tags map[string]string,
-	prefix string,
 	data map[string]interface{},
 ) {
+	fields := make(map[string]interface{})
 	for key, value := range data {
 		switch key {
 		default:
 			if val, ok := value.(float64); ok {
-				acc.Add(prefix+key, val, tags)
+				fields[key] = val
 			}
 		}
 	}
+	acc.AddFields("twemproxy_pool", fields, tags)
 }
 
 // Tags is not expected to be mutated after passing to Add.