From 963729ae36a185b7189490608c4b4b94b4362b02 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Sat, 19 Dec 2015 14:08:31 -0700
Subject: [PATCH] 0.3.0 output: datadog and amon

---
 outputs/amon/amon.go       | 35 ++++++++++++++++++++++-------------
 outputs/datadog/datadog.go | 37 ++++++++++++++++++++++---------------
 2 files changed, 44 insertions(+), 28 deletions(-)

diff --git a/outputs/amon/amon.go b/outputs/amon/amon.go
index 2ab068b75..231010baf 100644
--- a/outputs/amon/amon.go
+++ b/outputs/amon/amon.go
@@ -60,18 +60,23 @@ func (a *Amon) Write(points []*client.Point) error {
 	ts := TimeSeries{}
 	var tempSeries = make([]*Metric, len(points))
 	var acceptablePoints = 0
+
 	for _, pt := range points {
-		metric := &Metric{
-			Metric: strings.Replace(pt.Name(), "_", ".", -1),
-		}
-		if p, err := buildPoint(pt); err == nil {
-			metric.Points[0] = p
-			tempSeries[acceptablePoints] = metric
-			acceptablePoints += 1
+		mname := strings.Replace(pt.Name(), "_", ".", -1)
+		if amonPts, err := buildPoints(pt); err == nil {
+			for fieldName, amonPt := range amonPts {
+				metric := &Metric{
+					Metric: mname + "_" + strings.Replace(fieldName, "_", ".", -1),
+				}
+				metric.Points[0] = amonPt
+				tempSeries[acceptablePoints] = metric
+				acceptablePoints += 1
+			}
 		} else {
 			log.Printf("unable to build Metric for %s, skipping\n", pt.Name())
 		}
 	}
+
 	ts.Series = make([]*Metric, acceptablePoints)
 	copy(ts.Series, tempSeries[0:])
 	tsBytes, err := json.Marshal(ts)
@@ -110,13 +115,17 @@ func (a *Amon) authenticatedUrl() string {
 	return fmt.Sprintf("%s/api/system/%s", a.AmonInstance, a.ServerKey)
 }
 
-func buildPoint(pt *client.Point) (Point, error) {
-	var p Point
-	if err := p.setValue(pt.Fields()["value"]); err != nil {
-		return p, fmt.Errorf("unable to extract value from Fields, %s", err.Error())
+func buildPoints(pt *client.Point) (map[string]Point, error) {
+	pts := make(map[string]Point)
+	for k, v := range pt.Fields() {
+		var p Point
+		if err := p.setValue(v); err != nil {
+			return pts, fmt.Errorf("unable to extract value from Fields, %s", err.Error())
+		}
+		p[0] = float64(pt.Time().Unix())
+		pts[k] = p
 	}
-	p[0] = float64(pt.Time().Unix())
-	return p, nil
+	return pts, nil
 }
 
 func (p *Point) setValue(v interface{}) error {
diff --git a/outputs/datadog/datadog.go b/outputs/datadog/datadog.go
index f37c81a9c..eef0702a2 100644
--- a/outputs/datadog/datadog.go
+++ b/outputs/datadog/datadog.go
@@ -69,20 +69,23 @@ func (d *Datadog) Write(points []*client.Point) error {
 	ts := TimeSeries{}
 	var tempSeries = make([]*Metric, len(points))
 	var acceptablePoints = 0
+
 	for _, pt := range points {
-		metric := &Metric{
-			Metric: strings.Replace(pt.Name(), "_", ".", -1),
-			Tags:   buildTags(pt.Tags()),
-			Host:   pt.Tags()["host"],
-		}
-		if p, err := buildPoint(pt); err == nil {
-			metric.Points[0] = p
-			tempSeries[acceptablePoints] = metric
-			acceptablePoints += 1
+		mname := strings.Replace(pt.Name(), "_", ".", -1)
+		if amonPts, err := buildPoints(pt); err == nil {
+			for fieldName, amonPt := range amonPts {
+				metric := &Metric{
+					Metric: mname + strings.Replace(fieldName, "_", ".", -1),
+				}
+				metric.Points[0] = amonPt
+				tempSeries[acceptablePoints] = metric
+				acceptablePoints += 1
+			}
 		} else {
 			log.Printf("unable to build Metric for %s, skipping\n", pt.Name())
 		}
 	}
+
 	ts.Series = make([]*Metric, acceptablePoints)
 	copy(ts.Series, tempSeries[0:])
 	tsBytes, err := json.Marshal(ts)
@@ -123,13 +126,17 @@ func (d *Datadog) authenticatedUrl() string {
 	return fmt.Sprintf("%s?%s", d.apiUrl, q.Encode())
 }
 
-func buildPoint(pt *client.Point) (Point, error) {
-	var p Point
-	if err := p.setValue(pt.Fields()["value"]); err != nil {
-		return p, fmt.Errorf("unable to extract value from Fields, %s", err.Error())
+func buildPoints(pt *client.Point) (map[string]Point, error) {
+	pts := make(map[string]Point)
+	for k, v := range pt.Fields() {
+		var p Point
+		if err := p.setValue(v); err != nil {
+			return pts, fmt.Errorf("unable to extract value from Fields, %s", err.Error())
+		}
+		p[0] = float64(pt.Time().Unix())
+		pts[k] = p
 	}
-	p[0] = float64(pt.Time().Unix())
-	return p, nil
+	return pts, nil
 }
 
 func buildTags(ptTags map[string]string) []string {