fix plugin namespacing

CHANGELOG.md

@@ -2,19 +2,6 @@
 
 ### Release Notes
 
-- The StatsD plugin will now default all "delete_" config options to "true". This
-will change te default behavior for users who were not specifying these parameters
-in their config file.
-
-- The StatsD plugin will also no longer save it's state on a service reload.
-Essentially we have reverted PR [#887](https://github.com/influxdata/telegraf/pull/887).
-The reason for this is that saving the state in a global variable is not
-thread-safe (see [#1975](https://github.com/influxdata/telegraf/issues/1975) & [#2102](https://github.com/influxdata/telegraf/issues/2102)),
-and this creates issues if users want to define multiple instances
-of the statsd plugin. Saving state on reload may be considered in the future,
-but this would need to be implemented at a higher level and applied to all
-plugins, not just statsd.
-
 ### Features
 
 - [#2123](https://github.com/influxdata/telegraf/pull/2123): Fix improper calculation of CPU percentages
@@ -27,45 +14,12 @@ plugins, not just statsd.
 - [#2127](https://github.com/influxdata/telegraf/pull/2127): Update Go version to 1.7.4.
 - [#2126](https://github.com/influxdata/telegraf/pull/2126): Support a metric.Split function.
 - [#2026](https://github.com/influxdata/telegraf/pull/2065): elasticsearch "shield" (basic auth) support doc.
-- [#1885](https://github.com/influxdata/telegraf/pull/1885): Fix over-querying of cloudwatch metrics
-- [#1913](https://github.com/influxdata/telegraf/pull/1913): OpenTSDB basic auth support.
-- [#1908](https://github.com/influxdata/telegraf/pull/1908): RabbitMQ Connection metrics.
-- [#1937](https://github.com/influxdata/telegraf/pull/1937): HAProxy session limit metric.
-- [#2068](https://github.com/influxdata/telegraf/issues/2068): Accept strings for StatsD sets.
-- [#1893](https://github.com/influxdata/telegraf/issues/1893): Change StatsD default "reset" behavior.
-- [#2079](https://github.com/influxdata/telegraf/pull/2079): Enable setting ClientID in MQTT output.
-- [#2001](https://github.com/influxdata/telegraf/pull/2001): MongoDB input plugin: Improve state data.
-- [#2078](https://github.com/influxdata/telegraf/pull/2078): Ping input: add standard deviation field.
-- [#2121](https://github.com/influxdata/telegraf/pull/2121): Add GC pause metric to InfluxDB input plugin.
-- [#2006](https://github.com/influxdata/telegraf/pull/2006): Added response_timeout property to prometheus input plugin.
-- [#1763](https://github.com/influxdata/telegraf/issues/1763): Pulling github.com/lxn/win's pdh wrapper into telegraf.
-- [#1898](https://github.com/influxdata/telegraf/issues/1898): Support negative statsd counters.
-- [#1921](https://github.com/influxdata/telegraf/issues/1921): Elasticsearch cluster stats support.
-- [#1942](https://github.com/influxdata/telegraf/pull/1942): Change Amazon Kinesis output plugin to use the built-in serializer plugins.
-- [#1980](https://github.com/influxdata/telegraf/issues/1980): Hide username/password from elasticsearch error log messages.
-- [#2097](https://github.com/influxdata/telegraf/issues/2097): Configurable HTTP timeouts in Jolokia plugin
 
 ### Bugfixes
 
 - [#2049](https://github.com/influxdata/telegraf/pull/2049): Fix the Value data format not trimming null characters from input.
 - [#1949](https://github.com/influxdata/telegraf/issues/1949): Fix windows `net` plugin.
 - [#1775](https://github.com/influxdata/telegraf/issues/1775): Cache & expire metrics for delivery to prometheus
-- [#1775](https://github.com/influxdata/telegraf/issues/1775): Cache & expire metrics for delivery to prometheus.
-- [#2146](https://github.com/influxdata/telegraf/issues/2146): Fix potential panic in aggregator plugin metric maker.
-- [#1843](https://github.com/influxdata/telegraf/pull/1843) & [#1668](https://github.com/influxdata/telegraf/issues/1668): Add optional ability to define PID as a tag.
-- [#1730](https://github.com/influxdata/telegraf/issues/1730): Fix win_perf_counters not gathering non-English counters.
-- [#2061](https://github.com/influxdata/telegraf/issues/2061): Fix panic when file stat info cannot be collected due to permissions or other issue(s).
-- [#2045](https://github.com/influxdata/telegraf/issues/2045): Graylog output should set short_message field.
-- [#1904](https://github.com/influxdata/telegraf/issues/1904): Hddtemp always put the value in the field temperature.
-- [#1693](https://github.com/influxdata/telegraf/issues/1693): Properly collect nested jolokia struct data.
-- [#1917](https://github.com/influxdata/telegraf/pull/1917): fix puppetagent inputs plugin to support string for config variable.
-- [#1987](https://github.com/influxdata/telegraf/issues/1987): fix docker input plugin tags when registry has port.
-- [#2089](https://github.com/influxdata/telegraf/issues/2089): Fix tail input when reading from a pipe.
-- [#1449](https://github.com/influxdata/telegraf/issues/1449): MongoDB plugin always shows 0 replication lag.
-- [#1825](https://github.com/influxdata/telegraf/issues/1825): Consul plugin: add check_id as a tag in metrics to avoid overwrites.
-- [#1973](https://github.com/influxdata/telegraf/issues/1973): Partial fix: logparser CLF pattern with IPv6 addresses.
-- [#1975](https://github.com/influxdata/telegraf/issues/1975) & [#2102](https://github.com/influxdata/telegraf/issues/2102): Fix thread-safety when using multiple instances of the statsd input plugin.
-- [#2027](https://github.com/influxdata/telegraf/issues/2027): docker input: interface conversion panic fix.
 
 ## v1.1.2 [2016-12-12]
 

Godeps_windows

@@ -1,6 +1,7 @@
 github.com/Microsoft/go-winio ce2922f643c8fd76b46cadc7f404a06282678b34
 github.com/StackExchange/wmi f3e2bae1e0cb5aef83e319133eabfee30013a4a5
 github.com/go-ole/go-ole be49f7c07711fcb603cff39e1de7c67926dc0ba7
+github.com/lxn/win 950a0e81e7678e63d8e6cd32412bdecb325ccd88
 github.com/shirou/w32 3c9377fc6748f222729a8270fe2775d149a249ad
 golang.org/x/sys a646d33e2ee3172a661fc09bca23bb4889a41bc8
 github.com/go-ini/ini 9144852efba7c4daf409943ee90767da62d55438

accumulator.go

@@ -1,4 +1,4 @@
-package plugins
+package telegraf
 
 import "time"
 

agent/accumulator.go

@@ -4,7 +4,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/selfstat"
 )
 
@@ -18,14 +18,14 @@ type MetricMaker interface {
 		measurement string,
 		fields map[string]interface{},
 		tags map[string]string,
-		mType plugins.ValueType,
+		mType telegraf.ValueType,
 		t time.Time,
-	) plugins.Metric
+	) telegraf.Metric
 }
 
 func NewAccumulator(
 	maker MetricMaker,
-	metrics chan plugins.Metric,
+	metrics chan telegraf.Metric,
 ) *accumulator {
 	acc := accumulator{
 		maker:     maker,
@@ -36,7 +36,7 @@ func NewAccumulator(
 }
 
 type accumulator struct {
-	metrics chan plugins.Metric
+	metrics chan telegraf.Metric
 
 	maker MetricMaker
 
@@ -49,7 +49,7 @@ func (ac *accumulator) AddFields(
 	tags map[string]string,
 	t ...time.Time,
 ) {
-	if m := ac.maker.MakeMetric(measurement, fields, tags, plugins.Untyped, ac.getTime(t)); m != nil {
+	if m := ac.maker.MakeMetric(measurement, fields, tags, telegraf.Untyped, ac.getTime(t)); m != nil {
 		ac.metrics <- m
 	}
 }
@@ -60,7 +60,7 @@ func (ac *accumulator) AddGauge(
 	tags map[string]string,
 	t ...time.Time,
 ) {
-	if m := ac.maker.MakeMetric(measurement, fields, tags, plugins.Gauge, ac.getTime(t)); m != nil {
+	if m := ac.maker.MakeMetric(measurement, fields, tags, telegraf.Gauge, ac.getTime(t)); m != nil {
 		ac.metrics <- m
 	}
 }
@@ -71,7 +71,7 @@ func (ac *accumulator) AddCounter(
 	tags map[string]string,
 	t ...time.Time,
 ) {
-	if m := ac.maker.MakeMetric(measurement, fields, tags, plugins.Counter, ac.getTime(t)); m != nil {
+	if m := ac.maker.MakeMetric(measurement, fields, tags, telegraf.Counter, ac.getTime(t)); m != nil {
 		ac.metrics <- m
 	}
 }

agent/accumulator_test.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/metric"
 
 	"github.com/stretchr/testify/assert"
@@ -17,7 +17,7 @@ import (
 
 func TestAdd(t *testing.T) {
 	now := time.Now()
-	metrics := make(chan plugins.Metric, 10)
+	metrics := make(chan telegraf.Metric, 10)
 	defer close(metrics)
 	a := NewAccumulator(&TestMetricMaker{}, metrics)
 
@@ -48,7 +48,7 @@ func TestAdd(t *testing.T) {
 
 func TestAddFields(t *testing.T) {
 	now := time.Now()
-	metrics := make(chan plugins.Metric, 10)
+	metrics := make(chan telegraf.Metric, 10)
 	defer close(metrics)
 	a := NewAccumulator(&TestMetricMaker{}, metrics)
 
@@ -79,7 +79,7 @@ func TestAccAddError(t *testing.T) {
 	log.SetOutput(errBuf)
 	defer log.SetOutput(os.Stderr)
 
-	metrics := make(chan plugins.Metric, 10)
+	metrics := make(chan telegraf.Metric, 10)
 	defer close(metrics)
 	a := NewAccumulator(&TestMetricMaker{}, metrics)
 
@@ -100,7 +100,7 @@ func TestAccAddError(t *testing.T) {
 
 func TestAddNoIntervalWithPrecision(t *testing.T) {
 	now := time.Date(2006, time.February, 10, 12, 0, 0, 82912748, time.UTC)
-	metrics := make(chan plugins.Metric, 10)
+	metrics := make(chan telegraf.Metric, 10)
 	defer close(metrics)
 	a := NewAccumulator(&TestMetricMaker{}, metrics)
 	a.SetPrecision(0, time.Second)
@@ -132,7 +132,7 @@ func TestAddNoIntervalWithPrecision(t *testing.T) {
 
 func TestAddDisablePrecision(t *testing.T) {
 	now := time.Date(2006, time.February, 10, 12, 0, 0, 82912748, time.UTC)
-	metrics := make(chan plugins.Metric, 10)
+	metrics := make(chan telegraf.Metric, 10)
 	defer close(metrics)
 	a := NewAccumulator(&TestMetricMaker{}, metrics)
 
@@ -164,7 +164,7 @@ func TestAddDisablePrecision(t *testing.T) {
 
 func TestAddNoPrecisionWithInterval(t *testing.T) {
 	now := time.Date(2006, time.February, 10, 12, 0, 0, 82912748, time.UTC)
-	metrics := make(chan plugins.Metric, 10)
+	metrics := make(chan telegraf.Metric, 10)
 	defer close(metrics)
 	a := NewAccumulator(&TestMetricMaker{}, metrics)
 
@@ -196,7 +196,7 @@ func TestAddNoPrecisionWithInterval(t *testing.T) {
 
 func TestDifferentPrecisions(t *testing.T) {
 	now := time.Date(2006, time.February, 10, 12, 0, 0, 82912748, time.UTC)
-	metrics := make(chan plugins.Metric, 10)
+	metrics := make(chan telegraf.Metric, 10)
 	defer close(metrics)
 	a := NewAccumulator(&TestMetricMaker{}, metrics)
 
@@ -243,7 +243,7 @@ func TestDifferentPrecisions(t *testing.T) {
 
 func TestAddGauge(t *testing.T) {
 	now := time.Now()
-	metrics := make(chan plugins.Metric, 10)
+	metrics := make(chan telegraf.Metric, 10)
 	defer close(metrics)
 	a := NewAccumulator(&TestMetricMaker{}, metrics)
 
@@ -260,24 +260,24 @@ func TestAddGauge(t *testing.T) {
 	testm := <-metrics
 	actual := testm.String()
 	assert.Contains(t, actual, "acctest value=101")
-	assert.Equal(t, testm.Type(), plugins.Gauge)
+	assert.Equal(t, testm.Type(), telegraf.Gauge)
 
 	testm = <-metrics
 	actual = testm.String()
 	assert.Contains(t, actual, "acctest,acc=test value=101")
-	assert.Equal(t, testm.Type(), plugins.Gauge)
+	assert.Equal(t, testm.Type(), telegraf.Gauge)
 
 	testm = <-metrics
 	actual = testm.String()
 	assert.Equal(t,
 		fmt.Sprintf("acctest,acc=test value=101 %d\n", now.UnixNano()),
 		actual)
-	assert.Equal(t, testm.Type(), plugins.Gauge)
+	assert.Equal(t, testm.Type(), telegraf.Gauge)
 }
 
 func TestAddCounter(t *testing.T) {
 	now := time.Now()
-	metrics := make(chan plugins.Metric, 10)
+	metrics := make(chan telegraf.Metric, 10)
 	defer close(metrics)
 	a := NewAccumulator(&TestMetricMaker{}, metrics)
 
@@ -294,19 +294,19 @@ func TestAddCounter(t *testing.T) {
 	testm := <-metrics
 	actual := testm.String()
 	assert.Contains(t, actual, "acctest value=101")
-	assert.Equal(t, testm.Type(), plugins.Counter)
+	assert.Equal(t, testm.Type(), telegraf.Counter)
 
 	testm = <-metrics
 	actual = testm.String()
 	assert.Contains(t, actual, "acctest,acc=test value=101")
-	assert.Equal(t, testm.Type(), plugins.Counter)
+	assert.Equal(t, testm.Type(), telegraf.Counter)
 
 	testm = <-metrics
 	actual = testm.String()
 	assert.Equal(t,
 		fmt.Sprintf("acctest,acc=test value=101 %d\n", now.UnixNano()),
 		actual)
-	assert.Equal(t, testm.Type(), plugins.Counter)
+	assert.Equal(t, testm.Type(), telegraf.Counter)
 }
 
 type TestMetricMaker struct {
@@ -319,20 +319,20 @@ func (tm *TestMetricMaker) MakeMetric(
 	measurement string,
 	fields map[string]interface{},
 	tags map[string]string,
-	mType plugins.ValueType,
+	mType telegraf.ValueType,
 	t time.Time,
-) plugins.Metric {
+) telegraf.Metric {
 	switch mType {
-	case plugins.Untyped:
+	case telegraf.Untyped:
 		if m, err := metric.New(measurement, tags, fields, t); err == nil {
 			return m
 		}
-	case plugins.Counter:
-		if m, err := metric.New(measurement, tags, fields, t, plugins.Counter); err == nil {
+	case telegraf.Counter:
+		if m, err := metric.New(measurement, tags, fields, t, telegraf.Counter); err == nil {
 			return m
 		}
-	case plugins.Gauge:
-		if m, err := metric.New(measurement, tags, fields, t, plugins.Gauge); err == nil {
+	case telegraf.Gauge:
+		if m, err := metric.New(measurement, tags, fields, t, telegraf.Gauge); err == nil {
 			return m
 		}
 	}

agent/agent.go

@@ -8,10 +8,10 @@ import (
 	"sync"
 	"time"
 
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/internal/config"
 	"github.com/influxdata/telegraf/internal/models"
-	"github.com/influxdata/telegraf/plugins"
 	"github.com/influxdata/telegraf/selfstat"
 )
 
@@ -46,7 +46,7 @@ func NewAgent(config *config.Config) (*Agent, error) {
 func (a *Agent) Connect() error {
 	for _, o := range a.Config.Outputs {
 		switch ot := o.Output.(type) {
-		case plugins.ServiceOutput:
+		case telegraf.ServiceOutput:
 			if err := ot.Start(); err != nil {
 				log.Printf("E! Service for output %s failed to start, exiting\n%s\n",
 					o.Name, err.Error())
@@ -76,7 +76,7 @@ func (a *Agent) Close() error {
 	for _, o := range a.Config.Outputs {
 		err = o.Output.Close()
 		switch ot := o.Output.(type) {
-		case plugins.ServiceOutput:
+		case telegraf.ServiceOutput:
 			ot.Stop()
 		}
 	}
@@ -101,7 +101,7 @@ func (a *Agent) gatherer(
 	shutdown chan struct{},
 	input *models.RunningInput,
 	interval time.Duration,
-	metricC chan plugins.Metric,
+	metricC chan telegraf.Metric,
 ) {
 	defer panicRecover(input)
 
@@ -176,7 +176,7 @@ func gatherWithTimeout(
 func (a *Agent) Test() error {
 	shutdown := make(chan struct{})
 	defer close(shutdown)
-	metricC := make(chan plugins.Metric)
+	metricC := make(chan telegraf.Metric)
 
 	// dummy receiver for the point channel
 	go func() {
@@ -241,14 +241,14 @@ func (a *Agent) flush() {
 }
 
 // flusher monitors the metrics input channel and flushes on the minimum interval
-func (a *Agent) flusher(shutdown chan struct{}, metricC chan plugins.Metric) error {
+func (a *Agent) flusher(shutdown chan struct{}, metricC chan telegraf.Metric) error {
 	// Inelegant, but this sleep is to allow the Gather threads to run, so that
 	// the flusher will flush after metrics are collected.
 	time.Sleep(time.Millisecond * 300)
 
 	// create an output metric channel and a gorouting that continously passes
 	// each metric onto the output plugins & aggregators.
-	outMetricC := make(chan plugins.Metric, 100)
+	outMetricC := make(chan telegraf.Metric, 100)
 	var wg sync.WaitGroup
 	wg.Add(1)
 	go func() {
@@ -300,7 +300,7 @@ func (a *Agent) flusher(shutdown chan struct{}, metricC chan plugins.Metric) err
 		case metric := <-metricC:
 			// NOTE potential bottleneck here as we put each metric through the
 			// processors serially.
-			mS := []plugins.Metric{metric}
+			mS := []telegraf.Metric{metric}
 			for _, processor := range a.Config.Processors {
 				mS = processor.Apply(mS...)
 			}
@@ -321,13 +321,13 @@ func (a *Agent) Run(shutdown chan struct{}) error {
 		a.Config.Agent.Hostname, a.Config.Agent.FlushInterval.Duration)
 
 	// channel shared between all input threads for accumulating metrics
-	metricC := make(chan plugins.Metric, 100)
+	metricC := make(chan telegraf.Metric, 100)
 
 	// Start all ServicePlugins
 	for _, input := range a.Config.Inputs {
 		input.SetDefaultTags(a.Config.Tags)
 		switch p := input.Input.(type) {
-		case plugins.ServiceInput:
+		case telegraf.ServiceInput:
 			acc := NewAccumulator(input, metricC)
 			// Service input plugins should set their own precision of their
 			// metrics.

aggregator.go

@@ -1,4 +1,4 @@
-package plugins
+package telegraf
 
 // Aggregator is an interface for implementing an Aggregator plugin.
 // the RunningAggregator wraps this interface and guarantees that

cmd/telegraf/telegraf.go

@@ -13,10 +13,10 @@ import (
 	"strings"
 	"syscall"
 
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/agent"
 	"github.com/influxdata/telegraf/internal/config"
 	"github.com/influxdata/telegraf/logger"
-	"github.com/influxdata/telegraf/plugins"
 	"github.com/influxdata/telegraf/plugins/aggregators"
 	_ "github.com/influxdata/telegraf/plugins/aggregators/all"
 	"github.com/influxdata/telegraf/plugins/inputs"
@@ -367,13 +367,13 @@ func registerPlugin(pluginsDir, filePath string, p *plugin.Plugin) error {
 	name := strings.Replace(filePath, string(os.PathSeparator), ".", -1)
 
 	if create, err := p.Lookup("NewInput"); err == nil {
-		inputs.Add(name, inputs.Creator(create.(func() plugins.Input)))
+		inputs.Add(name, inputs.Creator(create.(func() telegraf.Input)))
 	} else if create, err := p.Lookup("NewOutput"); err == nil {
-		outputs.Add(name, outputs.Creator(create.(func() plugins.Output)))
+		outputs.Add(name, outputs.Creator(create.(func() telegraf.Output)))
 	} else if create, err := p.Lookup("NewProcessor"); err == nil {
-		processors.Add(name, processors.Creator(create.(func() plugins.Processor)))
+		processors.Add(name, processors.Creator(create.(func() telegraf.Processor)))
 	} else if create, err := p.Lookup("NewAggregator"); err == nil {
-		aggregators.Add(name, aggregators.Creator(create.(func() plugins.Aggregator)))
+		aggregators.Add(name, aggregators.Creator(create.(func() telegraf.Aggregator)))
 	} else {
 		return fmt.Errorf("not a telegraf plugin: %s%s", filePath, ext)
 	}

etc/telegraf.conf

@@ -784,18 +784,13 @@
 #   ## Timeout for HTTP requests to the elastic search server(s)
 #   http_timeout = "5s"
 #
-#   ## When local is true (the default), the node will read only its own stats.
-#   ## Set local to false when you want to read the node stats from all nodes
-#   ## of the cluster.
+#   ## set local to false when you want to read the indices stats from all nodes
+#   ## within the cluster
 #   local = true
 #
-#   ## set cluster_health to true when you want to also obtain cluster health stats
+#   ## set cluster_health to true when you want to also obtain cluster level stats
 #   cluster_health = false
 #
-#   ## Set cluster_stats to true when you want to obtain cluster stats from the
-#   ## Master node.
-#   cluster_stats = false
-
 #   ## Optional SSL Config
 #   # ssl_ca = "/etc/telegraf/ca.pem"
 #   # ssl_cert = "/etc/telegraf/cert.pem"

input.go

@@ -1,4 +1,4 @@
-package plugins
+package telegraf
 
 type Input interface {
 	// SampleConfig returns the default configuration of the Input

internal/buffer/buffer.go

@@ -3,7 +3,7 @@ package buffer
 import (
 	"sync"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/selfstat"
 )
 
@@ -14,7 +14,7 @@ var (
 
 // Buffer is an object for storing metrics in a circular buffer.
 type Buffer struct {
-	buf chan plugins.Metric
+	buf chan telegraf.Metric
 
 	mu sync.Mutex
 }
@@ -24,7 +24,7 @@ type Buffer struct {
 //   called when the buffer is full, then the oldest metric(s) will be dropped.
 func NewBuffer(size int) *Buffer {
 	return &Buffer{
-		buf: make(chan plugins.Metric, size),
+		buf: make(chan telegraf.Metric, size),
 	}
 }
 
@@ -39,7 +39,7 @@ func (b *Buffer) Len() int {
 }
 
 // Add adds metrics to the buffer.
-func (b *Buffer) Add(metrics ...plugins.Metric) {
+func (b *Buffer) Add(metrics ...telegraf.Metric) {
 	for i, _ := range metrics {
 		MetricsWritten.Incr(1)
 		select {
@@ -55,10 +55,10 @@ func (b *Buffer) Add(metrics ...plugins.Metric) {
 // Batch returns a batch of metrics of size batchSize.
 // the batch will be of maximum length batchSize. It can be less than batchSize,
 // if the length of Buffer is less than batchSize.
-func (b *Buffer) Batch(batchSize int) []plugins.Metric {
+func (b *Buffer) Batch(batchSize int) []telegraf.Metric {
 	b.mu.Lock()
 	n := min(len(b.buf), batchSize)
-	out := make([]plugins.Metric, n)
+	out := make([]telegraf.Metric, n)
 	for i := 0; i < n; i++ {
 		out[i] = <-b.buf
 	}

internal/buffer/buffer_test.go

@@ -3,13 +3,13 @@ package buffer
 import (
 	"testing"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/testutil"
 
 	"github.com/stretchr/testify/assert"
 )
 
-var metricList = []plugins.Metric{
+var metricList = []telegraf.Metric{
 	testutil.TestMetric(2, "mymetric1"),
 	testutil.TestMetric(1, "mymetric2"),
 	testutil.TestMetric(11, "mymetric3"),

internal/config/config.go

@@ -15,9 +15,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/internal/models"
-	"github.com/influxdata/telegraf/plugins"
 	"github.com/influxdata/telegraf/plugins/aggregators"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"github.com/influxdata/telegraf/plugins/outputs"
@@ -399,7 +399,7 @@ func printFilteredInputs(inputFilters []string, commented bool) {
 	sort.Strings(pnames)
 
 	// cache service inputs to print them at the end
-	servInputs := make(map[string]plugins.ServiceInput)
+	servInputs := make(map[string]telegraf.ServiceInput)
 	// for alphabetical looping:
 	servInputNames := []string{}
 
@@ -409,7 +409,7 @@ func printFilteredInputs(inputFilters []string, commented bool) {
 		input := creator()
 
 		switch p := input.(type) {
-		case plugins.ServiceInput:
+		case telegraf.ServiceInput:
 			servInputs[pname] = p
 			servInputNames = append(servInputNames, pname)
 			continue

internal/models/makemetric.go

@@ -5,8 +5,8 @@ import (
 	"math"
 	"time"
 
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/metric"
-	"github.com/influxdata/telegraf/plugins"
 )
 
 // makemetric is used by both RunningAggregator & RunningInput
@@ -32,9 +32,9 @@ func makemetric(
 	daemonTags map[string]string,
 	filter Filter,
 	applyFilter bool,
-	mType plugins.ValueType,
+	mType telegraf.ValueType,
 	t time.Time,
-) plugins.Metric {
+) telegraf.Metric {
 	if len(fields) == 0 || len(measurement) == 0 {
 		return nil
 	}

internal/models/running_aggregator.go

@@ -3,28 +3,28 @@ package models
 import (
 	"time"
 
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/metric"
-	"github.com/influxdata/telegraf/plugins"
 )
 
 type RunningAggregator struct {
-	a      plugins.Aggregator
+	a      telegraf.Aggregator
 	Config *AggregatorConfig
 
-	metrics chan plugins.Metric
+	metrics chan telegraf.Metric
 
 	periodStart time.Time
 	periodEnd   time.Time
 }
 
 func NewRunningAggregator(
-	a plugins.Aggregator,
+	a telegraf.Aggregator,
 	conf *AggregatorConfig,
 ) *RunningAggregator {
 	return &RunningAggregator{
 		a:       a,
 		Config:  conf,
-		metrics: make(chan plugins.Metric, 100),
+		metrics: make(chan telegraf.Metric, 100),
 	}
 }
 
@@ -52,9 +52,9 @@ func (r *RunningAggregator) MakeMetric(
 	measurement string,
 	fields map[string]interface{},
 	tags map[string]string,
-	mType plugins.ValueType,
+	mType telegraf.ValueType,
 	t time.Time,
-) plugins.Metric {
+) telegraf.Metric {
 	m := makemetric(
 		measurement,
 		fields,
@@ -70,9 +70,7 @@ func (r *RunningAggregator) MakeMetric(
 		t,
 	)
 
-	if m != nil {
-		m.SetAggregate(true)
-	}
+	m.SetAggregate(true)
 
 	return m
 }
@@ -80,7 +78,7 @@ func (r *RunningAggregator) MakeMetric(
 // Add applies the given metric to the aggregator.
 // Before applying to the plugin, it will run any defined filters on the metric.
 // Apply returns true if the original metric should be dropped.
-func (r *RunningAggregator) Add(in plugins.Metric) bool {
+func (r *RunningAggregator) Add(in telegraf.Metric) bool {
 	if r.Config.Filter.IsActive() {
 		// check if the aggregator should apply this metric
 		name := in.Name()
@@ -98,11 +96,11 @@ func (r *RunningAggregator) Add(in plugins.Metric) bool {
 	r.metrics <- in
 	return r.Config.DropOriginal
 }
-func (r *RunningAggregator) add(in plugins.Metric) {
+func (r *RunningAggregator) add(in telegraf.Metric) {
 	r.a.Add(in)
 }
 
-func (r *RunningAggregator) push(acc plugins.Accumulator) {
+func (r *RunningAggregator) push(acc telegraf.Accumulator) {
 	r.a.Push(acc)
 }
 
@@ -113,7 +111,7 @@ func (r *RunningAggregator) reset() {
 // Run runs the running aggregator, listens for incoming metrics, and waits
 // for period ticks to tell it when to push and reset the aggregator.
 func (r *RunningAggregator) Run(
-	acc plugins.Accumulator,
+	acc telegraf.Accumulator,
 	shutdown chan struct{},
 ) {
 	// The start of the period is truncated to the nearest second.

internal/models/running_aggregator_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/testutil"
 
 	"github.com/stretchr/testify/assert"
@@ -30,7 +30,7 @@ func TestAdd(t *testing.T) {
 		"RITest",
 		map[string]interface{}{"value": int(101)},
 		map[string]string{},
-		plugins.Untyped,
+		telegraf.Untyped,
 		time.Now().Add(time.Millisecond*150),
 	)
 	assert.False(t, ra.Add(m))
@@ -62,7 +62,7 @@ func TestAddMetricsOutsideCurrentPeriod(t *testing.T) {
 		"RITest",
 		map[string]interface{}{"value": int(101)},
 		map[string]string{},
-		plugins.Untyped,
+		telegraf.Untyped,
 		time.Now().Add(-time.Hour),
 	)
 	assert.False(t, ra.Add(m))
@@ -72,7 +72,7 @@ func TestAddMetricsOutsideCurrentPeriod(t *testing.T) {
 		"RITest",
 		map[string]interface{}{"value": int(101)},
 		map[string]string{},
-		plugins.Untyped,
+		telegraf.Untyped,
 		time.Now().Add(time.Hour),
 	)
 	assert.False(t, ra.Add(m))
@@ -82,7 +82,7 @@ func TestAddMetricsOutsideCurrentPeriod(t *testing.T) {
 		"RITest",
 		map[string]interface{}{"value": int(101)},
 		map[string]string{},
-		plugins.Untyped,
+		telegraf.Untyped,
 		time.Now().Add(time.Millisecond*50),
 	)
 	assert.False(t, ra.Add(m))
@@ -120,7 +120,7 @@ func TestAddAndPushOnePeriod(t *testing.T) {
 		"RITest",
 		map[string]interface{}{"value": int(101)},
 		map[string]string{},
-		plugins.Untyped,
+		telegraf.Untyped,
 		time.Now().Add(time.Millisecond*100),
 	)
 	assert.False(t, ra.Add(m))
@@ -151,7 +151,7 @@ func TestAddDropOriginal(t *testing.T) {
 		"RITest",
 		map[string]interface{}{"value": int(101)},
 		map[string]string{},
-		plugins.Untyped,
+		telegraf.Untyped,
 		time.Now(),
 	)
 	assert.True(t, ra.Add(m))
@@ -161,7 +161,7 @@ func TestAddDropOriginal(t *testing.T) {
 		"foobar",
 		map[string]interface{}{"value": int(101)},
 		map[string]string{},
-		plugins.Untyped,
+		telegraf.Untyped,
 		time.Now(),
 	)
 	assert.False(t, ra.Add(m2))
@@ -179,7 +179,7 @@ func TestMakeMetricA(t *testing.T) {
 		"RITest",
 		map[string]interface{}{"value": int(101)},
 		map[string]string{},
-		plugins.Untyped,
+		telegraf.Untyped,
 		now,
 	)
 	assert.Equal(
@@ -190,14 +190,14 @@ func TestMakeMetricA(t *testing.T) {
 	assert.Equal(
 		t,
 		m.Type(),
-		plugins.Untyped,
+		telegraf.Untyped,
 	)
 
 	m = ra.MakeMetric(
 		"RITest",
 		map[string]interface{}{"value": int(101)},
 		map[string]string{},
-		plugins.Counter,
+		telegraf.Counter,
 		now,
 	)
 	assert.Equal(
@@ -208,14 +208,14 @@ func TestMakeMetricA(t *testing.T) {
 	assert.Equal(
 		t,
 		m.Type(),
-		plugins.Counter,
+		telegraf.Counter,
 	)
 
 	m = ra.MakeMetric(
 		"RITest",
 		map[string]interface{}{"value": int(101)},
 		map[string]string{},
-		plugins.Gauge,
+		telegraf.Gauge,
 		now,
 	)
 	assert.Equal(
@@ -226,7 +226,7 @@ func TestMakeMetricA(t *testing.T) {
 	assert.Equal(
 		t,
 		m.Type(),
-		plugins.Gauge,
+		telegraf.Gauge,
 	)
 }
 
@@ -240,14 +240,14 @@ func (t *TestAggregator) Reset() {
 	atomic.StoreInt64(&t.sum, 0)
 }
 
-func (t *TestAggregator) Push(acc plugins.Accumulator) {
+func (t *TestAggregator) Push(acc telegraf.Accumulator) {
 	acc.AddFields("TestMetric",
 		map[string]interface{}{"sum": t.sum},
 		map[string]string{},
 	)
 }
 
-func (t *TestAggregator) Add(in plugins.Metric) {
+func (t *TestAggregator) Add(in telegraf.Metric) {
 	for _, v := range in.Fields() {
 		if vi, ok := v.(int64); ok {
 			atomic.AddInt64(&t.sum, vi)

internal/models/running_input.go

@@ -4,14 +4,14 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/selfstat"
 )
 
 var GlobalMetricsGathered = selfstat.Register("agent", "metrics_gathered", map[string]string{})
 
 type RunningInput struct {
-	Input  plugins.Input
+	Input  telegraf.Input
 	Config *InputConfig
 
 	trace       bool
@@ -21,7 +21,7 @@ type RunningInput struct {
 }
 
 func NewRunningInput(
-	input plugins.Input,
+	input telegraf.Input,
 	config *InputConfig,
 ) *RunningInput {
 	return &RunningInput{
@@ -56,9 +56,9 @@ func (r *RunningInput) MakeMetric(
 	measurement string,
 	fields map[string]interface{},
 	tags map[string]string,
-	mType plugins.ValueType,
+	mType telegraf.ValueType,
 	t time.Time,
-) plugins.Metric {
+) telegraf.Metric {
 	m := makemetric(
 		measurement,
 		fields,

internal/models/running_input_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -21,7 +21,7 @@ func TestMakeMetricNoFields(t *testing.T) {
 		"RITest",
 		map[string]interface{}{},
 		map[string]string{},
-		plugins.Untyped,
+		telegraf.Untyped,
 		now,
 	)
 	assert.Nil(t, m)
@@ -41,7 +41,7 @@ func TestMakeMetricNilFields(t *testing.T) {
 			"nil":   nil,
 		},
 		map[string]string{},
-		plugins.Untyped,
+		telegraf.Untyped,
 		now,
 	)
 	assert.Equal(
@@ -66,7 +66,7 @@ func TestMakeMetric(t *testing.T) {
 		"RITest",
 		map[string]interface{}{"value": int(101)},
 		map[string]string{},
-		plugins.Untyped,
+		telegraf.Untyped,
 		now,
 	)
 	assert.Equal(
@@ -77,14 +77,14 @@ func TestMakeMetric(t *testing.T) {
 	assert.Equal(
 		t,
 		m.Type(),
-		plugins.Untyped,
+		telegraf.Untyped,
 	)
 
 	m = ri.MakeMetric(
 		"RITest",
 		map[string]interface{}{"value": int(101)},
 		map[string]string{},
-		plugins.Counter,
+		telegraf.Counter,
 		now,
 	)
 	assert.Equal(
@@ -95,14 +95,14 @@ func TestMakeMetric(t *testing.T) {
 	assert.Equal(
 		t,
 		m.Type(),
-		plugins.Counter,
+		telegraf.Counter,
 	)
 
 	m = ri.MakeMetric(
 		"RITest",
 		map[string]interface{}{"value": int(101)},
 		map[string]string{},
-		plugins.Gauge,
+		telegraf.Gauge,
 		now,
 	)
 	assert.Equal(
@@ -113,7 +113,7 @@ func TestMakeMetric(t *testing.T) {
 	assert.Equal(
 		t,
 		m.Type(),
-		plugins.Gauge,
+		telegraf.Gauge,
 	)
 }
 
@@ -133,7 +133,7 @@ func TestMakeMetricWithPluginTags(t *testing.T) {
 		"RITest",
 		map[string]interface{}{"value": int(101)},
 		nil,
-		plugins.Untyped,
+		telegraf.Untyped,
 		now,
 	)
 	assert.Equal(
@@ -161,7 +161,7 @@ func TestMakeMetricFilteredOut(t *testing.T) {
 		"RITest",
 		map[string]interface{}{"value": int(101)},
 		nil,
-		plugins.Untyped,
+		telegraf.Untyped,
 		now,
 	)
 	assert.Nil(t, m)
@@ -183,7 +183,7 @@ func TestMakeMetricWithDaemonTags(t *testing.T) {
 		"RITest",
 		map[string]interface{}{"value": int(101)},
 		map[string]string{},
-		plugins.Untyped,
+		telegraf.Untyped,
 		now,
 	)
 	assert.Equal(
@@ -213,7 +213,7 @@ func TestMakeMetricInfFields(t *testing.T) {
 			"ninf":  ninf,
 		},
 		map[string]string{},
-		plugins.Untyped,
+		telegraf.Untyped,
 		now,
 	)
 	assert.Equal(
@@ -250,7 +250,7 @@ func TestMakeMetricAllFieldTypes(t *testing.T) {
 			"m": true,
 		},
 		map[string]string{},
-		plugins.Untyped,
+		telegraf.Untyped,
 		now,
 	)
 	assert.Contains(t, m.String(), "a=10i")
@@ -280,7 +280,7 @@ func TestMakeMetricNameOverride(t *testing.T) {
 		"RITest",
 		map[string]interface{}{"value": int(101)},
 		map[string]string{},
-		plugins.Untyped,
+		telegraf.Untyped,
 		now,
 	)
 	assert.Equal(
@@ -301,7 +301,7 @@ func TestMakeMetricNamePrefix(t *testing.T) {
 		"RITest",
 		map[string]interface{}{"value": int(101)},
 		map[string]string{},
-		plugins.Untyped,
+		telegraf.Untyped,
 		now,
 	)
 	assert.Equal(
@@ -322,7 +322,7 @@ func TestMakeMetricNameSuffix(t *testing.T) {
 		"RITest",
 		map[string]interface{}{"value": int(101)},
 		map[string]string{},
-		plugins.Untyped,
+		telegraf.Untyped,
 		now,
 	)
 	assert.Equal(
@@ -336,4 +336,4 @@ type testInput struct{}
 
 func (t *testInput) Description() string                   { return "" }
 func (t *testInput) SampleConfig() string                  { return "" }
-func (t *testInput) Gather(acc plugins.Accumulator) error { return nil }
+func (t *testInput) Gather(acc telegraf.Accumulator) error { return nil }

internal/models/running_output.go

@@ -4,7 +4,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal/buffer"
 	"github.com/influxdata/telegraf/metric"
 	"github.com/influxdata/telegraf/selfstat"
@@ -21,7 +21,7 @@ const (
 // RunningOutput contains the output configuration
 type RunningOutput struct {
 	Name              string
-	Output            plugins.Output
+	Output            telegraf.Output
 	Config            *OutputConfig
 	MetricBufferLimit int
 	MetricBatchSize   int
@@ -38,7 +38,7 @@ type RunningOutput struct {
 
 func NewRunningOutput(
 	name string,
-	output plugins.Output,
+	output telegraf.Output,
 	conf *OutputConfig,
 	batchSize int,
 	bufferLimit int,
@@ -89,7 +89,7 @@ func NewRunningOutput(
 
 // AddMetric adds a metric to the output. This function can also write cached
 // points if FlushBufferWhenFull is true.
-func (ro *RunningOutput) AddMetric(m plugins.Metric) {
+func (ro *RunningOutput) AddMetric(m telegraf.Metric) {
 	// Filter any tagexclude/taginclude parameters before adding metric
 	if ro.Config.Filter.IsActive() {
 		// In order to filter out tags, we need to create a new metric, since
@@ -161,7 +161,7 @@ func (ro *RunningOutput) Write() error {
 	return nil
 }
 
-func (ro *RunningOutput) write(metrics []plugins.Metric) error {
+func (ro *RunningOutput) write(metrics []telegraf.Metric) error {
 	nMetrics := len(metrics)
 	if nMetrics == 0 {
 		return nil

internal/models/running_output_test.go

@@ -5,14 +5,14 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/testutil"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
-var first5 = []plugins.Metric{
+var first5 = []telegraf.Metric{
 	testutil.TestMetric(101, "metric1"),
 	testutil.TestMetric(101, "metric2"),
 	testutil.TestMetric(101, "metric3"),
@@ -20,7 +20,7 @@ var first5 = []plugins.Metric{
 	testutil.TestMetric(101, "metric5"),
 }
 
-var next5 = []plugins.Metric{
+var next5 = []telegraf.Metric{
 	testutil.TestMetric(101, "metric6"),
 	testutil.TestMetric(101, "metric7"),
 	testutil.TestMetric(101, "metric8"),
@@ -465,7 +465,7 @@ func TestRunningOutputWriteFailOrder3(t *testing.T) {
 type mockOutput struct {
 	sync.Mutex
 
-	metrics []plugins.Metric
+	metrics []telegraf.Metric
 
 	// if true, mock a write failure
 	failWrite bool
@@ -487,7 +487,7 @@ func (m *mockOutput) SampleConfig() string {
 	return ""
 }
 
-func (m *mockOutput) Write(metrics []plugins.Metric) error {
+func (m *mockOutput) Write(metrics []telegraf.Metric) error {
 	m.Lock()
 	defer m.Unlock()
 	if m.failWrite {
@@ -495,7 +495,7 @@ func (m *mockOutput) Write(metrics []plugins.Metric) error {
 	}
 
 	if m.metrics == nil {
-		m.metrics = []plugins.Metric{}
+		m.metrics = []telegraf.Metric{}
 	}
 
 	for _, metric := range metrics {
@@ -504,7 +504,7 @@ func (m *mockOutput) Write(metrics []plugins.Metric) error {
 	return nil
 }
 
-func (m *mockOutput) Metrics() []plugins.Metric {
+func (m *mockOutput) Metrics() []telegraf.Metric {
 	m.Lock()
 	defer m.Unlock()
 	return m.metrics
@@ -531,7 +531,7 @@ func (m *perfOutput) SampleConfig() string {
 	return ""
 }
 
-func (m *perfOutput) Write(metrics []plugins.Metric) error {
+func (m *perfOutput) Write(metrics []telegraf.Metric) error {
 	if m.failWrite {
 		return fmt.Errorf("Failed Write!")
 	}

internal/models/running_processor.go

@@ -1,12 +1,12 @@
 package models
 
 import (
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 )
 
 type RunningProcessor struct {
 	Name      string
-	Processor plugins.Processor
+	Processor telegraf.Processor
 	Config    *ProcessorConfig
 }
 
@@ -23,8 +23,8 @@ type ProcessorConfig struct {
 	Filter Filter
 }
 
-func (rp *RunningProcessor) Apply(in ...plugins.Metric) []plugins.Metric {
-	ret := []plugins.Metric{}
+func (rp *RunningProcessor) Apply(in ...telegraf.Metric) []telegraf.Metric {
+	ret := []telegraf.Metric{}
 
 	for _, metric := range in {
 		if rp.Config.Filter.IsActive() {

internal/models/running_processor_test.go

@@ -3,7 +3,7 @@ package models
 import (
 	"testing"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/testutil"
 
 	"github.com/stretchr/testify/assert"
@@ -19,8 +19,8 @@ func (f *TestProcessor) Description() string  { return "" }
 //   "foo" to "fuz"
 //   "bar" to "baz"
 // And it also drops measurements named "dropme"
-func (f *TestProcessor) Apply(in ...plugins.Metric) []plugins.Metric {
-	out := make([]plugins.Metric, 0)
+func (f *TestProcessor) Apply(in ...telegraf.Metric) []telegraf.Metric {
+	out := make([]telegraf.Metric, 0)
 	for _, m := range in {
 		switch m.Name() {
 		case "foo":
@@ -46,7 +46,7 @@ func NewTestRunningProcessor() *RunningProcessor {
 }
 
 func TestRunningProcessor(t *testing.T) {
-	inmetrics := []plugins.Metric{
+	inmetrics := []telegraf.Metric{
 		testutil.TestMetric(1, "foo"),
 		testutil.TestMetric(1, "bar"),
 		testutil.TestMetric(1, "baz"),
@@ -69,7 +69,7 @@ func TestRunningProcessor(t *testing.T) {
 }
 
 func TestRunningProcessor_WithNameDrop(t *testing.T) {
-	inmetrics := []plugins.Metric{
+	inmetrics := []telegraf.Metric{
 		testutil.TestMetric(1, "foo"),
 		testutil.TestMetric(1, "bar"),
 		testutil.TestMetric(1, "baz"),
@@ -96,7 +96,7 @@ func TestRunningProcessor_WithNameDrop(t *testing.T) {
 }
 
 func TestRunningProcessor_DroppedMetric(t *testing.T) {
-	inmetrics := []plugins.Metric{
+	inmetrics := []telegraf.Metric{
 		testutil.TestMetric(1, "dropme"),
 		testutil.TestMetric(1, "foo"),
 		testutil.TestMetric(1, "bar"),

metric.go

@@ -1,4 +1,4 @@
-package plugins
+package telegraf
 
 import (
 	"time"

metric/metric.go

@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 
 	// TODO remove
 	"github.com/influxdata/influxdb/client/v2"
@@ -21,8 +21,8 @@ func New(
 	tags map[string]string,
 	fields map[string]interface{},
 	t time.Time,
-	mType ...plugins.ValueType,
-) (plugins.Metric, error) {
+	mType ...telegraf.ValueType,
+) (telegraf.Metric, error) {
 	if len(fields) == 0 {
 		return nil, fmt.Errorf("Metric cannot be made without any fields")
 	}
@@ -30,11 +30,11 @@ func New(
 		return nil, fmt.Errorf("Metric cannot be made with an empty name")
 	}
 
-	var thisType plugins.ValueType
+	var thisType telegraf.ValueType
 	if len(mType) > 0 {
 		thisType = mType[0]
 	} else {
-		thisType = plugins.Untyped
+		thisType = telegraf.Untyped
 	}
 
 	m := &metric{
@@ -129,7 +129,7 @@ type metric struct {
 	fields []byte
 	t      []byte
 
-	mType     plugins.ValueType
+	mType     telegraf.ValueType
 	aggregate bool
 
 	// cached values for reuse in "get" functions
@@ -154,7 +154,7 @@ func (m *metric) IsAggregate() bool {
 	return m.aggregate
 }
 
-func (m *metric) Type() plugins.ValueType {
+func (m *metric) Type() telegraf.ValueType {
 	return m.mType
 }
 
@@ -178,11 +178,11 @@ func (m *metric) Serialize() []byte {
 	return tmp
 }
 
-func (m *metric) Split(maxSize int) []plugins.Metric {
+func (m *metric) Split(maxSize int) []telegraf.Metric {
 	if m.Len() < maxSize {
-		return []plugins.Metric{m}
+		return []telegraf.Metric{m}
 	}
-	var out []plugins.Metric
+	var out []telegraf.Metric
 
 	// constant number of bytes for each metric (in addition to field bytes)
 	constant := len(m.name) + len(m.tags) + len(m.t) + 3
@@ -430,11 +430,11 @@ func (m *metric) RemoveField(key string) error {
 	return nil
 }
 
-func (m *metric) Copy() plugins.Metric {
+func (m *metric) Copy() telegraf.Metric {
 	return copyWith(m.name, m.tags, m.fields, m.t)
 }
 
-func copyWith(name, tags, fields, t []byte) plugins.Metric {
+func copyWith(name, tags, fields, t []byte) telegraf.Metric {
 	out := metric{
 		name:   make([]byte, len(name)),
 		tags:   make([]byte, len(tags)),

metric/metric_benchmark_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 )
 
 // vars for making sure that the compiler doesnt optimize out the benchmarks:
@@ -17,7 +17,7 @@ var (
 )
 
 func BenchmarkNewMetric(b *testing.B) {
-	var mt plugins.Metric
+	var mt telegraf.Metric
 	for n := 0; n < b.N; n++ {
 		mt, _ = New("test_metric",
 			map[string]string{
@@ -37,7 +37,7 @@ func BenchmarkNewMetric(b *testing.B) {
 }
 
 func BenchmarkAddTag(b *testing.B) {
-	var mt plugins.Metric
+	var mt telegraf.Metric
 	mt = &metric{
 		name:   []byte("cpu"),
 		tags:   []byte(",host=localhost"),
@@ -51,14 +51,14 @@ func BenchmarkAddTag(b *testing.B) {
 }
 
 func BenchmarkSplit(b *testing.B) {
-	var mt plugins.Metric
+	var mt telegraf.Metric
 	mt = &metric{
 		name:   []byte("cpu"),
 		tags:   []byte(",host=localhost"),
 		fields: []byte("a=101,b=10i,c=10101,d=101010,e=42"),
 		t:      []byte("1480614053000000000"),
 	}
-	var metrics []plugins.Metric
+	var metrics []telegraf.Metric
 	for n := 0; n < b.N; n++ {
 		metrics = mt.Split(60)
 	}

metric/metric_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 
 	"github.com/stretchr/testify/assert"
 )
@@ -26,7 +26,7 @@ func TestNewMetric(t *testing.T) {
 	m, err := New("cpu", tags, fields, now)
 	assert.NoError(t, err)
 
-	assert.Equal(t, plugins.Untyped, m.Type())
+	assert.Equal(t, telegraf.Untyped, m.Type())
 	assert.Equal(t, tags, m.Tags())
 	assert.Equal(t, fields, m.Fields())
 	assert.Equal(t, "cpu", m.Name())
@@ -402,10 +402,10 @@ func TestNewGaugeMetric(t *testing.T) {
 		"usage_idle": float64(99),
 		"usage_busy": float64(1),
 	}
-	m, err := New("cpu", tags, fields, now, plugins.Gauge)
+	m, err := New("cpu", tags, fields, now, telegraf.Gauge)
 	assert.NoError(t, err)
 
-	assert.Equal(t, plugins.Gauge, m.Type())
+	assert.Equal(t, telegraf.Gauge, m.Type())
 	assert.Equal(t, tags, m.Tags())
 	assert.Equal(t, fields, m.Fields())
 	assert.Equal(t, "cpu", m.Name())
@@ -424,10 +424,10 @@ func TestNewCounterMetric(t *testing.T) {
 		"usage_idle": float64(99),
 		"usage_busy": float64(1),
 	}
-	m, err := New("cpu", tags, fields, now, plugins.Counter)
+	m, err := New("cpu", tags, fields, now, telegraf.Counter)
 	assert.NoError(t, err)
 
-	assert.Equal(t, plugins.Counter, m.Type())
+	assert.Equal(t, telegraf.Counter, m.Type())
 	assert.Equal(t, tags, m.Tags())
 	assert.Equal(t, fields, m.Fields())
 	assert.Equal(t, "cpu", m.Name())

metric/parse.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 )
 
 var (
@@ -39,15 +39,15 @@ const (
 	fieldsState
 )
 
-func Parse(buf []byte) ([]plugins.Metric, error) {
+func Parse(buf []byte) ([]telegraf.Metric, error) {
 	return ParseWithDefaultTime(buf, time.Now())
 }
 
-func ParseWithDefaultTime(buf []byte, t time.Time) ([]plugins.Metric, error) {
+func ParseWithDefaultTime(buf []byte, t time.Time) ([]telegraf.Metric, error) {
 	if len(buf) <= 6 {
-		return []plugins.Metric{}, makeError("buffer too short", buf, 0)
+		return []telegraf.Metric{}, makeError("buffer too short", buf, 0)
 	}
-	metrics := make([]plugins.Metric, 0, bytes.Count(buf, []byte("\n"))+1)
+	metrics := make([]telegraf.Metric, 0, bytes.Count(buf, []byte("\n"))+1)
 	var errStr string
 	i := 0
 	for {
@@ -77,7 +77,7 @@ func ParseWithDefaultTime(buf []byte, t time.Time) ([]plugins.Metric, error) {
 	return metrics, nil
 }
 
-func parseMetric(buf []byte, defaultTime time.Time) (plugins.Metric, error) {
+func parseMetric(buf []byte, defaultTime time.Time) (telegraf.Metric, error) {
 	var dTime string
 	// scan the first block which is measurement[,tag1=value1,tag2=value=2...]
 	pos, key, err := scanKey(buf, 0)

output.go

@@ -1,4 +1,4 @@
-package plugins
+package telegraf
 
 type Output interface {
 	// Connect to the Output

plugins/aggregators/minmax/minmax.go

@@ -1,7 +1,7 @@
 package minmax
 
 import (
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/aggregators"
 )
 
@@ -9,7 +9,7 @@ type MinMax struct {
 	cache map[uint64]aggregate
 }
 
-func NewMinMax() plugins.Aggregator {
+func NewMinMax() telegraf.Aggregator {
 	mm := &MinMax{}
 	mm.Reset()
 	return mm
@@ -43,7 +43,7 @@ func (m *MinMax) Description() string {
 	return "Keep the aggregate min/max of each metric passing through."
 }
 
-func (m *MinMax) Add(in plugins.Metric) {
+func (m *MinMax) Add(in telegraf.Metric) {
 	id := in.HashID()
 	if _, ok := m.cache[id]; !ok {
 		// hit an uncached metric, create caches for first time:
@@ -86,7 +86,7 @@ func (m *MinMax) Add(in plugins.Metric) {
 	}
 }
 
-func (m *MinMax) Push(acc plugins.Accumulator) {
+func (m *MinMax) Push(acc telegraf.Accumulator) {
 	for _, aggregate := range m.cache {
 		fields := map[string]interface{}{}
 		for k, v := range aggregate.fields {
@@ -113,7 +113,7 @@ func convert(in interface{}) (float64, bool) {
 }
 
 func init() {
-	aggregators.Add("minmax", func() plugins.Aggregator {
+	aggregators.Add("minmax", func() telegraf.Aggregator {
 		return NewMinMax()
 	})
 }

plugins/aggregators/registry.go

@@ -1,8 +1,8 @@
 package aggregators
 
-import "github.com/influxdata/telegraf/plugins"
+import "github.com/influxdata/telegraf"
 
-type Creator func() plugins.Aggregator
+type Creator func() telegraf.Aggregator
 
 var Aggregators = map[string]Creator{}
 

plugins/inputs/aerospike/aerospike.go

@@ -9,7 +9,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal/errchan"
 	"github.com/influxdata/telegraf/plugins/inputs"
 
@@ -35,7 +35,7 @@ func (a *Aerospike) Description() string {
 	return "Read stats from aerospike server(s)"
 }
 
-func (a *Aerospike) Gather(acc plugins.Accumulator) error {
+func (a *Aerospike) Gather(acc telegraf.Accumulator) error {
 	if len(a.Servers) == 0 {
 		return a.gatherServer("127.0.0.1:3000", acc)
 	}
@@ -54,7 +54,7 @@ func (a *Aerospike) Gather(acc plugins.Accumulator) error {
 	return errChan.Error()
 }
 
-func (a *Aerospike) gatherServer(hostport string, acc plugins.Accumulator) error {
+func (a *Aerospike) gatherServer(hostport string, acc telegraf.Accumulator) error {
 	host, port, err := net.SplitHostPort(hostport)
 	if err != nil {
 		return err
@@ -152,7 +152,7 @@ func copyTags(m map[string]string) map[string]string {
 }
 
 func init() {
-	inputs.Add("aerospike", func() plugins.Input {
+	inputs.Add("aerospike", func() telegraf.Input {
 		return &Aerospike{}
 	})
 }

plugins/inputs/apache/apache.go

@@ -10,7 +10,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
@@ -57,7 +57,7 @@ func (n *Apache) Description() string {
 	return "Read Apache status information (mod_status)"
 }
 
-func (n *Apache) Gather(acc plugins.Accumulator) error {
+func (n *Apache) Gather(acc telegraf.Accumulator) error {
 	if len(n.Urls) == 0 {
 		n.Urls = []string{"http://localhost/server-status?auto"}
 	}
@@ -89,7 +89,7 @@ func (n *Apache) Gather(acc plugins.Accumulator) error {
 	return outerr
 }
 
-func (n *Apache) gatherUrl(addr *url.URL, acc plugins.Accumulator) error {
+func (n *Apache) gatherUrl(addr *url.URL, acc telegraf.Accumulator) error {
 
 	var tr *http.Transport
 
@@ -228,7 +228,7 @@ func getTags(addr *url.URL) map[string]string {
 }
 
 func init() {
-	inputs.Add("apache", func() plugins.Input {
+	inputs.Add("apache", func() telegraf.Input {
 		return &Apache{}
 	})
 }

plugins/inputs/bcache/bcache.go

@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
@@ -70,7 +70,7 @@ func prettyToBytes(v string) uint64 {
 	return uint64(result)
 }
 
-func (b *Bcache) gatherBcache(bdev string, acc plugins.Accumulator) error {
+func (b *Bcache) gatherBcache(bdev string, acc telegraf.Accumulator) error {
 	tags := getTags(bdev)
 	metrics, err := filepath.Glob(bdev + "/stats_total/*")
 	if len(metrics) < 0 {
@@ -105,7 +105,7 @@ func (b *Bcache) gatherBcache(bdev string, acc plugins.Accumulator) error {
 	return nil
 }
 
-func (b *Bcache) Gather(acc plugins.Accumulator) error {
+func (b *Bcache) Gather(acc telegraf.Accumulator) error {
 	bcacheDevsChecked := make(map[string]bool)
 	var restrictDevs bool
 	if len(b.BcacheDevs) != 0 {
@@ -136,7 +136,7 @@ func (b *Bcache) Gather(acc plugins.Accumulator) error {
 }
 
 func init() {
-	inputs.Add("bcache", func() plugins.Input {
+	inputs.Add("bcache", func() telegraf.Input {
 		return &Bcache{}
 	})
 }

plugins/inputs/cassandra/cassandra.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"io/ioutil"
 	"log"
@@ -35,13 +35,13 @@ type Cassandra struct {
 type javaMetric struct {
 	host   string
 	metric string
-	acc    plugins.Accumulator
+	acc    telegraf.Accumulator
 }
 
 type cassandraMetric struct {
 	host   string
 	metric string
-	acc    plugins.Accumulator
+	acc    telegraf.Accumulator
 }
 
 type jmxMetric interface {
@@ -49,12 +49,12 @@ type jmxMetric interface {
 }
 
 func newJavaMetric(host string, metric string,
-	acc plugins.Accumulator) *javaMetric {
+	acc telegraf.Accumulator) *javaMetric {
 	return &javaMetric{host: host, metric: metric, acc: acc}
 }
 
 func newCassandraMetric(host string, metric string,
-	acc plugins.Accumulator) *cassandraMetric {
+	acc telegraf.Accumulator) *cassandraMetric {
 	return &cassandraMetric{host: host, metric: metric, acc: acc}
 }
 
@@ -257,7 +257,7 @@ func parseServerTokens(server string) map[string]string {
 	return serverTokens
 }
 
-func (c *Cassandra) Gather(acc plugins.Accumulator) error {
+func (c *Cassandra) Gather(acc telegraf.Accumulator) error {
 	context := c.Context
 	servers := c.Servers
 	metrics := c.Metrics
@@ -289,6 +289,7 @@ func (c *Cassandra) Gather(acc plugins.Accumulator) error {
 				requestUrl.User = url.UserPassword(serverTokens["user"],
 					serverTokens["passwd"])
 			}
+			fmt.Printf("host %s url %s\n", serverTokens["host"], requestUrl)
 
 			out, err := c.getAttr(requestUrl)
 			if out["status"] != 200.0 {
@@ -302,7 +303,7 @@ func (c *Cassandra) Gather(acc plugins.Accumulator) error {
 }
 
 func init() {
-	inputs.Add("cassandra", func() plugins.Input {
+	inputs.Add("cassandra", func() telegraf.Input {
 		return &Cassandra{jClient: &JolokiaClientImpl{client: &http.Client{}}}
 	})
 }

plugins/inputs/ceph/ceph.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"io/ioutil"
 	"log"
@@ -75,7 +75,7 @@ func (c *Ceph) SampleConfig() string {
 	return sampleConfig
 }
 
-func (c *Ceph) Gather(acc plugins.Accumulator) error {
+func (c *Ceph) Gather(acc telegraf.Accumulator) error {
 	if c.GatherAdminSocketStats {
 		if err := c.gatherAdminSocketStats(acc); err != nil {
 			return err
@@ -91,7 +91,7 @@ func (c *Ceph) Gather(acc plugins.Accumulator) error {
 	return nil
 }
 
-func (c *Ceph) gatherAdminSocketStats(acc plugins.Accumulator) error {
+func (c *Ceph) gatherAdminSocketStats(acc telegraf.Accumulator) error {
 	sockets, err := findSockets(c)
 	if err != nil {
 		return fmt.Errorf("failed to find sockets at path '%s': %v", c.SocketDir, err)
@@ -117,10 +117,10 @@ func (c *Ceph) gatherAdminSocketStats(acc plugins.Accumulator) error {
 	return nil
 }
 
-func (c *Ceph) gatherClusterStats(acc plugins.Accumulator) error {
+func (c *Ceph) gatherClusterStats(acc telegraf.Accumulator) error {
 	jobs := []struct {
 		command string
-		parser  func(plugins.Accumulator, string) error
+		parser  func(telegraf.Accumulator, string) error
 	}{
 		{"status", decodeStatus},
 		{"df", decodeDf},
@@ -155,7 +155,7 @@ func init() {
 		GatherClusterStats:     false,
 	}
 
-	inputs.Add(measurement, func() plugins.Input { return &c })
+	inputs.Add(measurement, func() telegraf.Input { return &c })
 
 }
 
@@ -322,7 +322,7 @@ func (c *Ceph) exec(command string) (string, error) {
 	return output, nil
 }
 
-func decodeStatus(acc plugins.Accumulator, input string) error {
+func decodeStatus(acc telegraf.Accumulator, input string) error {
 	data := make(map[string]interface{})
 	err := json.Unmarshal([]byte(input), &data)
 	if err != nil {
@@ -347,7 +347,7 @@ func decodeStatus(acc plugins.Accumulator, input string) error {
 	return nil
 }
 
-func decodeStatusOsdmap(acc plugins.Accumulator, data map[string]interface{}) error {
+func decodeStatusOsdmap(acc telegraf.Accumulator, data map[string]interface{}) error {
 	osdmap, ok := data["osdmap"].(map[string]interface{})
 	if !ok {
 		return fmt.Errorf("WARNING %s - unable to decode osdmap", measurement)
@@ -360,7 +360,7 @@ func decodeStatusOsdmap(acc plugins.Accumulator, data map[string]interface{}) er
 	return nil
 }
 
-func decodeStatusPgmap(acc plugins.Accumulator, data map[string]interface{}) error {
+func decodeStatusPgmap(acc telegraf.Accumulator, data map[string]interface{}) error {
 	pgmap, ok := data["pgmap"].(map[string]interface{})
 	if !ok {
 		return fmt.Errorf("WARNING %s - unable to decode pgmap", measurement)
@@ -376,7 +376,7 @@ func decodeStatusPgmap(acc plugins.Accumulator, data map[string]interface{}) err
 	return nil
 }
 
-func decodeStatusPgmapState(acc plugins.Accumulator, data map[string]interface{}) error {
+func decodeStatusPgmapState(acc telegraf.Accumulator, data map[string]interface{}) error {
 	pgmap, ok := data["pgmap"].(map[string]interface{})
 	if !ok {
 		return fmt.Errorf("WARNING %s - unable to decode pgmap", measurement)
@@ -409,7 +409,7 @@ func decodeStatusPgmapState(acc plugins.Accumulator, data map[string]interface{}
 	return nil
 }
 
-func decodeDf(acc plugins.Accumulator, input string) error {
+func decodeDf(acc telegraf.Accumulator, input string) error {
 	data := make(map[string]interface{})
 	err := json.Unmarshal([]byte(input), &data)
 	if err != nil {
@@ -451,7 +451,7 @@ func decodeDf(acc plugins.Accumulator, input string) error {
 	return nil
 }
 
-func decodeOsdPoolStats(acc plugins.Accumulator, input string) error {
+func decodeOsdPoolStats(acc telegraf.Accumulator, input string) error {
 	data := make([]map[string]interface{}, 0)
 	err := json.Unmarshal([]byte(input), &data)
 	if err != nil {

plugins/inputs/cgroup/cgroup.go

@@ -1,7 +1,7 @@
 package cgroup
 
 import (
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
@@ -34,5 +34,5 @@ func (g *CGroup) Description() string {
 }
 
 func init() {
-	inputs.Add("cgroup", func() plugins.Input { return &CGroup{} })
+	inputs.Add("cgroup", func() telegraf.Input { return &CGroup{} })
 }

plugins/inputs/cgroup/cgroup_linux.go

@@ -11,12 +11,12 @@ import (
 	"regexp"
 	"strconv"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 )
 
 const metricName = "cgroup"
 
-func (g *CGroup) Gather(acc plugins.Accumulator) error {
+func (g *CGroup) Gather(acc telegraf.Accumulator) error {
 	list := make(chan pathInfo)
 	go g.generateDirs(list)
 
@@ -32,7 +32,7 @@ func (g *CGroup) Gather(acc plugins.Accumulator) error {
 	return nil
 }
 
-func (g *CGroup) gatherDir(dir string, acc plugins.Accumulator) error {
+func (g *CGroup) gatherDir(dir string, acc telegraf.Accumulator) error {
 	fields := make(map[string]interface{})
 
 	list := make(chan pathInfo)

plugins/inputs/cgroup/cgroup_notlinux.go

@@ -3,9 +3,9 @@
 package cgroup
 
 import (
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 )
 
-func (g *CGroup) Gather(acc plugins.Accumulator) error {
+func (g *CGroup) Gather(acc telegraf.Accumulator) error {
 	return nil
 }

plugins/inputs/chrony/chrony.go

@@ -10,7 +10,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
@@ -35,7 +35,7 @@ func (*Chrony) SampleConfig() string {
   `
 }
 
-func (c *Chrony) Gather(acc plugins.Accumulator) error {
+func (c *Chrony) Gather(acc telegraf.Accumulator) error {
 	if len(c.path) == 0 {
 		return errors.New("chronyc not found: verify that chrony is installed and that chronyc is in your PATH")
 	}
@@ -127,7 +127,7 @@ func init() {
 	if len(path) > 0 {
 		c.path = path
 	}
-	inputs.Add("chrony", func() plugins.Input {
+	inputs.Add("chrony", func() telegraf.Input {
 		return &c
 	})
 }

plugins/inputs/cloudwatch/cloudwatch.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/aws/aws-sdk-go/service/cloudwatch"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
 	internalaws "github.com/influxdata/telegraf/internal/config/aws"
 	"github.com/influxdata/telegraf/internal/errchan"
@@ -126,7 +126,11 @@ func (c *CloudWatch) Description() string {
 	return "Pull Metric Statistics from Amazon CloudWatch"
 }
 
-func SelectMetrics(c *CloudWatch) ([]*cloudwatch.Metric, error) {
+func (c *CloudWatch) Gather(acc telegraf.Accumulator) error {
+	if c.client == nil {
+		c.initializeCloudWatch()
+	}
+
 	var metrics []*cloudwatch.Metric
 
 	// check for provided metric filter
@@ -151,11 +155,11 @@ func SelectMetrics(c *CloudWatch) ([]*cloudwatch.Metric, error) {
 			} else {
 				allMetrics, err := c.fetchNamespaceMetrics()
 				if err != nil {
-					return nil, err
+					return err
 				}
 				for _, name := range m.MetricNames {
 					for _, metric := range allMetrics {
-						if isSelected(name, metric, m.Dimensions) {
+						if isSelected(metric, m.Dimensions) {
 							metrics = append(metrics, &cloudwatch.Metric{
 								Namespace:  aws.String(c.Namespace),
 								MetricName: aws.String(name),
@@ -165,26 +169,16 @@ func SelectMetrics(c *CloudWatch) ([]*cloudwatch.Metric, error) {
 					}
 				}
 			}
+
 		}
 	} else {
 		var err error
 		metrics, err = c.fetchNamespaceMetrics()
 		if err != nil {
-			return nil, err
+			return err
 		}
 	}
-	return metrics, nil
-}
 
-func (c *CloudWatch) Gather(acc plugins.Accumulator) error {
-	if c.client == nil {
-		c.initializeCloudWatch()
-	}
-
-	metrics, err := SelectMetrics(c)
-	if err != nil {
-		return err
-	}
 	metricCount := len(metrics)
 	errChan := errchan.New(metricCount)
 
@@ -210,7 +204,7 @@ func (c *CloudWatch) Gather(acc plugins.Accumulator) error {
 }
 
 func init() {
-	inputs.Add("cloudwatch", func() plugins.Input {
+	inputs.Add("cloudwatch", func() telegraf.Input {
 		ttl, _ := time.ParseDuration("1hr")
 		return &CloudWatch{
 			CacheTTL:  internal.Duration{Duration: ttl},
@@ -281,7 +275,7 @@ func (c *CloudWatch) fetchNamespaceMetrics() ([]*cloudwatch.Metric, error) {
  * Gather given Metric and emit any error
  */
 func (c *CloudWatch) gatherMetric(
-	acc plugins.Accumulator,
+	acc telegraf.Accumulator,
 	metric *cloudwatch.Metric,
 	now time.Time,
 	errChan chan error,
@@ -386,10 +380,7 @@ func hasWilcard(dimensions []*Dimension) bool {
 	return false
 }
 
-func isSelected(name string, metric *cloudwatch.Metric, dimensions []*Dimension) bool {
-	if name != *metric.MetricName {
-		return false
-	}
+func isSelected(metric *cloudwatch.Metric, dimensions []*Dimension) bool {
 	if len(metric.Dimensions) != len(dimensions) {
 		return false
 	}

plugins/inputs/cloudwatch/cloudwatch_test.go

@@ -11,9 +11,9 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-type mockGatherCloudWatchClient struct{}
+type mockCloudWatchClient struct{}
 
-func (m *mockGatherCloudWatchClient) ListMetrics(params *cloudwatch.ListMetricsInput) (*cloudwatch.ListMetricsOutput, error) {
+func (m *mockCloudWatchClient) ListMetrics(params *cloudwatch.ListMetricsInput) (*cloudwatch.ListMetricsOutput, error) {
 	metric := &cloudwatch.Metric{
 		Namespace:  params.Namespace,
 		MetricName: aws.String("Latency"),
@@ -31,7 +31,7 @@ func (m *mockGatherCloudWatchClient) ListMetrics(params *cloudwatch.ListMetricsI
 	return result, nil
 }
 
-func (m *mockGatherCloudWatchClient) GetMetricStatistics(params *cloudwatch.GetMetricStatisticsInput) (*cloudwatch.GetMetricStatisticsOutput, error) {
+func (m *mockCloudWatchClient) GetMetricStatistics(params *cloudwatch.GetMetricStatisticsInput) (*cloudwatch.GetMetricStatisticsOutput, error) {
 	dataPoint := &cloudwatch.Datapoint{
 		Timestamp:   params.EndTime,
 		Minimum:     aws.Float64(0.1),
@@ -62,7 +62,7 @@ func TestGather(t *testing.T) {
 	}
 
 	var acc testutil.Accumulator
-	c.client = &mockGatherCloudWatchClient{}
+	c.client = &mockCloudWatchClient{}
 
 	c.Gather(&acc)
 
@@ -83,94 +83,6 @@ func TestGather(t *testing.T) {
 
 }
 
-type mockSelectMetricsCloudWatchClient struct{}
-
-func (m *mockSelectMetricsCloudWatchClient) ListMetrics(params *cloudwatch.ListMetricsInput) (*cloudwatch.ListMetricsOutput, error) {
-	metrics := []*cloudwatch.Metric{}
-	// 4 metrics are available
-	metricNames := []string{"Latency", "RequestCount", "HealthyHostCount", "UnHealthyHostCount"}
-	// for 3 ELBs
-	loadBalancers := []string{"lb-1", "lb-2", "lb-3"}
-	// in 2 AZs
-	availabilityZones := []string{"us-east-1a", "us-east-1b"}
-	for _, m := range metricNames {
-		for _, lb := range loadBalancers {
-			// For each metric/ELB pair, we get an aggregate value across all AZs.
-			metrics = append(metrics, &cloudwatch.Metric{
-				Namespace:  aws.String("AWS/ELB"),
-				MetricName: aws.String(m),
-				Dimensions: []*cloudwatch.Dimension{
-					&cloudwatch.Dimension{
-						Name:  aws.String("LoadBalancerName"),
-						Value: aws.String(lb),
-					},
-				},
-			})
-			for _, az := range availabilityZones {
-				// We get a metric for each metric/ELB/AZ triplet.
-				metrics = append(metrics, &cloudwatch.Metric{
-					Namespace:  aws.String("AWS/ELB"),
-					MetricName: aws.String(m),
-					Dimensions: []*cloudwatch.Dimension{
-						&cloudwatch.Dimension{
-							Name:  aws.String("LoadBalancerName"),
-							Value: aws.String(lb),
-						},
-						&cloudwatch.Dimension{
-							Name:  aws.String("AvailabilityZone"),
-							Value: aws.String(az),
-						},
-					},
-				})
-			}
-		}
-	}
-
-	result := &cloudwatch.ListMetricsOutput{
-		Metrics: metrics,
-	}
-	return result, nil
-}
-
-func (m *mockSelectMetricsCloudWatchClient) GetMetricStatistics(params *cloudwatch.GetMetricStatisticsInput) (*cloudwatch.GetMetricStatisticsOutput, error) {
-	return nil, nil
-}
-
-func TestSelectMetrics(t *testing.T) {
-	duration, _ := time.ParseDuration("1m")
-	internalDuration := internal.Duration{
-		Duration: duration,
-	}
-	c := &CloudWatch{
-		Region:    "us-east-1",
-		Namespace: "AWS/ELB",
-		Delay:     internalDuration,
-		Period:    internalDuration,
-		RateLimit: 10,
-		Metrics: []*Metric{
-			&Metric{
-				MetricNames: []string{"Latency", "RequestCount"},
-				Dimensions: []*Dimension{
-					&Dimension{
-						Name:  "LoadBalancerName",
-						Value: "*",
-					},
-					&Dimension{
-						Name:  "AvailabilityZone",
-						Value: "*",
-					},
-				},
-			},
-		},
-	}
-	c.client = &mockSelectMetricsCloudWatchClient{}
-	metrics, err := SelectMetrics(c)
-	// We've asked for 2 (out of 4) metrics, over all 3 load balancers in all 2
-	// AZs. We should get 12 metrics.
-	assert.Equal(t, 12, len(metrics))
-	assert.Nil(t, err)
-}
-
 func TestGenerateStatisticsInputParams(t *testing.T) {
 	d := &cloudwatch.Dimension{
 		Name:  aws.String("LoadBalancerName"),

plugins/inputs/conntrack/conntrack.go

@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"log"
 	"path/filepath"
@@ -70,7 +70,7 @@ func (c *Conntrack) SampleConfig() string {
 	return sampleConfig
 }
 
-func (c *Conntrack) Gather(acc plugins.Accumulator) error {
+func (c *Conntrack) Gather(acc telegraf.Accumulator) error {
 	c.setDefaults()
 
 	var metricKey string
@@ -116,5 +116,5 @@ func (c *Conntrack) Gather(acc plugins.Accumulator) error {
 }
 
 func init() {
-	inputs.Add(inputName, func() plugins.Input { return &Conntrack{} })
+	inputs.Add(inputName, func() telegraf.Input { return &Conntrack{} })
 }

plugins/inputs/consul/README.md

@@ -29,9 +29,9 @@ to query the data. It will not report the [telemetry](https://www.consul.io/docs
 Tags:
 - node: on which node check/service is registered on
 - service_name: name of the service (this is the service name not the service ID)
-- check_id
 
 Fields:
+- check_id
 - check_name
 - service_id
 - status
@@ -41,6 +41,6 @@ Fields:
 ```
 $ telegraf --config ./telegraf.conf -input-filter consul -test
 * Plugin: consul, Collection 1
-> consul_health_checks,host=wolfpit,node=consul-server-node,check_id="serfHealth" check_name="Serf Health Status",service_id="",status="passing" 1464698464486439902
-> consul_health_checks,host=wolfpit,node=consul-server-node,service_name=www.example.com,check_id="service:www-example-com.test01" check_name="Service 'www.example.com' check",service_id="www-example-com.test01",status="critical" 1464698464486519036
+> consul_health_checks,host=wolfpit,node=consul-server-node check_id="serfHealth",check_name="Serf Health Status",service_id="",status="passing" 1464698464486439902
+> consul_health_checks,host=wolfpit,node=consul-server-node,service_name=www.example.com check_id="service:www-example-com.test01",check_name="Service 'www.example.com' check",service_id="www-example-com.test01",status="critical" 1464698464486519036
 ```

plugins/inputs/consul/consul.go

@@ -4,7 +4,7 @@ import (
 	"net/http"
 
 	"github.com/hashicorp/consul/api"
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
@@ -90,24 +90,24 @@ func (c *Consul) createAPIClient() (*api.Client, error) {
 	return api.NewClient(config)
 }
 
-func (c *Consul) GatherHealthCheck(acc plugins.Accumulator, checks []*api.HealthCheck) {
+func (c *Consul) GatherHealthCheck(acc telegraf.Accumulator, checks []*api.HealthCheck) {
 	for _, check := range checks {
 		record := make(map[string]interface{})
 		tags := make(map[string]string)
 
+		record["check_id"] = check.CheckID
 		record["check_name"] = check.Name
 		record["service_id"] = check.ServiceID
 		record["status"] = check.Status
 
 		tags["node"] = check.Node
 		tags["service_name"] = check.ServiceName
-		tags["check_id"] = check.CheckID
 
 		acc.AddFields("consul_health_checks", record, tags)
 	}
 }
 
-func (c *Consul) Gather(acc plugins.Accumulator) error {
+func (c *Consul) Gather(acc telegraf.Accumulator) error {
 	if c.client == nil {
 		newClient, err := c.createAPIClient()
 
@@ -130,7 +130,7 @@ func (c *Consul) Gather(acc plugins.Accumulator) error {
 }
 
 func init() {
-	inputs.Add("consul", func() plugins.Input {
+	inputs.Add("consul", func() telegraf.Input {
 		return &Consul{}
 	})
 }

plugins/inputs/consul/consul_test.go

@@ -22,6 +22,7 @@ var sampleChecks = []*api.HealthCheck{
 
 func TestGatherHealtCheck(t *testing.T) {
 	expectedFields := map[string]interface{}{
+		"check_id":   "foo.health123",
 		"check_name": "foo.health",
 		"status":     "passing",
 		"service_id": "foo.123",
@@ -30,7 +31,6 @@ func TestGatherHealtCheck(t *testing.T) {
 	expectedTags := map[string]string{
 		"node":         "localhost",
 		"service_name": "foo",
-		"check_id":     "foo.health123",
 	}
 
 	var acc testutil.Accumulator

plugins/inputs/couchbase/couchbase.go

@@ -2,7 +2,7 @@ package couchbase
 
 import (
 	couchbase "github.com/couchbase/go-couchbase"
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"sync"
 )
@@ -34,7 +34,7 @@ func (r *Couchbase) Description() string {
 
 // Reads stats from all configured clusters. Accumulates stats.
 // Returns one of the errors encountered while gathering stats (if any).
-func (r *Couchbase) Gather(acc plugins.Accumulator) error {
+func (r *Couchbase) Gather(acc telegraf.Accumulator) error {
 	if len(r.Servers) == 0 {
 		r.gatherServer("http://localhost:8091/", acc, nil)
 		return nil
@@ -57,7 +57,7 @@ func (r *Couchbase) Gather(acc plugins.Accumulator) error {
 	return outerr
 }
 
-func (r *Couchbase) gatherServer(addr string, acc plugins.Accumulator, pool *couchbase.Pool) error {
+func (r *Couchbase) gatherServer(addr string, acc telegraf.Accumulator, pool *couchbase.Pool) error {
 	if pool == nil {
 		client, err := couchbase.Connect(addr)
 		if err != nil {
@@ -98,7 +98,7 @@ func (r *Couchbase) gatherServer(addr string, acc plugins.Accumulator, pool *cou
 }
 
 func init() {
-	inputs.Add("couchbase", func() plugins.Input {
+	inputs.Add("couchbase", func() telegraf.Input {
 		return &Couchbase{}
 	})
 }

plugins/inputs/couchdb/couchdb.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"net/http"
 	"reflect"
@@ -82,7 +82,7 @@ func (*CouchDB) SampleConfig() string {
 `
 }
 
-func (c *CouchDB) Gather(accumulator plugins.Accumulator) error {
+func (c *CouchDB) Gather(accumulator telegraf.Accumulator) error {
 	errorChannel := make(chan error, len(c.HOSTs))
 	var wg sync.WaitGroup
 	for _, u := range c.HOSTs {
@@ -122,7 +122,7 @@ var client = &http.Client{
 	Timeout:   time.Duration(4 * time.Second),
 }
 
-func (c *CouchDB) fetchAndInsertData(accumulator plugins.Accumulator, host string) error {
+func (c *CouchDB) fetchAndInsertData(accumulator telegraf.Accumulator, host string) error {
 
 	response, error := client.Get(host)
 	if error != nil {
@@ -209,7 +209,7 @@ func (c *CouchDB) generateFields(prefix string, obj metaData) map[string]interfa
 }
 
 func init() {
-	inputs.Add("couchdb", func() plugins.Input {
+	inputs.Add("couchdb", func() telegraf.Input {
 		return &CouchDB{}
 	})
 }

plugins/inputs/disque/disque.go

@@ -11,7 +11,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
@@ -64,7 +64,7 @@ var ErrProtocolError = errors.New("disque protocol error")
 
 // Reads stats from all configured servers accumulates stats.
 // Returns one of the errors encountered while gather stats (if any).
-func (g *Disque) Gather(acc plugins.Accumulator) error {
+func (g *Disque) Gather(acc telegraf.Accumulator) error {
 	if len(g.Servers) == 0 {
 		url := &url.URL{
 			Host: ":7711",
@@ -101,7 +101,7 @@ func (g *Disque) Gather(acc plugins.Accumulator) error {
 
 const defaultPort = "7711"
 
-func (g *Disque) gatherServer(addr *url.URL, acc plugins.Accumulator) error {
+func (g *Disque) gatherServer(addr *url.URL, acc telegraf.Accumulator) error {
 	if g.c == nil {
 
 		_, _, err := net.SplitHostPort(addr.Host)
@@ -204,7 +204,7 @@ func (g *Disque) gatherServer(addr *url.URL, acc plugins.Accumulator) error {
 }
 
 func init() {
-	inputs.Add("disque", func() plugins.Input {
+	inputs.Add("disque", func() telegraf.Input {
 		return &Disque{}
 	})
 }

plugins/inputs/dns_query/dns_query.go

@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal/errchan"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
@@ -55,7 +55,7 @@ func (d *DnsQuery) SampleConfig() string {
 func (d *DnsQuery) Description() string {
 	return "Query given DNS server and gives statistics"
 }
-func (d *DnsQuery) Gather(acc plugins.Accumulator) error {
+func (d *DnsQuery) Gather(acc telegraf.Accumulator) error {
 	d.setDefaultValues()
 
 	errChan := errchan.New(len(d.Domains) * len(d.Servers))
@@ -156,7 +156,7 @@ func (d *DnsQuery) parseRecordType() (uint16, error) {
 }
 
 func init() {
-	inputs.Add("dns_query", func() plugins.Input {
+	inputs.Add("dns_query", func() telegraf.Input {
 		return &DnsQuery{}
 	})
 }

plugins/inputs/docker/docker.go

@@ -15,7 +15,7 @@ import (
 
 	"github.com/docker/engine-api/client"
 	"github.com/docker/engine-api/types"
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
@@ -79,7 +79,7 @@ func (d *Docker) Description() string {
 func (d *Docker) SampleConfig() string { return sampleConfig }
 
 // Gather starts stats collection
-func (d *Docker) Gather(acc plugins.Accumulator) error {
+func (d *Docker) Gather(acc telegraf.Accumulator) error {
 	if d.client == nil {
 		var c *client.Client
 		var err error
@@ -136,7 +136,7 @@ func (d *Docker) Gather(acc plugins.Accumulator) error {
 	return nil
 }
 
-func (d *Docker) gatherInfo(acc plugins.Accumulator) error {
+func (d *Docker) gatherInfo(acc telegraf.Accumulator) error {
 	// Init vars
 	dataFields := make(map[string]interface{})
 	metadataFields := make(map[string]interface{})
@@ -211,7 +211,7 @@ func (d *Docker) gatherInfo(acc plugins.Accumulator) error {
 
 func (d *Docker) gatherContainer(
 	container types.Container,
-	acc plugins.Accumulator,
+	acc telegraf.Accumulator,
 ) error {
 	var v *types.StatsJSON
 	// Parse container name
@@ -221,18 +221,14 @@ func (d *Docker) gatherContainer(
 		cname = strings.TrimPrefix(container.Names[0], "/")
 	}
 
-	// the image name sometimes has a version part, or a private repo
-	//   ie, rabbitmq:3-management or docker.someco.net:4443/rabbitmq:3-management
-	imageName := ""
+	// the image name sometimes has a version part.
+	//   ie, rabbitmq:3-management
+	imageParts := strings.Split(container.Image, ":")
+	imageName := imageParts[0]
 	imageVersion := "unknown"
-	i := strings.LastIndex(container.Image, ":") // index of last ':' character
-	if i > -1 {
-		imageVersion = container.Image[i+1:]
-		imageName = container.Image[:i]
-	} else {
-		imageName = container.Image
+	if len(imageParts) > 1 {
+		imageVersion = imageParts[1]
 	}
-
 	tags := map[string]string{
 		"engine_host":       d.engine_host,
 		"container_name":    cname,
@@ -272,7 +268,7 @@ func (d *Docker) gatherContainer(
 
 func gatherContainerStats(
 	stat *types.StatsJSON,
-	acc plugins.Accumulator,
+	acc telegraf.Accumulator,
 	tags map[string]string,
 	id string,
 	perDevice bool,
@@ -368,22 +364,11 @@ func gatherContainerStats(
 				if field == "container_id" {
 					continue
 				}
-
-				var uintV uint64
-				switch v := value.(type) {
-				case uint64:
-					uintV = v
-				case int64:
-					uintV = uint64(v)
-				default:
-					continue
-				}
-
 				_, ok := totalNetworkStatMap[field]
 				if ok {
-					totalNetworkStatMap[field] = totalNetworkStatMap[field].(uint64) + uintV
+					totalNetworkStatMap[field] = totalNetworkStatMap[field].(uint64) + value.(uint64)
 				} else {
-					totalNetworkStatMap[field] = uintV
+					totalNetworkStatMap[field] = value
 				}
 			}
 		}
@@ -422,7 +407,7 @@ func calculateCPUPercent(stat *types.StatsJSON) float64 {
 
 func gatherBlockIOMetrics(
 	stat *types.StatsJSON,
-	acc plugins.Accumulator,
+	acc telegraf.Accumulator,
 	tags map[string]string,
 	now time.Time,
 	id string,
@@ -502,22 +487,11 @@ func gatherBlockIOMetrics(
 				if field == "container_id" {
 					continue
 				}
-
-				var uintV uint64
-				switch v := value.(type) {
-				case uint64:
-					uintV = v
-				case int64:
-					uintV = uint64(v)
-				default:
-					continue
-				}
-
 				_, ok := totalStatMap[field]
 				if ok {
-					totalStatMap[field] = totalStatMap[field].(uint64) + uintV
+					totalStatMap[field] = totalStatMap[field].(uint64) + value.(uint64)
 				} else {
-					totalStatMap[field] = uintV
+					totalStatMap[field] = value
 				}
 			}
 		}
@@ -569,7 +543,7 @@ func parseSize(sizeStr string) (int64, error) {
 }
 
 func init() {
-	inputs.Add("docker", func() plugins.Input {
+	inputs.Add("docker", func() telegraf.Input {
 		return &Docker{
 			PerDevice: true,
 			Timeout:   internal.Duration{Duration: time.Second * 5},

plugins/inputs/docker/docker_test.go

@@ -340,7 +340,7 @@ func (d FakeDockerClient) ContainerList(octx context.Context, options types.Cont
 	container2 := types.Container{
 		ID:      "b7dfbb9478a6ae55e237d4d74f8bbb753f0817192b5081334dc78476296e2173",
 		Names:   []string{"/etcd2"},
-		Image:   "quay.io:4443/coreos/etcd:v2.2.2",
+		Image:   "quay.io/coreos/etcd:v2.2.2",
 		Command: "/etcd -name etcd2 -advertise-client-urls http://localhost:2379 -listen-client-urls http://0.0.0.0:2379",
 		Created: 1455941933,
 		Status:  "Up 4 hours",
@@ -429,7 +429,7 @@ func TestDockerGatherInfo(t *testing.T) {
 		},
 		map[string]string{
 			"container_name":    "etcd2",
-			"container_image":   "quay.io:4443/coreos/etcd",
+			"container_image":   "quay.io/coreos/etcd",
 			"cpu":               "cpu3",
 			"container_version": "v2.2.2",
 			"engine_host":       "absol",
@@ -477,7 +477,7 @@ func TestDockerGatherInfo(t *testing.T) {
 		map[string]string{
 			"engine_host":       "absol",
 			"container_name":    "etcd2",
-			"container_image":   "quay.io:4443/coreos/etcd",
+			"container_image":   "quay.io/coreos/etcd",
 			"container_version": "v2.2.2",
 		},
 	)

plugins/inputs/dovecot/dovecot.go

@@ -11,7 +11,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal/errchan"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
@@ -51,7 +51,7 @@ func (d *Dovecot) SampleConfig() string { return sampleConfig }
 const defaultPort = "24242"
 
 // Reads stats from all configured servers.
-func (d *Dovecot) Gather(acc plugins.Accumulator) error {
+func (d *Dovecot) Gather(acc telegraf.Accumulator) error {
 	if !validQuery[d.Type] {
 		return fmt.Errorf("Error: %s is not a valid query type\n",
 			d.Type)
@@ -81,7 +81,7 @@ func (d *Dovecot) Gather(acc plugins.Accumulator) error {
 	return errChan.Error()
 }
 
-func (d *Dovecot) gatherServer(addr string, acc plugins.Accumulator, qtype string, filter string) error {
+func (d *Dovecot) gatherServer(addr string, acc telegraf.Accumulator, qtype string, filter string) error {
 	_, _, err := net.SplitHostPort(addr)
 	if err != nil {
 		return fmt.Errorf("Error: %s on url %s\n", err, addr)
@@ -111,7 +111,7 @@ func (d *Dovecot) gatherServer(addr string, acc plugins.Accumulator, qtype strin
 	return gatherStats(&buf, acc, host, qtype)
 }
 
-func gatherStats(buf *bytes.Buffer, acc plugins.Accumulator, host string, qtype string) error {
+func gatherStats(buf *bytes.Buffer, acc telegraf.Accumulator, host string, qtype string) error {
 
 	lines := strings.Split(buf.String(), "\n")
 	head := strings.Split(lines[0], "\t")
@@ -183,7 +183,7 @@ func secParser(tm string) float64 {
 }
 
 func init() {
-	inputs.Add("dovecot", func() plugins.Input {
+	inputs.Add("dovecot", func() telegraf.Input {
 		return &Dovecot{}
 	})
 }

plugins/inputs/elasticsearch/README.md

@@ -2,8 +2,7 @@
 
 The [elasticsearch](https://www.elastic.co/) plugin queries endpoints to obtain
 [node](https://www.elastic.co/guide/en/elasticsearch/reference/current/cluster-nodes-stats.html)
-and optionally [cluster-health](https://www.elastic.co/guide/en/elasticsearch/reference/current/cluster-health.html)
-or [cluster-stats](https://www.elastic.co/guide/en/elasticsearch/reference/current/cluster-stats.html) metrics.
+and optionally [cluster](https://www.elastic.co/guide/en/elasticsearch/reference/current/cluster-health.html) stats.
 
 ### Configuration:
 
@@ -15,18 +14,13 @@ or [cluster-stats](https://www.elastic.co/guide/en/elasticsearch/reference/curre
   ## Timeout for HTTP requests to the elastic search server(s)
   http_timeout = "5s"
 
-  ## When local is true (the default), the node will read only its own stats.
-  ## Set local to false when you want to read the node stats from all nodes
-  ## of the cluster. 
+  ## set local to false when you want to read the indices stats from all nodes
+  ## within the cluster
   local = true
 
-  ## Set cluster_health to true when you want to also obtain cluster health stats
+  ## set cluster_health to true when you want to also obtain cluster level stats
   cluster_health = false
 
-  ## Set cluster_stats to true when you want to obtain cluster stats from the 
-  ## Master node. 
-  cluster_stats = false
-
   ## Optional SSL Config
   # ssl_ca = "/etc/telegraf/ca.pem"
   # ssl_cert = "/etc/telegraf/cert.pem"

plugins/inputs/elasticsearch/elasticsearch.go

@@ -4,27 +4,21 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
-	"regexp"
 	"sync"
 	"time"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/internal/errchan"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	jsonparser "github.com/influxdata/telegraf/plugins/parsers/json"
-	"io/ioutil"
-	"strings"
 )
 
-// mask for masking username/password from error messages
-var mask = regexp.MustCompile(`https?:\/\/\S+:\S+@`)
-
-// Nodestats are always generated, so simply define a constant for these endpoints
 const statsPath = "/_nodes/stats"
 const statsPathLocal = "/_nodes/_local/stats"
+const healthPath = "/_cluster/health"
 
-type nodeStat struct {
+type node struct {
 	Host       string            `json:"host"`
 	Name       string            `json:"name"`
 	Attributes map[string]string `json:"attributes"`
@@ -64,20 +58,6 @@ type indexHealth struct {
 	UnassignedShards    int    `json:"unassigned_shards"`
 }
 
-type clusterStats struct {
-	NodeName    string      `json:"node_name"`
-	ClusterName string      `json:"cluster_name"`
-	Status      string      `json:"status"`
-	Indices     interface{} `json:"indices"`
-	Nodes       interface{} `json:"nodes"`
-}
-
-type catMaster struct {
-	NodeID   string `json:"id"`
-	NodeIP   string `json:"ip"`
-	NodeName string `json:"node"`
-}
-
 const sampleConfig = `
   ## specify a list of one or more Elasticsearch servers
   # you can add username and password to your url to use basic authentication:
@@ -87,18 +67,13 @@ const sampleConfig = `
   ## Timeout for HTTP requests to the elastic search server(s)
   http_timeout = "5s"
 
-  ## When local is true (the default), the node will read only its own stats.
-  ## Set local to false when you want to read the node stats from all nodes
-  ## of the cluster.
+  ## set local to false when you want to read the indices stats from all nodes
+  ## within the cluster
   local = true
 
-  ## Set cluster_health to true when you want to also obtain cluster health stats
+  ## set cluster_health to true when you want to also obtain cluster level stats
   cluster_health = false
 
-  ## Set cluster_stats to true when you want to also obtain cluster stats from the
-  ## Master node.
-  cluster_stats = false
-
   ## Optional SSL Config
   # ssl_ca = "/etc/telegraf/ca.pem"
   # ssl_cert = "/etc/telegraf/cert.pem"
@@ -110,18 +85,15 @@ const sampleConfig = `
 // Elasticsearch is a plugin to read stats from one or many Elasticsearch
 // servers.
 type Elasticsearch struct {
-	Local                   bool
-	Servers                 []string
-	HttpTimeout             internal.Duration
-	ClusterHealth           bool
-	ClusterStats            bool
-	SSLCA                   string `toml:"ssl_ca"`   // Path to CA file
-	SSLCert                 string `toml:"ssl_cert"` // Path to host cert file
-	SSLKey                  string `toml:"ssl_key"`  // Path to cert key file
-	InsecureSkipVerify      bool   // Use SSL but skip chain & host verification
-	client                  *http.Client
-	catMasterResponseTokens []string
-	isMaster                bool
+	Local              bool
+	Servers            []string
+	HttpTimeout        internal.Duration
+	ClusterHealth      bool
+	SSLCA              string `toml:"ssl_ca"`   // Path to CA file
+	SSLCert            string `toml:"ssl_cert"` // Path to host cert file
+	SSLKey             string `toml:"ssl_key"`  // Path to cert key file
+	InsecureSkipVerify bool   // Use SSL but skip chain & host verification
+	client             *http.Client
 }
 
 // NewElasticsearch return a new instance of Elasticsearch
@@ -143,7 +115,7 @@ func (e *Elasticsearch) Description() string {
 
 // Gather reads the stats from Elasticsearch and writes it to the
 // Accumulator.
-func (e *Elasticsearch) Gather(acc plugins.Accumulator) error {
+func (e *Elasticsearch) Gather(acc telegraf.Accumulator) error {
 	if e.client == nil {
 		client, err := e.createHttpClient()
 
@@ -153,12 +125,12 @@ func (e *Elasticsearch) Gather(acc plugins.Accumulator) error {
 		e.client = client
 	}
 
-	errChan := errchan.New(len(e.Servers) * 3)
+	errChan := errchan.New(len(e.Servers))
 	var wg sync.WaitGroup
 	wg.Add(len(e.Servers))
 
 	for _, serv := range e.Servers {
-		go func(s string, acc plugins.Accumulator) {
+		go func(s string, acc telegraf.Accumulator) {
 			defer wg.Done()
 			var url string
 			if e.Local {
@@ -166,36 +138,12 @@ func (e *Elasticsearch) Gather(acc plugins.Accumulator) error {
 			} else {
 				url = s + statsPath
 			}
-			e.isMaster = false
-
-			if e.ClusterStats {
-				// get cat/master information here so NodeStats can determine
-				// whether this node is the Master
-				e.setCatMaster(s + "/_cat/master")
-			}
-
-			// Always gather node states
 			if err := e.gatherNodeStats(url, acc); err != nil {
-				err = fmt.Errorf(mask.ReplaceAllString(err.Error(), "http(s)://XXX:XXX@"))
 				errChan.C <- err
 				return
 			}
-
 			if e.ClusterHealth {
-				url = s + "/_cluster/health?level=indices"
-				if err := e.gatherClusterHealth(url, acc); err != nil {
-					err = fmt.Errorf(mask.ReplaceAllString(err.Error(), "http(s)://XXX:XXX@"))
-					errChan.C <- err
-					return
-				}
-			}
-
-			if e.ClusterStats && e.isMaster {
-				if err := e.gatherClusterStats(s+"/_cluster/stats", acc); err != nil {
-					err = fmt.Errorf(mask.ReplaceAllString(err.Error(), "http(s)://XXX:XXX@"))
-					errChan.C <- err
-					return
-				}
+				e.gatherClusterStats(fmt.Sprintf("%s/_cluster/health?level=indices", s), acc)
 			}
 		}(serv, acc)
 	}
@@ -221,15 +169,14 @@ func (e *Elasticsearch) createHttpClient() (*http.Client, error) {
 	return client, nil
 }
 
-func (e *Elasticsearch) gatherNodeStats(url string, acc plugins.Accumulator) error {
+func (e *Elasticsearch) gatherNodeStats(url string, acc telegraf.Accumulator) error {
 	nodeStats := &struct {
-		ClusterName string               `json:"cluster_name"`
-		Nodes       map[string]*nodeStat `json:"nodes"`
+		ClusterName string           `json:"cluster_name"`
+		Nodes       map[string]*node `json:"nodes"`
 	}{}
-	if err := e.gatherJsonData(url, nodeStats); err != nil {
+	if err := e.gatherData(url, nodeStats); err != nil {
 		return err
 	}
-
 	for id, n := range nodeStats.Nodes {
 		tags := map[string]string{
 			"node_id":      id,
@@ -238,11 +185,6 @@ func (e *Elasticsearch) gatherNodeStats(url string, acc plugins.Accumulator) err
 			"cluster_name": nodeStats.ClusterName,
 		}
 
-		if e.ClusterStats {
-			// check for master
-			e.isMaster = (id == e.catMasterResponseTokens[0])
-		}
-
 		for k, v := range n.Attributes {
 			tags["node_attribute_"+k] = v
 		}
@@ -262,7 +204,6 @@ func (e *Elasticsearch) gatherNodeStats(url string, acc plugins.Accumulator) err
 		now := time.Now()
 		for p, s := range stats {
 			f := jsonparser.JSONFlattener{}
-			// parse Json, ignoring strings and bools
 			err := f.FlattenJSON("", s)
 			if err != nil {
 				return err
@@ -273,31 +214,31 @@ func (e *Elasticsearch) gatherNodeStats(url string, acc plugins.Accumulator) err
 	return nil
 }
 
-func (e *Elasticsearch) gatherClusterHealth(url string, acc plugins.Accumulator) error {
-	healthStats := &clusterHealth{}
-	if err := e.gatherJsonData(url, healthStats); err != nil {
+func (e *Elasticsearch) gatherClusterStats(url string, acc telegraf.Accumulator) error {
+	clusterStats := &clusterHealth{}
+	if err := e.gatherData(url, clusterStats); err != nil {
 		return err
 	}
 	measurementTime := time.Now()
 	clusterFields := map[string]interface{}{
-		"status":                healthStats.Status,
-		"timed_out":             healthStats.TimedOut,
-		"number_of_nodes":       healthStats.NumberOfNodes,
-		"number_of_data_nodes":  healthStats.NumberOfDataNodes,
-		"active_primary_shards": healthStats.ActivePrimaryShards,
-		"active_shards":         healthStats.ActiveShards,
-		"relocating_shards":     healthStats.RelocatingShards,
-		"initializing_shards":   healthStats.InitializingShards,
-		"unassigned_shards":     healthStats.UnassignedShards,
+		"status":                clusterStats.Status,
+		"timed_out":             clusterStats.TimedOut,
+		"number_of_nodes":       clusterStats.NumberOfNodes,
+		"number_of_data_nodes":  clusterStats.NumberOfDataNodes,
+		"active_primary_shards": clusterStats.ActivePrimaryShards,
+		"active_shards":         clusterStats.ActiveShards,
+		"relocating_shards":     clusterStats.RelocatingShards,
+		"initializing_shards":   clusterStats.InitializingShards,
+		"unassigned_shards":     clusterStats.UnassignedShards,
 	}
 	acc.AddFields(
 		"elasticsearch_cluster_health",
 		clusterFields,
-		map[string]string{"name": healthStats.ClusterName},
+		map[string]string{"name": clusterStats.ClusterName},
 		measurementTime,
 	)
 
-	for name, health := range healthStats.Indices {
+	for name, health := range clusterStats.Indices {
 		indexFields := map[string]interface{}{
 			"status":                health.Status,
 			"number_of_shards":      health.NumberOfShards,
@@ -318,60 +259,7 @@ func (e *Elasticsearch) gatherClusterHealth(url string, acc plugins.Accumulator)
 	return nil
 }
 
-func (e *Elasticsearch) gatherClusterStats(url string, acc plugins.Accumulator) error {
-	clusterStats := &clusterStats{}
-	if err := e.gatherJsonData(url, clusterStats); err != nil {
-		return err
-	}
-	now := time.Now()
-	tags := map[string]string{
-		"node_name":    clusterStats.NodeName,
-		"cluster_name": clusterStats.ClusterName,
-		"status":       clusterStats.Status,
-	}
-
-	stats := map[string]interface{}{
-		"nodes":   clusterStats.Nodes,
-		"indices": clusterStats.Indices,
-	}
-
-	for p, s := range stats {
-		f := jsonparser.JSONFlattener{}
-		// parse json, including bools and strings
-		err := f.FullFlattenJSON("", s, true, true)
-		if err != nil {
-			return err
-		}
-		acc.AddFields("elasticsearch_clusterstats_"+p, f.Fields, tags, now)
-	}
-
-	return nil
-}
-
-func (e *Elasticsearch) setCatMaster(url string) error {
-	r, err := e.client.Get(url)
-	if err != nil {
-		return err
-	}
-	defer r.Body.Close()
-	if r.StatusCode != http.StatusOK {
-		// NOTE: we are not going to read/discard r.Body under the assumption we'd prefer
-		// to let the underlying transport close the connection and re-establish a new one for
-		// future calls.
-		return fmt.Errorf("status-code %d, expected %d", r.StatusCode, http.StatusOK)
-	}
-	response, err := ioutil.ReadAll(r.Body)
-
-	if err != nil {
-		return err
-	}
-
-	e.catMasterResponseTokens = strings.Split(string(response), " ")
-
-	return nil
-}
-
-func (e *Elasticsearch) gatherJsonData(url string, v interface{}) error {
+func (e *Elasticsearch) gatherData(url string, v interface{}) error {
 	r, err := e.client.Get(url)
 	if err != nil {
 		return err
@@ -384,16 +272,14 @@ func (e *Elasticsearch) gatherJsonData(url string, v interface{}) error {
 		return fmt.Errorf("elasticsearch: API responded with status-code %d, expected %d",
 			r.StatusCode, http.StatusOK)
 	}
-
 	if err = json.NewDecoder(r.Body).Decode(v); err != nil {
 		return err
 	}
-
 	return nil
 }
 
 func init() {
-	inputs.Add("elasticsearch", func() plugins.Input {
+	inputs.Add("elasticsearch", func() telegraf.Input {
 		return NewElasticsearch()
 	})
 }

plugins/inputs/elasticsearch/elasticsearch_test.go

@@ -8,8 +8,6 @@ import (
 
 	"github.com/influxdata/telegraf/testutil"
 
-	"fmt"
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
@@ -39,13 +37,16 @@ func (t *transportMock) RoundTrip(r *http.Request) (*http.Response, error) {
 func (t *transportMock) CancelRequest(_ *http.Request) {
 }
 
-func checkIsMaster(es *Elasticsearch, expected bool, t *testing.T) {
-	if es.isMaster != expected {
-		msg := fmt.Sprintf("IsMaster set incorrectly")
-		assert.Fail(t, msg)
+func TestElasticsearch(t *testing.T) {
+	es := newElasticsearchWithClient()
+	es.Servers = []string{"http://example.com:9200"}
+	es.client.Transport = newTransportMock(http.StatusOK, statsResponse)
+
+	var acc testutil.Accumulator
+	if err := es.Gather(&acc); err != nil {
+		t.Fatal(err)
 	}
-}
-func checkNodeStatsResult(t *testing.T, acc *testutil.Accumulator) {
+
 	tags := map[string]string{
 		"cluster_name":          "es-testcluster",
 		"node_attribute_master": "true",
@@ -54,55 +55,25 @@ func checkNodeStatsResult(t *testing.T, acc *testutil.Accumulator) {
 		"node_host":             "test",
 	}
 
-	acc.AssertContainsTaggedFields(t, "elasticsearch_indices", nodestatsIndicesExpected, tags)
-	acc.AssertContainsTaggedFields(t, "elasticsearch_os", nodestatsOsExpected, tags)
-	acc.AssertContainsTaggedFields(t, "elasticsearch_process", nodestatsProcessExpected, tags)
-	acc.AssertContainsTaggedFields(t, "elasticsearch_jvm", nodestatsJvmExpected, tags)
-	acc.AssertContainsTaggedFields(t, "elasticsearch_thread_pool", nodestatsThreadPoolExpected, tags)
-	acc.AssertContainsTaggedFields(t, "elasticsearch_fs", nodestatsFsExpected, tags)
-	acc.AssertContainsTaggedFields(t, "elasticsearch_transport", nodestatsTransportExpected, tags)
-	acc.AssertContainsTaggedFields(t, "elasticsearch_http", nodestatsHttpExpected, tags)
-	acc.AssertContainsTaggedFields(t, "elasticsearch_breakers", nodestatsBreakersExpected, tags)
+	acc.AssertContainsTaggedFields(t, "elasticsearch_indices", indicesExpected, tags)
+	acc.AssertContainsTaggedFields(t, "elasticsearch_os", osExpected, tags)
+	acc.AssertContainsTaggedFields(t, "elasticsearch_process", processExpected, tags)
+	acc.AssertContainsTaggedFields(t, "elasticsearch_jvm", jvmExpected, tags)
+	acc.AssertContainsTaggedFields(t, "elasticsearch_thread_pool", threadPoolExpected, tags)
+	acc.AssertContainsTaggedFields(t, "elasticsearch_fs", fsExpected, tags)
+	acc.AssertContainsTaggedFields(t, "elasticsearch_transport", transportExpected, tags)
+	acc.AssertContainsTaggedFields(t, "elasticsearch_http", httpExpected, tags)
+	acc.AssertContainsTaggedFields(t, "elasticsearch_breakers", breakersExpected, tags)
 }
 
-func TestGather(t *testing.T) {
-	es := newElasticsearchWithClient()
-	es.Servers = []string{"http://example.com:9200"}
-	es.client.Transport = newTransportMock(http.StatusOK, nodeStatsResponse)
-
-	var acc testutil.Accumulator
-	if err := es.Gather(&acc); err != nil {
-		t.Fatal(err)
-	}
-
-	checkIsMaster(es, false, t)
-	checkNodeStatsResult(t, &acc)
-}
-
-func TestGatherNodeStats(t *testing.T) {
-	es := newElasticsearchWithClient()
-	es.Servers = []string{"http://example.com:9200"}
-	es.client.Transport = newTransportMock(http.StatusOK, nodeStatsResponse)
-
-	var acc testutil.Accumulator
-	if err := es.gatherNodeStats("junk", &acc); err != nil {
-		t.Fatal(err)
-	}
-
-	checkIsMaster(es, false, t)
-	checkNodeStatsResult(t, &acc)
-}
-
-func TestGatherClusterHealth(t *testing.T) {
+func TestGatherClusterStats(t *testing.T) {
 	es := newElasticsearchWithClient()
 	es.Servers = []string{"http://example.com:9200"}
 	es.ClusterHealth = true
-	es.client.Transport = newTransportMock(http.StatusOK, clusterHealthResponse)
+	es.client.Transport = newTransportMock(http.StatusOK, clusterResponse)
 
 	var acc testutil.Accumulator
-	require.NoError(t, es.gatherClusterHealth("junk", &acc))
-
-	checkIsMaster(es, false, t)
+	require.NoError(t, es.Gather(&acc))
 
 	acc.AssertContainsTaggedFields(t, "elasticsearch_cluster_health",
 		clusterHealthExpected,
@@ -117,77 +88,6 @@ func TestGatherClusterHealth(t *testing.T) {
 		map[string]string{"index": "v2"})
 }
 
-func TestGatherClusterStatsMaster(t *testing.T) {
-	// This needs multiple steps to replicate the multiple calls internally.
-	es := newElasticsearchWithClient()
-	es.ClusterStats = true
-	es.Servers = []string{"http://example.com:9200"}
-
-	// first get catMaster
-	es.client.Transport = newTransportMock(http.StatusOK, IsMasterResult)
-	require.NoError(t, es.setCatMaster("junk"))
-
-	IsMasterResultTokens := strings.Split(string(IsMasterResult), " ")
-	if es.catMasterResponseTokens[0] != IsMasterResultTokens[0] {
-		msg := fmt.Sprintf("catmaster is incorrect")
-		assert.Fail(t, msg)
-	}
-
-	// now get node status, which determines whether we're master
-	var acc testutil.Accumulator
-	es.Local = true
-	es.client.Transport = newTransportMock(http.StatusOK, nodeStatsResponse)
-	if err := es.gatherNodeStats("junk", &acc); err != nil {
-		t.Fatal(err)
-	}
-
-	checkIsMaster(es, true, t)
-	checkNodeStatsResult(t, &acc)
-
-	// now test the clusterstats method
-	es.client.Transport = newTransportMock(http.StatusOK, clusterStatsResponse)
-	require.NoError(t, es.gatherClusterStats("junk", &acc))
-
-	tags := map[string]string{
-		"cluster_name": "es-testcluster",
-		"node_name":    "test.host.com",
-		"status":       "red",
-	}
-
-	acc.AssertContainsTaggedFields(t, "elasticsearch_clusterstats_nodes", clusterstatsNodesExpected, tags)
-	acc.AssertContainsTaggedFields(t, "elasticsearch_clusterstats_indices", clusterstatsIndicesExpected, tags)
-}
-
-func TestGatherClusterStatsNonMaster(t *testing.T) {
-	// This needs multiple steps to replicate the multiple calls internally.
-	es := newElasticsearchWithClient()
-	es.ClusterStats = true
-	es.Servers = []string{"http://example.com:9200"}
-
-	// first get catMaster
-	es.client.Transport = newTransportMock(http.StatusOK, IsNotMasterResult)
-	require.NoError(t, es.setCatMaster("junk"))
-
-	IsNotMasterResultTokens := strings.Split(string(IsNotMasterResult), " ")
-	if es.catMasterResponseTokens[0] != IsNotMasterResultTokens[0] {
-		msg := fmt.Sprintf("catmaster is incorrect")
-		assert.Fail(t, msg)
-	}
-
-	// now get node status, which determines whether we're master
-	var acc testutil.Accumulator
-	es.Local = true
-	es.client.Transport = newTransportMock(http.StatusOK, nodeStatsResponse)
-	if err := es.gatherNodeStats("junk", &acc); err != nil {
-		t.Fatal(err)
-	}
-
-	// ensure flag is clear so Cluster Stats would not be done
-	checkIsMaster(es, false, t)
-	checkNodeStatsResult(t, &acc)
-
-}
-
 func newElasticsearchWithClient() *Elasticsearch {
 	es := NewElasticsearch()
 	es.client = &http.Client{}

plugins/inputs/elasticsearch/testdata_test.go

@@ -1,6 +1,6 @@
 package elasticsearch
 
-const clusterHealthResponse = `
+const clusterResponse = `
 {
    "cluster_name": "elasticsearch_telegraf",
    "status": "green",
@@ -71,7 +71,7 @@ var v2IndexExpected = map[string]interface{}{
 	"unassigned_shards":     20,
 }
 
-const nodeStatsResponse = `
+const statsResponse = `
 {
   "cluster_name": "es-testcluster",
   "nodes": {
@@ -489,7 +489,7 @@ const nodeStatsResponse = `
 }
 `
 
-var nodestatsIndicesExpected = map[string]interface{}{
+var indicesExpected = map[string]interface{}{
 	"id_cache_memory_size_in_bytes":             float64(0),
 	"completion_size_in_bytes":                  float64(0),
 	"suggest_total":                             float64(0),
@@ -561,7 +561,7 @@ var nodestatsIndicesExpected = map[string]interface{}{
 	"segments_fixed_bit_set_memory_in_bytes":    float64(0),
 }
 
-var nodestatsOsExpected = map[string]interface{}{
+var osExpected = map[string]interface{}{
 	"load_average_0":           float64(0.01),
 	"load_average_1":           float64(0.04),
 	"load_average_2":           float64(0.05),
@@ -576,7 +576,7 @@ var nodestatsOsExpected = map[string]interface{}{
 	"mem_used_in_bytes":        float64(1621868544),
 }
 
-var nodestatsProcessExpected = map[string]interface{}{
+var processExpected = map[string]interface{}{
 	"mem_total_virtual_in_bytes": float64(4747890688),
 	"timestamp":                  float64(1436460392945),
 	"open_file_descriptors":      float64(160),
@@ -586,7 +586,7 @@ var nodestatsProcessExpected = map[string]interface{}{
 	"cpu_user_in_millis":         float64(13610),
 }
 
-var nodestatsJvmExpected = map[string]interface{}{
+var jvmExpected = map[string]interface{}{
 	"timestamp":                                     float64(1436460392945),
 	"uptime_in_millis":                              float64(202245),
 	"mem_non_heap_used_in_bytes":                    float64(39634576),
@@ -621,7 +621,7 @@ var nodestatsJvmExpected = map[string]interface{}{
 	"buffer_pools_mapped_total_capacity_in_bytes":   float64(0),
 }
 
-var nodestatsThreadPoolExpected = map[string]interface{}{
+var threadPoolExpected = map[string]interface{}{
 	"merge_threads":                 float64(6),
 	"merge_queue":                   float64(4),
 	"merge_active":                  float64(5),
@@ -726,7 +726,7 @@ var nodestatsThreadPoolExpected = map[string]interface{}{
 	"flush_completed":               float64(3),
 }
 
-var nodestatsFsExpected = map[string]interface{}{
+var fsExpected = map[string]interface{}{
 	"data_0_total_in_bytes":     float64(19507089408),
 	"data_0_free_in_bytes":      float64(16909316096),
 	"data_0_available_in_bytes": float64(15894814720),
@@ -736,7 +736,7 @@ var nodestatsFsExpected = map[string]interface{}{
 	"total_total_in_bytes":      float64(19507089408),
 }
 
-var nodestatsTransportExpected = map[string]interface{}{
+var transportExpected = map[string]interface{}{
 	"server_open":      float64(13),
 	"rx_count":         float64(6),
 	"rx_size_in_bytes": float64(1380),
@@ -744,12 +744,12 @@ var nodestatsTransportExpected = map[string]interface{}{
 	"tx_size_in_bytes": float64(1380),
 }
 
-var nodestatsHttpExpected = map[string]interface{}{
+var httpExpected = map[string]interface{}{
 	"current_open": float64(3),
 	"total_opened": float64(3),
 }
 
-var nodestatsBreakersExpected = map[string]interface{}{
+var breakersExpected = map[string]interface{}{
 	"fielddata_estimated_size_in_bytes": float64(0),
 	"fielddata_overhead":                float64(1.03),
 	"fielddata_tripped":                 float64(0),
@@ -763,273 +763,3 @@ var nodestatsBreakersExpected = map[string]interface{}{
 	"parent_limit_size_in_bytes":        float64(727213670),
 	"parent_estimated_size_in_bytes":    float64(0),
 }
-
-const clusterStatsResponse = `
-{
-   "host":"ip-10-0-1-214",
-   "log_type":"metrics",
-   "timestamp":1475767451229,
-   "log_level":"INFO",
-   "node_name":"test.host.com",
-   "cluster_name":"es-testcluster",
-   "status":"red",
-   "indices":{
-      "count":1,
-      "shards":{
-         "total":4,
-         "primaries":4,
-         "replication":0.0,
-         "index":{
-            "shards":{
-               "min":4,
-               "max":4,
-               "avg":4.0
-            },
-            "primaries":{
-               "min":4,
-               "max":4,
-               "avg":4.0
-            },
-            "replication":{
-               "min":0.0,
-               "max":0.0,
-               "avg":0.0
-            }
-         }
-      },
-      "docs":{
-         "count":4,
-         "deleted":0
-      },
-      "store":{
-         "size_in_bytes":17084,
-         "throttle_time_in_millis":0
-      },
-      "fielddata":{
-         "memory_size_in_bytes":0,
-         "evictions":0
-      },
-      "query_cache":{
-         "memory_size_in_bytes":0,
-         "total_count":0,
-         "hit_count":0,
-         "miss_count":0,
-         "cache_size":0,
-         "cache_count":0,
-         "evictions":0
-      },
-      "completion":{
-         "size_in_bytes":0
-      },
-      "segments":{
-         "count":4,
-         "memory_in_bytes":11828,
-         "terms_memory_in_bytes":8932,
-         "stored_fields_memory_in_bytes":1248,
-         "term_vectors_memory_in_bytes":0,
-         "norms_memory_in_bytes":1280,
-         "doc_values_memory_in_bytes":368,
-         "index_writer_memory_in_bytes":0,
-         "index_writer_max_memory_in_bytes":2048000,
-         "version_map_memory_in_bytes":0,
-         "fixed_bit_set_memory_in_bytes":0
-      },
-      "percolate":{
-         "total":0,
-         "time_in_millis":0,
-         "current":0,
-         "memory_size_in_bytes":-1,
-         "memory_size":"-1b",
-         "queries":0
-      }
-   },
-   "nodes":{
-      "count":{
-         "total":1,
-         "master_only":0,
-         "data_only":0,
-         "master_data":1,
-         "client":0
-      },
-      "versions":[
-         {
-         "version": "2.3.3"
-         }
-      ],
-      "os":{
-         "available_processors":1,
-         "allocated_processors":1,
-         "mem":{
-            "total_in_bytes":593301504
-         },
-         "names":[
-            {
-               "name":"Linux",
-               "count":1
-            }
-         ]
-      },
-      "process":{
-         "cpu":{
-            "percent":0
-         },
-         "open_file_descriptors":{
-            "min":145,
-            "max":145,
-            "avg":145
-         }
-      },
-      "jvm":{
-         "max_uptime_in_millis":11580527,
-         "versions":[
-            {
-               "version":"1.8.0_101",
-               "vm_name":"OpenJDK 64-Bit Server VM",
-               "vm_version":"25.101-b13",
-               "vm_vendor":"Oracle Corporation",
-               "count":1
-            }
-         ],
-         "mem":{
-            "heap_used_in_bytes":70550288,
-            "heap_max_in_bytes":1065025536
-         },
-         "threads":30
-      },
-      "fs":{
-         "total_in_bytes":8318783488,
-         "free_in_bytes":6447439872,
-         "available_in_bytes":6344785920
-      },
-      "plugins":[
-         {
-            "name":"cloud-aws",
-            "version":"2.3.3",
-            "description":"The Amazon Web Service (AWS) Cloud plugin allows to use AWS API for the unicast discovery mechanism and add S3 repositories.",
-            "jvm":true,
-            "classname":"org.elasticsearch.plugin.cloud.aws.CloudAwsPlugin",
-            "isolated":true,
-            "site":false
-         },
-         {
-            "name":"kopf",
-            "version":"2.0.1",
-            "description":"kopf - simple web administration tool for Elasticsearch",
-            "url":"/_plugin/kopf/",
-            "jvm":false,
-            "site":true
-         },
-         {
-            "name":"tr-metrics",
-            "version":"7bd5b4b",
-            "description":"Logs cluster and node stats for performance monitoring.",
-            "jvm":true,
-            "classname":"com.trgr.elasticsearch.plugin.metrics.MetricsPlugin",
-            "isolated":true,
-            "site":false
-         }
-      ]
-   }
-}
-`
-
-var clusterstatsIndicesExpected = map[string]interface{}{
-	"completion_size_in_bytes":                  float64(0),
-	"count":                                     float64(1),
-	"docs_count":                                float64(4),
-	"docs_deleted":                              float64(0),
-	"fielddata_evictions":                       float64(0),
-	"fielddata_memory_size_in_bytes":            float64(0),
-	"percolate_current":                         float64(0),
-	"percolate_memory_size_in_bytes":            float64(-1),
-	"percolate_queries":                         float64(0),
-	"percolate_time_in_millis":                  float64(0),
-	"percolate_total":                           float64(0),
-	"percolate_memory_size":                     "-1b",
-	"query_cache_cache_count":                   float64(0),
-	"query_cache_cache_size":                    float64(0),
-	"query_cache_evictions":                     float64(0),
-	"query_cache_hit_count":                     float64(0),
-	"query_cache_memory_size_in_bytes":          float64(0),
-	"query_cache_miss_count":                    float64(0),
-	"query_cache_total_count":                   float64(0),
-	"segments_count":                            float64(4),
-	"segments_doc_values_memory_in_bytes":       float64(368),
-	"segments_fixed_bit_set_memory_in_bytes":    float64(0),
-	"segments_index_writer_max_memory_in_bytes": float64(2.048e+06),
-	"segments_index_writer_memory_in_bytes":     float64(0),
-	"segments_memory_in_bytes":                  float64(11828),
-	"segments_norms_memory_in_bytes":            float64(1280),
-	"segments_stored_fields_memory_in_bytes":    float64(1248),
-	"segments_term_vectors_memory_in_bytes":     float64(0),
-	"segments_terms_memory_in_bytes":            float64(8932),
-	"segments_version_map_memory_in_bytes":      float64(0),
-	"shards_index_primaries_avg":                float64(4),
-	"shards_index_primaries_max":                float64(4),
-	"shards_index_primaries_min":                float64(4),
-	"shards_index_replication_avg":              float64(0),
-	"shards_index_replication_max":              float64(0),
-	"shards_index_replication_min":              float64(0),
-	"shards_index_shards_avg":                   float64(4),
-	"shards_index_shards_max":                   float64(4),
-	"shards_index_shards_min":                   float64(4),
-	"shards_primaries":                          float64(4),
-	"shards_replication":                        float64(0),
-	"shards_total":                              float64(4),
-	"store_size_in_bytes":                       float64(17084),
-	"store_throttle_time_in_millis":             float64(0),
-}
-
-var clusterstatsNodesExpected = map[string]interface{}{
-	"count_client":                      float64(0),
-	"count_data_only":                   float64(0),
-	"count_master_data":                 float64(1),
-	"count_master_only":                 float64(0),
-	"count_total":                       float64(1),
-	"fs_available_in_bytes":             float64(6.34478592e+09),
-	"fs_free_in_bytes":                  float64(6.447439872e+09),
-	"fs_total_in_bytes":                 float64(8.318783488e+09),
-	"jvm_max_uptime_in_millis":          float64(1.1580527e+07),
-	"jvm_mem_heap_max_in_bytes":         float64(1.065025536e+09),
-	"jvm_mem_heap_used_in_bytes":        float64(7.0550288e+07),
-	"jvm_threads":                       float64(30),
-	"jvm_versions_0_count":              float64(1),
-	"jvm_versions_0_version":            "1.8.0_101",
-	"jvm_versions_0_vm_name":            "OpenJDK 64-Bit Server VM",
-	"jvm_versions_0_vm_vendor":          "Oracle Corporation",
-	"jvm_versions_0_vm_version":         "25.101-b13",
-	"os_allocated_processors":           float64(1),
-	"os_available_processors":           float64(1),
-	"os_mem_total_in_bytes":             float64(5.93301504e+08),
-	"os_names_0_count":                  float64(1),
-	"os_names_0_name":                   "Linux",
-	"process_cpu_percent":               float64(0),
-	"process_open_file_descriptors_avg": float64(145),
-	"process_open_file_descriptors_max": float64(145),
-	"process_open_file_descriptors_min": float64(145),
-	"versions_0_version":                "2.3.3",
-	"plugins_0_classname":               "org.elasticsearch.plugin.cloud.aws.CloudAwsPlugin",
-	"plugins_0_description":             "The Amazon Web Service (AWS) Cloud plugin allows to use AWS API for the unicast discovery mechanism and add S3 repositories.",
-	"plugins_0_isolated":                true,
-	"plugins_0_jvm":                     true,
-	"plugins_0_name":                    "cloud-aws",
-	"plugins_0_site":                    false,
-	"plugins_0_version":                 "2.3.3",
-	"plugins_1_description":             "kopf - simple web administration tool for Elasticsearch",
-	"plugins_1_jvm":                     false,
-	"plugins_1_name":                    "kopf",
-	"plugins_1_site":                    true,
-	"plugins_1_url":                     "/_plugin/kopf/",
-	"plugins_1_version":                 "2.0.1",
-	"plugins_2_classname":               "com.trgr.elasticsearch.plugin.metrics.MetricsPlugin",
-	"plugins_2_description":             "Logs cluster and node stats for performance monitoring.",
-	"plugins_2_isolated":                true,
-	"plugins_2_jvm":                     true,
-	"plugins_2_name":                    "tr-metrics",
-	"plugins_2_site":                    false,
-	"plugins_2_version":                 "7bd5b4b",
-}
-
-const IsMasterResult = "SDFsfSDFsdfFSDSDfSFDSDF 10.206.124.66 10.206.124.66 test.host.com "
-
-const IsNotMasterResult = "junk 10.206.124.66 10.206.124.66 test.junk.com "

plugins/inputs/exec/exec.go

@@ -13,7 +13,7 @@ import (
 
 	"github.com/kballard/go-shellquote"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/internal/errchan"
 	"github.com/influxdata/telegraf/plugins/inputs"
@@ -61,12 +61,12 @@ func NewExec() *Exec {
 }
 
 type Runner interface {
-	Run(*Exec, string, plugins.Accumulator) ([]byte, error)
+	Run(*Exec, string, telegraf.Accumulator) ([]byte, error)
 }
 
 type CommandRunner struct{}
 
-func AddNagiosState(exitCode error, acc plugins.Accumulator) error {
+func AddNagiosState(exitCode error, acc telegraf.Accumulator) error {
 	nagiosState := 0
 	if exitCode != nil {
 		exiterr, ok := exitCode.(*exec.ExitError)
@@ -89,7 +89,7 @@ func AddNagiosState(exitCode error, acc plugins.Accumulator) error {
 func (c CommandRunner) Run(
 	e *Exec,
 	command string,
-	acc plugins.Accumulator,
+	acc telegraf.Accumulator,
 ) ([]byte, error) {
 	split_cmd, err := shellquote.Split(command)
 	if err != nil || len(split_cmd) == 0 {
@@ -145,7 +145,7 @@ func removeCarriageReturns(b bytes.Buffer) bytes.Buffer {
 
 }
 
-func (e *Exec) ProcessCommand(command string, acc plugins.Accumulator, wg *sync.WaitGroup) {
+func (e *Exec) ProcessCommand(command string, acc telegraf.Accumulator, wg *sync.WaitGroup) {
 	defer wg.Done()
 
 	out, err := e.runner.Run(e, command, acc)
@@ -176,7 +176,7 @@ func (e *Exec) SetParser(parser parsers.Parser) {
 	e.parser = parser
 }
 
-func (e *Exec) Gather(acc plugins.Accumulator) error {
+func (e *Exec) Gather(acc telegraf.Accumulator) error {
 	var wg sync.WaitGroup
 	// Legacy single command support
 	if e.Command != "" {
@@ -226,7 +226,7 @@ func (e *Exec) Gather(acc plugins.Accumulator) error {
 }
 
 func init() {
-	inputs.Add("exec", func() plugins.Input {
+	inputs.Add("exec", func() telegraf.Input {
 		return NewExec()
 	})
 }

plugins/inputs/exec/exec_test.go

@@ -6,7 +6,7 @@ import (
 	"runtime"
 	"testing"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/parsers"
 
 	"github.com/influxdata/telegraf/testutil"
@@ -83,7 +83,7 @@ func newRunnerMock(out []byte, err error) Runner {
 	}
 }
 
-func (r runnerMock) Run(e *Exec, command string, acc plugins.Accumulator) ([]byte, error) {
+func (r runnerMock) Run(e *Exec, command string, acc telegraf.Accumulator) ([]byte, error) {
 	if r.err != nil {
 		return nil, r.err
 	}

plugins/inputs/filestat/filestat.go

@@ -4,10 +4,9 @@ import (
 	"crypto/md5"
 	"fmt"
 	"io"
-	"log"
 	"os"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal/globpath"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
@@ -47,7 +46,7 @@ func (_ *FileStat) Description() string {
 
 func (_ *FileStat) SampleConfig() string { return sampleConfig }
 
-func (f *FileStat) Gather(acc plugins.Accumulator) error {
+func (f *FileStat) Gather(acc telegraf.Accumulator) error {
 	var errS string
 	var err error
 
@@ -79,14 +78,8 @@ func (f *FileStat) Gather(acc plugins.Accumulator) error {
 				"file": fileName,
 			}
 			fields := map[string]interface{}{
-				"exists": int64(1),
-			}
-
-			if fileInfo == nil {
-				log.Printf("E! Unable to get info for file [%s], possible permissions issue",
-					fileName)
-			} else {
-				fields["size_bytes"] = fileInfo.Size()
+				"exists":     int64(1),
+				"size_bytes": fileInfo.Size(),
 			}
 
 			if f.Md5 {
@@ -126,7 +119,7 @@ func getMd5(file string) (string, error) {
 }
 
 func init() {
-	inputs.Add("filestat", func() plugins.Input {
+	inputs.Add("filestat", func() telegraf.Input {
 		return NewFileStat()
 	})
 }

plugins/inputs/graylog/graylog.go

@@ -14,7 +14,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
@@ -129,7 +129,7 @@ func (h *GrayLog) Description() string {
 }
 
 // Gathers data for all servers.
-func (h *GrayLog) Gather(acc plugins.Accumulator) error {
+func (h *GrayLog) Gather(acc telegraf.Accumulator) error {
 	var wg sync.WaitGroup
 
 	if h.client.HTTPClient() == nil {
@@ -178,14 +178,14 @@ func (h *GrayLog) Gather(acc plugins.Accumulator) error {
 
 // Gathers data from a particular server
 // Parameters:
-//     acc      : The plugins.Accumulator to use
+//     acc      : The telegraf Accumulator to use
 //     serverURL: endpoint to send request to
 //     service  : the service being queried
 //
 // Returns:
 //     error: Any error that may have occurred
 func (h *GrayLog) gatherServer(
-	acc plugins.Accumulator,
+	acc telegraf.Accumulator,
 	serverURL string,
 ) error {
 	resp, _, err := h.sendRequest(serverURL)
@@ -304,7 +304,7 @@ func (h *GrayLog) sendRequest(serverURL string) (string, float64, error) {
 }
 
 func init() {
-	inputs.Add("graylog", func() plugins.Input {
+	inputs.Add("graylog", func() telegraf.Input {
 		return &GrayLog{
 			client: &RealHTTPClient{},
 		}

plugins/inputs/haproxy/haproxy.go

@@ -13,7 +13,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal/errchan"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
@@ -115,7 +115,7 @@ func (r *haproxy) Description() string {
 
 // Reads stats from all configured servers accumulates stats.
 // Returns one of the errors encountered while gather stats (if any).
-func (g *haproxy) Gather(acc plugins.Accumulator) error {
+func (g *haproxy) Gather(acc telegraf.Accumulator) error {
 	if len(g.Servers) == 0 {
 		return g.gatherServer("http://127.0.0.1:1936/haproxy?stats", acc)
 	}
@@ -160,7 +160,7 @@ func (g *haproxy) Gather(acc plugins.Accumulator) error {
 	return errChan.Error()
 }
 
-func (g *haproxy) gatherServerSocket(addr string, acc plugins.Accumulator) error {
+func (g *haproxy) gatherServerSocket(addr string, acc telegraf.Accumulator) error {
 	socketPath := getSocketAddr(addr)
 
 	c, err := net.Dial("unix", socketPath)
@@ -178,7 +178,7 @@ func (g *haproxy) gatherServerSocket(addr string, acc plugins.Accumulator) error
 	return importCsvResult(c, acc, socketPath)
 }
 
-func (g *haproxy) gatherServer(addr string, acc plugins.Accumulator) error {
+func (g *haproxy) gatherServer(addr string, acc telegraf.Accumulator) error {
 	if !strings.HasPrefix(addr, "http") {
 		return g.gatherServerSocket(addr, acc)
 	}
@@ -229,7 +229,7 @@ func getSocketAddr(sock string) string {
 	}
 }
 
-func importCsvResult(r io.Reader, acc plugins.Accumulator, host string) error {
+func importCsvResult(r io.Reader, acc telegraf.Accumulator, host string) error {
 	csv := csv.NewReader(r)
 	result, err := csv.ReadAll()
 	now := time.Now()
@@ -263,11 +263,6 @@ func importCsvResult(r io.Reader, acc plugins.Accumulator, host string) error {
 				if err == nil {
 					fields["smax"] = ival
 				}
-			case HF_SLIM:
-				ival, err := strconv.ParseUint(v, 10, 64)
-				if err == nil {
-					fields["slim"] = ival
-				}
 			case HF_STOT:
 				ival, err := strconv.ParseUint(v, 10, 64)
 				if err == nil {
@@ -436,7 +431,7 @@ func importCsvResult(r io.Reader, acc plugins.Accumulator, host string) error {
 }
 
 func init() {
-	inputs.Add("haproxy", func() plugins.Input {
+	inputs.Add("haproxy", func() telegraf.Input {
 		return &haproxy{}
 	})
 }

plugins/inputs/haproxy/haproxy_test.go

@@ -198,7 +198,6 @@ func HaproxyGetFieldValues() map[string]interface{} {
 		"rtime":             uint64(312),
 		"scur":              uint64(1),
 		"smax":              uint64(32),
-		"slim":              uint64(32),
 		"srv_abort":         uint64(1),
 		"stot":              uint64(171014),
 		"ttime":             uint64(2341),
@@ -224,6 +223,6 @@ be_static,host1,0,0,0,1,,28,7873,1209688,,0,,0,0,0,0,UP,1,1,0,0,0,70698,0,,2,18,
 be_static,host2,0,0,0,1,,28,13830,1085929,,0,,0,0,0,0,UP,1,1,0,0,0,70698,0,,2,18,9,,28,,2,0,,1,L4OK,,0,0,19,6,3,0,0,0,,,,0,0,,,,,338,,,0,1,1,38,
 be_static,host3,0,0,0,1,,28,17959,1259760,,0,,0,0,0,0,UP,1,1,0,0,0,70698,0,,2,18,10,,28,,2,0,,1,L4OK,,1,0,20,6,2,0,0,0,,,,0,0,,,,,92,,,0,1,1,17,
 be_static,BACKEND,0,0,0,2,200,307,160276,13322728,0,0,,0,0,0,0,UP,11,11,0,,0,70698,0,,2,18,0,,307,,1,0,,4,,,,0,205,73,29,0,0,,,,,0,0,0,0,0,0,92,,,0,1,3,381,
-be_app,host0,0,0,1,32,32,171014,510913516,2193856571,,0,,0,1,1,0,UP,100,1,0,1,0,70698,0,,2,19,1,,171013,,2,3,,12,L7OK,301,10,0,119534,48051,2345,1056,0,0,,,,73,1,,,,,0,Moved Permanently,,0,2,312,2341,
-be_app,host4,0,0,2,29,32,171013,499318742,2195595896,12,34,,0,2,0,0,UP,100,1,0,2,0,70698,0,,2,19,2,,171013,,2,3,,12,L7OK,301,12,0,119572,47882,2441,1088,0,0,,,,84,2,,,,,0,Moved Permanently,,0,2,316,2355,
+be_app,host0,0,0,1,32,,171014,510913516,2193856571,,0,,0,1,1,0,UP,100,1,0,1,0,70698,0,,2,19,1,,171013,,2,3,,12,L7OK,301,10,0,119534,48051,2345,1056,0,0,,,,73,1,,,,,0,Moved Permanently,,0,2,312,2341,
+be_app,host4,0,0,2,29,,171013,499318742,2195595896,12,34,,0,2,0,0,UP,100,1,0,2,0,70698,0,,2,19,2,,171013,,2,3,,12,L7OK,301,12,0,119572,47882,2441,1088,0,0,,,,84,2,,,,,0,Moved Permanently,,0,2,316,2355,
 `

plugins/inputs/hddtemp/README.md

@@ -8,7 +8,7 @@ Hddtemp should be installed and its daemon running
 
 ## Configuration
 
-```toml
+```
 [[inputs.hddtemp]]
 ## By default, telegraf gathers temps data from all disks detected by the
 ## hddtemp.
@@ -20,24 +20,3 @@ Hddtemp should be installed and its daemon running
 # address = "127.0.0.1:7634"
 # devices = ["sda", "*"]
 ```
-
-## Measurements
-
-- hddtemp
-  - temperature
-
-Tags:
-- device
-- model
-- unit
-- status
-
-
-
-## Example output
-
-```
-> hddtemp,unit=C,status=,host=server1,device=sdb,model=WDC\ WD740GD-00FLA1 temperature=43i 1481655647000000000
-> hddtemp,device=sdc,model=SAMSUNG\ HD103UI,unit=C,status=,host=server1 temperature=38i 148165564700000000
-> hddtemp,device=sdd,model=SAMSUNG\ HD103UI,unit=C,status=,host=server1 temperature=36i 1481655647000000000
-```

plugins/inputs/hddtemp/go-hddtemp/hddtemp.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 )
 
-type Disk struct {
+type disk struct {
 	DeviceName  string
 	Model       string
 	Temperature int32
@@ -16,19 +16,12 @@ type Disk struct {
 	Status      string
 }
 
-type hddtemp struct {
-}
-
-func New() *hddtemp {
-	return &hddtemp{}
-}
-
-func (h *hddtemp) Fetch(address string) ([]Disk, error) {
+func Fetch(address string) ([]disk, error) {
 	var (
 		err    error
 		conn   net.Conn
 		buffer bytes.Buffer
-		disks  []Disk
+		disks  []disk
 	)
 
 	if conn, err = net.Dial("tcp", address); err != nil {
@@ -55,7 +48,7 @@ func (h *hddtemp) Fetch(address string) ([]Disk, error) {
 			status = temperatureField
 		}
 
-		disks = append(disks, Disk{
+		disks = append(disks, disk{
 			DeviceName:  device,
 			Model:       fields[offset+2],
 			Temperature: int32(temperature),

plugins/inputs/hddtemp/go-hddtemp/hddtemp_test.go

@@ -10,13 +10,13 @@ func TestFetch(t *testing.T) {
 	l := serve(t, []byte("|/dev/sda|foobar|36|C|"))
 	defer l.Close()
 
-	disks, err := New().Fetch(l.Addr().String())
+	disks, err := Fetch(l.Addr().String())
 
 	if err != nil {
 		t.Error("expecting err to be nil")
 	}
 
-	expected := []Disk{
+	expected := []disk{
 		{
 			DeviceName:  "sda",
 			Model:       "foobar",
@@ -31,7 +31,7 @@ func TestFetch(t *testing.T) {
 }
 
 func TestFetchWrongAddress(t *testing.T) {
-	_, err := New().Fetch("127.0.0.1:1")
+	_, err := Fetch("127.0.0.1:1")
 
 	if err == nil {
 		t.Error("expecting err to be non-nil")
@@ -42,13 +42,13 @@ func TestFetchStatus(t *testing.T) {
 	l := serve(t, []byte("|/dev/sda|foobar|SLP|C|"))
 	defer l.Close()
 
-	disks, err := New().Fetch(l.Addr().String())
+	disks, err := Fetch(l.Addr().String())
 
 	if err != nil {
 		t.Error("expecting err to be nil")
 	}
 
-	expected := []Disk{
+	expected := []disk{
 		{
 			DeviceName:  "sda",
 			Model:       "foobar",
@@ -67,13 +67,13 @@ func TestFetchTwoDisks(t *testing.T) {
 	l := serve(t, []byte("|/dev/hda|ST380011A|46|C||/dev/hdd|ST340016A|SLP|*|"))
 	defer l.Close()
 
-	disks, err := New().Fetch(l.Addr().String())
+	disks, err := Fetch(l.Addr().String())
 
 	if err != nil {
 		t.Error("expecting err to be nil")
 	}
 
-	expected := []Disk{
+	expected := []disk{
 		{
 			DeviceName:  "hda",
 			Model:       "ST380011A",

plugins/inputs/hddtemp/hddtemp.go

@@ -3,7 +3,7 @@
 package hddtemp
 
 import (
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	gohddtemp "github.com/influxdata/telegraf/plugins/inputs/hddtemp/go-hddtemp"
 )
@@ -13,11 +13,6 @@ const defaultAddress = "127.0.0.1:7634"
 type HDDTemp struct {
 	Address string
 	Devices []string
-	fetcher Fetcher
-}
-
-type Fetcher interface {
-	Fetch(address string) ([]gohddtemp.Disk, error)
 }
 
 func (_ *HDDTemp) Description() string {
@@ -40,11 +35,8 @@ func (_ *HDDTemp) SampleConfig() string {
 	return hddtempSampleConfig
 }
 
-func (h *HDDTemp) Gather(acc plugins.Accumulator) error {
-	if h.fetcher == nil {
-		h.fetcher = gohddtemp.New()
-	}
-	disks, err := h.fetcher.Fetch(h.Address)
+func (h *HDDTemp) Gather(acc telegraf.Accumulator) error {
+	disks, err := gohddtemp.Fetch(h.Address)
 
 	if err != nil {
 		return err
@@ -61,7 +53,7 @@ func (h *HDDTemp) Gather(acc plugins.Accumulator) error {
 				}
 
 				fields := map[string]interface{}{
-					"temperature": disk.Temperature,
+					disk.DeviceName: disk.Temperature,
 				}
 
 				acc.AddFields("hddtemp", fields, tags)
@@ -73,7 +65,7 @@ func (h *HDDTemp) Gather(acc plugins.Accumulator) error {
 }
 
 func init() {
-	inputs.Add("hddtemp", func() plugins.Input {
+	inputs.Add("hddtemp", func() telegraf.Input {
 		return &HDDTemp{
 			Address: defaultAddress,
 			Devices: []string{"*"},

plugins/inputs/hddtemp/hddtemp_test.go

@@ -1,80 +0,0 @@
-package hddtemp
-
-import (
-	"testing"
-
-	hddtemp "github.com/influxdata/telegraf/plugins/inputs/hddtemp/go-hddtemp"
-	"github.com/influxdata/telegraf/testutil"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-type mockFetcher struct {
-}
-
-func (h *mockFetcher) Fetch(address string) ([]hddtemp.Disk, error) {
-	return []hddtemp.Disk{
-		hddtemp.Disk{
-			DeviceName:  "Disk1",
-			Model:       "Model1",
-			Temperature: 13,
-			Unit:        "C",
-		},
-		hddtemp.Disk{
-			DeviceName:  "Disk2",
-			Model:       "Model2",
-			Temperature: 14,
-			Unit:        "C",
-		},
-	}, nil
-
-}
-func newMockFetcher() *mockFetcher {
-	return &mockFetcher{}
-}
-
-func TestFetch(t *testing.T) {
-	hddtemp := &HDDTemp{
-		fetcher: newMockFetcher(),
-		Devices: []string{"*"},
-	}
-
-	acc := &testutil.Accumulator{}
-	err := hddtemp.Gather(acc)
-
-	require.NoError(t, err)
-	assert.Equal(t, acc.NFields(), 2)
-
-	var tests = []struct {
-		fields map[string]interface{}
-		tags   map[string]string
-	}{
-		{
-			map[string]interface{}{
-				"temperature": int32(13),
-			},
-			map[string]string{
-				"device": "Disk1",
-				"model":  "Model1",
-				"unit":   "C",
-				"status": "",
-			},
-		},
-		{
-			map[string]interface{}{
-				"temperature": int32(14),
-			},
-			map[string]string{
-				"device": "Disk2",
-				"model":  "Model2",
-				"unit":   "C",
-				"status": "",
-			},
-		},
-	}
-
-	for _, test := range tests {
-		acc.AssertContainsTaggedFields(t, "hddtemp", test.fields, test.tags)
-	}
-
-}

plugins/inputs/http_listener/http_listener.go

@@ -10,7 +10,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"github.com/influxdata/telegraf/plugins/parsers/influx"
@@ -42,7 +42,7 @@ type HTTPListener struct {
 	listener net.Listener
 
 	parser influx.InfluxParser
-	acc    plugins.Accumulator
+	acc    telegraf.Accumulator
 	pool   *pool
 
 	BytesRecv       selfstat.Stat
@@ -84,13 +84,13 @@ func (h *HTTPListener) Description() string {
 	return "Influx HTTP write listener"
 }
 
-func (h *HTTPListener) Gather(_ plugins.Accumulator) error {
+func (h *HTTPListener) Gather(_ telegraf.Accumulator) error {
 	h.BuffersCreated.Set(h.pool.ncreated())
 	return nil
 }
 
 // Start starts the http listener service.
-func (h *HTTPListener) Start(acc plugins.Accumulator) error {
+func (h *HTTPListener) Start(acc telegraf.Accumulator) error {
 	h.mu.Lock()
 	defer h.mu.Unlock()
 
@@ -324,7 +324,7 @@ func badRequest(res http.ResponseWriter) {
 }
 
 func init() {
-	inputs.Add("http_listener", func() plugins.Input {
+	inputs.Add("http_listener", func() telegraf.Input {
 		return &HTTPListener{
 			ServiceAddress: ":8186",
 		}

plugins/inputs/http_response/http_response.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
@@ -141,7 +141,7 @@ func (h *HTTPResponse) HTTPGather() (map[string]interface{}, error) {
 }
 
 // Gather gets all metric fields and tags and returns any errors it encounters
-func (h *HTTPResponse) Gather(acc plugins.Accumulator) error {
+func (h *HTTPResponse) Gather(acc telegraf.Accumulator) error {
 	// Set default values
 	if h.ResponseTimeout.Duration < time.Second {
 		h.ResponseTimeout.Duration = time.Second * 5
@@ -174,7 +174,7 @@ func (h *HTTPResponse) Gather(acc plugins.Accumulator) error {
 }
 
 func init() {
-	inputs.Add("http_response", func() plugins.Input {
+	inputs.Add("http_response", func() telegraf.Input {
 		return &HTTPResponse{}
 	})
 }

plugins/inputs/httpjson/httpjson.go

@@ -10,7 +10,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"github.com/influxdata/telegraf/plugins/parsers"
@@ -120,7 +120,7 @@ func (h *HttpJson) Description() string {
 }
 
 // Gathers data for all servers.
-func (h *HttpJson) Gather(acc plugins.Accumulator) error {
+func (h *HttpJson) Gather(acc telegraf.Accumulator) error {
 	var wg sync.WaitGroup
 
 	if h.client.HTTPClient() == nil {
@@ -169,14 +169,14 @@ func (h *HttpJson) Gather(acc plugins.Accumulator) error {
 
 // Gathers data from a particular server
 // Parameters:
-//     acc      : The plugins.Accumulator to use
+//     acc      : The telegraf Accumulator to use
 //     serverURL: endpoint to send request to
 //     service  : the service being queried
 //
 // Returns:
 //     error: Any error that may have occurred
 func (h *HttpJson) gatherServer(
-	acc plugins.Accumulator,
+	acc telegraf.Accumulator,
 	serverURL string,
 ) error {
 	resp, responseTime, err := h.sendRequest(serverURL)
@@ -292,7 +292,7 @@ func (h *HttpJson) sendRequest(serverURL string) (string, float64, error) {
 }
 
 func init() {
-	inputs.Add("httpjson", func() plugins.Input {
+	inputs.Add("httpjson", func() telegraf.Input {
 		return &HttpJson{
 			client: &RealHTTPClient{},
 			ResponseTimeout: internal.Duration{

plugins/inputs/influxdb/influxdb.go

@@ -9,7 +9,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
@@ -43,7 +43,7 @@ func (*InfluxDB) SampleConfig() string {
 `
 }
 
-func (i *InfluxDB) Gather(acc plugins.Accumulator) error {
+func (i *InfluxDB) Gather(acc telegraf.Accumulator) error {
 	if len(i.URLs) == 0 {
 		i.URLs = []string{"http://localhost:8086/debug/vars"}
 	}
@@ -94,44 +94,43 @@ type point struct {
 }
 
 type memstats struct {
-	Alloc         int64      `json:"Alloc"`
-	TotalAlloc    int64      `json:"TotalAlloc"`
-	Sys           int64      `json:"Sys"`
-	Lookups       int64      `json:"Lookups"`
-	Mallocs       int64      `json:"Mallocs"`
-	Frees         int64      `json:"Frees"`
-	HeapAlloc     int64      `json:"HeapAlloc"`
-	HeapSys       int64      `json:"HeapSys"`
-	HeapIdle      int64      `json:"HeapIdle"`
-	HeapInuse     int64      `json:"HeapInuse"`
-	HeapReleased  int64      `json:"HeapReleased"`
-	HeapObjects   int64      `json:"HeapObjects"`
-	StackInuse    int64      `json:"StackInuse"`
-	StackSys      int64      `json:"StackSys"`
-	MSpanInuse    int64      `json:"MSpanInuse"`
-	MSpanSys      int64      `json:"MSpanSys"`
-	MCacheInuse   int64      `json:"MCacheInuse"`
-	MCacheSys     int64      `json:"MCacheSys"`
-	BuckHashSys   int64      `json:"BuckHashSys"`
-	GCSys         int64      `json:"GCSys"`
-	OtherSys      int64      `json:"OtherSys"`
-	NextGC        int64      `json:"NextGC"`
-	LastGC        int64      `json:"LastGC"`
-	PauseTotalNs  int64      `json:"PauseTotalNs"`
-	PauseNs       [256]int64 `json:"PauseNs"`
-	NumGC         int64      `json:"NumGC"`
-	GCCPUFraction float64    `json:"GCCPUFraction"`
+	Alloc         int64   `json:"Alloc"`
+	TotalAlloc    int64   `json:"TotalAlloc"`
+	Sys           int64   `json:"Sys"`
+	Lookups       int64   `json:"Lookups"`
+	Mallocs       int64   `json:"Mallocs"`
+	Frees         int64   `json:"Frees"`
+	HeapAlloc     int64   `json:"HeapAlloc"`
+	HeapSys       int64   `json:"HeapSys"`
+	HeapIdle      int64   `json:"HeapIdle"`
+	HeapInuse     int64   `json:"HeapInuse"`
+	HeapReleased  int64   `json:"HeapReleased"`
+	HeapObjects   int64   `json:"HeapObjects"`
+	StackInuse    int64   `json:"StackInuse"`
+	StackSys      int64   `json:"StackSys"`
+	MSpanInuse    int64   `json:"MSpanInuse"`
+	MSpanSys      int64   `json:"MSpanSys"`
+	MCacheInuse   int64   `json:"MCacheInuse"`
+	MCacheSys     int64   `json:"MCacheSys"`
+	BuckHashSys   int64   `json:"BuckHashSys"`
+	GCSys         int64   `json:"GCSys"`
+	OtherSys      int64   `json:"OtherSys"`
+	NextGC        int64   `json:"NextGC"`
+	LastGC        int64   `json:"LastGC"`
+	PauseTotalNs  int64   `json:"PauseTotalNs"`
+	NumGC         int64   `json:"NumGC"`
+	GCCPUFraction float64 `json:"GCCPUFraction"`
 }
 
 // Gathers data from a particular URL
 // Parameters:
-//     acc    : The plugins.Accumulator to use
+//     acc    : The telegraf Accumulator to use
 //     url    : endpoint to send request to
 //
 // Returns:
 //     error: Any error that may have occurred
 func (i *InfluxDB) gatherURL(
-	acc plugins.Accumulator,
+	acc telegraf.Accumulator,
 	url string,
 ) error {
 	shardCounter := 0
@@ -203,7 +202,6 @@ func (i *InfluxDB) gatherURL(
 						"next_gc":         m.NextGC,
 						"last_gc":         m.LastGC,
 						"pause_total_ns":  m.PauseTotalNs,
-						"pause_ns":        m.PauseNs[(m.NumGC+255)%256],
 						"num_gc":          m.NumGC,
 						"gcc_pu_fraction": m.GCCPUFraction,
 					},
@@ -258,7 +256,7 @@ func (i *InfluxDB) gatherURL(
 }
 
 func init() {
-	inputs.Add("influxdb", func() plugins.Input {
+	inputs.Add("influxdb", func() telegraf.Input {
 		return &InfluxDB{
 			Timeout: internal.Duration{Duration: time.Second * 5},
 		}

plugins/inputs/influxdb/influxdb_test.go

@@ -86,7 +86,6 @@ func TestInfluxDB(t *testing.T) {
 		"frees":           int64(381008),
 		"heap_idle":       int64(15802368),
 		"pause_total_ns":  int64(5132914),
-		"pause_ns":        int64(127053),
 		"lookups":         int64(77),
 		"heap_sys":        int64(33849344),
 		"mcache_sys":      int64(16384),

plugins/inputs/internal/internal.go

@@ -3,7 +3,7 @@ package internal
 import (
 	"runtime"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"github.com/influxdata/telegraf/selfstat"
 )
@@ -12,7 +12,7 @@ type Self struct {
 	CollectMemstats bool
 }
 
-func NewSelf() plugins.Input {
+func NewSelf() telegraf.Input {
 	return &Self{
 		CollectMemstats: true,
 	}
@@ -31,7 +31,7 @@ func (s *Self) SampleConfig() string {
 	return sampleConfig
 }
 
-func (s *Self) Gather(acc plugins.Accumulator) error {
+func (s *Self) Gather(acc telegraf.Accumulator) error {
 	if s.CollectMemstats {
 		m := &runtime.MemStats{}
 		runtime.ReadMemStats(m)

plugins/inputs/ipmi_sensor/ipmi.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
@@ -37,7 +37,7 @@ func (m *Ipmi) Description() string {
 	return "Read metrics from one or many bare metal servers"
 }
 
-func (m *Ipmi) Gather(acc plugins.Accumulator) error {
+func (m *Ipmi) Gather(acc telegraf.Accumulator) error {
 	if m.runner == nil {
 		m.runner = CommandRunner{}
 	}
@@ -51,7 +51,7 @@ func (m *Ipmi) Gather(acc plugins.Accumulator) error {
 	return nil
 }
 
-func (m *Ipmi) gatherServer(serv string, acc plugins.Accumulator) error {
+func (m *Ipmi) gatherServer(serv string, acc telegraf.Accumulator) error {
 	conn := NewConnection(serv)
 
 	res, err := m.runner.Run(conn, "sdr")
@@ -123,7 +123,7 @@ func transform(s string) string {
 }
 
 func init() {
-	inputs.Add("ipmi_sensor", func() plugins.Input {
+	inputs.Add("ipmi_sensor", func() telegraf.Input {
 		return &Ipmi{}
 	})
 }

plugins/inputs/iptables/iptables.go

@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
@@ -42,7 +42,7 @@ func (ipt *Iptables) SampleConfig() string {
 }
 
 // Gather gathers iptables packets and bytes throughput from the configured tables and chains.
-func (ipt *Iptables) Gather(acc plugins.Accumulator) error {
+func (ipt *Iptables) Gather(acc telegraf.Accumulator) error {
 	if ipt.Table == "" || len(ipt.Chains) == 0 {
 		return nil
 	}
@@ -88,7 +88,7 @@ var chainNameRe = regexp.MustCompile(`^Chain\s+(\S+)`)
 var fieldsHeaderRe = regexp.MustCompile(`^\s*pkts\s+bytes\s+`)
 var valuesRe = regexp.MustCompile(`^\s*([0-9]+)\s+([0-9]+)\s+.*?(/\*\s(.*)\s\*/)?$`)
 
-func (ipt *Iptables) parseAndGather(data string, acc plugins.Accumulator) error {
+func (ipt *Iptables) parseAndGather(data string, acc telegraf.Accumulator) error {
 	lines := strings.Split(data, "\n")
 	if len(lines) < 3 {
 		return nil
@@ -120,7 +120,7 @@ func (ipt *Iptables) parseAndGather(data string, acc plugins.Accumulator) error
 type chainLister func(table, chain string) (string, error)
 
 func init() {
-	inputs.Add("iptables", func() plugins.Input {
+	inputs.Add("iptables", func() telegraf.Input {
 		ipt := new(Iptables)
 		ipt.lister = ipt.chainList
 		return ipt

plugins/inputs/jolokia/README.md

@@ -6,8 +6,7 @@
 # Read JMX metrics through Jolokia
 [[inputs.jolokia]]
   ## This is the context root used to compose the jolokia url
-  ## NOTE that Jolokia requires a trailing slash at the end of the context root
-  context = "/jolokia/"
+  context = "/jolokia"
 
   ## This specifies the mode used
   # mode = "proxy"
@@ -18,16 +17,7 @@
   # [inputs.jolokia.proxy]
   #   host = "127.0.0.1"
   #   port = "8080"
-  
-  ## Optional http timeouts
-  ##
-  ## response_header_timeout, if non-zero, specifies the amount of time to wait
-  ## for a server's response headers after fully writing the request.
-  # response_header_timeout = "3s"
-  ##
-  ## client_timeout specifies a time limit for requests made by this client.
-  ## Includes connection time, any redirects, and reading the response body.
-  # client_timeout = "4s"
+
 
   ## List of servers exposing jolokia read service
   [[inputs.jolokia.servers]]

plugins/inputs/jolokia/jolokia.go

@@ -10,15 +10,10 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/influxdata/telegraf/plugins"
-	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
-// Default http timeouts
-var DefaultResponseHeaderTimeout = internal.Duration{Duration: 3 * time.Second}
-var DefaultClientTimeout = internal.Duration{Duration: 4 * time.Second}
-
 type Server struct {
 	Name     string
 	Host     string
@@ -53,16 +48,12 @@ type Jolokia struct {
 	Servers []Server
 	Metrics []Metric
 	Proxy   Server
-
-	ResponseHeaderTimeout internal.Duration `toml:"response_header_timeout"`
-	ClientTimeout         internal.Duration `toml:"client_timeout"`
 }
 
 const sampleConfig = `
   ## This is the context root used to compose the jolokia url
-  ## NOTE that Jolokia requires a trailing slash at the end of the context root
   ## NOTE that your jolokia security policy must allow for POST requests.
-  context = "/jolokia/"
+  context = "/jolokia"
 
   ## This specifies the mode used
   # mode = "proxy"
@@ -74,15 +65,6 @@ const sampleConfig = `
   #   host = "127.0.0.1"
   #   port = "8080"
 
-  ## Optional http timeouts
-  ##
-  ## response_header_timeout, if non-zero, specifies the amount of time to wait
-  ## for a server's response headers after fully writing the request.
-  # response_header_timeout = "3s"
-  ##
-  ## client_timeout specifies a time limit for requests made by this client.
-  ## Includes connection time, any redirects, and reading the response body.
-  # client_timeout = "4s"
 
   ## List of servers exposing jolokia read service
   [[inputs.jolokia.servers]]
@@ -166,7 +148,7 @@ func (j *Jolokia) doRequest(req *http.Request) (map[string]interface{}, error) {
 
 func (j *Jolokia) prepareRequest(server Server, metric Metric) (*http.Request, error) {
 	var jolokiaUrl *url.URL
-	context := j.Context // Usually "/jolokia/"
+	context := j.Context // Usually "/jolokia"
 
 	// Create bodyContent
 	bodyContent := map[string]interface{}{
@@ -238,26 +220,7 @@ func (j *Jolokia) prepareRequest(server Server, metric Metric) (*http.Request, e
 	return req, nil
 }
 
-func extractValues(measurement string, value interface{}, fields map[string]interface{}) {
-	if mapValues, ok := value.(map[string]interface{}); ok {
-		for k2, v2 := range mapValues {
-			extractValues(measurement+"_"+k2, v2, fields)
-		}
-	} else {
-		fields[measurement] = value
-	}
-}
-
-func (j *Jolokia) Gather(acc plugins.Accumulator) error {
-
-	if j.jClient == nil {
-		tr := &http.Transport{ResponseHeaderTimeout: j.ResponseHeaderTimeout.Duration}
-		j.jClient = &JolokiaClientImpl{&http.Client{
-			Transport: tr,
-			Timeout:   j.ClientTimeout.Duration,
-		}}
-	}
-
+func (j *Jolokia) Gather(acc telegraf.Accumulator) error {
 	servers := j.Servers
 	metrics := j.Metrics
 	tags := make(map[string]string)
@@ -281,8 +244,23 @@ func (j *Jolokia) Gather(acc plugins.Accumulator) error {
 			if err != nil {
 				fmt.Printf("Error handling response: %s\n", err)
 			} else {
+
 				if values, ok := out["value"]; ok {
-					extractValues(measurement, values, fields)
+					switch t := values.(type) {
+					case map[string]interface{}:
+						for k, v := range t {
+							switch t2 := v.(type) {
+							case map[string]interface{}:
+								for k2, v2 := range t2 {
+									fields[measurement+"_"+k+"_"+k2] = v2
+								}
+							case interface{}:
+								fields[measurement+"_"+k] = t2
+							}
+						}
+					case interface{}:
+						fields[measurement] = t
+					}
 				} else {
 					fmt.Printf("Missing key 'value' in output response\n")
 				}
@@ -297,10 +275,12 @@ func (j *Jolokia) Gather(acc plugins.Accumulator) error {
 }
 
 func init() {
-	inputs.Add("jolokia", func() plugins.Input {
-		return &Jolokia{
-			ResponseHeaderTimeout: DefaultResponseHeaderTimeout,
-			ClientTimeout:         DefaultClientTimeout,
+	inputs.Add("jolokia", func() telegraf.Input {
+		tr := &http.Transport{ResponseHeaderTimeout: time.Duration(3 * time.Second)}
+		client := &http.Client{
+			Transport: tr,
+			Timeout:   time.Duration(4 * time.Second),
 		}
+		return &Jolokia{jClient: &JolokiaClientImpl{client: client}}
 	})
 }

plugins/inputs/jolokia/jolokia_test.go

@@ -12,37 +12,6 @@ import (
 	_ "github.com/stretchr/testify/require"
 )
 
-const validThreeLevelMultiValueJSON = `
-{
-  "request":{
-    "mbean":"java.lang:type=*",
-    "type":"read"
-  },
-  "value":{
-		"java.lang:type=Memory":{
-			"ObjectPendingFinalizationCount":0,
-			"Verbose":false,
-			"HeapMemoryUsage":{
-				"init":134217728,
-				"committed":173015040,
-				"max":1908932608,
-				"used":16840016
-			},
-			"NonHeapMemoryUsage":{
-				"init":2555904,
-				"committed":51380224,
-				"max":-1,
-				"used":49944048
-			},
-			"ObjectName":{
-				"objectName":"java.lang:type=Memory"
-			}
-		}
-  },
-  "timestamp":1446129191,
-  "status":200
-}`
-
 const validMultiValueJSON = `
 {
   "request":{
@@ -134,38 +103,6 @@ func TestHttpJsonMultiValue(t *testing.T) {
 	acc.AssertContainsTaggedFields(t, "jolokia", fields, tags)
 }
 
-// Test that the proper values are ignored or collected
-func TestHttpJsonThreeLevelMultiValue(t *testing.T) {
-	jolokia := genJolokiaClientStub(validThreeLevelMultiValueJSON, 200, Servers, []Metric{HeapMetric})
-
-	var acc testutil.Accumulator
-	err := jolokia.Gather(&acc)
-
-	assert.Nil(t, err)
-	assert.Equal(t, 1, len(acc.Metrics))
-
-	fields := map[string]interface{}{
-		"heap_memory_usage_java.lang:type=Memory_ObjectPendingFinalizationCount": 0.0,
-		"heap_memory_usage_java.lang:type=Memory_Verbose":                        false,
-		"heap_memory_usage_java.lang:type=Memory_HeapMemoryUsage_init":           134217728.0,
-		"heap_memory_usage_java.lang:type=Memory_HeapMemoryUsage_max":            1908932608.0,
-		"heap_memory_usage_java.lang:type=Memory_HeapMemoryUsage_used":           16840016.0,
-		"heap_memory_usage_java.lang:type=Memory_HeapMemoryUsage_committed":      173015040.0,
-		"heap_memory_usage_java.lang:type=Memory_NonHeapMemoryUsage_init":        2555904.0,
-		"heap_memory_usage_java.lang:type=Memory_NonHeapMemoryUsage_committed":   51380224.0,
-		"heap_memory_usage_java.lang:type=Memory_NonHeapMemoryUsage_max":         -1.0,
-		"heap_memory_usage_java.lang:type=Memory_NonHeapMemoryUsage_used":        49944048.0,
-		"heap_memory_usage_java.lang:type=Memory_ObjectName_objectName":          "java.lang:type=Memory",
-	}
-
-	tags := map[string]string{
-		"jolokia_host": "127.0.0.1",
-		"jolokia_port": "8080",
-		"jolokia_name": "as1",
-	}
-	acc.AssertContainsTaggedFields(t, "jolokia", fields, tags)
-}
-
 // Test that the proper values are ignored or collected
 func TestHttpJsonOn404(t *testing.T) {
 

plugins/inputs/kafka_consumer/kafka_consumer.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"github.com/influxdata/telegraf/plugins/parsers"
 
@@ -37,7 +37,7 @@ type Kafka struct {
 	done chan struct{}
 
 	// keep the accumulator internally:
-	acc plugins.Accumulator
+	acc telegraf.Accumulator
 
 	// doNotCommitMsgs tells the parser not to call CommitUpTo on the consumer
 	// this is mostly for test purposes, but there may be a use-case for it later.
@@ -75,7 +75,7 @@ func (k *Kafka) SetParser(parser parsers.Parser) {
 	k.parser = parser
 }
 
-func (k *Kafka) Start(acc plugins.Accumulator) error {
+func (k *Kafka) Start(acc telegraf.Accumulator) error {
 	k.Lock()
 	defer k.Unlock()
 	var consumerErr error
@@ -162,12 +162,12 @@ func (k *Kafka) Stop() {
 	}
 }
 
-func (k *Kafka) Gather(acc plugins.Accumulator) error {
+func (k *Kafka) Gather(acc telegraf.Accumulator) error {
 	return nil
 }
 
 func init() {
-	inputs.Add("kafka_consumer", func() plugins.Input {
+	inputs.Add("kafka_consumer", func() telegraf.Input {
 		return &Kafka{}
 	})
 }

plugins/inputs/kubernetes/kubernetes.go

@@ -9,7 +9,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/internal/errchan"
 	"github.com/influxdata/telegraf/plugins/inputs"
@@ -54,7 +54,7 @@ const (
 )
 
 func init() {
-	inputs.Add("kubernetes", func() plugins.Input {
+	inputs.Add("kubernetes", func() telegraf.Input {
 		return &Kubernetes{}
 	})
 }
@@ -70,7 +70,7 @@ func (k *Kubernetes) Description() string {
 }
 
 //Gather collects kubernetes metrics from a given URL
-func (k *Kubernetes) Gather(acc plugins.Accumulator) error {
+func (k *Kubernetes) Gather(acc telegraf.Accumulator) error {
 	var wg sync.WaitGroup
 	errChan := errchan.New(1)
 	wg.Add(1)
@@ -91,7 +91,7 @@ func buildURL(endpoint string, base string) (*url.URL, error) {
 	return addr, nil
 }
 
-func (k *Kubernetes) gatherSummary(baseURL string, acc plugins.Accumulator) error {
+func (k *Kubernetes) gatherSummary(baseURL string, acc telegraf.Accumulator) error {
 	url := fmt.Sprintf("%s/stats/summary", baseURL)
 	var req, err = http.NewRequest("GET", url, nil)
 	var token []byte
@@ -139,7 +139,7 @@ func (k *Kubernetes) gatherSummary(baseURL string, acc plugins.Accumulator) erro
 	return nil
 }
 
-func buildSystemContainerMetrics(summaryMetrics *SummaryMetrics, acc plugins.Accumulator) {
+func buildSystemContainerMetrics(summaryMetrics *SummaryMetrics, acc telegraf.Accumulator) {
 	for _, container := range summaryMetrics.Node.SystemContainers {
 		tags := map[string]string{
 			"node_name":      summaryMetrics.Node.NodeName,
@@ -161,7 +161,7 @@ func buildSystemContainerMetrics(summaryMetrics *SummaryMetrics, acc plugins.Acc
 	}
 }
 
-func buildNodeMetrics(summaryMetrics *SummaryMetrics, acc plugins.Accumulator) {
+func buildNodeMetrics(summaryMetrics *SummaryMetrics, acc telegraf.Accumulator) {
 	tags := map[string]string{
 		"node_name": summaryMetrics.Node.NodeName,
 	}
@@ -187,7 +187,7 @@ func buildNodeMetrics(summaryMetrics *SummaryMetrics, acc plugins.Accumulator) {
 	acc.AddFields("kubernetes_node", fields, tags)
 }
 
-func buildPodMetrics(summaryMetrics *SummaryMetrics, acc plugins.Accumulator) {
+func buildPodMetrics(summaryMetrics *SummaryMetrics, acc telegraf.Accumulator) {
 	for _, pod := range summaryMetrics.Pods {
 		for _, container := range pod.Containers {
 			tags := map[string]string{

plugins/inputs/leofs/leofs.go

@@ -10,7 +10,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
@@ -148,7 +148,7 @@ func (l *LeoFS) Description() string {
 	return "Read metrics from a LeoFS Server via SNMP"
 }
 
-func (l *LeoFS) Gather(acc plugins.Accumulator) error {
+func (l *LeoFS) Gather(acc telegraf.Accumulator) error {
 	if len(l.Servers) == 0 {
 		l.gatherServer(defaultEndpoint, ServerTypeManagerMaster, acc)
 		return nil
@@ -181,7 +181,7 @@ func (l *LeoFS) Gather(acc plugins.Accumulator) error {
 func (l *LeoFS) gatherServer(
 	endpoint string,
 	serverType ServerType,
-	acc plugins.Accumulator,
+	acc telegraf.Accumulator,
 ) error {
 	cmd := exec.Command("snmpwalk", "-v2c", "-cpublic", endpoint, oid)
 	stdout, err := cmd.StdoutPipe()
@@ -231,7 +231,7 @@ func retrieveTokenAfterColon(line string) (string, error) {
 }
 
 func init() {
-	inputs.Add("leofs", func() plugins.Input {
+	inputs.Add("leofs", func() telegraf.Input {
 		return &LeoFS{}
 	})
 }

plugins/inputs/logparser/README.md

@@ -40,11 +40,8 @@ regex patterns.
 ## Grok Parser
 
 The grok parser uses a slightly modified version of logstash "grok" patterns,
-with the format
+with the format `%{<capture_syntax>[:<semantic_name>][:<modifier>]}`
 
-```
-%{<capture_syntax>[:<semantic_name>][:<modifier>]}
-```
 
 Telegraf has many of it's own
 [built-in patterns](https://github.com/influxdata/telegraf/blob/master/plugins/inputs/logparser/grok/patterns/influx-patterns),
@@ -95,3 +92,4 @@ Timestamp modifiers can be used to convert captures to the timestamp of the
 CUSTOM time layouts must be within quotes and be the representation of the
 "reference time", which is `Mon Jan 2 15:04:05 -0700 MST 2006`
 See https://golang.org/pkg/time/#Parse for more details.
+

plugins/inputs/logparser/grok/grok.go

@@ -12,7 +12,7 @@ import (
 
 	"github.com/vjeantet/grok"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/metric"
 )
 
@@ -151,7 +151,7 @@ func (p *Parser) Compile() error {
 	return p.compileCustomPatterns()
 }
 
-func (p *Parser) ParseLine(line string) (plugins.Metric, error) {
+func (p *Parser) ParseLine(line string) (telegraf.Metric, error) {
 	var err error
 	// values are the parsed fields from the log line
 	var values map[string]string

plugins/inputs/logparser/grok/grok_test.go

@@ -4,13 +4,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
-var benchM plugins.Metric
+var benchM telegraf.Metric
 
 func Benchmark_ParseLine_CommonLogFormat(b *testing.B) {
 	p := &Parser{
@@ -18,7 +18,7 @@ func Benchmark_ParseLine_CommonLogFormat(b *testing.B) {
 	}
 	p.Compile()
 
-	var m plugins.Metric
+	var m telegraf.Metric
 	for n := 0; n < b.N; n++ {
 		m, _ = p.ParseLine(`127.0.0.1 user-identifier frank [10/Oct/2000:13:55:36 -0700] "GET /apache_pb.gif HTTP/1.0" 200 2326`)
 	}
@@ -31,7 +31,7 @@ func Benchmark_ParseLine_CombinedLogFormat(b *testing.B) {
 	}
 	p.Compile()
 
-	var m plugins.Metric
+	var m telegraf.Metric
 	for n := 0; n < b.N; n++ {
 		m, _ = p.ParseLine(`127.0.0.1 user-identifier frank [10/Oct/2000:13:55:36 -0700] "GET /apache_pb.gif HTTP/1.0" 200 2326 "-" "Mozilla"`)
 	}
@@ -50,7 +50,7 @@ func Benchmark_ParseLine_CustomPattern(b *testing.B) {
 	}
 	p.Compile()
 
-	var m plugins.Metric
+	var m telegraf.Metric
 	for n := 0; n < b.N; n++ {
 		m, _ = p.ParseLine(`[04/Jun/2016:12:41:45 +0100] 1.25 200 192.168.1.1 5.432µs 101`)
 	}
@@ -82,46 +82,6 @@ func TestMeasurementName(t *testing.T) {
 	assert.Equal(t, "my_web_log", m.Name())
 }
 
-func TestCLF_IPv6(t *testing.T) {
-	p := &Parser{
-		Measurement: "my_web_log",
-		Patterns:    []string{"%{COMMON_LOG_FORMAT}"},
-	}
-	assert.NoError(t, p.Compile())
-
-	m, err := p.ParseLine(`2001:0db8:85a3:0000:0000:8a2e:0370:7334 user-identifier frank [10/Oct/2000:13:55:36 -0700] "GET /apache_pb.gif HTTP/1.0" 200 2326`)
-	require.NotNil(t, m)
-	assert.NoError(t, err)
-	assert.Equal(t,
-		map[string]interface{}{
-			"resp_bytes":   int64(2326),
-			"auth":         "frank",
-			"client_ip":    "2001:0db8:85a3:0000:0000:8a2e:0370:7334",
-			"http_version": float64(1.0),
-			"ident":        "user-identifier",
-			"request":      "/apache_pb.gif",
-		},
-		m.Fields())
-	assert.Equal(t, map[string]string{"verb": "GET", "resp_code": "200"}, m.Tags())
-	assert.Equal(t, "my_web_log", m.Name())
-
-	m, err = p.ParseLine(`::1 user-identifier frank [10/Oct/2000:13:55:36 -0700] "GET /apache_pb.gif HTTP/1.0" 200 2326`)
-	require.NotNil(t, m)
-	assert.NoError(t, err)
-	assert.Equal(t,
-		map[string]interface{}{
-			"resp_bytes":   int64(2326),
-			"auth":         "frank",
-			"client_ip":    "::1",
-			"http_version": float64(1.0),
-			"ident":        "user-identifier",
-			"request":      "/apache_pb.gif",
-		},
-		m.Fields())
-	assert.Equal(t, map[string]string{"verb": "GET", "resp_code": "200"}, m.Tags())
-	assert.Equal(t, "my_web_log", m.Name())
-}
-
 func TestCustomInfluxdbHttpd(t *testing.T) {
 	p := &Parser{
 		Patterns: []string{`\[httpd\] %{COMBINED_LOG_FORMAT} %{UUID:uuid:drop} %{NUMBER:response_time_us:int}`},

plugins/inputs/logparser/grok/influx_patterns.go

@@ -56,7 +56,7 @@ EXAMPLE_LOG \[%{HTTPDATE:ts:ts-httpd}\] %{NUMBER:myfloat:float} %{RESPONSE_CODE}
 NGUSERNAME [a-zA-Z0-9\.\@\-\+_%]+
 NGUSER %{NGUSERNAME}
 # Wider-ranging client IP matching
-CLIENT (?:%{IPV6}|%{IPV4}|%{HOSTNAME}|%{HOSTPORT})
+CLIENT (?:%{IPORHOST}|%{HOSTPORT}|::1)
 
 ##
 ## COMMON LOG PATTERNS

plugins/inputs/logparser/logparser.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/hpcloud/tail"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal/errchan"
 	"github.com/influxdata/telegraf/internal/globpath"
 	"github.com/influxdata/telegraf/plugins/inputs"
@@ -18,7 +18,7 @@ import (
 )
 
 type LogParser interface {
-	ParseLine(line string) (plugins.Metric, error)
+	ParseLine(line string) (telegraf.Metric, error)
 	Compile() error
 }
 
@@ -30,7 +30,7 @@ type LogParserPlugin struct {
 	lines   chan string
 	done    chan struct{}
 	wg      sync.WaitGroup
-	acc     plugins.Accumulator
+	acc     telegraf.Accumulator
 	parsers []LogParser
 
 	sync.Mutex
@@ -76,11 +76,11 @@ func (l *LogParserPlugin) Description() string {
 	return "Stream and parse log file(s)."
 }
 
-func (l *LogParserPlugin) Gather(acc plugins.Accumulator) error {
+func (l *LogParserPlugin) Gather(acc telegraf.Accumulator) error {
 	return nil
 }
 
-func (l *LogParserPlugin) Start(acc plugins.Accumulator) error {
+func (l *LogParserPlugin) Start(acc telegraf.Accumulator) error {
 	l.Lock()
 	defer l.Unlock()
 
@@ -185,7 +185,7 @@ func (l *LogParserPlugin) receiver(tailer *tail.Tail) {
 func (l *LogParserPlugin) parser() {
 	defer l.wg.Done()
 
-	var m plugins.Metric
+	var m telegraf.Metric
 	var err error
 	var line string
 	for {
@@ -225,7 +225,7 @@ func (l *LogParserPlugin) Stop() {
 }
 
 func init() {
-	inputs.Add("logparser", func() plugins.Input {
+	inputs.Add("logparser", func() telegraf.Input {
 		return &LogParserPlugin{}
 	})
 }

plugins/inputs/lustre2/lustre2.go

@@ -13,7 +13,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
@@ -353,7 +353,7 @@ var wanted_mdt_jobstats_fields = []*mapping{
 	},
 }
 
-func (l *Lustre2) GetLustreProcStats(fileglob string, wanted_fields []*mapping, acc plugins.Accumulator) error {
+func (l *Lustre2) GetLustreProcStats(fileglob string, wanted_fields []*mapping, acc telegraf.Accumulator) error {
 	files, err := filepath.Glob(fileglob)
 	if err != nil {
 		return err
@@ -422,7 +422,7 @@ func (l *Lustre2) Description() string {
 }
 
 // Gather reads stats from all lustre targets
-func (l *Lustre2) Gather(acc plugins.Accumulator) error {
+func (l *Lustre2) Gather(acc telegraf.Accumulator) error {
 	l.allFields = make(map[string]map[string]interface{})
 
 	if len(l.Ost_procfiles) == 0 {
@@ -500,7 +500,7 @@ func (l *Lustre2) Gather(acc plugins.Accumulator) error {
 }
 
 func init() {
-	inputs.Add("lustre2", func() plugins.Input {
+	inputs.Add("lustre2", func() telegraf.Input {
 		return &Lustre2{}
 	})
 }

plugins/inputs/mailchimp/mailchimp.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
@@ -35,7 +35,7 @@ func (m *MailChimp) Description() string {
 	return "Gathers metrics from the /3.0/reports MailChimp API"
 }
 
-func (m *MailChimp) Gather(acc plugins.Accumulator) error {
+func (m *MailChimp) Gather(acc telegraf.Accumulator) error {
 	if m.api == nil {
 		m.api = NewChimpAPI(m.ApiKey)
 	}
@@ -72,7 +72,7 @@ func (m *MailChimp) Gather(acc plugins.Accumulator) error {
 	return nil
 }
 
-func gatherReport(acc plugins.Accumulator, report Report, now time.Time) {
+func gatherReport(acc telegraf.Accumulator, report Report, now time.Time) {
 	tags := make(map[string]string)
 	tags["id"] = report.ID
 	tags["campaign_title"] = report.CampaignTitle
@@ -111,7 +111,7 @@ func gatherReport(acc plugins.Accumulator, report Report, now time.Time) {
 }
 
 func init() {
-	inputs.Add("mailchimp", func() plugins.Input {
+	inputs.Add("mailchimp", func() telegraf.Input {
 		return &MailChimp{}
 	})
 }

plugins/inputs/memcached/memcached.go

@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal/errchan"
 	"github.com/influxdata/telegraf/plugins/inputs"
 )
@@ -69,7 +69,7 @@ func (m *Memcached) Description() string {
 }
 
 // Gather reads stats from all configured servers accumulates stats
-func (m *Memcached) Gather(acc plugins.Accumulator) error {
+func (m *Memcached) Gather(acc telegraf.Accumulator) error {
 	if len(m.Servers) == 0 && len(m.UnixSockets) == 0 {
 		return m.gatherServer(":11211", false, acc)
 	}
@@ -89,7 +89,7 @@ func (m *Memcached) Gather(acc plugins.Accumulator) error {
 func (m *Memcached) gatherServer(
 	address string,
 	unix bool,
-	acc plugins.Accumulator,
+	acc telegraf.Accumulator,
 ) error {
 	var conn net.Conn
 	var err error
@@ -180,7 +180,7 @@ func parseResponse(r *bufio.Reader) (map[string]string, error) {
 }
 
 func init() {
-	inputs.Add("memcached", func() plugins.Input {
+	inputs.Add("memcached", func() telegraf.Input {
 		return &Memcached{}
 	})
 }

plugins/inputs/mesos/mesos.go

@@ -12,7 +12,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	jsonparser "github.com/influxdata/telegraf/plugins/parsers/json"
 )
@@ -94,7 +94,7 @@ func (m *Mesos) SetDefaults() {
 }
 
 // Gather() metrics from given list of Mesos Masters
-func (m *Mesos) Gather(acc plugins.Accumulator) error {
+func (m *Mesos) Gather(acc telegraf.Accumulator) error {
 	var wg sync.WaitGroup
 	var errorChannel chan error
 
@@ -425,7 +425,7 @@ type TaskStats struct {
 	Statistics  map[string]interface{} `json:"statistics"`
 }
 
-func (m *Mesos) gatherSlaveTaskMetrics(address string, defaultPort string, acc plugins.Accumulator) error {
+func (m *Mesos) gatherSlaveTaskMetrics(address string, defaultPort string, acc telegraf.Accumulator) error {
 	var metrics []TaskStats
 
 	host, _, err := net.SplitHostPort(address)
@@ -476,7 +476,7 @@ func (m *Mesos) gatherSlaveTaskMetrics(address string, defaultPort string, acc p
 }
 
 // This should not belong to the object
-func (m *Mesos) gatherMainMetrics(a string, defaultPort string, role Role, acc plugins.Accumulator) error {
+func (m *Mesos) gatherMainMetrics(a string, defaultPort string, role Role, acc telegraf.Accumulator) error {
 	var jsonOut map[string]interface{}
 
 	host, _, err := net.SplitHostPort(a)
@@ -532,7 +532,7 @@ func (m *Mesos) gatherMainMetrics(a string, defaultPort string, role Role, acc p
 }
 
 func init() {
-	inputs.Add("mesos", func() plugins.Input {
+	inputs.Add("mesos", func() telegraf.Input {
 		return &Mesos{}
 	})
 }

plugins/inputs/mock_Plugin.go

@@ -1,7 +1,7 @@
 package inputs
 
 import (
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 
 	"github.com/stretchr/testify/mock"
 )
@@ -22,7 +22,7 @@ func (m *MockPlugin) SampleConfig() string {
 }
 
 // Gather defines what data the plugin will gather.
-func (m *MockPlugin) Gather(_a0 plugins.Accumulator) error {
+func (m *MockPlugin) Gather(_a0 telegraf.Accumulator) error {
 	ret := m.Called(_a0)
 
 	r0 := ret.Error(0)

plugins/inputs/mongodb/mongodb.go

@@ -9,7 +9,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal/errchan"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"gopkg.in/mgo.v2"
@@ -49,7 +49,7 @@ var localhost = &url.URL{Host: "127.0.0.1:27017"}
 
 // Reads stats from all configured servers accumulates stats.
 // Returns one of the errors encountered while gather stats (if any).
-func (m *MongoDB) Gather(acc plugins.Accumulator) error {
+func (m *MongoDB) Gather(acc telegraf.Accumulator) error {
 	if len(m.Servers) == 0 {
 		m.gatherServer(m.getMongoServer(localhost), acc)
 		return nil
@@ -89,7 +89,7 @@ func (m *MongoDB) getMongoServer(url *url.URL) *Server {
 	return m.mongos[url.Host]
 }
 
-func (m *MongoDB) gatherServer(server *Server, acc plugins.Accumulator) error {
+func (m *MongoDB) gatherServer(server *Server, acc telegraf.Accumulator) error {
 	if server.Session == nil {
 		var dialAddrs []string
 		if server.Url.User != nil {
@@ -139,7 +139,7 @@ func (m *MongoDB) gatherServer(server *Server, acc plugins.Accumulator) error {
 }
 
 func init() {
-	inputs.Add("mongodb", func() plugins.Input {
+	inputs.Add("mongodb", func() telegraf.Input {
 		return &MongoDB{
 			mongos: make(map[string]*Server),
 		}

plugins/inputs/mongodb/mongodb_data.go

@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"strconv"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 )
 
 type MongodbData struct {
@@ -21,6 +21,9 @@ type DbData struct {
 }
 
 func NewMongodbData(statLine *StatLine, tags map[string]string) *MongodbData {
+	if statLine.NodeType != "" && statLine.NodeType != "UNK" {
+		tags["state"] = statLine.NodeType
+	}
 	return &MongodbData{
 		StatLine: statLine,
 		Tags:     tags,
@@ -58,7 +61,6 @@ var DefaultReplStats = map[string]string{
 	"repl_getmores_per_sec": "GetMoreR",
 	"repl_commands_per_sec": "CommandR",
 	"member_status":         "NodeType",
-	"state":                 "NodeState",
 	"repl_lag":              "ReplLag",
 }
 
@@ -138,7 +140,7 @@ func (d *MongodbData) add(key string, val interface{}) {
 	d.Fields[key] = val
 }
 
-func (d *MongodbData) flush(acc plugins.Accumulator) {
+func (d *MongodbData) flush(acc telegraf.Accumulator) {
 	acc.AddFields(
 		"mongodb",
 		d.Fields,

plugins/inputs/mongodb/mongodb_data_test.go

@@ -95,12 +95,12 @@ func TestStateTag(t *testing.T) {
 			Insert:        0,
 			Query:         0,
 			NodeType:      "PRI",
-			NodeState:     "PRIMARY",
 		},
 		tags,
 	)
 
 	stateTags := make(map[string]string)
+	stateTags["state"] = "PRI"
 
 	var acc testutil.Accumulator
 
@@ -115,7 +115,6 @@ func TestStateTag(t *testing.T) {
 		"getmores_per_sec":      int64(0),
 		"inserts_per_sec":       int64(0),
 		"member_status":         "PRI",
-		"state":                 "PRIMARY",
 		"net_in_bytes":          int64(0),
 		"net_out_bytes":         int64(0),
 		"open_connections":      int64(0),

plugins/inputs/mongodb/mongodb_server.go

@@ -5,7 +5,7 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"gopkg.in/mgo.v2"
 	"gopkg.in/mgo.v2/bson"
 )
@@ -22,7 +22,7 @@ func (s *Server) getDefaultTags() map[string]string {
 	return tags
 }
 
-func (s *Server) gatherData(acc plugins.Accumulator, gatherDbStats bool) error {
+func (s *Server) gatherData(acc telegraf.Accumulator, gatherDbStats bool) error {
 	s.Session.SetMode(mgo.Eventual, true)
 	s.Session.SetSocketTimeout(0)
 	result_server := &ServerStatus{}

plugins/inputs/mongodb/mongostat.go

@@ -11,6 +11,8 @@ import (
 	"sort"
 	"strings"
 	"time"
+
+	"gopkg.in/mgo.v2/bson"
 )
 
 const (
@@ -103,10 +105,9 @@ type ReplSetStatus struct {
 
 // ReplSetMember stores information related to a replica set member
 type ReplSetMember struct {
-	Name       string    `bson:"name"`
-	State      int64     `bson:"state"`
-	StateStr   string    `bson:"stateStr"`
-	OptimeDate time.Time `bson:"optimeDate"`
+	Name       string               `bson:"name"`
+	State      int64                `bson:"state"`
+	OptimeDate *bson.MongoTimestamp `bson:"optimeDate"`
 }
 
 // WiredTiger stores information related to the WiredTiger storage engine.
@@ -419,7 +420,6 @@ type StatLine struct {
 	NumConnections                                        int64
 	ReplSetName                                           string
 	NodeType                                              string
-	NodeState                                             string
 
 	// Cluster fields
 	JumboChunksCount int64
@@ -566,8 +566,6 @@ func NewStatLine(oldMongo, newMongo MongoStatus, key string, all bool, sampleSec
 			returnVal.NodeType = "PRI"
 		} else if newStat.Repl.Secondary.(bool) {
 			returnVal.NodeType = "SEC"
-		} else if newStat.Repl.ArbiterOnly != nil && newStat.Repl.ArbiterOnly.(bool) {
-			returnVal.NodeType = "ARB"
 		} else {
 			returnVal.NodeType = "UNK"
 		}
@@ -694,8 +692,6 @@ func NewStatLine(oldMongo, newMongo MongoStatus, key string, all bool, sampleSec
 		me := ReplSetMember{}
 		for _, member := range newReplStat.Members {
 			if member.Name == myName {
-				// Store my state string
-				returnVal.NodeState = member.StateStr
 				if member.State == 1 {
 					// I'm the master
 					returnVal.ReplLag = 0
@@ -710,9 +706,9 @@ func NewStatLine(oldMongo, newMongo MongoStatus, key string, all bool, sampleSec
 			}
 		}
 
-		if me.State == 2 {
-			// OptimeDate.Unix() type is int64
-			lag := master.OptimeDate.Unix() - me.OptimeDate.Unix()
+		if me.OptimeDate != nil && master.OptimeDate != nil && me.State == 2 {
+			// MongoTimestamp type is int64 where the first 32bits are the unix timestamp
+			lag := int64(*master.OptimeDate>>32 - *me.OptimeDate>>32)
 			if lag < 0 {
 				returnVal.ReplLag = 0
 			} else {

plugins/inputs/mqtt_consumer/mqtt_consumer.go

@@ -7,7 +7,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"github.com/influxdata/telegraf/plugins/parsers"
@@ -46,7 +46,7 @@ type MQTTConsumer struct {
 	done chan struct{}
 
 	// keep the accumulator internally:
-	acc plugins.Accumulator
+	acc telegraf.Accumulator
 
 	started bool
 }
@@ -100,7 +100,7 @@ func (m *MQTTConsumer) SetParser(parser parsers.Parser) {
 	m.parser = parser
 }
 
-func (m *MQTTConsumer) Start(acc plugins.Accumulator) error {
+func (m *MQTTConsumer) Start(acc telegraf.Accumulator) error {
 	m.Lock()
 	defer m.Unlock()
 	m.started = false
@@ -191,7 +191,7 @@ func (m *MQTTConsumer) Stop() {
 	m.started = false
 }
 
-func (m *MQTTConsumer) Gather(acc plugins.Accumulator) error {
+func (m *MQTTConsumer) Gather(acc telegraf.Accumulator) error {
 	return nil
 }
 
@@ -242,7 +242,7 @@ func (m *MQTTConsumer) createOpts() (*mqtt.ClientOptions, error) {
 }
 
 func init() {
-	inputs.Add("mqtt_consumer", func() plugins.Input {
+	inputs.Add("mqtt_consumer", func() telegraf.Input {
 		return &MQTTConsumer{}
 	})
 }

plugins/inputs/mysql/README.md

@@ -25,8 +25,8 @@ This plugin gathers the statistic data from MySQL server
   ##  [username[:password]@][protocol[(address)]]/[?tls=[true|false|skip-verify]]
   ##  see https://github.com/go-sql-driver/mysql#dsn-data-source-name
   ##  e.g.
-  ##    servers = ["user:passwd@tcp(127.0.0.1:3306)/?tls=false"]
-  ##    servers = ["user@tcp(127.0.0.1:3306)/?tls=false"]
+  ##    db_user:passwd@tcp(127.0.0.1:3306)/?tls=false
+  ##    db_user@tcp(127.0.0.1:3306)/?tls=false
   #
   ## If no servers are specified, then localhost is used as the host.
   servers = ["tcp(127.0.0.1:3306)/"]

plugins/inputs/mysql/mysql.go

@@ -9,7 +9,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/internal/errchan"
 	"github.com/influxdata/telegraf/plugins/inputs"
 
@@ -41,8 +41,8 @@ var sampleConfig = `
   ##  [username[:password]@][protocol[(address)]]/[?tls=[true|false|skip-verify]]
   ##  see https://github.com/go-sql-driver/mysql#dsn-data-source-name
   ##  e.g.
-  ##    servers = ["user:passwd@tcp(127.0.0.1:3306)/?tls=false"]
-  ##    servers = ["user@tcp(127.0.0.1:3306)/?tls=false"]
+  ##    db_user:passwd@tcp(127.0.0.1:3306)/?tls=false
+  ##    db_user@tcp(127.0.0.1:3306)/?tls=false
   #
   ## If no servers are specified, then localhost is used as the host.
   servers = ["tcp(127.0.0.1:3306)/"]
@@ -118,7 +118,7 @@ func (m *Mysql) InitMysql() {
 	initDone = true
 }
 
-func (m *Mysql) Gather(acc plugins.Accumulator) error {
+func (m *Mysql) Gather(acc telegraf.Accumulator) error {
 	if len(m.Servers) == 0 {
 		// default to localhost if nothing specified.
 		return m.gatherServer(localhost, acc)
@@ -534,7 +534,7 @@ const (
 	`
 )
 
-func (m *Mysql) gatherServer(serv string, acc plugins.Accumulator) error {
+func (m *Mysql) gatherServer(serv string, acc telegraf.Accumulator) error {
 	serv, err := dsnAddTimeout(serv)
 	if err != nil {
 		return err
@@ -649,7 +649,7 @@ func (m *Mysql) gatherServer(serv string, acc plugins.Accumulator) error {
 
 // gatherGlobalVariables can be used to fetch all global variables from
 // MySQL environment.
-func (m *Mysql) gatherGlobalVariables(db *sql.DB, serv string, acc plugins.Accumulator) error {
+func (m *Mysql) gatherGlobalVariables(db *sql.DB, serv string, acc telegraf.Accumulator) error {
 	// run query
 	rows, err := db.Query(globalVariablesQuery)
 	if err != nil {
@@ -690,7 +690,7 @@ func (m *Mysql) gatherGlobalVariables(db *sql.DB, serv string, acc plugins.Accum
 // When the server is slave, then it returns only one row.
 // If the multi-source replication is set, then everything works differently
 // This code does not work with multi-source replication.
-func (m *Mysql) gatherSlaveStatuses(db *sql.DB, serv string, acc plugins.Accumulator) error {
+func (m *Mysql) gatherSlaveStatuses(db *sql.DB, serv string, acc telegraf.Accumulator) error {
 	// run query
 	rows, err := db.Query(slaveStatusQuery)
 	if err != nil {
@@ -734,7 +734,7 @@ func (m *Mysql) gatherSlaveStatuses(db *sql.DB, serv string, acc plugins.Accumul
 
 // gatherBinaryLogs can be used to collect size and count of all binary files
 // binlogs metric requires the MySQL server to turn it on in configuration
-func (m *Mysql) gatherBinaryLogs(db *sql.DB, serv string, acc plugins.Accumulator) error {
+func (m *Mysql) gatherBinaryLogs(db *sql.DB, serv string, acc telegraf.Accumulator) error {
 	// run query
 	rows, err := db.Query(binaryLogsQuery)
 	if err != nil {
@@ -771,7 +771,7 @@ func (m *Mysql) gatherBinaryLogs(db *sql.DB, serv string, acc plugins.Accumulato
 // gatherGlobalStatuses can be used to get MySQL status metrics
 // the mappings of actual names and names of each status to be exported
 // to output is provided on mappings variable
-func (m *Mysql) gatherGlobalStatuses(db *sql.DB, serv string, acc plugins.Accumulator) error {
+func (m *Mysql) gatherGlobalStatuses(db *sql.DB, serv string, acc telegraf.Accumulator) error {
 	// If user forgot the '/', add it
 	if strings.HasSuffix(serv, ")") {
 		serv = serv + "/"
@@ -828,13 +828,6 @@ func (m *Mysql) gatherGlobalStatuses(db *sql.DB, serv string, acc plugins.Accumu
 			}
 
 			fields["queries"] = i
-		case "Questions":
-			i, err := strconv.ParseInt(string(val.([]byte)), 10, 64)
-			if err != nil {
-				return err
-			}
-
-			fields["questions"] = i
 		case "Slow_queries":
 			i, err := strconv.ParseInt(string(val.([]byte)), 10, 64)
 			if err != nil {
@@ -889,7 +882,7 @@ func (m *Mysql) gatherGlobalStatuses(db *sql.DB, serv string, acc plugins.Accumu
 
 // GatherProcessList can be used to collect metrics on each running command
 // and its state with its running count
-func (m *Mysql) GatherProcessListStatuses(db *sql.DB, serv string, acc plugins.Accumulator) error {
+func (m *Mysql) GatherProcessListStatuses(db *sql.DB, serv string, acc telegraf.Accumulator) error {
 	// run query
 	rows, err := db.Query(infoSchemaProcessListQuery)
 	if err != nil {
@@ -934,7 +927,7 @@ func (m *Mysql) GatherProcessListStatuses(db *sql.DB, serv string, acc plugins.A
 
 // gatherPerfTableIOWaits can be used to get total count and time
 // of I/O wait event for each table and process
-func (m *Mysql) gatherPerfTableIOWaits(db *sql.DB, serv string, acc plugins.Accumulator) error {
+func (m *Mysql) gatherPerfTableIOWaits(db *sql.DB, serv string, acc telegraf.Accumulator) error {
 	rows, err := db.Query(perfTableIOWaitsQuery)
 	if err != nil {
 		return err
@@ -983,7 +976,7 @@ func (m *Mysql) gatherPerfTableIOWaits(db *sql.DB, serv string, acc plugins.Accu
 
 // gatherPerfIndexIOWaits can be used to get total count and time
 // of I/O wait event for each index and process
-func (m *Mysql) gatherPerfIndexIOWaits(db *sql.DB, serv string, acc plugins.Accumulator) error {
+func (m *Mysql) gatherPerfIndexIOWaits(db *sql.DB, serv string, acc telegraf.Accumulator) error {
 	rows, err := db.Query(perfIndexIOWaitsQuery)
 	if err != nil {
 		return err
@@ -1036,7 +1029,7 @@ func (m *Mysql) gatherPerfIndexIOWaits(db *sql.DB, serv string, acc plugins.Accu
 }
 
 // gatherInfoSchemaAutoIncStatuses can be used to get auto incremented values of the column
-func (m *Mysql) gatherInfoSchemaAutoIncStatuses(db *sql.DB, serv string, acc plugins.Accumulator) error {
+func (m *Mysql) gatherInfoSchemaAutoIncStatuses(db *sql.DB, serv string, acc telegraf.Accumulator) error {
 	rows, err := db.Query(infoSchemaAutoIncQuery)
 	if err != nil {
 		return err
@@ -1073,7 +1066,7 @@ func (m *Mysql) gatherInfoSchemaAutoIncStatuses(db *sql.DB, serv string, acc plu
 // the total number and time for SQL and external lock wait events
 // for each table and operation
 // requires the MySQL server to be enabled to save this metric
-func (m *Mysql) gatherPerfTableLockWaits(db *sql.DB, serv string, acc plugins.Accumulator) error {
+func (m *Mysql) gatherPerfTableLockWaits(db *sql.DB, serv string, acc telegraf.Accumulator) error {
 	// check if table exists,
 	// if performance_schema is not enabled, tables do not exist
 	// then there is no need to scan them
@@ -1202,7 +1195,7 @@ func (m *Mysql) gatherPerfTableLockWaits(db *sql.DB, serv string, acc plugins.Ac
 }
 
 // gatherPerfEventWaits can be used to get total time and number of event waits
-func (m *Mysql) gatherPerfEventWaits(db *sql.DB, serv string, acc plugins.Accumulator) error {
+func (m *Mysql) gatherPerfEventWaits(db *sql.DB, serv string, acc telegraf.Accumulator) error {
 	rows, err := db.Query(perfEventWaitsQuery)
 	if err != nil {
 		return err
@@ -1234,7 +1227,7 @@ func (m *Mysql) gatherPerfEventWaits(db *sql.DB, serv string, acc plugins.Accumu
 }
 
 // gatherPerfFileEvents can be used to get stats on file events
-func (m *Mysql) gatherPerfFileEventsStatuses(db *sql.DB, serv string, acc plugins.Accumulator) error {
+func (m *Mysql) gatherPerfFileEventsStatuses(db *sql.DB, serv string, acc telegraf.Accumulator) error {
 	rows, err := db.Query(perfFileEventsQuery)
 	if err != nil {
 		return err
@@ -1292,7 +1285,7 @@ func (m *Mysql) gatherPerfFileEventsStatuses(db *sql.DB, serv string, acc plugin
 }
 
 // gatherPerfEventsStatements can be used to get attributes of each event
-func (m *Mysql) gatherPerfEventsStatements(db *sql.DB, serv string, acc plugins.Accumulator) error {
+func (m *Mysql) gatherPerfEventsStatements(db *sql.DB, serv string, acc telegraf.Accumulator) error {
 	query := fmt.Sprintf(
 		perfEventsStatementsQuery,
 		m.PerfEventsStatementsDigestTextLimit,
@@ -1359,7 +1352,7 @@ func (m *Mysql) gatherPerfEventsStatements(db *sql.DB, serv string, acc plugins.
 }
 
 // gatherTableSchema can be used to gather stats on each schema
-func (m *Mysql) gatherTableSchema(db *sql.DB, serv string, acc plugins.Accumulator) error {
+func (m *Mysql) gatherTableSchema(db *sql.DB, serv string, acc telegraf.Accumulator) error {
 	var dbList []string
 	servtag := getDSNTag(serv)
 
@@ -1539,7 +1532,7 @@ func getDSNTag(dsn string) string {
 }
 
 func init() {
-	inputs.Add("mysql", func() plugins.Input {
+	inputs.Add("mysql", func() telegraf.Input {
 		return &Mysql{}
 	})
 }

plugins/inputs/nats_consumer/nats_consumer.go

@@ -5,7 +5,7 @@ import (
 	"log"
 	"sync"
 
-	"github.com/influxdata/telegraf/plugins"
+	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"github.com/influxdata/telegraf/plugins/parsers"
 	"github.com/nats-io/nats"
@@ -47,7 +47,7 @@ type natsConsumer struct {
 	// channel for all NATS read errors
 	errs chan error
 	done chan struct{}
-	acc  plugins.Accumulator
+	acc  telegraf.Accumulator
 }
 
 var sampleConfig = `
@@ -93,7 +93,7 @@ func (n *natsConsumer) natsErrHandler(c *nats.Conn, s *nats.Subscription, e erro
 }
 
 // Start the nats consumer. Caller must call *natsConsumer.Stop() to clean up.
-func (n *natsConsumer) Start(acc plugins.Accumulator) error {
+func (n *natsConsumer) Start(acc telegraf.Accumulator) error {
 	n.Lock()
 	defer n.Unlock()
 
@@ -197,12 +197,12 @@ func (n *natsConsumer) Stop() {
 	n.Unlock()
 }
 
-func (n *natsConsumer) Gather(acc plugins.Accumulator) error {
+func (n *natsConsumer) Gather(acc telegraf.Accumulator) error {
 	return nil
 }
 
 func init() {
-	inputs.Add("nats_consumer", func() plugins.Input {
+	inputs.Add("nats_consumer", func() telegraf.Input {
 		return &natsConsumer{
 			Servers:             []string{"nats://localhost:4222"},
 			Secure:              false,