From 2611931f8280f023623934031b8a64da93cacb97 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Sat, 19 Dec 2015 14:19:43 -0700
Subject: [PATCH] 0.3.0 output: librato

---
 outputs/amon/amon.go       | 10 ++++----
 outputs/datadog/datadog.go | 10 ++++----
 outputs/librato/librato.go | 50 +++++++++++++++++++++++---------------
 3 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/outputs/amon/amon.go b/outputs/amon/amon.go
index 231010baf..84914a27c 100644
--- a/outputs/amon/amon.go
+++ b/outputs/amon/amon.go
@@ -58,8 +58,8 @@ func (a *Amon) Write(points []*client.Point) error {
 		return nil
 	}
 	ts := TimeSeries{}
-	var tempSeries = make([]*Metric, len(points))
-	var acceptablePoints = 0
+	tempSeries := []*Metric{}
+	metricCounter := 0
 
 	for _, pt := range points {
 		mname := strings.Replace(pt.Name(), "_", ".", -1)
@@ -69,15 +69,15 @@ func (a *Amon) Write(points []*client.Point) error {
 					Metric: mname + "_" + strings.Replace(fieldName, "_", ".", -1),
 				}
 				metric.Points[0] = amonPt
-				tempSeries[acceptablePoints] = metric
-				acceptablePoints += 1
+				tempSeries = append(tempSeries, metric)
+				metricCounter++
 			}
 		} else {
 			log.Printf("unable to build Metric for %s, skipping\n", pt.Name())
 		}
 	}
 
-	ts.Series = make([]*Metric, acceptablePoints)
+	ts.Series = make([]*Metric, metricCounter)
 	copy(ts.Series, tempSeries[0:])
 	tsBytes, err := json.Marshal(ts)
 	if err != nil {
diff --git a/outputs/datadog/datadog.go b/outputs/datadog/datadog.go
index eef0702a2..e654f9780 100644
--- a/outputs/datadog/datadog.go
+++ b/outputs/datadog/datadog.go
@@ -67,8 +67,8 @@ func (d *Datadog) Write(points []*client.Point) error {
 		return nil
 	}
 	ts := TimeSeries{}
-	var tempSeries = make([]*Metric, len(points))
-	var acceptablePoints = 0
+	tempSeries := []*Metric{}
+	metricCounter := 0
 
 	for _, pt := range points {
 		mname := strings.Replace(pt.Name(), "_", ".", -1)
@@ -78,15 +78,15 @@ func (d *Datadog) Write(points []*client.Point) error {
 					Metric: mname + strings.Replace(fieldName, "_", ".", -1),
 				}
 				metric.Points[0] = amonPt
-				tempSeries[acceptablePoints] = metric
-				acceptablePoints += 1
+				tempSeries = append(tempSeries, metric)
+				metricCounter++
 			}
 		} else {
 			log.Printf("unable to build Metric for %s, skipping\n", pt.Name())
 		}
 	}
 
-	ts.Series = make([]*Metric, acceptablePoints)
+	ts.Series = make([]*Metric, metricCounter)
 	copy(ts.Series, tempSeries[0:])
 	tsBytes, err := json.Marshal(ts)
 	if err != nil {
diff --git a/outputs/librato/librato.go b/outputs/librato/librato.go
index 9f8f6dd0d..a653ce196 100644
--- a/outputs/librato/librato.go
+++ b/outputs/librato/librato.go
@@ -74,17 +74,21 @@ func (l *Librato) Write(points []*client.Point) error {
 		return nil
 	}
 	metrics := Metrics{}
-	var tempGauges = make([]*Gauge, len(points))
-	var acceptablePoints = 0
+	tempGauges := []*Gauge{}
+	metricCounter := 0
+
 	for _, pt := range points {
-		if gauge, err := l.buildGauge(pt); err == nil {
-			tempGauges[acceptablePoints] = gauge
-			acceptablePoints += 1
+		if gauges, err := l.buildGauges(pt); err == nil {
+			for _, gauge := range gauges {
+				tempGauges = append(tempGauges, gauge)
+				metricCounter++
+			}
 		} else {
 			log.Printf("unable to build Gauge for %s, skipping\n", pt.Name())
 		}
 	}
-	metrics.Gauges = make([]*Gauge, acceptablePoints)
+
+	metrics.Gauges = make([]*Gauge, metricCounter)
 	copy(metrics.Gauges, tempGauges[0:])
 	metricsBytes, err := json.Marshal(metrics)
 	if err != nil {
@@ -118,22 +122,28 @@ func (l *Librato) Description() string {
 	return "Configuration for Librato API to send metrics to."
 }
 
-func (l *Librato) buildGauge(pt *client.Point) (*Gauge, error) {
-	gauge := &Gauge{
-		Name:        pt.Name(),
-		MeasureTime: pt.Time().Unix(),
-	}
-	if err := gauge.setValue(pt.Fields()["value"]); err != nil {
-		return gauge, fmt.Errorf("unable to extract value from Fields, %s\n", err.Error())
-	}
-	if l.SourceTag != "" {
-		if source, ok := pt.Tags()[l.SourceTag]; ok {
-			gauge.Source = source
-		} else {
-			return gauge, fmt.Errorf("undeterminable Source type from Field, %s\n", l.SourceTag)
+func (l *Librato) buildGauges(pt *client.Point) ([]*Gauge, error) {
+	gauges := []*Gauge{}
+	for fieldName, value := range pt.Fields() {
+		gauge := &Gauge{
+			Name:        pt.Name() + "_" + fieldName,
+			MeasureTime: pt.Time().Unix(),
+		}
+		if err := gauge.setValue(value); err != nil {
+			return gauges, fmt.Errorf("unable to extract value from Fields, %s\n",
+				err.Error())
+		}
+		if l.SourceTag != "" {
+			if source, ok := pt.Tags()[l.SourceTag]; ok {
+				gauge.Source = source
+			} else {
+				return gauges,
+					fmt.Errorf("undeterminable Source type from Field, %s\n",
+						l.SourceTag)
+			}
 		}
 	}
-	return gauge, nil
+	return gauges, nil
 }
 
 func (g *Gauge) setValue(v interface{}) error {