diff --git a/cmd/telegraf/telegraf.go b/cmd/telegraf/telegraf.go index b6ef61a09..26d6ebc66 100644 --- a/cmd/telegraf/telegraf.go +++ b/cmd/telegraf/telegraf.go @@ -16,11 +16,11 @@ import ( "github.com/influxdata/telegraf/agent" "github.com/influxdata/telegraf/internal/config" "github.com/influxdata/telegraf/logger" + "github.com/influxdata/telegraf/registry/inputs" + "github.com/influxdata/telegraf/registry/outputs" _ "github.com/influxdata/telegraf/plugins/aggregators/all" - "github.com/influxdata/telegraf/plugins/inputs" _ "github.com/influxdata/telegraf/plugins/inputs/all" - "github.com/influxdata/telegraf/plugins/outputs" _ "github.com/influxdata/telegraf/plugins/outputs/all" _ "github.com/influxdata/telegraf/plugins/processors/all" diff --git a/doc.go b/doc.go new file mode 100644 index 000000000..8757fc4a6 --- /dev/null +++ b/doc.go @@ -0,0 +1 @@ +package telegraf diff --git a/internal/config/config.go b/internal/config/config.go index 24dec4169..4e68038d2 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -18,12 +18,12 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal" "github.com/influxdata/telegraf/internal/models" - "github.com/influxdata/telegraf/plugins/aggregators" - "github.com/influxdata/telegraf/plugins/inputs" - "github.com/influxdata/telegraf/plugins/outputs" "github.com/influxdata/telegraf/plugins/parsers" - "github.com/influxdata/telegraf/plugins/processors" "github.com/influxdata/telegraf/plugins/serializers" + "github.com/influxdata/telegraf/registry/aggregators" + "github.com/influxdata/telegraf/registry/inputs" + "github.com/influxdata/telegraf/registry/outputs" + "github.com/influxdata/telegraf/registry/processors" "github.com/influxdata/config" "github.com/influxdata/toml" diff --git a/internal/config/config_test.go b/internal/config/config_test.go index 3498d815d..fb8904262 100644 --- a/internal/config/config_test.go +++ b/internal/config/config_test.go @@ -6,11 +6,11 @@ import ( "time" "github.com/influxdata/telegraf/internal/models" - "github.com/influxdata/telegraf/plugins/inputs" "github.com/influxdata/telegraf/plugins/inputs/exec" "github.com/influxdata/telegraf/plugins/inputs/memcached" "github.com/influxdata/telegraf/plugins/inputs/procstat" "github.com/influxdata/telegraf/plugins/parsers" + "github.com/influxdata/telegraf/registry/inputs" "github.com/stretchr/testify/assert" ) diff --git a/plugins/aggregators/minmax/minmax.go b/plugins/aggregators/minmax/minmax.go index 1c83c0cc2..b663c7e80 100644 --- a/plugins/aggregators/minmax/minmax.go +++ b/plugins/aggregators/minmax/minmax.go @@ -2,7 +2,7 @@ package minmax import ( "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/aggregators" + "github.com/influxdata/telegraf/registry/aggregators" ) type MinMax struct { diff --git a/plugins/inputs/aerospike/aerospike.go b/plugins/inputs/aerospike/aerospike.go index 10f7fcd40..f60fa9402 100644 --- a/plugins/inputs/aerospike/aerospike.go +++ b/plugins/inputs/aerospike/aerospike.go @@ -11,7 +11,7 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal/errchan" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" as "github.com/aerospike/aerospike-client-go" ) diff --git a/plugins/inputs/apache/apache.go b/plugins/inputs/apache/apache.go index 85e7ee4d9..c67f4d5ba 100644 --- a/plugins/inputs/apache/apache.go +++ b/plugins/inputs/apache/apache.go @@ -12,7 +12,7 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) type Apache struct { diff --git a/plugins/inputs/bcache/bcache.go b/plugins/inputs/bcache/bcache.go index 1171dbd92..83ba4374e 100644 --- a/plugins/inputs/bcache/bcache.go +++ b/plugins/inputs/bcache/bcache.go @@ -9,7 +9,7 @@ import ( "strings" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) type Bcache struct { diff --git a/plugins/inputs/cassandra/cassandra.go b/plugins/inputs/cassandra/cassandra.go index 710a2b661..b53e6ae11 100644 --- a/plugins/inputs/cassandra/cassandra.go +++ b/plugins/inputs/cassandra/cassandra.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" "io/ioutil" "log" "net/http" diff --git a/plugins/inputs/ceph/ceph.go b/plugins/inputs/ceph/ceph.go index 7c03b6262..38db5d006 100644 --- a/plugins/inputs/ceph/ceph.go +++ b/plugins/inputs/ceph/ceph.go @@ -11,7 +11,7 @@ import ( "strings" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) const ( diff --git a/plugins/inputs/cgroup/cgroup.go b/plugins/inputs/cgroup/cgroup.go index cc5e4b496..337c7b4d6 100644 --- a/plugins/inputs/cgroup/cgroup.go +++ b/plugins/inputs/cgroup/cgroup.go @@ -2,7 +2,7 @@ package cgroup import ( "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) type CGroup struct { diff --git a/plugins/inputs/chrony/chrony.go b/plugins/inputs/chrony/chrony.go index f39108921..2d08aea88 100644 --- a/plugins/inputs/chrony/chrony.go +++ b/plugins/inputs/chrony/chrony.go @@ -12,7 +12,7 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) var ( diff --git a/plugins/inputs/cloudwatch/cloudwatch.go b/plugins/inputs/cloudwatch/cloudwatch.go index a812c1265..31e45fc07 100644 --- a/plugins/inputs/cloudwatch/cloudwatch.go +++ b/plugins/inputs/cloudwatch/cloudwatch.go @@ -15,7 +15,7 @@ import ( internalaws "github.com/influxdata/telegraf/internal/config/aws" "github.com/influxdata/telegraf/internal/errchan" "github.com/influxdata/telegraf/internal/limiter" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) type ( diff --git a/plugins/inputs/conntrack/conntrack.go b/plugins/inputs/conntrack/conntrack.go index 841aedb54..4076dcc4d 100644 --- a/plugins/inputs/conntrack/conntrack.go +++ b/plugins/inputs/conntrack/conntrack.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" "log" "path/filepath" ) diff --git a/plugins/inputs/consul/consul.go b/plugins/inputs/consul/consul.go index 0eaa25604..ba58afbb4 100644 --- a/plugins/inputs/consul/consul.go +++ b/plugins/inputs/consul/consul.go @@ -6,7 +6,7 @@ import ( "github.com/hashicorp/consul/api" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) type Consul struct { diff --git a/plugins/inputs/couchbase/couchbase.go b/plugins/inputs/couchbase/couchbase.go index 48e0c1a75..4a88845de 100644 --- a/plugins/inputs/couchbase/couchbase.go +++ b/plugins/inputs/couchbase/couchbase.go @@ -3,7 +3,7 @@ package couchbase import ( couchbase "github.com/couchbase/go-couchbase" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" "sync" ) diff --git a/plugins/inputs/couchdb/couchdb.go b/plugins/inputs/couchdb/couchdb.go index bf241649a..784ffdbbb 100644 --- a/plugins/inputs/couchdb/couchdb.go +++ b/plugins/inputs/couchdb/couchdb.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" "net/http" "reflect" "strings" diff --git a/plugins/inputs/disque/disque.go b/plugins/inputs/disque/disque.go index 0e4baf9cb..288aa468d 100644 --- a/plugins/inputs/disque/disque.go +++ b/plugins/inputs/disque/disque.go @@ -12,7 +12,7 @@ import ( "time" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) type Disque struct { diff --git a/plugins/inputs/dns_query/dns_query.go b/plugins/inputs/dns_query/dns_query.go index 1bccc52c0..cba618f7e 100644 --- a/plugins/inputs/dns_query/dns_query.go +++ b/plugins/inputs/dns_query/dns_query.go @@ -10,7 +10,7 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal/errchan" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) type DnsQuery struct { diff --git a/plugins/inputs/docker/docker.go b/plugins/inputs/docker/docker.go index 82a3791b6..a025e45f9 100644 --- a/plugins/inputs/docker/docker.go +++ b/plugins/inputs/docker/docker.go @@ -17,7 +17,7 @@ import ( "github.com/docker/engine-api/types" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) // Docker object diff --git a/plugins/inputs/dovecot/dovecot.go b/plugins/inputs/dovecot/dovecot.go index 56290e759..5cce52093 100644 --- a/plugins/inputs/dovecot/dovecot.go +++ b/plugins/inputs/dovecot/dovecot.go @@ -13,7 +13,7 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal/errchan" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) type Dovecot struct { diff --git a/plugins/inputs/elasticsearch/elasticsearch.go b/plugins/inputs/elasticsearch/elasticsearch.go index 370e3fbdd..7cbd841f2 100644 --- a/plugins/inputs/elasticsearch/elasticsearch.go +++ b/plugins/inputs/elasticsearch/elasticsearch.go @@ -11,8 +11,8 @@ import ( "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" + "github.com/influxdata/telegraf/registry/inputs" "io/ioutil" "strings" ) diff --git a/plugins/inputs/exec/exec.go b/plugins/inputs/exec/exec.go index 154080138..09fa13890 100644 --- a/plugins/inputs/exec/exec.go +++ b/plugins/inputs/exec/exec.go @@ -16,9 +16,9 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal" "github.com/influxdata/telegraf/internal/errchan" - "github.com/influxdata/telegraf/plugins/inputs" "github.com/influxdata/telegraf/plugins/parsers" "github.com/influxdata/telegraf/plugins/parsers/nagios" + "github.com/influxdata/telegraf/registry/inputs" ) const sampleConfig = ` diff --git a/plugins/inputs/filestat/filestat.go b/plugins/inputs/filestat/filestat.go index 83f511a84..8378f41fd 100644 --- a/plugins/inputs/filestat/filestat.go +++ b/plugins/inputs/filestat/filestat.go @@ -9,7 +9,7 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal/globpath" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) const sampleConfig = ` diff --git a/plugins/inputs/graylog/graylog.go b/plugins/inputs/graylog/graylog.go index 52e2ef42a..2a7f2e8a3 100644 --- a/plugins/inputs/graylog/graylog.go +++ b/plugins/inputs/graylog/graylog.go @@ -16,7 +16,7 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) type ResponseMetrics struct { diff --git a/plugins/inputs/haproxy/haproxy.go b/plugins/inputs/haproxy/haproxy.go index 2be418a65..3a53384d8 100644 --- a/plugins/inputs/haproxy/haproxy.go +++ b/plugins/inputs/haproxy/haproxy.go @@ -14,7 +14,7 @@ import ( "time" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) //CSV format: https://cbonte.github.io/haproxy-dconv/1.5/configuration.html#9.1 diff --git a/plugins/inputs/hddtemp/hddtemp.go b/plugins/inputs/hddtemp/hddtemp.go index ac11218dd..b239229a3 100644 --- a/plugins/inputs/hddtemp/hddtemp.go +++ b/plugins/inputs/hddtemp/hddtemp.go @@ -4,8 +4,8 @@ package hddtemp import ( "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" gohddtemp "github.com/influxdata/telegraf/plugins/inputs/hddtemp/go-hddtemp" + "github.com/influxdata/telegraf/registry/inputs" ) const defaultAddress = "127.0.0.1:7634" diff --git a/plugins/inputs/http_listener/http_listener.go b/plugins/inputs/http_listener/http_listener.go index 0f426f809..6f4200acc 100644 --- a/plugins/inputs/http_listener/http_listener.go +++ b/plugins/inputs/http_listener/http_listener.go @@ -12,8 +12,8 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal" - "github.com/influxdata/telegraf/plugins/inputs" "github.com/influxdata/telegraf/plugins/parsers/influx" + "github.com/influxdata/telegraf/registry/inputs" "github.com/influxdata/telegraf/selfstat" ) diff --git a/plugins/inputs/http_response/http_response.go b/plugins/inputs/http_response/http_response.go index 111e35518..0beab1a1f 100644 --- a/plugins/inputs/http_response/http_response.go +++ b/plugins/inputs/http_response/http_response.go @@ -13,7 +13,7 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) // HTTPResponse struct diff --git a/plugins/inputs/httpjson/httpjson.go b/plugins/inputs/httpjson/httpjson.go index 89bfccf77..9085c8381 100644 --- a/plugins/inputs/httpjson/httpjson.go +++ b/plugins/inputs/httpjson/httpjson.go @@ -12,8 +12,8 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal" - "github.com/influxdata/telegraf/plugins/inputs" "github.com/influxdata/telegraf/plugins/parsers" + "github.com/influxdata/telegraf/registry/inputs" ) // HttpJson struct diff --git a/plugins/inputs/influxdb/influxdb.go b/plugins/inputs/influxdb/influxdb.go index 3c98eead3..545d564a8 100644 --- a/plugins/inputs/influxdb/influxdb.go +++ b/plugins/inputs/influxdb/influxdb.go @@ -11,7 +11,7 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) type InfluxDB struct { diff --git a/plugins/inputs/internal/internal.go b/plugins/inputs/internal/internal.go index f6123edd5..80bde7d0f 100644 --- a/plugins/inputs/internal/internal.go +++ b/plugins/inputs/internal/internal.go @@ -4,7 +4,7 @@ import ( "runtime" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" "github.com/influxdata/telegraf/selfstat" ) diff --git a/plugins/inputs/ipmi_sensor/ipmi.go b/plugins/inputs/ipmi_sensor/ipmi.go index b2389a675..308ca429f 100644 --- a/plugins/inputs/ipmi_sensor/ipmi.go +++ b/plugins/inputs/ipmi_sensor/ipmi.go @@ -9,7 +9,7 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) var ( diff --git a/plugins/inputs/iptables/iptables.go b/plugins/inputs/iptables/iptables.go index 31b049d9f..7676e1802 100644 --- a/plugins/inputs/iptables/iptables.go +++ b/plugins/inputs/iptables/iptables.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) // Iptables is a telegraf plugin to gather packets and bytes throughput from Linux's iptables packet filter. diff --git a/plugins/inputs/jolokia/jolokia.go b/plugins/inputs/jolokia/jolokia.go index 7f371c935..00c999604 100644 --- a/plugins/inputs/jolokia/jolokia.go +++ b/plugins/inputs/jolokia/jolokia.go @@ -12,7 +12,7 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) // Default http timeouts diff --git a/plugins/inputs/kafka_consumer/kafka_consumer.go b/plugins/inputs/kafka_consumer/kafka_consumer.go index f4176edd3..8709e8287 100644 --- a/plugins/inputs/kafka_consumer/kafka_consumer.go +++ b/plugins/inputs/kafka_consumer/kafka_consumer.go @@ -6,8 +6,8 @@ import ( "sync" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" "github.com/influxdata/telegraf/plugins/parsers" + "github.com/influxdata/telegraf/registry/inputs" "github.com/Shopify/sarama" "github.com/wvanbergen/kafka/consumergroup" diff --git a/plugins/inputs/kubernetes/kubernetes.go b/plugins/inputs/kubernetes/kubernetes.go index ee95d560f..690395406 100644 --- a/plugins/inputs/kubernetes/kubernetes.go +++ b/plugins/inputs/kubernetes/kubernetes.go @@ -12,7 +12,7 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal" "github.com/influxdata/telegraf/internal/errchan" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) // Kubernetes represents the config object for the plugin diff --git a/plugins/inputs/leofs/leofs.go b/plugins/inputs/leofs/leofs.go index 06c71e932..90c8d79eb 100644 --- a/plugins/inputs/leofs/leofs.go +++ b/plugins/inputs/leofs/leofs.go @@ -12,7 +12,7 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) const oid = ".1.3.6.1.4.1.35450" diff --git a/plugins/inputs/logparser/logparser.go b/plugins/inputs/logparser/logparser.go index 8ec328358..372fcba45 100644 --- a/plugins/inputs/logparser/logparser.go +++ b/plugins/inputs/logparser/logparser.go @@ -11,7 +11,7 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal/errchan" "github.com/influxdata/telegraf/internal/globpath" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" // Parsers "github.com/influxdata/telegraf/plugins/inputs/logparser/grok" diff --git a/plugins/inputs/lustre2/lustre2.go b/plugins/inputs/lustre2/lustre2.go index 8ef9223b5..eddefbbe6 100644 --- a/plugins/inputs/lustre2/lustre2.go +++ b/plugins/inputs/lustre2/lustre2.go @@ -15,7 +15,7 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) // Lustre proc files can change between versions, so we want to future-proof diff --git a/plugins/inputs/mailchimp/mailchimp.go b/plugins/inputs/mailchimp/mailchimp.go index d7255191a..3477b31b3 100644 --- a/plugins/inputs/mailchimp/mailchimp.go +++ b/plugins/inputs/mailchimp/mailchimp.go @@ -5,7 +5,7 @@ import ( "time" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) type MailChimp struct { diff --git a/plugins/inputs/memcached/memcached.go b/plugins/inputs/memcached/memcached.go index 5ee538e93..d0726f6e9 100644 --- a/plugins/inputs/memcached/memcached.go +++ b/plugins/inputs/memcached/memcached.go @@ -10,7 +10,7 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal/errchan" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) // Memcached is a memcached plugin diff --git a/plugins/inputs/mesos/mesos.go b/plugins/inputs/mesos/mesos.go index e6c68bd7d..f9c0d2580 100644 --- a/plugins/inputs/mesos/mesos.go +++ b/plugins/inputs/mesos/mesos.go @@ -13,8 +13,8 @@ import ( "time" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" jsonparser "github.com/influxdata/telegraf/plugins/parsers/json" + "github.com/influxdata/telegraf/registry/inputs" ) type Role string diff --git a/plugins/inputs/mongodb/mongodb.go b/plugins/inputs/mongodb/mongodb.go index 0bf822a4c..7f2a54002 100644 --- a/plugins/inputs/mongodb/mongodb.go +++ b/plugins/inputs/mongodb/mongodb.go @@ -11,7 +11,7 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal/errchan" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" "gopkg.in/mgo.v2" ) diff --git a/plugins/inputs/mqtt_consumer/mqtt_consumer.go b/plugins/inputs/mqtt_consumer/mqtt_consumer.go index cfade2944..6fa83eb08 100644 --- a/plugins/inputs/mqtt_consumer/mqtt_consumer.go +++ b/plugins/inputs/mqtt_consumer/mqtt_consumer.go @@ -9,8 +9,8 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal" - "github.com/influxdata/telegraf/plugins/inputs" "github.com/influxdata/telegraf/plugins/parsers" + "github.com/influxdata/telegraf/registry/inputs" "github.com/eclipse/paho.mqtt.golang" ) diff --git a/plugins/inputs/mysql/mysql.go b/plugins/inputs/mysql/mysql.go index adc21880b..747de757b 100644 --- a/plugins/inputs/mysql/mysql.go +++ b/plugins/inputs/mysql/mysql.go @@ -11,7 +11,7 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal/errchan" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" "github.com/go-sql-driver/mysql" ) diff --git a/plugins/inputs/nats_consumer/nats_consumer.go b/plugins/inputs/nats_consumer/nats_consumer.go index cbb85e016..673ad9875 100644 --- a/plugins/inputs/nats_consumer/nats_consumer.go +++ b/plugins/inputs/nats_consumer/nats_consumer.go @@ -6,8 +6,8 @@ import ( "sync" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" "github.com/influxdata/telegraf/plugins/parsers" + "github.com/influxdata/telegraf/registry/inputs" "github.com/nats-io/nats" ) diff --git a/plugins/inputs/net_response/net_response.go b/plugins/inputs/net_response/net_response.go index ad0de46c3..2827f2b30 100644 --- a/plugins/inputs/net_response/net_response.go +++ b/plugins/inputs/net_response/net_response.go @@ -10,7 +10,7 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) // NetResponses struct diff --git a/plugins/inputs/nginx/nginx.go b/plugins/inputs/nginx/nginx.go index 3fe8c04d1..5de2f6101 100644 --- a/plugins/inputs/nginx/nginx.go +++ b/plugins/inputs/nginx/nginx.go @@ -13,7 +13,7 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal/errchan" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) type Nginx struct { diff --git a/plugins/inputs/nsq/nsq.go b/plugins/inputs/nsq/nsq.go index 8bfd72788..0901c0ead 100644 --- a/plugins/inputs/nsq/nsq.go +++ b/plugins/inputs/nsq/nsq.go @@ -33,7 +33,7 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal/errchan" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) // Might add Lookupd endpoints for cluster discovery diff --git a/plugins/inputs/nsq_consumer/nsq_consumer.go b/plugins/inputs/nsq_consumer/nsq_consumer.go index d4f4e9679..dee8b41aa 100644 --- a/plugins/inputs/nsq_consumer/nsq_consumer.go +++ b/plugins/inputs/nsq_consumer/nsq_consumer.go @@ -4,8 +4,8 @@ import ( "log" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" "github.com/influxdata/telegraf/plugins/parsers" + "github.com/influxdata/telegraf/registry/inputs" "github.com/nsqio/go-nsq" ) diff --git a/plugins/inputs/nstat/nstat.go b/plugins/inputs/nstat/nstat.go index 5096d7b03..c66a6c5c8 100644 --- a/plugins/inputs/nstat/nstat.go +++ b/plugins/inputs/nstat/nstat.go @@ -7,7 +7,7 @@ import ( "strconv" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) var ( diff --git a/plugins/inputs/ntpq/ntpq.go b/plugins/inputs/ntpq/ntpq.go index 601d5b2df..a7019827b 100644 --- a/plugins/inputs/ntpq/ntpq.go +++ b/plugins/inputs/ntpq/ntpq.go @@ -11,7 +11,7 @@ import ( "strings" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) // Mapping of ntpq header names to tag keys diff --git a/plugins/inputs/passenger/passenger.go b/plugins/inputs/passenger/passenger.go index 84e92cb1a..8d787f1ce 100644 --- a/plugins/inputs/passenger/passenger.go +++ b/plugins/inputs/passenger/passenger.go @@ -9,7 +9,7 @@ import ( "strings" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" "golang.org/x/net/html/charset" ) diff --git a/plugins/inputs/phpfpm/phpfpm.go b/plugins/inputs/phpfpm/phpfpm.go index d7a14d0ee..46889b5b6 100644 --- a/plugins/inputs/phpfpm/phpfpm.go +++ b/plugins/inputs/phpfpm/phpfpm.go @@ -13,7 +13,7 @@ import ( "sync" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) const ( diff --git a/plugins/inputs/ping/ping.go b/plugins/inputs/ping/ping.go index 32264eec7..1d7382cfd 100644 --- a/plugins/inputs/ping/ping.go +++ b/plugins/inputs/ping/ping.go @@ -13,7 +13,7 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) // HostPinger is a function that runs the "ping" function using a list of diff --git a/plugins/inputs/ping/ping_windows.go b/plugins/inputs/ping/ping_windows.go index 7fb112810..0c4f261c1 100644 --- a/plugins/inputs/ping/ping_windows.go +++ b/plugins/inputs/ping/ping_windows.go @@ -5,7 +5,7 @@ import ( "errors" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" "os/exec" "regexp" "strconv" diff --git a/plugins/inputs/postgresql/postgresql.go b/plugins/inputs/postgresql/postgresql.go index 7019762ed..273a9787b 100644 --- a/plugins/inputs/postgresql/postgresql.go +++ b/plugins/inputs/postgresql/postgresql.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) type Postgresql struct { diff --git a/plugins/inputs/postgresql_extensible/postgresql_extensible.go b/plugins/inputs/postgresql_extensible/postgresql_extensible.go index 00729bf75..ec9821425 100644 --- a/plugins/inputs/postgresql_extensible/postgresql_extensible.go +++ b/plugins/inputs/postgresql_extensible/postgresql_extensible.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" "github.com/influxdata/telegraf/plugins/inputs/postgresql" + "github.com/influxdata/telegraf/registry/inputs" ) type Postgresql struct { diff --git a/plugins/inputs/powerdns/powerdns.go b/plugins/inputs/powerdns/powerdns.go index 68b1696e0..18da1fe9f 100644 --- a/plugins/inputs/powerdns/powerdns.go +++ b/plugins/inputs/powerdns/powerdns.go @@ -11,7 +11,7 @@ import ( "time" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) type Powerdns struct { diff --git a/plugins/inputs/procstat/procstat.go b/plugins/inputs/procstat/procstat.go index 565d0ebd1..fb7aa5270 100644 --- a/plugins/inputs/procstat/procstat.go +++ b/plugins/inputs/procstat/procstat.go @@ -9,7 +9,7 @@ import ( "strings" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) type Procstat struct { diff --git a/plugins/inputs/prometheus/prometheus.go b/plugins/inputs/prometheus/prometheus.go index 97da17f04..b423bec2a 100644 --- a/plugins/inputs/prometheus/prometheus.go +++ b/plugins/inputs/prometheus/prometheus.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" "io/ioutil" "net" "net/http" diff --git a/plugins/inputs/puppetagent/puppetagent.go b/plugins/inputs/puppetagent/puppetagent.go index c8a265bb8..3ecc553a5 100644 --- a/plugins/inputs/puppetagent/puppetagent.go +++ b/plugins/inputs/puppetagent/puppetagent.go @@ -9,7 +9,7 @@ import ( "strings" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) // PuppetAgent is a PuppetAgent plugin diff --git a/plugins/inputs/rabbitmq/rabbitmq.go b/plugins/inputs/rabbitmq/rabbitmq.go index c33b11e66..4983b5688 100644 --- a/plugins/inputs/rabbitmq/rabbitmq.go +++ b/plugins/inputs/rabbitmq/rabbitmq.go @@ -11,7 +11,7 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal" "github.com/influxdata/telegraf/internal/errchan" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) // DefaultUsername will set a default value that corrasponds to the default diff --git a/plugins/inputs/raindrops/raindrops.go b/plugins/inputs/raindrops/raindrops.go index 6851f5d93..f9784acbd 100644 --- a/plugins/inputs/raindrops/raindrops.go +++ b/plugins/inputs/raindrops/raindrops.go @@ -12,7 +12,7 @@ import ( "time" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) type Raindrops struct { diff --git a/plugins/inputs/redis/redis.go b/plugins/inputs/redis/redis.go index 2dd947a2a..5a0751e8e 100644 --- a/plugins/inputs/redis/redis.go +++ b/plugins/inputs/redis/redis.go @@ -13,7 +13,7 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal/errchan" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) type Redis struct { diff --git a/plugins/inputs/rethinkdb/rethinkdb.go b/plugins/inputs/rethinkdb/rethinkdb.go index 32237a80f..5f81a0b0f 100644 --- a/plugins/inputs/rethinkdb/rethinkdb.go +++ b/plugins/inputs/rethinkdb/rethinkdb.go @@ -6,7 +6,7 @@ import ( "sync" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" "gopkg.in/dancannon/gorethink.v1" ) diff --git a/plugins/inputs/riak/riak.go b/plugins/inputs/riak/riak.go index 19bf7df04..df5db408b 100644 --- a/plugins/inputs/riak/riak.go +++ b/plugins/inputs/riak/riak.go @@ -8,7 +8,7 @@ import ( "time" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) // Type Riak gathers statistics from one or more Riak instances diff --git a/plugins/inputs/sensors/sensors.go b/plugins/inputs/sensors/sensors.go index 1caf6ba59..ecb6b7a45 100644 --- a/plugins/inputs/sensors/sensors.go +++ b/plugins/inputs/sensors/sensors.go @@ -13,7 +13,7 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) var ( diff --git a/plugins/inputs/snmp/snmp.go b/plugins/inputs/snmp/snmp.go index 9296bc043..08709268c 100644 --- a/plugins/inputs/snmp/snmp.go +++ b/plugins/inputs/snmp/snmp.go @@ -13,7 +13,7 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" "github.com/soniah/gosnmp" ) diff --git a/plugins/inputs/snmp_legacy/snmp_legacy.go b/plugins/inputs/snmp_legacy/snmp_legacy.go index e5dbbc459..949ff19b8 100644 --- a/plugins/inputs/snmp_legacy/snmp_legacy.go +++ b/plugins/inputs/snmp_legacy/snmp_legacy.go @@ -9,7 +9,7 @@ import ( "time" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" "github.com/soniah/gosnmp" ) diff --git a/plugins/inputs/socket_listener/socket_listener.go b/plugins/inputs/socket_listener/socket_listener.go index 9d3a8e1fe..1ac0cd31b 100644 --- a/plugins/inputs/socket_listener/socket_listener.go +++ b/plugins/inputs/socket_listener/socket_listener.go @@ -10,8 +10,8 @@ import ( "sync" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" "github.com/influxdata/telegraf/plugins/parsers" + "github.com/influxdata/telegraf/registry/inputs" ) type setReadBufferer interface { diff --git a/plugins/inputs/sqlserver/sqlserver.go b/plugins/inputs/sqlserver/sqlserver.go index 5afbb067e..dd5663673 100644 --- a/plugins/inputs/sqlserver/sqlserver.go +++ b/plugins/inputs/sqlserver/sqlserver.go @@ -3,7 +3,7 @@ package sqlserver import ( "database/sql" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" "sync" "time" diff --git a/plugins/inputs/statsd/statsd.go b/plugins/inputs/statsd/statsd.go index d2c627b8a..21986111a 100644 --- a/plugins/inputs/statsd/statsd.go +++ b/plugins/inputs/statsd/statsd.go @@ -14,7 +14,7 @@ import ( "github.com/influxdata/telegraf/plugins/parsers/graphite" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) const ( diff --git a/plugins/inputs/sysstat/sysstat.go b/plugins/inputs/sysstat/sysstat.go index 9c9ef6b05..56f103eb5 100644 --- a/plugins/inputs/sysstat/sysstat.go +++ b/plugins/inputs/sysstat/sysstat.go @@ -19,7 +19,7 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) var ( diff --git a/plugins/inputs/system/cpu.go b/plugins/inputs/system/cpu.go index 3ed2606fa..0e285ba04 100644 --- a/plugins/inputs/system/cpu.go +++ b/plugins/inputs/system/cpu.go @@ -5,7 +5,7 @@ import ( "time" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" "github.com/shirou/gopsutil/cpu" ) diff --git a/plugins/inputs/system/disk.go b/plugins/inputs/system/disk.go index 3f6d83c1c..d82968653 100644 --- a/plugins/inputs/system/disk.go +++ b/plugins/inputs/system/disk.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) type DiskStats struct { diff --git a/plugins/inputs/system/kernel.go b/plugins/inputs/system/kernel.go index 66cb0f763..e404dc051 100644 --- a/plugins/inputs/system/kernel.go +++ b/plugins/inputs/system/kernel.go @@ -10,7 +10,7 @@ import ( "strconv" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) // /proc/stat file line prefixes to gather stats on: diff --git a/plugins/inputs/system/kernel_notlinux.go b/plugins/inputs/system/kernel_notlinux.go index 9053b5c04..f9a4c8dee 100644 --- a/plugins/inputs/system/kernel_notlinux.go +++ b/plugins/inputs/system/kernel_notlinux.go @@ -4,7 +4,7 @@ package system import ( "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) type Kernel struct { diff --git a/plugins/inputs/system/kernel_vmstat.go b/plugins/inputs/system/kernel_vmstat.go index 93c822789..6caaede68 100644 --- a/plugins/inputs/system/kernel_vmstat.go +++ b/plugins/inputs/system/kernel_vmstat.go @@ -10,7 +10,7 @@ import ( "strconv" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) type KernelVmstat struct { diff --git a/plugins/inputs/system/memory.go b/plugins/inputs/system/memory.go index 26dc550f8..5327a06cd 100644 --- a/plugins/inputs/system/memory.go +++ b/plugins/inputs/system/memory.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) type MemStats struct { diff --git a/plugins/inputs/system/net.go b/plugins/inputs/system/net.go index 3f89176fb..0603ce43c 100644 --- a/plugins/inputs/system/net.go +++ b/plugins/inputs/system/net.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) type NetIOStats struct { diff --git a/plugins/inputs/system/netstat.go b/plugins/inputs/system/netstat.go index 98b729bbe..4e003d415 100644 --- a/plugins/inputs/system/netstat.go +++ b/plugins/inputs/system/netstat.go @@ -5,7 +5,7 @@ import ( "syscall" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) type NetStats struct { diff --git a/plugins/inputs/system/processes.go b/plugins/inputs/system/processes.go index 0950323fd..924bd8338 100644 --- a/plugins/inputs/system/processes.go +++ b/plugins/inputs/system/processes.go @@ -14,7 +14,7 @@ import ( "strconv" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) type Processes struct { diff --git a/plugins/inputs/system/system.go b/plugins/inputs/system/system.go index 1a61f11bf..1dc92ba8d 100644 --- a/plugins/inputs/system/system.go +++ b/plugins/inputs/system/system.go @@ -10,7 +10,7 @@ import ( "github.com/shirou/gopsutil/load" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) type SystemStats struct{} diff --git a/plugins/inputs/tail/tail.go b/plugins/inputs/tail/tail.go index 508c1e320..a3c0e6117 100644 --- a/plugins/inputs/tail/tail.go +++ b/plugins/inputs/tail/tail.go @@ -9,8 +9,8 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal/globpath" - "github.com/influxdata/telegraf/plugins/inputs" "github.com/influxdata/telegraf/plugins/parsers" + "github.com/influxdata/telegraf/registry/inputs" ) type Tail struct { diff --git a/plugins/inputs/tcp_listener/tcp_listener.go b/plugins/inputs/tcp_listener/tcp_listener.go index 544f36bd6..61347a82f 100644 --- a/plugins/inputs/tcp_listener/tcp_listener.go +++ b/plugins/inputs/tcp_listener/tcp_listener.go @@ -9,8 +9,8 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal" - "github.com/influxdata/telegraf/plugins/inputs" "github.com/influxdata/telegraf/plugins/parsers" + "github.com/influxdata/telegraf/registry/inputs" "github.com/influxdata/telegraf/selfstat" ) diff --git a/plugins/inputs/trig/trig.go b/plugins/inputs/trig/trig.go index 647794f0a..34b813437 100644 --- a/plugins/inputs/trig/trig.go +++ b/plugins/inputs/trig/trig.go @@ -4,7 +4,7 @@ import ( "math" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) type Trig struct { diff --git a/plugins/inputs/twemproxy/twemproxy.go b/plugins/inputs/twemproxy/twemproxy.go index cda56943f..5a04578f3 100644 --- a/plugins/inputs/twemproxy/twemproxy.go +++ b/plugins/inputs/twemproxy/twemproxy.go @@ -8,7 +8,7 @@ import ( "time" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) type Twemproxy struct { diff --git a/plugins/inputs/udp_listener/udp_listener.go b/plugins/inputs/udp_listener/udp_listener.go index 53c6a72f5..4dd856be3 100644 --- a/plugins/inputs/udp_listener/udp_listener.go +++ b/plugins/inputs/udp_listener/udp_listener.go @@ -7,8 +7,8 @@ import ( "time" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" "github.com/influxdata/telegraf/plugins/parsers" + "github.com/influxdata/telegraf/registry/inputs" "github.com/influxdata/telegraf/selfstat" ) diff --git a/plugins/inputs/varnish/varnish.go b/plugins/inputs/varnish/varnish.go index c75041221..dba68cdd1 100644 --- a/plugins/inputs/varnish/varnish.go +++ b/plugins/inputs/varnish/varnish.go @@ -15,7 +15,7 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/filter" "github.com/influxdata/telegraf/internal" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) type runner func(cmdName string) (*bytes.Buffer, error) diff --git a/plugins/inputs/webhooks/webhooks.go b/plugins/inputs/webhooks/webhooks.go index fcddbebd7..725817f35 100644 --- a/plugins/inputs/webhooks/webhooks.go +++ b/plugins/inputs/webhooks/webhooks.go @@ -8,7 +8,7 @@ import ( "github.com/gorilla/mux" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" "github.com/influxdata/telegraf/plugins/inputs/webhooks/filestack" "github.com/influxdata/telegraf/plugins/inputs/webhooks/github" diff --git a/plugins/inputs/win_perf_counters/win_perf_counters.go b/plugins/inputs/win_perf_counters/win_perf_counters.go index da59c3040..fa035f558 100644 --- a/plugins/inputs/win_perf_counters/win_perf_counters.go +++ b/plugins/inputs/win_perf_counters/win_perf_counters.go @@ -9,7 +9,7 @@ import ( "unsafe" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) var sampleConfig string = ` diff --git a/plugins/inputs/zfs/zfs_freebsd.go b/plugins/inputs/zfs/zfs_freebsd.go index 7ee72a140..038856e3d 100644 --- a/plugins/inputs/zfs/zfs_freebsd.go +++ b/plugins/inputs/zfs/zfs_freebsd.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) func (z *Zfs) gatherPoolStats(acc telegraf.Accumulator) (string, error) { diff --git a/plugins/inputs/zfs/zfs_linux.go b/plugins/inputs/zfs/zfs_linux.go index 71ec7e5dc..958d187fa 100644 --- a/plugins/inputs/zfs/zfs_linux.go +++ b/plugins/inputs/zfs/zfs_linux.go @@ -10,7 +10,7 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) type poolInfo struct { diff --git a/plugins/inputs/zfs/zfs_other.go b/plugins/inputs/zfs/zfs_other.go index 98de02be9..74eea8283 100644 --- a/plugins/inputs/zfs/zfs_other.go +++ b/plugins/inputs/zfs/zfs_other.go @@ -4,7 +4,7 @@ package zfs import ( "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) func (z *Zfs) Gather(acc telegraf.Accumulator) error { diff --git a/plugins/inputs/zookeeper/zookeeper.go b/plugins/inputs/zookeeper/zookeeper.go index c11b55f68..7a712ae12 100644 --- a/plugins/inputs/zookeeper/zookeeper.go +++ b/plugins/inputs/zookeeper/zookeeper.go @@ -11,7 +11,7 @@ import ( "time" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/inputs" + "github.com/influxdata/telegraf/registry/inputs" ) // Zookeeper is a zookeeper plugin diff --git a/plugins/outputs/amon/amon.go b/plugins/outputs/amon/amon.go index a113f2616..501133b23 100644 --- a/plugins/outputs/amon/amon.go +++ b/plugins/outputs/amon/amon.go @@ -10,7 +10,7 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal" - "github.com/influxdata/telegraf/plugins/outputs" + "github.com/influxdata/telegraf/registry/outputs" ) type Amon struct { diff --git a/plugins/outputs/amqp/amqp.go b/plugins/outputs/amqp/amqp.go index d86cac596..ec469ff1f 100644 --- a/plugins/outputs/amqp/amqp.go +++ b/plugins/outputs/amqp/amqp.go @@ -9,8 +9,8 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal" - "github.com/influxdata/telegraf/plugins/outputs" "github.com/influxdata/telegraf/plugins/serializers" + "github.com/influxdata/telegraf/registry/outputs" "github.com/streadway/amqp" ) diff --git a/plugins/outputs/cloudwatch/cloudwatch.go b/plugins/outputs/cloudwatch/cloudwatch.go index 4eb2706a3..78275c51e 100644 --- a/plugins/outputs/cloudwatch/cloudwatch.go +++ b/plugins/outputs/cloudwatch/cloudwatch.go @@ -12,7 +12,7 @@ import ( "github.com/influxdata/telegraf" internalaws "github.com/influxdata/telegraf/internal/config/aws" - "github.com/influxdata/telegraf/plugins/outputs" + "github.com/influxdata/telegraf/registry/outputs" ) type CloudWatch struct { diff --git a/plugins/outputs/datadog/datadog.go b/plugins/outputs/datadog/datadog.go index cf54de725..00e134189 100644 --- a/plugins/outputs/datadog/datadog.go +++ b/plugins/outputs/datadog/datadog.go @@ -11,7 +11,7 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal" - "github.com/influxdata/telegraf/plugins/outputs" + "github.com/influxdata/telegraf/registry/outputs" ) type Datadog struct { diff --git a/plugins/outputs/discard/discard.go b/plugins/outputs/discard/discard.go index 4a6d634b7..9d4b3c846 100644 --- a/plugins/outputs/discard/discard.go +++ b/plugins/outputs/discard/discard.go @@ -2,7 +2,7 @@ package discard import ( "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/outputs" + "github.com/influxdata/telegraf/registry/outputs" ) type Discard struct{} diff --git a/plugins/outputs/file/file.go b/plugins/outputs/file/file.go index e05d0fe83..f36e7770f 100644 --- a/plugins/outputs/file/file.go +++ b/plugins/outputs/file/file.go @@ -6,8 +6,8 @@ import ( "os" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/outputs" "github.com/influxdata/telegraf/plugins/serializers" + "github.com/influxdata/telegraf/registry/outputs" ) type File struct { diff --git a/plugins/outputs/graphite/graphite.go b/plugins/outputs/graphite/graphite.go index 8d4447cdd..7c2dc1592 100644 --- a/plugins/outputs/graphite/graphite.go +++ b/plugins/outputs/graphite/graphite.go @@ -9,8 +9,8 @@ import ( "time" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/outputs" "github.com/influxdata/telegraf/plugins/serializers" + "github.com/influxdata/telegraf/registry/outputs" ) type Graphite struct { diff --git a/plugins/outputs/graylog/graylog.go b/plugins/outputs/graylog/graylog.go index e77eae558..de5e8222c 100644 --- a/plugins/outputs/graylog/graylog.go +++ b/plugins/outputs/graylog/graylog.go @@ -8,7 +8,7 @@ import ( ejson "encoding/json" "fmt" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/outputs" + "github.com/influxdata/telegraf/registry/outputs" "io" "math" "net" diff --git a/plugins/outputs/influxdb/influxdb.go b/plugins/outputs/influxdb/influxdb.go index 5a5899a60..257e7a43c 100644 --- a/plugins/outputs/influxdb/influxdb.go +++ b/plugins/outputs/influxdb/influxdb.go @@ -10,7 +10,7 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal" "github.com/influxdata/telegraf/metric" - "github.com/influxdata/telegraf/plugins/outputs" + "github.com/influxdata/telegraf/registry/outputs" "github.com/influxdata/telegraf/plugins/outputs/influxdb/client" ) diff --git a/plugins/outputs/instrumental/instrumental.go b/plugins/outputs/instrumental/instrumental.go index e10fcbb06..dde9d239b 100644 --- a/plugins/outputs/instrumental/instrumental.go +++ b/plugins/outputs/instrumental/instrumental.go @@ -12,9 +12,9 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal" "github.com/influxdata/telegraf/metric" - "github.com/influxdata/telegraf/plugins/outputs" "github.com/influxdata/telegraf/plugins/serializers" "github.com/influxdata/telegraf/plugins/serializers/graphite" + "github.com/influxdata/telegraf/registry/outputs" ) var ( diff --git a/plugins/outputs/kafka/kafka.go b/plugins/outputs/kafka/kafka.go index 3815f5726..f0f0d20af 100644 --- a/plugins/outputs/kafka/kafka.go +++ b/plugins/outputs/kafka/kafka.go @@ -6,8 +6,8 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal" - "github.com/influxdata/telegraf/plugins/outputs" "github.com/influxdata/telegraf/plugins/serializers" + "github.com/influxdata/telegraf/registry/outputs" "github.com/Shopify/sarama" ) diff --git a/plugins/outputs/kinesis/kinesis.go b/plugins/outputs/kinesis/kinesis.go index 8cbdea682..68c9566a6 100644 --- a/plugins/outputs/kinesis/kinesis.go +++ b/plugins/outputs/kinesis/kinesis.go @@ -10,8 +10,8 @@ import ( "github.com/influxdata/telegraf" internalaws "github.com/influxdata/telegraf/internal/config/aws" - "github.com/influxdata/telegraf/plugins/outputs" "github.com/influxdata/telegraf/plugins/serializers" + "github.com/influxdata/telegraf/registry/outputs" ) type KinesisOutput struct { diff --git a/plugins/outputs/librato/librato.go b/plugins/outputs/librato/librato.go index ed020d54f..9bcda61f9 100644 --- a/plugins/outputs/librato/librato.go +++ b/plugins/outputs/librato/librato.go @@ -11,8 +11,8 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal" - "github.com/influxdata/telegraf/plugins/outputs" "github.com/influxdata/telegraf/plugins/serializers/graphite" + "github.com/influxdata/telegraf/registry/outputs" ) // Librato structure for configuration and client diff --git a/plugins/outputs/mqtt/mqtt.go b/plugins/outputs/mqtt/mqtt.go index b1d94f87c..8b0f87dc3 100644 --- a/plugins/outputs/mqtt/mqtt.go +++ b/plugins/outputs/mqtt/mqtt.go @@ -7,8 +7,8 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal" - "github.com/influxdata/telegraf/plugins/outputs" "github.com/influxdata/telegraf/plugins/serializers" + "github.com/influxdata/telegraf/registry/outputs" paho "github.com/eclipse/paho.mqtt.golang" ) diff --git a/plugins/outputs/nats/nats.go b/plugins/outputs/nats/nats.go index e65e799cf..14627c6d0 100644 --- a/plugins/outputs/nats/nats.go +++ b/plugins/outputs/nats/nats.go @@ -7,8 +7,8 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal" - "github.com/influxdata/telegraf/plugins/outputs" "github.com/influxdata/telegraf/plugins/serializers" + "github.com/influxdata/telegraf/registry/outputs" ) type NATS struct { diff --git a/plugins/outputs/nsq/nsq.go b/plugins/outputs/nsq/nsq.go index bd1705c10..f6f5c2d0f 100644 --- a/plugins/outputs/nsq/nsq.go +++ b/plugins/outputs/nsq/nsq.go @@ -6,8 +6,8 @@ import ( "github.com/nsqio/go-nsq" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/outputs" "github.com/influxdata/telegraf/plugins/serializers" + "github.com/influxdata/telegraf/registry/outputs" ) type NSQ struct { diff --git a/plugins/outputs/opentsdb/opentsdb.go b/plugins/outputs/opentsdb/opentsdb.go index ac4d1224e..bdd6a1822 100644 --- a/plugins/outputs/opentsdb/opentsdb.go +++ b/plugins/outputs/opentsdb/opentsdb.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/outputs" + "github.com/influxdata/telegraf/registry/outputs" ) type OpenTSDB struct { diff --git a/plugins/outputs/prometheus_client/prometheus_client.go b/plugins/outputs/prometheus_client/prometheus_client.go index e86a0a526..5b9ccc8bc 100644 --- a/plugins/outputs/prometheus_client/prometheus_client.go +++ b/plugins/outputs/prometheus_client/prometheus_client.go @@ -10,7 +10,7 @@ import ( "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/internal" - "github.com/influxdata/telegraf/plugins/outputs" + "github.com/influxdata/telegraf/registry/outputs" "github.com/prometheus/client_golang/prometheus" ) diff --git a/plugins/outputs/riemann/riemann.go b/plugins/outputs/riemann/riemann.go index 25cf3011a..86d430fae 100644 --- a/plugins/outputs/riemann/riemann.go +++ b/plugins/outputs/riemann/riemann.go @@ -10,7 +10,7 @@ import ( "github.com/amir/raidman" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/outputs" + "github.com/influxdata/telegraf/registry/outputs" ) type Riemann struct { diff --git a/plugins/outputs/riemann_legacy/riemann.go b/plugins/outputs/riemann_legacy/riemann.go index 69de7f521..3d464613f 100644 --- a/plugins/outputs/riemann_legacy/riemann.go +++ b/plugins/outputs/riemann_legacy/riemann.go @@ -9,7 +9,7 @@ import ( "github.com/amir/raidman" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/outputs" + "github.com/influxdata/telegraf/registry/outputs" ) const deprecationMsg = "E! Error: this Riemann output plugin will be deprecated in a future release, see https://github.com/influxdata/telegraf/issues/1878 for more details & discussion." diff --git a/plugins/outputs/socket_writer/socket_writer.go b/plugins/outputs/socket_writer/socket_writer.go index 2c54bb0bb..735a59288 100644 --- a/plugins/outputs/socket_writer/socket_writer.go +++ b/plugins/outputs/socket_writer/socket_writer.go @@ -6,8 +6,8 @@ import ( "strings" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/outputs" "github.com/influxdata/telegraf/plugins/serializers" + "github.com/influxdata/telegraf/registry/outputs" ) type SocketWriter struct { diff --git a/plugins/processors/printer/printer.go b/plugins/processors/printer/printer.go index a65a104e6..456a7b4bf 100644 --- a/plugins/processors/printer/printer.go +++ b/plugins/processors/printer/printer.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/influxdata/telegraf" - "github.com/influxdata/telegraf/plugins/processors" + "github.com/influxdata/telegraf/registry/processors" ) type Printer struct { diff --git a/plugins/aggregators/registry.go b/registry/aggregators/registry.go similarity index 100% rename from plugins/aggregators/registry.go rename to registry/aggregators/registry.go diff --git a/registry/doc.go b/registry/doc.go new file mode 100644 index 000000000..b2a276fb4 --- /dev/null +++ b/registry/doc.go @@ -0,0 +1 @@ +package registry diff --git a/plugins/inputs/registry.go b/registry/inputs/registry.go similarity index 100% rename from plugins/inputs/registry.go rename to registry/inputs/registry.go diff --git a/plugins/outputs/registry.go b/registry/outputs/registry.go similarity index 100% rename from plugins/outputs/registry.go rename to registry/outputs/registry.go diff --git a/plugins/processors/registry.go b/registry/processors/registry.go similarity index 100% rename from plugins/processors/registry.go rename to registry/processors/registry.go