Only split metrics if there is an udp output (#2799)

plugins/outputs/influxdb/influxdb.go

@@ -2,6 +2,7 @@ package influxdb
 
 import (
 	"fmt"
+	"io"
 	"log"
 	"math/rand"
 	"strings"
@@ -42,6 +43,7 @@ type InfluxDB struct {
 	Precision string
 
 	clients      []client.Client
+	splitPayload bool
 }
 
 var sampleConfig = `
@@ -109,6 +111,7 @@ func (i *InfluxDB) Connect() error {
 				return fmt.Errorf("Error creating UDP Client [%s]: %s", u, err)
 			}
 			i.clients = append(i.clients, c)
+			i.splitPayload = true
 		default:
 			// If URL doesn't start with "udp", assume HTTP client
 			config := client.HTTPConfig{
@@ -159,17 +162,26 @@ func (i *InfluxDB) Description() string {
 	return "Configuration for influxdb server to send metrics to"
 }
 
+func (i *InfluxDB) getReader(metrics []telegraf.Metric) io.Reader {
+	if !i.splitPayload {
+		return metric.NewReader(metrics)
+	}
+
+	splitData := make([]telegraf.Metric, 0)
+	for _, m := range metrics {
+		splitData = append(splitData, m.Split(i.UDPPayload)...)
+	}
+	return metric.NewReader(splitData)
+}
+
 // Write will choose a random server in the cluster to write to until a successful write
 // occurs, logging each unsuccessful. If all servers fail, return error.
 func (i *InfluxDB) Write(metrics []telegraf.Metric) error {
 	bufsize := 0
-	splitData := make([]telegraf.Metric, 0)
-
 	for _, m := range metrics {
 		bufsize += m.Len()
-		splitData = append(splitData, m.Split(i.UDPPayload)...)
 	}
-	r := metric.NewReader(splitData)
+	r := i.getReader(metrics)
 
 	// This will get set to nil if a successful write occurs
 	err := fmt.Errorf("Could not write to any InfluxDB server in cluster")