move plugin interfaces into separate package

2016-12-23 10:18:27 -05:00
parent 3e6c4a53a4
commit 81caa56859
182 changed files with 817 additions and 817 deletions
--- a/plugins/outputs/amon/amon.go
+++ b/plugins/outputs/amon/amon.go
@@ -8,7 +8,7 @@ import (
 	"net/http"
 	"strings"

-	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/outputs"
 )
@@ -53,7 +53,7 @@ func (a *Amon) Connect() error {
 	return nil
 }

-func (a *Amon) Write(metrics []telegraf.Metric) error {
+func (a *Amon) Write(metrics []plugins.Metric) error {
 	if len(metrics) == 0 {
 		return nil
 	}
@@ -115,7 +115,7 @@ func (a *Amon) authenticatedUrl() string {
 	return fmt.Sprintf("%s/api/system/%s", a.AmonInstance, a.ServerKey)
 }

-func buildMetrics(m telegraf.Metric) (map[string]Point, error) {
+func buildMetrics(m plugins.Metric) (map[string]Point, error) {
 	ms := make(map[string]Point)
 	for k, v := range m.Fields() {
 		var p Point
@@ -151,7 +151,7 @@ func (a *Amon) Close() error {
 }

 func init() {
-	outputs.Add("amon", func() telegraf.Output {
+	outputs.Add("amon", func() plugins.Output {
 		return &Amon{}
 	})
 }
--- a/plugins/outputs/amon/amon_test.go
+++ b/plugins/outputs/amon/amon_test.go
@@ -8,12 +8,12 @@ import (

 	"github.com/influxdata/telegraf/testutil"

-	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins"
 )

 func TestBuildPoint(t *testing.T) {
 	var tagtests = []struct {
-		ptIn  telegraf.Metric
+		ptIn  plugins.Metric
 		outPt Point
 		err   error
 	}{
--- a/plugins/outputs/amqp/amqp.go
+++ b/plugins/outputs/amqp/amqp.go
@@ -7,7 +7,7 @@ import (
 	"sync"
 	"time"

-	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/outputs"
 	"github.com/influxdata/telegraf/plugins/serializers"
@@ -171,7 +171,7 @@ func (q *AMQP) Description() string {
 	return "Configuration for the AMQP server to send metrics to"
 }

-func (q *AMQP) Write(metrics []telegraf.Metric) error {
+func (q *AMQP) Write(metrics []plugins.Metric) error {
 	q.Lock()
 	defer q.Unlock()
 	if len(metrics) == 0 {
@@ -214,7 +214,7 @@ func (q *AMQP) Write(metrics []telegraf.Metric) error {
 }

 func init() {
-	outputs.Add("amqp", func() telegraf.Output {
+	outputs.Add("amqp", func() plugins.Output {
 		return &AMQP{
 			AuthMethod:      DefaultAuthMethod,
 			Database:        DefaultDatabase,
--- a/plugins/outputs/cloudwatch/cloudwatch.go
+++ b/plugins/outputs/cloudwatch/cloudwatch.go
@@ -10,7 +10,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/cloudwatch"

-	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins"
 	internalaws "github.com/influxdata/telegraf/internal/config/aws"
 	"github.com/influxdata/telegraf/plugins/outputs"
 )
@@ -92,7 +92,7 @@ func (c *CloudWatch) Close() error {
 	return nil
 }

-func (c *CloudWatch) Write(metrics []telegraf.Metric) error {
+func (c *CloudWatch) Write(metrics []plugins.Metric) error {
 	for _, m := range metrics {
 		err := c.WriteSinglePoint(m)
 		if err != nil {
@@ -106,7 +106,7 @@ func (c *CloudWatch) Write(metrics []telegraf.Metric) error {
 // Write data for a single point. A point can have many fields and one field
 // is equal to one MetricDatum. There is a limit on how many MetricDatums a
 // request can have so we process one Point at a time.
-func (c *CloudWatch) WriteSinglePoint(point telegraf.Metric) error {
+func (c *CloudWatch) WriteSinglePoint(point plugins.Metric) error {
 	datums := BuildMetricDatum(point)

 	const maxDatumsPerCall = 20 // PutMetricData only supports up to 20 data metrics per call
@@ -163,7 +163,7 @@ func PartitionDatums(size int, datums []*cloudwatch.MetricDatum) [][]*cloudwatch

 // Make a MetricDatum for each field in a Point. Only fields with values that can be
 // converted to float64 are supported. Non-supported fields are skipped.
-func BuildMetricDatum(point telegraf.Metric) []*cloudwatch.MetricDatum {
+func BuildMetricDatum(point plugins.Metric) []*cloudwatch.MetricDatum {
 	datums := make([]*cloudwatch.MetricDatum, len(point.Fields()))
 	i := 0

@@ -250,7 +250,7 @@ func BuildDimensions(mTags map[string]string) []*cloudwatch.Dimension {
 }

 func init() {
-	outputs.Add("cloudwatch", func() telegraf.Output {
+	outputs.Add("cloudwatch", func() plugins.Output {
 		return &CloudWatch{}
 	})
 }
--- a/plugins/outputs/cloudwatch/cloudwatch_test.go
+++ b/plugins/outputs/cloudwatch/cloudwatch_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/cloudwatch"

-	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins"
 	"github.com/influxdata/telegraf/testutil"

 	"github.com/stretchr/testify/assert"
@@ -51,7 +51,7 @@ func TestBuildDimensions(t *testing.T) {
 func TestBuildMetricDatums(t *testing.T) {
 	assert := assert.New(t)

-	validMetrics := []telegraf.Metric{
+	validMetrics := []plugins.Metric{
 		testutil.TestMetric(1),
 		testutil.TestMetric(int32(1)),
 		testutil.TestMetric(int64(1)),
--- a/plugins/outputs/datadog/datadog.go
+++ b/plugins/outputs/datadog/datadog.go
@@ -9,7 +9,7 @@ import (
 	"net/url"
 	"sort"

-	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/outputs"
 )
@@ -61,7 +61,7 @@ func (d *Datadog) Connect() error {
 	return nil
 }

-func (d *Datadog) Write(metrics []telegraf.Metric) error {
+func (d *Datadog) Write(metrics []plugins.Metric) error {
 	if len(metrics) == 0 {
 		return nil
 	}
@@ -136,7 +136,7 @@ func (d *Datadog) authenticatedUrl() string {
 	return fmt.Sprintf("%s?%s", d.apiUrl, q.Encode())
 }

-func buildMetrics(m telegraf.Metric) (map[string]Point, error) {
+func buildMetrics(m plugins.Metric) (map[string]Point, error) {
 	ms := make(map[string]Point)
 	for k, v := range m.Fields() {
 		if !verifyValue(v) {
@@ -194,7 +194,7 @@ func (d *Datadog) Close() error {
 }

 func init() {
-	outputs.Add("datadog", func() telegraf.Output {
+	outputs.Add("datadog", func() plugins.Output {
 		return NewDatadog(datadog_api)
 	})
 }
--- a/plugins/outputs/datadog/datadog_test.go
+++ b/plugins/outputs/datadog/datadog_test.go
@@ -11,7 +11,7 @@ import (

 	"github.com/influxdata/telegraf/testutil"

-	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -100,7 +100,7 @@ func TestBuildTags(t *testing.T) {

 func TestBuildPoint(t *testing.T) {
 	var tagtests = []struct {
-		ptIn  telegraf.Metric
+		ptIn  plugins.Metric
 		outPt Point
 		err   error
 	}{
@@ -170,7 +170,7 @@ func TestBuildPoint(t *testing.T) {

 func TestVerifyValue(t *testing.T) {
 	var tagtests = []struct {
-		ptIn        telegraf.Metric
+		ptIn        plugins.Metric
 		validMetric bool
 	}{
 		{
--- a/plugins/outputs/discard/discard.go
+++ b/plugins/outputs/discard/discard.go
@@ -1,7 +1,7 @@
 package discard

 import (
-	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins"
 	"github.com/influxdata/telegraf/plugins/outputs"
 )

@@ -11,8 +11,8 @@ func (d *Discard) Connect() error                        { return nil }
 func (d *Discard) Close() error                          { return nil }
 func (d *Discard) SampleConfig() string                  { return "" }
 func (d *Discard) Description() string                   { return "Send metrics to nowhere at all" }
-func (d *Discard) Write(metrics []telegraf.Metric) error { return nil }
+func (d *Discard) Write(metrics []plugins.Metric) error { return nil }

 func init() {
-	outputs.Add("discard", func() telegraf.Output { return &Discard{} })
+	outputs.Add("discard", func() plugins.Output { return &Discard{} })
 }
--- a/plugins/outputs/file/file.go
+++ b/plugins/outputs/file/file.go
@@ -5,7 +5,7 @@ import (
 	"io"
 	"os"

-	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins"
 	"github.com/influxdata/telegraf/plugins/outputs"
 	"github.com/influxdata/telegraf/plugins/serializers"
 )
@@ -86,7 +86,7 @@ func (f *File) Description() string {
 	return "Send telegraf metrics to file(s)"
 }

-func (f *File) Write(metrics []telegraf.Metric) error {
+func (f *File) Write(metrics []plugins.Metric) error {
 	if len(metrics) == 0 {
 		return nil
 	}
@@ -105,7 +105,7 @@ func (f *File) Write(metrics []telegraf.Metric) error {
 }

 func init() {
-	outputs.Add("file", func() telegraf.Output {
+	outputs.Add("file", func() plugins.Output {
 		return &File{}
 	})
 }
--- a/plugins/outputs/graphite/graphite.go
+++ b/plugins/outputs/graphite/graphite.go
@@ -7,7 +7,7 @@ import (
 	"net"
 	"time"

-	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins"
 	"github.com/influxdata/telegraf/plugins/outputs"
 	"github.com/influxdata/telegraf/plugins/serializers"
 )
@@ -73,7 +73,7 @@ func (g *Graphite) Description() string {

 // 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 (g *Graphite) Write(metrics []telegraf.Metric) error {
+func (g *Graphite) Write(metrics []plugins.Metric) error {
 	// Prepare data
 	var batch []byte
 	s, err := serializers.NewGraphiteSerializer(g.Prefix, g.Template)
@@ -116,7 +116,7 @@ func (g *Graphite) Write(metrics []telegraf.Metric) error {
 }

 func init() {
-	outputs.Add("graphite", func() telegraf.Output {
+	outputs.Add("graphite", func() plugins.Output {
 		return &Graphite{}
 	})
 }
--- a/plugins/outputs/graphite/graphite_test.go
+++ b/plugins/outputs/graphite/graphite_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"

-	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins"
 	"github.com/influxdata/telegraf/metric"

 	"github.com/stretchr/testify/assert"
@@ -29,7 +29,7 @@ func TestGraphiteError(t *testing.T) {
 		time.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC),
 	)
 	// Prepare point list
-	var metrics []telegraf.Metric
+	var metrics []plugins.Metric
 	metrics = append(metrics, m1)
 	// Error
 	err1 := g.Connect()
@@ -72,7 +72,7 @@ func TestGraphiteOK(t *testing.T) {
 	)

 	// Prepare point list
-	metrics := []telegraf.Metric{m1, m2, m3}
+	metrics := []plugins.Metric{m1, m2, m3}
 	err1 := g.Connect()
 	require.NoError(t, err1)
 	// Send Data
--- a/plugins/outputs/graylog/graylog.go
+++ b/plugins/outputs/graylog/graylog.go
@@ -7,7 +7,7 @@ import (
 	"encoding/binary"
 	ejson "encoding/json"
 	"fmt"
-	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins"
 	"github.com/influxdata/telegraf/plugins/outputs"
 	"io"
 	"math"
@@ -186,7 +186,7 @@ func (g *Graylog) Description() string {
 	return "Send telegraf metrics to graylog(s)"
 }

-func (g *Graylog) Write(metrics []telegraf.Metric) error {
+func (g *Graylog) Write(metrics []plugins.Metric) error {
 	if len(metrics) == 0 {
 		return nil
 	}
@@ -207,7 +207,7 @@ func (g *Graylog) Write(metrics []telegraf.Metric) error {
 	return nil
 }

-func serialize(metric telegraf.Metric) ([]string, error) {
+func serialize(metric plugins.Metric) ([]string, error) {
 	out := []string{}

 	m := make(map[string]interface{})
@@ -246,7 +246,7 @@ func serialize(metric telegraf.Metric) ([]string, error) {
 }

 func init() {
-	outputs.Add("graylog", func() telegraf.Output {
+	outputs.Add("graylog", func() plugins.Output {
 		return &Graylog{}
 	})
 }
--- a/plugins/outputs/influxdb/influxdb.go
+++ b/plugins/outputs/influxdb/influxdb.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"

-	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/outputs"

@@ -174,7 +174,7 @@ func (i *InfluxDB) Description() string {

 // 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 {
+func (i *InfluxDB) Write(metrics []plugins.Metric) error {
 	if len(i.conns) == 0 {
 		err := i.Connect()
 		if err != nil {
@@ -219,7 +219,7 @@ func (i *InfluxDB) Write(metrics []telegraf.Metric) error {
 }

 func init() {
-	outputs.Add("influxdb", func() telegraf.Output {
+	outputs.Add("influxdb", func() plugins.Output {
 		return &InfluxDB{
 			Timeout: internal.Duration{Duration: time.Second * 5},
 		}
--- a/plugins/outputs/instrumental/instrumental.go
+++ b/plugins/outputs/instrumental/instrumental.go
@@ -9,7 +9,7 @@ import (
 	"regexp"
 	"strings"

-	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/metric"
 	"github.com/influxdata/telegraf/plugins/outputs"
@@ -78,7 +78,7 @@ func (i *Instrumental) Close() error {
 	return nil
 }

-func (i *Instrumental) Write(metrics []telegraf.Metric) error {
+func (i *Instrumental) Write(metrics []plugins.Metric) error {
 	if i.conn == nil {
 		err := i.Connect()
 		if err != nil {
@@ -93,7 +93,7 @@ func (i *Instrumental) Write(metrics []telegraf.Metric) error {

 	var points []string
 	var metricType string
-	var toSerialize telegraf.Metric
+	var toSerialize plugins.Metric
 	var newTags map[string]string

 	for _, m := range metrics {
@@ -204,7 +204,7 @@ func (i *Instrumental) authenticate(conn net.Conn) error {
 }

 func init() {
-	outputs.Add("instrumental", func() telegraf.Output {
+	outputs.Add("instrumental", func() plugins.Output {
 		return &Instrumental{
 			Host:     DefaultHost,
 			Template: graphite.DEFAULT_TEMPLATE,
--- a/plugins/outputs/instrumental/instrumental_test.go
+++ b/plugins/outputs/instrumental/instrumental_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"

-	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins"
 	"github.com/influxdata/telegraf/metric"
 	"github.com/stretchr/testify/assert"
 )
@@ -40,7 +40,7 @@ func TestWrite(t *testing.T) {
 		time.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC),
 	)

-	metrics := []telegraf.Metric{m1, m2}
+	metrics := []plugins.Metric{m1, m2}
 	i.Write(metrics)

 	// Counter and Histogram are increments
@@ -71,7 +71,7 @@ func TestWrite(t *testing.T) {
 		time.Date(2010, time.November, 10, 23, 0, 0, 0, time.UTC),
 	)

-	metrics = []telegraf.Metric{m3, m4, m5, m6}
+	metrics = []plugins.Metric{m3, m4, m5, m6}
 	i.Write(metrics)

 	wg.Wait()
--- a/plugins/outputs/kafka/kafka.go
+++ b/plugins/outputs/kafka/kafka.go
@@ -4,7 +4,7 @@ import (
 	"crypto/tls"
 	"fmt"

-	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/outputs"
 	"github.com/influxdata/telegraf/plugins/serializers"
@@ -148,7 +148,7 @@ func (k *Kafka) Description() string {
 	return "Configuration for the Kafka server to send metrics to"
 }

-func (k *Kafka) Write(metrics []telegraf.Metric) error {
+func (k *Kafka) Write(metrics []plugins.Metric) error {
 	if len(metrics) == 0 {
 		return nil
 	}
@@ -177,7 +177,7 @@ func (k *Kafka) Write(metrics []telegraf.Metric) error {
 }

 func init() {
-	outputs.Add("kafka", func() telegraf.Output {
+	outputs.Add("kafka", func() plugins.Output {
 		return &Kafka{
 			MaxRetry:     3,
 			RequiredAcks: -1,
--- a/plugins/outputs/kinesis/kinesis.go
+++ b/plugins/outputs/kinesis/kinesis.go
@@ -8,7 +8,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/kinesis"

-	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins"
 	internalaws "github.com/influxdata/telegraf/internal/config/aws"
 	"github.com/influxdata/telegraf/plugins/outputs"
 	"github.com/influxdata/telegraf/plugins/serializers"
@@ -156,7 +156,7 @@ func writekinesis(k *KinesisOutput, r []*kinesis.PutRecordsRequestEntry) time.Du
 	return time.Since(start)
 }

-func (k *KinesisOutput) Write(metrics []telegraf.Metric) error {
+func (k *KinesisOutput) Write(metrics []plugins.Metric) error {
 	var sz uint32

 	if len(metrics) == 0 {
@@ -196,7 +196,7 @@ func (k *KinesisOutput) Write(metrics []telegraf.Metric) error {
 }

 func init() {
-	outputs.Add("kinesis", func() telegraf.Output {
+	outputs.Add("kinesis", func() plugins.Output {
 		return &KinesisOutput{}
 	})
 }
--- a/plugins/outputs/librato/librato.go
+++ b/plugins/outputs/librato/librato.go
@@ -9,7 +9,7 @@ import (
 	"net/http"
 	"regexp"

-	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/outputs"
 	"github.com/influxdata/telegraf/plugins/serializers/graphite"
@@ -85,7 +85,7 @@ func (l *Librato) Connect() error {
 	return nil
 }

-func (l *Librato) Write(metrics []telegraf.Metric) error {
+func (l *Librato) Write(metrics []plugins.Metric) error {

 	if len(metrics) == 0 {
 		return nil
@@ -180,7 +180,7 @@ func (l *Librato) Description() string {
 	return "Configuration for Librato API to send metrics to."
 }

-func (l *Librato) buildGauges(m telegraf.Metric) ([]*Gauge, error) {
+func (l *Librato) buildGauges(m plugins.Metric) ([]*Gauge, error) {

 	gauges := []*Gauge{}
 	if m.Time().Unix() == 0 {
@@ -255,7 +255,7 @@ func (l *Librato) Close() error {
 }

 func init() {
-	outputs.Add("librato", func() telegraf.Output {
+	outputs.Add("librato", func() plugins.Output {
 		return NewLibrato(libratoAPI)
 	})
 }
--- a/plugins/outputs/librato/librato_test.go
+++ b/plugins/outputs/librato/librato_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"

-	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins"
 	"github.com/influxdata/telegraf/metric"
 	"github.com/stretchr/testify/require"
 )
@@ -39,7 +39,7 @@ func TestUriOverride(t *testing.T) {
 	l.APIToken = "123456"
 	err := l.Connect()
 	require.NoError(t, err)
-	err = l.Write([]telegraf.Metric{newHostMetric(int32(0), "name", "host")})
+	err = l.Write([]plugins.Metric{newHostMetric(int32(0), "name", "host")})
 	require.NoError(t, err)
 }

@@ -55,7 +55,7 @@ func TestBadStatusCode(t *testing.T) {
 	l.APIToken = "123456"
 	err := l.Connect()
 	require.NoError(t, err)
-	err = l.Write([]telegraf.Metric{newHostMetric(int32(0), "name", "host")})
+	err = l.Write([]plugins.Metric{newHostMetric(int32(0), "name", "host")})
 	if err == nil {
 		t.Errorf("error expected but none returned")
 	} else {
@@ -69,7 +69,7 @@ func TestBuildGauge(t *testing.T) {

 	mtime := time.Date(2009, time.November, 10, 23, 0, 0, 0, time.UTC).Unix()
 	var gaugeTests = []struct {
-		ptIn     telegraf.Metric
+		ptIn     plugins.Metric
 		outGauge *Gauge
 		err      error
 	}{
@@ -163,7 +163,7 @@ func TestBuildGauge(t *testing.T) {
 	}
 }

-func newHostMetric(value interface{}, name, host string) telegraf.Metric {
+func newHostMetric(value interface{}, name, host string) plugins.Metric {
 	m, _ := metric.New(
 		name,
 		map[string]string{"host": host},
@@ -206,7 +206,7 @@ func TestBuildGaugeWithSource(t *testing.T) {
 		mtime,
 	)
 	var gaugeTests = []struct {
-		ptIn     telegraf.Metric
+		ptIn     plugins.Metric
 		template string
 		outGauge *Gauge
 		err      error
--- a/plugins/outputs/mqtt/mqtt.go
+++ b/plugins/outputs/mqtt/mqtt.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"sync"

-	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/outputs"
 	"github.com/influxdata/telegraf/plugins/serializers"
@@ -109,7 +109,7 @@ func (m *MQTT) Description() string {
 	return "Configuration for MQTT server to send metrics to"
 }

-func (m *MQTT) Write(metrics []telegraf.Metric) error {
+func (m *MQTT) Write(metrics []plugins.Metric) error {
 	m.Lock()
 	defer m.Unlock()
 	if len(metrics) == 0 {
@@ -199,7 +199,7 @@ func (m *MQTT) createOpts() (*paho.ClientOptions, error) {
 }

 func init() {
-	outputs.Add("mqtt", func() telegraf.Output {
+	outputs.Add("mqtt", func() plugins.Output {
 		return &MQTT{}
 	})
 }
--- a/plugins/outputs/nats/nats.go
+++ b/plugins/outputs/nats/nats.go
@@ -5,7 +5,7 @@ import (

 	nats_client "github.com/nats-io/nats"

-	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/outputs"
 	"github.com/influxdata/telegraf/plugins/serializers"
@@ -109,7 +109,7 @@ func (n *NATS) Description() string {
 	return "Send telegraf measurements to NATS"
 }

-func (n *NATS) Write(metrics []telegraf.Metric) error {
+func (n *NATS) Write(metrics []plugins.Metric) error {
 	if len(metrics) == 0 {
 		return nil
 	}
@@ -129,7 +129,7 @@ func (n *NATS) Write(metrics []telegraf.Metric) error {
 }

 func init() {
-	outputs.Add("nats", func() telegraf.Output {
+	outputs.Add("nats", func() plugins.Output {
 		return &NATS{}
 	})
 }
--- a/plugins/outputs/nsq/nsq.go
+++ b/plugins/outputs/nsq/nsq.go
@@ -5,7 +5,7 @@ import (

 	"github.com/nsqio/go-nsq"

-	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins"
 	"github.com/influxdata/telegraf/plugins/outputs"
 	"github.com/influxdata/telegraf/plugins/serializers"
 )
@@ -60,7 +60,7 @@ func (n *NSQ) Description() string {
 	return "Send telegraf measurements to NSQD"
 }

-func (n *NSQ) Write(metrics []telegraf.Metric) error {
+func (n *NSQ) Write(metrics []plugins.Metric) error {
 	if len(metrics) == 0 {
 		return nil
 	}
@@ -80,7 +80,7 @@ func (n *NSQ) Write(metrics []telegraf.Metric) error {
 }

 func init() {
-	outputs.Add("nsq", func() telegraf.Output {
+	outputs.Add("nsq", func() plugins.Output {
 		return &NSQ{}
 	})
 }
--- a/plugins/outputs/opentsdb/opentsdb.go
+++ b/plugins/outputs/opentsdb/opentsdb.go
@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"strings"

-	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins"
 	"github.com/influxdata/telegraf/plugins/outputs"
 )

@@ -78,7 +78,7 @@ func (o *OpenTSDB) Connect() error {
 	return nil
 }

-func (o *OpenTSDB) Write(metrics []telegraf.Metric) error {
+func (o *OpenTSDB) Write(metrics []plugins.Metric) error {
 	if len(metrics) == 0 {
 		return nil
 	}
@@ -97,7 +97,7 @@ func (o *OpenTSDB) Write(metrics []telegraf.Metric) error {
 	}
 }

-func (o *OpenTSDB) WriteHttp(metrics []telegraf.Metric, u *url.URL) error {
+func (o *OpenTSDB) WriteHttp(metrics []plugins.Metric, u *url.URL) error {
 	http := openTSDBHttp{
 		Host:      u.Host,
 		Port:      o.Port,
@@ -142,7 +142,7 @@ func (o *OpenTSDB) WriteHttp(metrics []telegraf.Metric, u *url.URL) error {
 	return nil
 }

-func (o *OpenTSDB) WriteTelnet(metrics []telegraf.Metric, u *url.URL) error {
+func (o *OpenTSDB) WriteTelnet(metrics []plugins.Metric, u *url.URL) error {
 	// Send Data with telnet / socket communication
 	uri := fmt.Sprintf("%s:%d", u.Host, o.Port)
 	tcpAddr, _ := net.ResolveTCPAddr("tcp", uri)
@@ -225,7 +225,7 @@ func (o *OpenTSDB) Close() error {
 }

 func init() {
-	outputs.Add("opentsdb", func() telegraf.Output {
+	outputs.Add("opentsdb", func() plugins.Output {
 		return &OpenTSDB{}
 	})
 }
--- a/plugins/outputs/opentsdb/opentsdb_test.go
+++ b/plugins/outputs/opentsdb/opentsdb_test.go
@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"testing"

-	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins"
 	"github.com/influxdata/telegraf/testutil"
 	//"github.com/stretchr/testify/require"
 )
@@ -78,7 +78,7 @@ func TestBuildTagsTelnet(t *testing.T) {
 func BenchmarkHttpSend(b *testing.B) {
 	const BatchSize = 50
 	const MetricsCount = 4 * BatchSize
-	metrics := make([]telegraf.Metric, MetricsCount)
+	metrics := make([]plugins.Metric, MetricsCount)
 	for i := 0; i < MetricsCount; i++ {
 		metrics[i] = testutil.TestMetric(1.0)
 	}
--- a/plugins/outputs/prometheus_client/prometheus_client.go
+++ b/plugins/outputs/prometheus_client/prometheus_client.go
@@ -8,7 +8,7 @@ import (
 	"sync"
 	"time"

-	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/outputs"
 	"github.com/prometheus/client_golang/prometheus"
@@ -104,7 +104,7 @@ func (p *PrometheusClient) Collect(ch chan<- prometheus.Metric) {
 	}
 }

-func (p *PrometheusClient) Write(metrics []telegraf.Metric) error {
+func (p *PrometheusClient) Write(metrics []plugins.Metric) error {
 	p.Lock()
 	defer p.Unlock()

@@ -131,9 +131,9 @@ func (p *PrometheusClient) Write(metrics []telegraf.Metric) error {
 		// Get a type if it's available, defaulting to Untyped
 		var mType prometheus.ValueType
 		switch point.Type() {
-		case telegraf.Counter:
+		case plugins.Counter:
 			mType = prometheus.CounterValue
-		case telegraf.Gauge:
+		case plugins.Gauge:
 			mType = prometheus.GaugeValue
 		default:
 			mType = prometheus.UntypedValue
@@ -186,7 +186,7 @@ func (p *PrometheusClient) Write(metrics []telegraf.Metric) error {
 }

 func init() {
-	outputs.Add("prometheus_client", func() telegraf.Output {
+	outputs.Add("prometheus_client", func() plugins.Output {
 		return &PrometheusClient{
 			ExpirationInterval: internal.Duration{Duration: time.Second * 60},
 		}
--- a/plugins/outputs/prometheus_client/prometheus_client_test.go
+++ b/plugins/outputs/prometheus_client/prometheus_client_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

-	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/metric"
 	"github.com/influxdata/telegraf/plugins/inputs/prometheus"
@@ -37,7 +37,7 @@ func TestPrometheusWritePointEmptyTag(t *testing.T) {
 		tags,
 		map[string]interface{}{"value": 1.0},
 		now)
-	var metrics = []telegraf.Metric{
+	var metrics = []plugins.Metric{
 		pt1,
 		pt2,
 	}
@@ -72,7 +72,7 @@ func TestPrometheusWritePointEmptyTag(t *testing.T) {
 		tags,
 		map[string]interface{}{"value": 1.0},
 		now)
-	metrics = []telegraf.Metric{
+	metrics = []plugins.Metric{
 		pt3,
 		pt4,
 	}
@@ -110,7 +110,7 @@ func TestPrometheusExpireOldMetrics(t *testing.T) {
 		tags,
 		map[string]interface{}{"value": 0.0},
 		now)
-	var metrics = []telegraf.Metric{pt1}
+	var metrics = []plugins.Metric{pt1}
 	require.NoError(t, pClient.Write(metrics))

 	for _, m := range pClient.metrics {
@@ -122,7 +122,7 @@ func TestPrometheusExpireOldMetrics(t *testing.T) {
 		tags,
 		map[string]interface{}{"value": 1.0},
 		now)
-	var metrics2 = []telegraf.Metric{pt2}
+	var metrics2 = []plugins.Metric{pt2}
 	require.NoError(t, pClient.Write(metrics2))

 	expected := []struct {
--- a/plugins/outputs/registry.go
+++ b/plugins/outputs/registry.go
@@ -1,10 +1,10 @@
 package outputs

 import (
-	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins"
 )

-type Creator func() telegraf.Output
+type Creator func() plugins.Output

 var Outputs = map[string]Creator{}

--- a/plugins/outputs/riemann/riemann.go
+++ b/plugins/outputs/riemann/riemann.go
@@ -8,7 +8,7 @@ import (
 	"strings"

 	"github.com/amir/raidman"
-	"github.com/influxdata/telegraf"
+	"github.com/influxdata/telegraf/plugins"
 	"github.com/influxdata/telegraf/plugins/outputs"
 )

@@ -61,7 +61,7 @@ func (r *Riemann) Description() string {
 	return "Configuration for the Riemann server to send metrics to"
 }

-func (r *Riemann) Write(metrics []telegraf.Metric) error {
+func (r *Riemann) Write(metrics []plugins.Metric) error {
 	log.Printf(deprecationMsg)
 	if len(metrics) == 0 {
 		return nil
@@ -92,7 +92,7 @@ func (r *Riemann) Write(metrics []telegraf.Metric) error {
 	return nil
 }

-func buildEvents(p telegraf.Metric, s string) []*raidman.Event {
+func buildEvents(p plugins.Metric, s string) []*raidman.Event {
 	events := []*raidman.Event{}
 	for fieldName, value := range p.Fields() {
 		host, ok := p.Tags()["host"]
@@ -150,7 +150,7 @@ func serviceName(s string, n string, t map[string]string, f string) string {
 }

 func init() {
-	outputs.Add("riemann", func() telegraf.Output {
+	outputs.Add("riemann", func() plugins.Output {
 		return &Riemann{}
 	})
 }