From 9a5ced8b371dc6c26051351199f8023b8f16f151 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Sat, 19 Dec 2015 14:55:44 -0700
Subject: [PATCH] 0.3.0 outputs: riemann

---
 outputs/riemann/riemann.go | 40 ++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/outputs/riemann/riemann.go b/outputs/riemann/riemann.go
index 1a02216e6..eaa0aab9c 100644
--- a/outputs/riemann/riemann.go
+++ b/outputs/riemann/riemann.go
@@ -55,8 +55,10 @@ func (r *Riemann) Write(points []*client.Point) error {
 
 	var events []*raidman.Event
 	for _, p := range points {
-		ev := buildEvent(p)
-		events = append(events, ev)
+		evs := buildEvents(p)
+		for _, ev := range evs {
+			events = append(events, ev)
+		}
 	}
 
 	var senderr = r.client.SendMulti(events)
@@ -68,24 +70,28 @@ func (r *Riemann) Write(points []*client.Point) error {
 	return nil
 }
 
-func buildEvent(p *client.Point) *raidman.Event {
-	host, ok := p.Tags()["host"]
-	if !ok {
-		hostname, err := os.Hostname()
-		if err != nil {
-			host = "unknown"
-		} else {
-			host = hostname
+func buildEvents(p *client.Point) []*raidman.Event {
+	events := []*raidman.Event{}
+	for fieldName, value := range p.Fields() {
+		host, ok := p.Tags()["host"]
+		if !ok {
+			hostname, err := os.Hostname()
+			if err != nil {
+				host = "unknown"
+			} else {
+				host = hostname
+			}
 		}
+
+		event := &raidman.Event{
+			Host:    host,
+			Service: p.Name() + "_" + fieldName,
+			Metric:  value,
+		}
+		events = append(events, event)
 	}
 
-	var event = &raidman.Event{
-		Host:    host,
-		Service: p.Name(),
-		Metric:  p.Fields()["value"],
-	}
-
-	return event
+	return events
 }
 
 func init() {