Fix issue 524

plugins/inputs/aerospike/aerospike.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"encoding/binary"
 	"fmt"
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs"
 	"net"
 	"strconv"
 	"strings"

plugins/inputs/aerospike/aerospike_test.go

@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

plugins/inputs/all/all.go

@@ -1,40 +1,40 @@
 package all
 
 import (
-	_ "github.com/influxdb/telegraf/plugins/inputs/aerospike"
-	_ "github.com/influxdb/telegraf/plugins/inputs/apache"
-	_ "github.com/influxdb/telegraf/plugins/inputs/bcache"
-	_ "github.com/influxdb/telegraf/plugins/inputs/disque"
-	_ "github.com/influxdb/telegraf/plugins/inputs/elasticsearch"
-	_ "github.com/influxdb/telegraf/plugins/inputs/exec"
-	_ "github.com/influxdb/telegraf/plugins/inputs/haproxy"
-	_ "github.com/influxdb/telegraf/plugins/inputs/httpjson"
-	_ "github.com/influxdb/telegraf/plugins/inputs/influxdb"
-	_ "github.com/influxdb/telegraf/plugins/inputs/jolokia"
-	_ "github.com/influxdb/telegraf/plugins/inputs/kafka_consumer"
-	_ "github.com/influxdb/telegraf/plugins/inputs/leofs"
-	_ "github.com/influxdb/telegraf/plugins/inputs/lustre2"
-	_ "github.com/influxdb/telegraf/plugins/inputs/mailchimp"
-	_ "github.com/influxdb/telegraf/plugins/inputs/memcached"
-	_ "github.com/influxdb/telegraf/plugins/inputs/mongodb"
-	_ "github.com/influxdb/telegraf/plugins/inputs/mysql"
-	_ "github.com/influxdb/telegraf/plugins/inputs/nginx"
-	_ "github.com/influxdb/telegraf/plugins/inputs/nsq"
-	_ "github.com/influxdb/telegraf/plugins/inputs/passenger"
-	_ "github.com/influxdb/telegraf/plugins/inputs/phpfpm"
-	_ "github.com/influxdb/telegraf/plugins/inputs/ping"
-	_ "github.com/influxdb/telegraf/plugins/inputs/postgresql"
-	_ "github.com/influxdb/telegraf/plugins/inputs/procstat"
-	_ "github.com/influxdb/telegraf/plugins/inputs/prometheus"
-	_ "github.com/influxdb/telegraf/plugins/inputs/puppetagent"
-	_ "github.com/influxdb/telegraf/plugins/inputs/rabbitmq"
-	_ "github.com/influxdb/telegraf/plugins/inputs/redis"
-	_ "github.com/influxdb/telegraf/plugins/inputs/rethinkdb"
-	_ "github.com/influxdb/telegraf/plugins/inputs/sensors"
-	_ "github.com/influxdb/telegraf/plugins/inputs/statsd"
-	_ "github.com/influxdb/telegraf/plugins/inputs/system"
-	_ "github.com/influxdb/telegraf/plugins/inputs/trig"
-	_ "github.com/influxdb/telegraf/plugins/inputs/twemproxy"
-	_ "github.com/influxdb/telegraf/plugins/inputs/zfs"
-	_ "github.com/influxdb/telegraf/plugins/inputs/zookeeper"
+	_ "github.com/influxdata/telegraf/plugins/inputs/aerospike"
+	_ "github.com/influxdata/telegraf/plugins/inputs/apache"
+	_ "github.com/influxdata/telegraf/plugins/inputs/bcache"
+	_ "github.com/influxdata/telegraf/plugins/inputs/disque"
+	_ "github.com/influxdata/telegraf/plugins/inputs/elasticsearch"
+	_ "github.com/influxdata/telegraf/plugins/inputs/exec"
+	_ "github.com/influxdata/telegraf/plugins/inputs/haproxy"
+	_ "github.com/influxdata/telegraf/plugins/inputs/httpjson"
+	_ "github.com/influxdata/telegraf/plugins/inputs/influxdb"
+	_ "github.com/influxdata/telegraf/plugins/inputs/jolokia"
+	_ "github.com/influxdata/telegraf/plugins/inputs/kafka_consumer"
+	_ "github.com/influxdata/telegraf/plugins/inputs/leofs"
+	_ "github.com/influxdata/telegraf/plugins/inputs/lustre2"
+	_ "github.com/influxdata/telegraf/plugins/inputs/mailchimp"
+	_ "github.com/influxdata/telegraf/plugins/inputs/memcached"
+	_ "github.com/influxdata/telegraf/plugins/inputs/mongodb"
+	_ "github.com/influxdata/telegraf/plugins/inputs/mysql"
+	_ "github.com/influxdata/telegraf/plugins/inputs/nginx"
+	_ "github.com/influxdata/telegraf/plugins/inputs/nsq"
+	_ "github.com/influxdata/telegraf/plugins/inputs/passenger"
+	_ "github.com/influxdata/telegraf/plugins/inputs/phpfpm"
+	_ "github.com/influxdata/telegraf/plugins/inputs/ping"
+	_ "github.com/influxdata/telegraf/plugins/inputs/postgresql"
+	_ "github.com/influxdata/telegraf/plugins/inputs/procstat"
+	_ "github.com/influxdata/telegraf/plugins/inputs/prometheus"
+	_ "github.com/influxdata/telegraf/plugins/inputs/puppetagent"
+	_ "github.com/influxdata/telegraf/plugins/inputs/rabbitmq"
+	_ "github.com/influxdata/telegraf/plugins/inputs/redis"
+	_ "github.com/influxdata/telegraf/plugins/inputs/rethinkdb"
+	_ "github.com/influxdata/telegraf/plugins/inputs/sensors"
+	_ "github.com/influxdata/telegraf/plugins/inputs/statsd"
+	_ "github.com/influxdata/telegraf/plugins/inputs/system"
+	_ "github.com/influxdata/telegraf/plugins/inputs/trig"
+	_ "github.com/influxdata/telegraf/plugins/inputs/twemproxy"
+	_ "github.com/influxdata/telegraf/plugins/inputs/zfs"
+	_ "github.com/influxdata/telegraf/plugins/inputs/zookeeper"
 )

plugins/inputs/apache/apache.go

@@ -11,7 +11,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 type Apache struct {

plugins/inputs/apache/apache_test.go

@@ -6,7 +6,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 
 	"github.com/stretchr/testify/require"
 )

plugins/inputs/bcache/bcache.go

@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 type Bcache struct {

plugins/inputs/bcache/bcache_test.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/require"
 )
 

plugins/inputs/disque/disque.go

@@ -10,7 +10,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 type Disque struct {

plugins/inputs/disque/disque_test.go

@@ -6,7 +6,7 @@ import (
 	"net"
 	"testing"
 
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/require"
 )
 

plugins/inputs/elasticsearch/elasticsearch.go

@@ -6,8 +6,8 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/influxdb/telegraf/internal"
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 const statsPath = "/_nodes/stats"

plugins/inputs/elasticsearch/elasticsearch_test.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 
 	"github.com/stretchr/testify/require"
 )

plugins/inputs/exec/exec.go

@@ -8,8 +8,8 @@ import (
 
 	"github.com/gonuts/go-shellquote"
 
-	"github.com/influxdb/telegraf/internal"
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 const sampleConfig = `

plugins/inputs/exec/exec_test.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

plugins/inputs/haproxy/haproxy.go

@@ -3,7 +3,7 @@ package haproxy
 import (
 	"encoding/csv"
 	"fmt"
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs"
 	"io"
 	"net/http"
 	"net/url"

plugins/inputs/haproxy/haproxy_test.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"net/http"

plugins/inputs/httpjson/httpjson.go

@@ -11,8 +11,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/influxdb/telegraf/internal"
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 type HttpJson struct {

plugins/inputs/httpjson/httpjson_test.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

plugins/inputs/influxdb/influxdb.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 type InfluxDB struct {

plugins/inputs/influxdb/influxdb_test.go

@@ -5,8 +5,8 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/influxdb/telegraf/plugins/inputs/influxdb"
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/plugins/inputs/influxdb"
+	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/require"
 )
 

plugins/inputs/jolokia/jolokia.go

@@ -8,7 +8,7 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 type Server struct {

plugins/inputs/jolokia/jolokia_test.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/assert"
 	_ "github.com/stretchr/testify/require"
 )

plugins/inputs/kafka_consumer/kafka_consumer.go

@@ -5,8 +5,8 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/influxdb/influxdb/models"
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/influxdb/models"
+	"github.com/influxdata/telegraf/plugins/inputs"
 
 	"github.com/Shopify/sarama"
 	"github.com/wvanbergen/kafka/consumergroup"

plugins/inputs/kafka_consumer/kafka_consumer_integration_test.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/Shopify/sarama"
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

plugins/inputs/kafka_consumer/kafka_consumer_test.go

@@ -4,8 +4,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/influxdb/influxdb/models"
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/influxdb/models"
+	"github.com/influxdata/telegraf/testutil"
 
 	"github.com/Shopify/sarama"
 	"github.com/stretchr/testify/assert"

plugins/inputs/leofs/leofs.go

@@ -3,7 +3,7 @@ package leofs
 import (
 	"bufio"
 	"fmt"
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs"
 	"net/url"
 	"os/exec"
 	"strconv"

plugins/inputs/leofs/leofs_test.go

@@ -1,7 +1,7 @@
 package leofs
 
 import (
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"io/ioutil"

plugins/inputs/lustre2/lustre2.go

@@ -13,8 +13,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/influxdb/telegraf/internal"
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 // Lustre proc files can change between versions, so we want to future-proof

plugins/inputs/lustre2/lustre2_test.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/require"
 )
 

plugins/inputs/mailchimp/mailchimp.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 type MailChimp struct {

plugins/inputs/mailchimp/mailchimp_test.go

@@ -7,7 +7,7 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 
 	"github.com/stretchr/testify/require"
 )

plugins/inputs/memcached/memcached.go

@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 // Memcached is a memcached plugin

plugins/inputs/memcached/memcached_test.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

plugins/inputs/mongodb/mongodb.go

@@ -9,7 +9,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs"
 	"gopkg.in/mgo.v2"
 )
 

plugins/inputs/mongodb/mongodb_data.go

@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"strconv"
 
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 type MongodbData struct {

plugins/inputs/mongodb/mongodb_data_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/assert"
 )
 

plugins/inputs/mongodb/mongodb_server.go

@@ -4,7 +4,7 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs"
 	"gopkg.in/mgo.v2"
 	"gopkg.in/mgo.v2/bson"
 )

plugins/inputs/mongodb/mongodb_server_test.go

@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

plugins/inputs/mysql/mysql.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	_ "github.com/go-sql-driver/mysql"
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 type Mysql struct {

plugins/inputs/mysql/mysql_test.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

plugins/inputs/nginx/nginx.go

@@ -11,7 +11,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 type Nginx struct {

plugins/inputs/nginx/nginx_test.go

@@ -8,7 +8,7 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

plugins/inputs/nsq/nsq.go

@@ -31,7 +31,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 // Might add Lookupd endpoints for cluster discovery

plugins/inputs/nsq/nsq_test.go

@@ -7,7 +7,7 @@ import (
 	"net/url"
 	"testing"
 
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 
 	"github.com/stretchr/testify/require"
 )

plugins/inputs/passenger/passenger.go

@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs"
 	"golang.org/x/net/html/charset"
 )
 

plugins/inputs/passenger/passenger_test.go

@@ -6,7 +6,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

plugins/inputs/phpfpm/phpfpm.go

@@ -12,7 +12,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 const (

plugins/inputs/phpfpm/phpfpm_test.go

@@ -10,7 +10,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

plugins/inputs/ping/ping.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 // HostPinger is a function that runs the "ping" function using a list of

plugins/inputs/ping/ping_test.go

@@ -6,7 +6,7 @@ import (
 	"sort"
 	"testing"
 
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/assert"
 )
 

plugins/inputs/postgresql/postgresql.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs"
 
 	_ "github.com/lib/pq"
 )

plugins/inputs/postgresql/postgresql_test.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

plugins/inputs/procstat/procstat.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/shirou/gopsutil/process"
 
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 type Procstat struct {

plugins/inputs/procstat/procstat_test.go

@@ -10,7 +10,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 )
 
 func TestGather(t *testing.T) {

plugins/inputs/procstat/spec_processor.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/shirou/gopsutil/process"
 
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 type SpecProcessor struct {

plugins/inputs/prometheus/prometheus.go

@@ -3,7 +3,7 @@ package prometheus
 import (
 	"errors"
 	"fmt"
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs"
 	"github.com/prometheus/common/expfmt"
 	"github.com/prometheus/common/model"
 	"io"

plugins/inputs/prometheus/prometheus_test.go

@@ -6,7 +6,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

plugins/inputs/puppetagent/puppetagent.go

@@ -8,7 +8,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 // PuppetAgent is a PuppetAgent plugin

plugins/inputs/puppetagent/puppetagent_test.go

@@ -1,7 +1,7 @@
 package puppetagent
 
 import (
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 	"testing"
 )
 

plugins/inputs/rabbitmq/rabbitmq.go

@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 const DefaultUsername = "guest"

plugins/inputs/rabbitmq/rabbitmq_test.go

@@ -6,7 +6,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

plugins/inputs/redis/redis.go

@@ -10,7 +10,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 type Redis struct {

plugins/inputs/redis/redis_test.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/require"
 )
 

plugins/inputs/rethinkdb/rethinkdb.go

@@ -5,7 +5,7 @@ import (
 	"net/url"
 	"sync"
 
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs"
 
 	"gopkg.in/dancannon/gorethink.v1"
 )

plugins/inputs/rethinkdb/rethinkdb_data.go

@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 type serverStatus struct {

plugins/inputs/rethinkdb/rethinkdb_data_test.go

@@ -3,7 +3,7 @@ package rethinkdb
 import (
 	"testing"
 
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/assert"
 )
 

plugins/inputs/rethinkdb/rethinkdb_server.go

@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs"
 
 	"gopkg.in/dancannon/gorethink.v1"
 )

plugins/inputs/rethinkdb/rethinkdb_server_test.go

@@ -5,7 +5,7 @@ package rethinkdb
 import (
 	"testing"
 
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

plugins/inputs/sensors/sensors.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/md14454/gosensors"
 
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 type Sensors struct {

plugins/inputs/statsd/README.md

@@ -157,4 +157,4 @@ mem.cached.localhost:256|g
 ```
 
 There are many more options available,
-[More details can be found here](https://github.com/influxdb/influxdb/tree/master/services/graphite#templates)
+[More details can be found here](https://github.com/influxdata/influxdb/tree/master/services/graphite#templates)

plugins/inputs/statsd/statsd.go

@@ -10,9 +10,9 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/influxdb/influxdb/services/graphite"
+	"github.com/influxdata/influxdb/services/graphite"
 
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 const UDP_PACKET_SIZE int = 1500

plugins/inputs/statsd/statsd_test.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 )
 
 // Invalid lines should return an error

plugins/inputs/system/cpu.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs"
 	"github.com/shirou/gopsutil/cpu"
 )
 

plugins/inputs/system/cpu_test.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 	"github.com/shirou/gopsutil/cpu"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

plugins/inputs/system/disk.go

@@ -3,7 +3,7 @@ package system
 import (
 	"fmt"
 
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 type DiskStats struct {

plugins/inputs/system/disk_test.go

@@ -3,7 +3,7 @@ package system
 import (
 	"testing"
 
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 	"github.com/shirou/gopsutil/disk"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

plugins/inputs/system/docker.go

@@ -5,7 +5,7 @@ package system
 import (
 	"fmt"
 
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 type DockerStats struct {

plugins/inputs/system/docker_test.go

@@ -5,7 +5,7 @@ package system
 import (
 	"testing"
 
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 	"github.com/shirou/gopsutil/cpu"
 	"github.com/shirou/gopsutil/docker"
 

plugins/inputs/system/memory.go

@@ -3,7 +3,7 @@ package system
 import (
 	"fmt"
 
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 type MemStats struct {

plugins/inputs/system/memory_test.go

@@ -3,7 +3,7 @@ package system
 import (
 	"testing"
 
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 	"github.com/shirou/gopsutil/mem"
 	"github.com/stretchr/testify/require"
 )

plugins/inputs/system/net.go

@@ -5,7 +5,7 @@ import (
 	"net"
 	"strings"
 
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 type NetIOStats struct {

plugins/inputs/system/net_test.go

@@ -4,7 +4,7 @@ import (
 	"syscall"
 	"testing"
 
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 	"github.com/shirou/gopsutil/net"
 	"github.com/stretchr/testify/require"
 )

plugins/inputs/system/netstat.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"syscall"
 
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 type NetStats struct {

plugins/inputs/system/ps.go

@@ -5,8 +5,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/influxdb/telegraf/internal"
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/plugins/inputs"
 
 	dc "github.com/fsouza/go-dockerclient"
 	"github.com/shirou/gopsutil/cpu"

plugins/inputs/system/system.go

@@ -8,7 +8,7 @@ import (
 	"github.com/shirou/gopsutil/host"
 	"github.com/shirou/gopsutil/load"
 
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 type SystemStats struct{}

plugins/inputs/trig/trig.go

@@ -3,7 +3,7 @@ package trig
 import (
 	"math"
 
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 type Trig struct {

plugins/inputs/trig/trig_test.go

@@ -4,7 +4,7 @@ import (
 	"math"
 	"testing"
 
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 )
 
 func TestTrig(t *testing.T) {

plugins/inputs/twemproxy/twemproxy.go

@@ -7,7 +7,7 @@ import (
 	"net"
 	"time"
 
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 type Twemproxy struct {

plugins/inputs/twemproxy/twemproxy_test.go

@@ -5,7 +5,7 @@ import (
 	"net"
 	"testing"
 
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/require"
 )
 

plugins/inputs/zfs/zfs.go

@@ -6,8 +6,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/influxdb/telegraf/internal"
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 type Zfs struct {

plugins/inputs/zfs/zfs_test.go

@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/require"
 )
 

plugins/inputs/zookeeper/zookeeper.go

@@ -10,7 +10,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/influxdb/telegraf/plugins/inputs"
+	"github.com/influxdata/telegraf/plugins/inputs"
 )
 
 // Zookeeper is a zookeeper plugin

plugins/inputs/zookeeper/zookeeper_test.go

@@ -3,7 +3,7 @@ package zookeeper
 import (
 	"testing"
 
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

plugins/outputs/all/all.go

@@ -1,17 +1,17 @@
 package all
 
 import (
-	_ "github.com/influxdb/telegraf/plugins/outputs/amon"
-	_ "github.com/influxdb/telegraf/plugins/outputs/amqp"
-	_ "github.com/influxdb/telegraf/plugins/outputs/datadog"
-	_ "github.com/influxdb/telegraf/plugins/outputs/graphite"
-	_ "github.com/influxdb/telegraf/plugins/outputs/influxdb"
-	_ "github.com/influxdb/telegraf/plugins/outputs/kafka"
-	_ "github.com/influxdb/telegraf/plugins/outputs/kinesis"
-	_ "github.com/influxdb/telegraf/plugins/outputs/librato"
-	_ "github.com/influxdb/telegraf/plugins/outputs/mqtt"
-	_ "github.com/influxdb/telegraf/plugins/outputs/nsq"
-	_ "github.com/influxdb/telegraf/plugins/outputs/opentsdb"
-	_ "github.com/influxdb/telegraf/plugins/outputs/prometheus_client"
-	_ "github.com/influxdb/telegraf/plugins/outputs/riemann"
+	_ "github.com/influxdata/telegraf/plugins/outputs/amon"
+	_ "github.com/influxdata/telegraf/plugins/outputs/amqp"
+	_ "github.com/influxdata/telegraf/plugins/outputs/datadog"
+	_ "github.com/influxdata/telegraf/plugins/outputs/graphite"
+	_ "github.com/influxdata/telegraf/plugins/outputs/influxdb"
+	_ "github.com/influxdata/telegraf/plugins/outputs/kafka"
+	_ "github.com/influxdata/telegraf/plugins/outputs/kinesis"
+	_ "github.com/influxdata/telegraf/plugins/outputs/librato"
+	_ "github.com/influxdata/telegraf/plugins/outputs/mqtt"
+	_ "github.com/influxdata/telegraf/plugins/outputs/nsq"
+	_ "github.com/influxdata/telegraf/plugins/outputs/opentsdb"
+	_ "github.com/influxdata/telegraf/plugins/outputs/prometheus_client"
+	_ "github.com/influxdata/telegraf/plugins/outputs/riemann"
 )

plugins/outputs/amon/amon.go

@@ -8,9 +8,9 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/influxdb/influxdb/client/v2"
-	"github.com/influxdb/telegraf/internal"
-	"github.com/influxdb/telegraf/plugins/outputs"
+	"github.com/influxdata/influxdb/client/v2"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/plugins/outputs"
 )
 
 type Amon struct {

plugins/outputs/amon/amon_test.go

@@ -6,9 +6,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 
-	"github.com/influxdb/influxdb/client/v2"
+	"github.com/influxdata/influxdb/client/v2"
 )
 
 func TestBuildPoint(t *testing.T) {

plugins/outputs/amqp/amqp.go

@@ -10,8 +10,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/influxdb/influxdb/client/v2"
-	"github.com/influxdb/telegraf/plugins/outputs"
+	"github.com/influxdata/influxdb/client/v2"
+	"github.com/influxdata/telegraf/plugins/outputs"
 	"github.com/streadway/amqp"
 )
 

plugins/outputs/amqp/amqp_test.go

@@ -3,7 +3,7 @@ package amqp
 import (
 	"testing"
 
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 	"github.com/stretchr/testify/require"
 )
 

plugins/outputs/datadog/datadog.go

@@ -10,9 +10,9 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/influxdb/influxdb/client/v2"
-	"github.com/influxdb/telegraf/internal"
-	"github.com/influxdb/telegraf/plugins/outputs"
+	"github.com/influxdata/influxdb/client/v2"
+	"github.com/influxdata/telegraf/internal"
+	"github.com/influxdata/telegraf/plugins/outputs"
 )
 
 type Datadog struct {

plugins/outputs/datadog/datadog_test.go

@@ -9,9 +9,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/influxdb/telegraf/testutil"
+	"github.com/influxdata/telegraf/testutil"
 
-	"github.com/influxdb/influxdb/client/v2"
+	"github.com/influxdata/influxdb/client/v2"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

plugins/outputs/graphite/graphite.go

@@ -3,8 +3,8 @@ package graphite
 import (
 	"errors"
 	"fmt"
-	"github.com/influxdb/influxdb/client/v2"
-	"github.com/influxdb/telegraf/plugins/outputs"
+	"github.com/influxdata/influxdb/client/v2"
+	"github.com/influxdata/telegraf/plugins/outputs"
 	"log"
 	"math/rand"
 	"net"