testing/telegraf: upgrade to 1.11.3

switch from glide to dep
remove pkgusers/groups - they're not needed during build
simplify build script
simplify init.d script
move config from /etc/telegraf/telegraf.conf to /etc/telegraf.conf
	and /etc/telegraf.conf.d
remove broken logrotate config, it missed action to force telegraf
	to reopen log file.
log rotation can be done via telegraf config
add conf.d file

8 files changed, 44 insertions, 871 deletions

diff --git a/testing/telegraf/APKBUILD b/testing/telegraf/APKBUILD
index f0e151b4a2..aaea3a66a5 100644
--- a/testing/telegraf/APKBUILD
+++ b/testing/telegraf/APKBUILD
@@ -1,60 +1,51 @@
 # Contributor: Katie Holly <holly@fuslvz.ws>
 # Maintainer: Katie Holly <holly@fuslvz.ws>
+# Maintainer: Konstantin Kulikov <k.kulikov2@gmail.com>
 pkgname=telegraf
-pkgver=1.7.4
-pkgrel=1
+pkgver=1.11.3
+pkgrel=0
 pkgdesc="A plugin-driven server agent for collecting & reporting metrics, part of the InfluxDB project"
 url="https://www.influxdata.com/time-series-platform/telegraf/"
-arch="x86_64"
+arch="x86_64 aarch64 armhf"
 license="MIT"
-makedepends="go glide"
-pkgusers="telegraf"
-pkggroups="telegraf"
+makedepends="go dep"
 install="$pkgname.pre-install"
-options="!net"
+subpackages="$pkgname-openrc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/influxdata/$pkgname/archive/$pkgver.tar.gz
-	telegraf-makefile-ldflags.patch
 	telegraf.initd
-	telegraf.logrotate
-	glide.yaml
-	glide.lock
+	telegraf.confd
 	"
-builddir="$srcdir"/$pkgname-$pkgver
-_godir="$srcdir"/go
-_vendor=influxdata
+builddir="$srcdir/src/github.com/influxdata/$pkgname"
 
-unpack() {
-	default_unpack
-	mkdir -p "$_godir"/bin "$_godir"/src/github.com/"$_vendor" "$builddir/.glide" "$builddir/.glidetmp"
-	ln -sf "$builddir" "$_godir"/src/github.com/$_vendor/$pkgname
-	cp "$srcdir"/glide.yaml "$srcdir"/glide.lock "$_godir"/src/github.com/$_vendor/$pkgname
+export GOPATH="$srcdir"
+export GOCACHE="$srcdir/gocache"
+
+prepare() {
+	mkdir -p ${builddir%/*}
+	mv "$srcdir"/$pkgname-$pkgver "$builddir"/ || return 1
+	cd "$builddir"
+	dep ensure -v
+	default_prepare
 }
 
 build() {
-	cd "$_godir"/src/github.com/$_vendor/$pkgname
-	export GOPATH="$_godir"
-	export PATH="$PATH:$_godir"
-	GLIDE_HOME="$builddir/.glide" GLIDE_TMP="$builddir/.glidetmp" glide install
-	make PREFIX=/usr VERSION=$pkgver BRANCH= COMMIT= telegraf
+	go build -ldflags "-X main.version=$pkgver" ./cmd/telegraf
 }
 
 check() {
-	cd "$_godir"/src/github.com/$_vendor/$pkgname
-	make test
+	# filecount tests are excluded because they depend on exact file sizes
+	# which depend on filesystem used.
+	go test -short $(go list ./... | grep -v plugins/inputs/filecount)
 }
 
 package() {
-	mkdir -p "$pkgdir"/usr/bin "$pkgdir"/etc/$pkgname "$pkgdir"/etc/logrotate.d/$pkgname
-	install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
-	install -Dm755 "$builddir"/$pkgname "$pkgdir"/usr/bin/$pkgname
-	install -Dm644 "$srcdir"/$pkgname.logrotate "$pkgdir"/etc/logrotate.d/$pkgname
-	install -Dm644 "$builddir"/etc/$pkgname.conf "$pkgdir"/etc/$pkgname/$pkgname.conf
-	install -Dm644 "$builddir"/etc/logrotate.d/$pkgname "$pkgdir"/etc/logrotate.d/$pkgname
+	install -Dm755 "$srcdir/$pkgname.initd" "$pkgdir/etc/init.d/$pkgname"
+	install -Dm644 "$srcdir/$pkgname.confd" "$pkgdir/etc/conf.d/$pkgname"
+	install -Dm755 "$builddir/$pkgname" "$pkgdir/usr/bin/$pkgname"
+	install -Dm644 "$builddir/etc/$pkgname.conf" "$pkgdir/etc/$pkgname.conf"
+	install -dm755 "$pkgdir/etc/$pkgname.conf.d"
 }
 
-sha512sums="180bc7b2077e4fc10f0d13fe08b7293d5632be8e717a63f2463775a95258fedfde106863e56f9dda3f6844d879e2b0e5b06397a62545045874215d9078e391b9  telegraf-1.7.4.tar.gz
-abc5879cc7a465c1e59d1c421b0ebc3690ea31f946145bc8ed65ecc7fa6392ec7f9536161610c0bdb1fb6f7974692c85bb6408eb1e3ce4af4568926dc2c8bee0  telegraf-makefile-ldflags.patch
-0682835506f8bd2f417fa7edcc8c394445d99545fb7599812a15e63bdcb64e3687b4f20e7adf1d8e640fd8b0e7f2d9144eb23ae6da29025cf2da07bfaa236e71  telegraf.initd
-bf6ead6e3f69be7c82b01ad8e9ec52158d4b543676a4d6aea077cdad91ae477f18b98c6e2cbfa795483055d9604aaf93dcfb2a9af6ddc50f29c5b75a18a7a678  telegraf.logrotate
-a2b00f1ce3d7fcaa25270aae59b537af3929a7abe70e9621d809d63c7582cd655b1e3d53cabd52e7b489ae42e49f7ff3c7a89a1781db6d017ccff9e1db97c47e  glide.yaml
-b41f55525a3446db67a5677025d0a9f4b7c24727b80432d372ad9ca7aede57951276f7cd3d95c02ea0031fe63a6459e1d4bd0ddc7ccdf8049af3f5e72f500e3a  glide.lock"
+sha512sums="55a9b791fd9952c2594430f77084062026b10ee8bfa6e270ed2be8743f9995680cf09e49acc8abc48c5753f4b756840b3b1d43cc30132fec87aca301a1995141  telegraf-1.11.3.tar.gz
+abe483deb8e12fe140de2c36d17bbfbc97ed7a5de8c3d76162357f7ba6575b8236b7197b92a26ed6d54f95c1ccbfc12ca62d6cc0371bf49d10a1ea5622a51ed1  telegraf.initd
+90188e1ba88d3a0714e1590f78a2abf3719cbe2f3d734f9c72ded13cf9c8495c1bf6696f2780289775bf53da347eee72aea8fe5555a4754360d1fbaa9d3c362b  telegraf.confd"
diff --git a/testing/telegraf/glide.lock b/testing/telegraf/glide.lock
deleted file mode 100644
index 8568042ae8..0000000000
--- a/testing/telegraf/glide.lock
+++ /dev/null
@@ -1,502 +0,0 @@
-hash: 029e05d4ad5b88493053dd3766c0868bc5d3c041a1db2ffd2a9704fe1812e9be
-updated: 2018-09-14T09:06:44.71798281Z
-imports:
-- name: code.cloudfoundry.org/clock
-  version: e9dc86bbf0e5bbe6bf7ff5a6f71e048959b61f71
-- name: collectd.org
-  version: 2ce144541b8903101fb8f1483cc0497a68798122
-  subpackages:
-  - api
-  - cdtime
-  - network
-- name: github.com/aerospike/aerospike-client-go
-  version: 95e1ad7791bdbca44707fedbb29be42024900d9c
-  subpackages:
-  - internal/lua
-  - internal/lua/resources
-  - logger
-  - pkg/bcrypt
-  - pkg/ripemd160
-  - types
-  - types/atomic
-  - types/particle_type
-  - types/rand
-  - utils/buffer
-- name: github.com/amir/raidman
-  version: c74861fe6a7bb8ede0a010ce4485bdbb4fc4c985
-  subpackages:
-  - proto
-- name: github.com/apache/thrift
-  version: 4aaa92ece8503a6da9bc6701604f69acf2b99d07
-  subpackages:
-  - lib/go/thrift
-- name: github.com/armon/go-metrics
-  version: 783273d703149aaeb9897cf58613d5af48861c25
-- name: github.com/aws/aws-sdk-go
-  version: c861d27d0304a79f727e9a8a4e2ac1e74602fdc0
-  subpackages:
-  - aws
-  - aws/awserr
-  - aws/awsutil
-  - aws/client
-  - aws/client/metadata
-  - aws/corehandlers
-  - aws/credentials
-  - aws/credentials/ec2rolecreds
-  - aws/credentials/endpointcreds
-  - aws/credentials/stscreds
-  - aws/defaults
-  - aws/ec2metadata
-  - aws/endpoints
-  - aws/request
-  - aws/session
-  - aws/signer/v4
-  - internal/shareddefaults
-  - private/protocol
-  - private/protocol/json/jsonutil
-  - private/protocol/jsonrpc
-  - private/protocol/query
-  - private/protocol/query/queryutil
-  - private/protocol/rest
-  - private/protocol/xml/xmlutil
-  - service/cloudwatch
-  - service/kinesis
-  - service/sts
-- name: github.com/beorn7/perks
-  version: 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
-  subpackages:
-  - quantile
-- name: github.com/bsm/sarama-cluster
-  version: abf039439f66c1ce78017f560b490612552f6472
-- name: github.com/cenkalti/backoff
-  version: b02f2bbce11d7ea6b97f282ef1771b0fe2f65ef3
-- name: github.com/couchbase/go-couchbase
-  version: bfe555a140d53dc1adf390f1a1d4b0fd4ceadb28
-- name: github.com/couchbase/gomemcached
-  version: 4a25d2f4e1dea9ea7dd76dfd943407abf9b07d29
-  subpackages:
-  - client
-- name: github.com/couchbase/goutils
-  version: 5823a0cbaaa9008406021dc5daf80125ea30bba6
-  subpackages:
-  - logging
-- name: github.com/davecgh/go-spew
-  version: 346938d642f2ec3594ed81d874461961cd0faa76
-  subpackages:
-  - spew
-- name: github.com/dgrijalva/jwt-go
-  version: dbeaa9332f19a944acb5736b4456cfcc02140e29
-- name: github.com/docker/distribution
-  version: 83389a148052d74ac602f5f1d62f86ff2f3c4aa5
-  subpackages:
-  - digestset
-  - reference
-- name: github.com/docker/docker
-  version: f5ec1e2936dcbe7b5001c2b817188b095c700c27
-  subpackages:
-  - api/types
-  - api/types/blkiodev
-  - api/types/container
-  - api/types/events
-  - api/types/filters
-  - api/types/mount
-  - api/types/network
-  - api/types/reference
-  - api/types/registry
-  - api/types/strslice
-  - api/types/swarm
-  - api/types/time
-  - api/types/versions
-  - api/types/volume
-  - client
-  - pkg/tlsconfig
-- name: github.com/docker/go-connections
-  version: 990a1a1a70b0da4c4cb70e117971a4f0babfbf1a
-  subpackages:
-  - nat
-  - sockets
-  - tlsconfig
-- name: github.com/docker/go-units
-  version: 47565b4f722fb6ceae66b95f853feed578a4a51c
-- name: github.com/eapache/go-resiliency
-  version: b86b1ec0dd4209a588dc1285cdd471e73525c0b3
-  subpackages:
-  - breaker
-- name: github.com/eapache/go-xerial-snappy
-  version: bb955e01b9346ac19dc29eb16586c90ded99a98c
-- name: github.com/eapache/queue
-  version: 44cc805cf13205b55f69e14bcb69867d1ae92f98
-- name: github.com/eclipse/paho.mqtt.golang
-  version: aff15770515e3c57fc6109da73d42b0d46f7f483
-  subpackages:
-  - packets
-- name: github.com/fsnotify/fsnotify
-  version: c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9
-- name: github.com/go-ini/ini
-  version: 9144852efba7c4daf409943ee90767da62d55438
-- name: github.com/go-logfmt/logfmt
-  version: 390ab7935ee28ec6b286364bba9b4dd6410cb3d5
-- name: github.com/go-ole/go-ole
-  version: be49f7c07711fcb603cff39e1de7c67926dc0ba7
-  subpackages:
-  - oleutil
-- name: github.com/go-redis/redis
-  version: 73b70592cdaa9e6abdfcfbf97b4a90d80728c836
-  subpackages:
-  - internal
-  - internal/consistenthash
-  - internal/hashtag
-  - internal/pool
-  - internal/proto
-- name: github.com/go-sql-driver/mysql
-  version: 2e00b5cd70399450106cec6431c2e2ce3cae5034
-- name: github.com/gobwas/glob
-  version: bea32b9cd2d6f55753d94a28e959b13f0244797a
-  subpackages:
-  - compiler
-  - match
-  - syntax
-  - syntax/ast
-  - syntax/lexer
-  - util/runes
-  - util/strings
-- name: github.com/gogo/protobuf
-  version: 7b6c6391c4ff245962047fc1e2c6e08b1cdfa0e8
-  subpackages:
-  - proto
-- name: github.com/golang/protobuf
-  version: 8ee79997227bf9b34611aee7946ae64735e6fd93
-  subpackages:
-  - proto
-  - ptypes
-  - ptypes/any
-  - ptypes/duration
-  - ptypes/timestamp
-- name: github.com/golang/snappy
-  version: 7db9049039a047d955fe8c19b83c8ff5abd765c7
-- name: github.com/google/go-cmp
-  version: f94e52cad91c65a63acc1e75d4be223ea22e99bc
-  subpackages:
-  - cmp
-  - cmp/internal/diff
-  - cmp/internal/value
-- name: github.com/gorilla/context
-  version: 08b5f424b9271eedf6f9f0ce86cb9396ed337a42
-- name: github.com/gorilla/mux
-  version: 53c1911da2b537f792e7cafcb446b05ffe33b996
-- name: github.com/hailocab/go-hostpool
-  version: e80d13ce29ede4452c43dea11e79b9bc8a15b478
-- name: github.com/hashicorp/consul
-  version: 5174058f0d2bda63fa5198ab96c33d9a909c58ed
-  subpackages:
-  - api
-- name: github.com/hashicorp/go-cleanhttp
-  version: d5fe4b57a186c716b0e00b8c301cbd9b4182694d
-- name: github.com/hashicorp/go-immutable-radix
-  version: 7f3cd4390caab3250a57f30efdb2a65dd7649ecf
-- name: github.com/hashicorp/go-rootcerts
-  version: 6bb64b370b90e7ef1fa532be9e591a81c3493e00
-- name: github.com/hashicorp/golang-lru
-  version: 0fb14efe8c47ae851c0034ed7a448854d3d34cf3
-  subpackages:
-  - simplelru
-- name: github.com/hashicorp/serf
-  version: fc4bdedf2366c64984e280c6eefc703ca7812585
-  subpackages:
-  - coordinate
-- name: github.com/influxdata/go-syslog
-  version: eecd51df3ad85464a2bab9b7d3a45bc1e299059e
-  subpackages:
-  - rfc5424
-  - rfc5425
-- name: github.com/influxdata/tail
-  version: c43482518d410361b6c383d7aebce33d0471d7bc
-  subpackages:
-  - ratelimiter
-  - util
-  - watch
-  - winfile
-- name: github.com/influxdata/toml
-  version: 2a2e3012f7cfbef64091cc79776311e65dfa211b
-  subpackages:
-  - ast
-- name: github.com/influxdata/wlog
-  version: 7c63b0a71ef8300adc255344d275e10e5c3a71ec
-- name: github.com/jackc/pgx
-  version: 63f58fd32edb5684b9e9f4cfaac847c6b42b3917
-  subpackages:
-  - chunkreader
-  - internal/sanitize
-  - pgio
-  - pgproto3
-  - pgtype
-  - stdlib
-- name: github.com/jmespath/go-jmespath
-  version: bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d
-- name: github.com/kardianos/osext
-  version: c2c54e542fb797ad986b31721e1baedf214ca413
-- name: github.com/kardianos/service
-  version: 6d3a0ee7d3425d9d835debc51a0ca1ffa28f4893
-- name: github.com/kballard/go-shellquote
-  version: d8ec1a69a250a17bb0e419c386eac1f3711dc142
-- name: github.com/kr/logfmt
-  version: b84e30acd515aadc4b783ad4ff83aff3299bdfe0
-- name: github.com/matttproud/golang_protobuf_extensions
-  version: c12348ce28de40eed0136aa2b644d0ee0650e56c
-  subpackages:
-  - pbutil
-- name: github.com/Microsoft/ApplicationInsights-Go
-  version: 3612f58550c1de70f1a110c78c830e55f29aa65d
-  subpackages:
-  - appinsights
-  - appinsights/contracts
-- name: github.com/Microsoft/go-winio
-  version: ce2922f643c8fd76b46cadc7f404a06282678b34
-- name: github.com/miekg/dns
-  version: 99f84ae56e75126dd77e5de4fae2ea034a468ca1
-- name: github.com/mitchellh/go-homedir
-  version: ae18d6b8b3205b561c79e8e5f69bff09736185f4
-- name: github.com/mitchellh/mapstructure
-  version: d0303fe809921458f417bcf828397a65db30a7e4
-- name: github.com/multiplay/go-ts3
-  version: 07477f49b8dfa3ada231afc7b7b17617d42afe8e
-- name: github.com/naoina/go-stringutil
-  version: 6b638e95a32d0c1131db0e7fe83775cbea4a0d0b
-- name: github.com/nats-io/gnatsd
-  version: 393bbb7c031433e68707c8810fda0bfcfbe6ab9b
-  subpackages:
-  - conf
-  - logger
-  - server
-  - server/pse
-  - util
-- name: github.com/nats-io/go-nats
-  version: ea9585611a4ab58a205b9b125ebd74c389a6b898
-  subpackages:
-  - encoders/builtin
-  - util
-- name: github.com/nats-io/nuid
-  version: 289cccf02c178dc782430d534e3c1f5b72af807f
-- name: github.com/nsqio/go-nsq
-  version: eee57a3ac4174c55924125bb15eeeda8cffb6e6f
-- name: github.com/opencontainers/go-digest
-  version: c9281466c8b2f606084ac71339773efd177436e7
-- name: github.com/opencontainers/runc
-  version: 89ab7f2ccc1e45ddf6485eaa802c35dcf321dfc8
-  subpackages:
-  - libcontainer/user
-- name: github.com/opentracing-contrib/go-observer
-  version: a52f2342449246d5bcc273e65cbdcfa5f7d6c63c
-- name: github.com/opentracing/opentracing-go
-  version: 06f47b42c792fef2796e9681353e1d908c417827
-  subpackages:
-  - ext
-  - log
-- name: github.com/openzipkin/zipkin-go-opentracing
-  version: 1cafbdfde94fbf2b373534764e0863aa3bd0bf7b
-  subpackages:
-  - _thrift/gen-go/scribe
-  - _thrift/gen-go/zipkincore
-  - flag
-  - types
-  - wire
-- name: github.com/pierrec/lz4
-  version: 5c9560bfa9ace2bf86080bf40d46b34ae44604df
-- name: github.com/pierrec/xxHash
-  version: 5a004441f897722c627870a981d02b29924215fa
-  subpackages:
-  - xxHash32
-- name: github.com/pkg/errors
-  version: 645ef00459ed84a119197bfb8d8205042c6df63d
-- name: github.com/pmezard/go-difflib
-  version: 792786c7400a136282c1664665ae0a8db921c6c2
-  subpackages:
-  - difflib
-- name: github.com/prometheus/client_golang
-  version: c317fb74746eac4fc65fe3909195f4cf67c5562a
-  subpackages:
-  - prometheus
-  - prometheus/promhttp
-- name: github.com/prometheus/client_model
-  version: fa8ad6fec33561be4280a8f0514318c79d7f6cb6
-  subpackages:
-  - go
-- name: github.com/prometheus/common
-  version: dd2f054febf4a6c00f2343686efb775948a8bff4
-  subpackages:
-  - expfmt
-  - internal/bitbucket.org/ww/goautoneg
-  - log
-  - model
-- name: github.com/prometheus/procfs
-  version: 1878d9fbb537119d24b21ca07effd591627cd160
-- name: github.com/rcrowley/go-metrics
-  version: 1f30fe9094a513ce4c700b9a54458bbb0c96996c
-- name: github.com/samuel/go-zookeeper
-  version: 1d7be4effb13d2d908342d349d71a284a7542693
-  subpackages:
-  - zk
-- name: github.com/satori/go.uuid
-  version: 5bf94b69c6b68ee1b541973bb8e1144db23a194b
-- name: github.com/shirou/gopsutil
-  version: c95755e4bcd7a62bb8bd33f3a597a7c7f35e2cf3
-  subpackages:
-  - cpu
-  - disk
-  - host
-  - internal/common
-  - load
-  - mem
-  - net
-  - process
-- name: github.com/shirou/w32
-  version: 3c9377fc6748f222729a8270fe2775d149a249ad
-- name: github.com/Shopify/sarama
-  version: 3b1b38866a79f06deddf0487d5c27ba0697ccd65
-- name: github.com/Sirupsen/logrus
-  version: 61e43dc76f7ee59a82bdf3d71033dc12bea4c77d
-- name: github.com/soniah/gosnmp
-  version: f15472a4cd6f6ea7929e4c7d9f163c49f059924f
-- name: github.com/StackExchange/wmi
-  version: f3e2bae1e0cb5aef83e319133eabfee30013a4a5
-- name: github.com/streadway/amqp
-  version: 63795daa9a446c920826655f26ba31c81c860fd6
-- name: github.com/stretchr/objx
-  version: facf9a85c22f48d2f52f2380e4efce1768749a89
-- name: github.com/stretchr/testify
-  version: 12b6f73e6084dad08a7c6e575284b177ecafbc71
-  subpackages:
-  - assert
-  - mock
-  - require
-- name: github.com/tidwall/gjson
-  version: 0623bd8fbdbf97cc62b98d15108832851a658e59
-- name: github.com/tidwall/match
-  version: 173748da739a410c5b0b813b956f89ff94730b4c
-- name: github.com/vjeantet/grok
-  version: d73e972b60935c7fec0b4ffbc904ed39ecaf7efe
-- name: github.com/wvanbergen/kafka
-  version: bc265fedb9ff5b5c5d3c0fdcef4a819b3523d3ee
-  subpackages:
-  - consumergroup
-- name: github.com/wvanbergen/kazoo-go
-  version: 968957352185472eacb69215fa3dbfcfdbac1096
-- name: github.com/yuin/gopher-lua
-  version: 66c871e454fcf10251c61bf8eff02d0978cae75a
-  subpackages:
-  - ast
-  - parse
-  - pm
-- name: github.com/zensqlmonitor/go-mssqldb
-  version: ffe5510c6fa5e15e6d983210ab501c815b56b363
-- name: golang.org/x/crypto
-  version: dc137beb6cce2043eb6b5f223ab8bf51c32459f4
-  subpackages:
-  - bcrypt
-  - blowfish
-  - md4
-  - pbkdf2
-- name: golang.org/x/net
-  version: a337091b0525af65de94df2eb7e98bd9962dcbe2
-  subpackages:
-  - context
-  - context/ctxhttp
-  - html
-  - html/atom
-  - html/charset
-  - http2
-  - http2/hpack
-  - idna
-  - internal/timeseries
-  - lex/httplex
-  - proxy
-  - trace
-  - websocket
-- name: golang.org/x/sys
-  version: 739734461d1c916b6c72a63d7efda2b27edb369f
-  subpackages:
-  - unix
-  - windows
-  - windows/registry
-  - windows/svc
-  - windows/svc/debug
-  - windows/svc/eventlog
-  - windows/svc/mgr
-- name: golang.org/x/text
-  version: 506f9d5c962f284575e88337e7d9296d27e729d3
-  subpackages:
-  - encoding
-  - encoding/charmap
-  - encoding/htmlindex
-  - encoding/internal
-  - encoding/internal/identifier
-  - encoding/japanese
-  - encoding/korean
-  - encoding/simplifiedchinese
-  - encoding/traditionalchinese
-  - encoding/unicode
-  - internal/tag
-  - internal/utf8internal
-  - language
-  - runes
-  - secure/bidirule
-  - transform
-  - unicode/bidi
-  - unicode/norm
-- name: google.golang.org/genproto
-  version: 11c7f9e547da6db876260ce49ea7536985904c9b
-  subpackages:
-  - googleapis/rpc/status
-- name: google.golang.org/grpc
-  version: de2209a968d48e8970546c8a710189f7461370f7
-  subpackages:
-  - balancer
-  - balancer/roundrobin
-  - codes
-  - connectivity
-  - credentials
-  - encoding
-  - grpclb/grpc_lb_v1/messages
-  - grpclog
-  - internal
-  - keepalive
-  - metadata
-  - naming
-  - peer
-  - resolver
-  - resolver/dns
-  - resolver/passthrough
-  - stats
-  - status
-  - tap
-  - transport
-- name: gopkg.in/asn1-ber.v1
-  version: 4e86f4367175e39f69d9358a5f17b4dda270378d
-- name: gopkg.in/fatih/pool.v2
-  version: 6e328e67893eb46323ad06f0e92cb9536babbabc
-- name: gopkg.in/fsnotify.v1
-  version: 7be54206639f256967dd82fa767397ba5f8f48f5
-- name: gopkg.in/gorethink/gorethink.v3
-  version: 7ab832f7b65573104a555d84a27992ae9ea1f659
-  subpackages:
-  - encoding
-  - ql2
-  - types
-- name: gopkg.in/ldap.v2
-  version: 8168ee085ee43257585e50c6441aadf54ecb2c9f
-- name: gopkg.in/mgo.v2
-  version: 3f83fa5005286a7fe593b055f0d7771a7dce4655
-  subpackages:
-  - bson
-  - internal/json
-  - internal/sasl
-  - internal/scram
-- name: gopkg.in/olivere/elastic.v5
-  version: 3113f9b9ad37509fe5f8a0e5e91c96fdc4435e26
-  subpackages:
-  - uritemplates
-- name: gopkg.in/tomb.v1
-  version: dd632973f1e7218eb1089048e0798ec9ae7dceb8
-- name: gopkg.in/yaml.v2
-  version: 4c78c975fe7c825c6d1466c42be594d1d6f3aba6
-testImports: []
diff --git a/testing/telegraf/glide.yaml b/testing/telegraf/glide.yaml
deleted file mode 100644
index 18754a52dd..0000000000
--- a/testing/telegraf/glide.yaml
+++ /dev/null
@@ -1,277 +0,0 @@
-package: github.com/influxdata/telegraf
-import:
-- package: code.cloudfoundry.org/clock
-  version: e9dc86bbf0e5bbe6bf7ff5a6f71e048959b61f71
-- package: collectd.org
-  version: 2ce144541b8903101fb8f1483cc0497a68798122
-  subpackages:
-  - api
-  - network
-- package: github.com/aerospike/aerospike-client-go
-  version: 95e1ad7791bdbca44707fedbb29be42024900d9c
-- package: github.com/amir/raidman
-  version: c74861fe6a7bb8ede0a010ce4485bdbb4fc4c985
-- package: github.com/apache/thrift
-  version: 4aaa92ece8503a6da9bc6701604f69acf2b99d07
-  subpackages:
-  - lib/go/thrift
-- package: github.com/aws/aws-sdk-go
-  version: c861d27d0304a79f727e9a8a4e2ac1e74602fdc0
-  subpackages:
-  - aws
-  - aws/client
-  - aws/credentials
-  - aws/credentials/stscreds
-  - aws/session
-  - service/cloudwatch
-  - service/kinesis
-  - service/sts
-- package: github.com/beorn7/perks
-  version: 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
-- package: github.com/bsm/sarama-cluster
-  version: abf039439f66c1ce78017f560b490612552f6472
-- package: github.com/cenkalti/backoff
-  version: b02f2bbce11d7ea6b97f282ef1771b0fe2f65ef3
-- package: github.com/couchbase/go-couchbase
-  version: bfe555a140d53dc1adf390f1a1d4b0fd4ceadb28
-- package: github.com/couchbase/gomemcached
-  version: 4a25d2f4e1dea9ea7dd76dfd943407abf9b07d29
-- package: github.com/couchbase/goutils
-  version: 5823a0cbaaa9008406021dc5daf80125ea30bba6
-- package: github.com/davecgh/go-spew
-  version: 346938d642f2ec3594ed81d874461961cd0faa76
-- package: github.com/dgrijalva/jwt-go
-  version: dbeaa9332f19a944acb5736b4456cfcc02140e29
-- package: github.com/docker/docker
-  version: f5ec1e2936dcbe7b5001c2b817188b095c700c27
-  subpackages:
-  - api/types
-  - api/types/container
-  - api/types/filters
-  - api/types/registry
-  - api/types/swarm
-  - client
-- package: github.com/docker/go-connections
-  version: 990a1a1a70b0da4c4cb70e117971a4f0babfbf1a
-  subpackages:
-  - sockets
-- package: github.com/eapache/go-resiliency
-  version: b86b1ec0dd4209a588dc1285cdd471e73525c0b3
-- package: github.com/eapache/go-xerial-snappy
-  version: bb955e01b9346ac19dc29eb16586c90ded99a98c
-- package: github.com/eapache/queue
-  version: 44cc805cf13205b55f69e14bcb69867d1ae92f98
-- package: github.com/eclipse/paho.mqtt.golang
-  version: aff15770515e3c57fc6109da73d42b0d46f7f483
-- package: github.com/go-logfmt/logfmt
-  version: 390ab7935ee28ec6b286364bba9b4dd6410cb3d5
-- package: github.com/go-sql-driver/mysql
-  version: 2e00b5cd70399450106cec6431c2e2ce3cae5034
-- package: github.com/gobwas/glob
-  version: bea32b9cd2d6f55753d94a28e959b13f0244797a
-- package: github.com/go-ini/ini
-  version: 9144852efba7c4daf409943ee90767da62d55438
-- package: github.com/gogo/protobuf
-  version: 7b6c6391c4ff245962047fc1e2c6e08b1cdfa0e8
-- package: github.com/golang/protobuf
-  version: 8ee79997227bf9b34611aee7946ae64735e6fd93
-  subpackages:
-  - proto
-- package: github.com/golang/snappy
-  version: 7db9049039a047d955fe8c19b83c8ff5abd765c7
-- package: github.com/go-ole/go-ole
-  version: be49f7c07711fcb603cff39e1de7c67926dc0ba7
-- package: github.com/google/go-cmp
-  version: f94e52cad91c65a63acc1e75d4be223ea22e99bc
-- package: github.com/gorilla/mux
-  version: 53c1911da2b537f792e7cafcb446b05ffe33b996
-- package: github.com/go-redis/redis
-  version: 73b70592cdaa9e6abdfcfbf97b4a90d80728c836
-- package: github.com/hailocab/go-hostpool
-  version: e80d13ce29ede4452c43dea11e79b9bc8a15b478
-- package: github.com/hashicorp/consul
-  version: 5174058f0d2bda63fa5198ab96c33d9a909c58ed
-  subpackages:
-  - api
-- package: github.com/influxdata/go-syslog
-  version: eecd51df3ad85464a2bab9b7d3a45bc1e299059e
-  subpackages:
-  - rfc5424
-  - rfc5425
-- package: github.com/influxdata/tail
-  version: c43482518d410361b6c383d7aebce33d0471d7bc
-- package: github.com/influxdata/toml
-  version: 2a2e3012f7cfbef64091cc79776311e65dfa211b
-  subpackages:
-  - ast
-- package: github.com/influxdata/wlog
-  version: 7c63b0a71ef8300adc255344d275e10e5c3a71ec
-- package: github.com/fsnotify/fsnotify
-  version: c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9
-- package: github.com/jackc/pgx
-  version: 63f58fd32edb5684b9e9f4cfaac847c6b42b3917
-  subpackages:
-  - stdlib
-- package: github.com/jmespath/go-jmespath
-  version: bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d
-- package: github.com/kardianos/osext
-  version: c2c54e542fb797ad986b31721e1baedf214ca413
-- package: github.com/kardianos/service
-  version: 6d3a0ee7d3425d9d835debc51a0ca1ffa28f4893
-- package: github.com/kballard/go-shellquote
-  version: d8ec1a69a250a17bb0e419c386eac1f3711dc142
-- package: github.com/matttproud/golang_protobuf_extensions
-  version: c12348ce28de40eed0136aa2b644d0ee0650e56c
-  subpackages:
-  - pbutil
-- package: github.com/Microsoft/ApplicationInsights-Go
-  version: 3612f58550c1de70f1a110c78c830e55f29aa65d
-  subpackages:
-  - appinsights
-- package: github.com/Microsoft/go-winio
-  version: ce2922f643c8fd76b46cadc7f404a06282678b34
-- package: github.com/miekg/dns
-  version: 99f84ae56e75126dd77e5de4fae2ea034a468ca1
-- package: github.com/mitchellh/mapstructure
-  version: d0303fe809921458f417bcf828397a65db30a7e4
-- package: github.com/multiplay/go-ts3
-  version: 07477f49b8dfa3ada231afc7b7b17617d42afe8e
-- package: github.com/naoina/go-stringutil
-  version: 6b638e95a32d0c1131db0e7fe83775cbea4a0d0b
-- package: github.com/nats-io/gnatsd
-  version: 393bbb7c031433e68707c8810fda0bfcfbe6ab9b
-  subpackages:
-  - server
-- package: github.com/nats-io/go-nats
-  version: ea9585611a4ab58a205b9b125ebd74c389a6b898
-- package: github.com/nats-io/nuid
-  version: 289cccf02c178dc782430d534e3c1f5b72af807f
-- package: github.com/nsqio/go-nsq
-  version: eee57a3ac4174c55924125bb15eeeda8cffb6e6f
-- package: github.com/opencontainers/runc
-  version: 89ab7f2ccc1e45ddf6485eaa802c35dcf321dfc8
-- package: github.com/opentracing-contrib/go-observer
-  version: a52f2342449246d5bcc273e65cbdcfa5f7d6c63c
-- package: github.com/opentracing/opentracing-go
-  version: 06f47b42c792fef2796e9681353e1d908c417827
-- package: github.com/openzipkin/zipkin-go-opentracing
-  version: 1cafbdfde94fbf2b373534764e0863aa3bd0bf7b
-  subpackages:
-  - _thrift/gen-go/zipkincore
-- package: github.com/pierrec/lz4
-  version: 5c9560bfa9ace2bf86080bf40d46b34ae44604df
-- package: github.com/pierrec/xxHash
-  version: 5a004441f897722c627870a981d02b29924215fa
-- package: github.com/pkg/errors
-  version: 645ef00459ed84a119197bfb8d8205042c6df63d
-- package: github.com/pmezard/go-difflib/difflib
-  version: 792786c7400a136282c1664665ae0a8db921c6c2
-- package: github.com/prometheus/client_golang
-  version: c317fb74746eac4fc65fe3909195f4cf67c5562a
-  subpackages:
-  - prometheus
-  - prometheus/promhttp
-- package: github.com/prometheus/client_model
-  version: fa8ad6fec33561be4280a8f0514318c79d7f6cb6
-  subpackages:
-  - go
-- package: github.com/prometheus/common
-  version: dd2f054febf4a6c00f2343686efb775948a8bff4
-  subpackages:
-  - expfmt
-  - log
-- package: github.com/prometheus/procfs
-  version: 1878d9fbb537119d24b21ca07effd591627cd160
-- package: github.com/rcrowley/go-metrics
-  version: 1f30fe9094a513ce4c700b9a54458bbb0c96996c
-- package: github.com/samuel/go-zookeeper
-  version: 1d7be4effb13d2d908342d349d71a284a7542693
-- package: github.com/satori/go.uuid
-  version: 5bf94b69c6b68ee1b541973bb8e1144db23a194b
-- package: github.com/shirou/gopsutil
-  version: c95755e4bcd7a62bb8bd33f3a597a7c7f35e2cf3
-  subpackages:
-  - cpu
-  - disk
-  - host
-  - load
-  - mem
-  - net
-  - process
-- package: github.com/shirou/w32
-  version: 3c9377fc6748f222729a8270fe2775d149a249ad
-- package: github.com/Shopify/sarama
-  version: 3b1b38866a79f06deddf0487d5c27ba0697ccd65
-- package: github.com/Sirupsen/logrus
-  version: 61e43dc76f7ee59a82bdf3d71033dc12bea4c77d
-- package: github.com/soniah/gosnmp
-  version: f15472a4cd6f6ea7929e4c7d9f163c49f059924f
-- package: github.com/StackExchange/wmi
-  version: f3e2bae1e0cb5aef83e319133eabfee30013a4a5
-- package: github.com/streadway/amqp
-  version: 63795daa9a446c920826655f26ba31c81c860fd6
-- package: github.com/stretchr/objx
-  version: facf9a85c22f48d2f52f2380e4efce1768749a89
-- package: github.com/stretchr/testify
-  version: 12b6f73e6084dad08a7c6e575284b177ecafbc71
-  subpackages:
-  - assert
-  - mock
-- package: github.com/tidwall/gjson
-  version: 0623bd8fbdbf97cc62b98d15108832851a658e59
-- package: github.com/tidwall/match
-  version: 173748da739a410c5b0b813b956f89ff94730b4c
-- package: github.com/vjeantet/grok
-  version: d73e972b60935c7fec0b4ffbc904ed39ecaf7efe
-- package: github.com/wvanbergen/kafka
-  version: bc265fedb9ff5b5c5d3c0fdcef4a819b3523d3ee
-  subpackages:
-  - consumergroup
-- package: github.com/wvanbergen/kazoo-go
-  version: 968957352185472eacb69215fa3dbfcfdbac1096
-- package: github.com/yuin/gopher-lua
-  version: 66c871e454fcf10251c61bf8eff02d0978cae75a
-- package: github.com/zensqlmonitor/go-mssqldb
-  version: ffe5510c6fa5e15e6d983210ab501c815b56b363
-- package: golang.org/x/crypto
-  version: dc137beb6cce2043eb6b5f223ab8bf51c32459f4
-- package: golang.org/x/net
-  version: a337091b0525af65de94df2eb7e98bd9962dcbe2
-  subpackages:
-  - context
-  - html/charset
-- package: golang.org/x/sys
-  version: 739734461d1c916b6c72a63d7efda2b27edb369f
-  subpackages:
-  - unix
-  - windows
-  - windows/svc
-  - windows/svc/mgr
-- package: golang.org/x/text
-  version: 506f9d5c962f284575e88337e7d9296d27e729d3
-- package: google.golang.org/genproto
-  version: 11c7f9e547da6db876260ce49ea7536985904c9b
-- package: google.golang.org/grpc
-  version: de2209a968d48e8970546c8a710189f7461370f7
-  subpackages:
-  - codes
-  - credentials
-  - status
-- package: gopkg.in/asn1-ber.v1
-  version: 4e86f4367175e39f69d9358a5f17b4dda270378d
-- package: gopkg.in/fatih/pool.v2
-  version: 6e328e67893eb46323ad06f0e92cb9536babbabc
-- package: gopkg.in/gorethink/gorethink.v3
-  version: 7ab832f7b65573104a555d84a27992ae9ea1f659
-- package: gopkg.in/ldap.v2
-  version: 8168ee085ee43257585e50c6441aadf54ecb2c9f
-- package: gopkg.in/mgo.v2
-  version: 3f83fa5005286a7fe593b055f0d7771a7dce4655
-  subpackages:
-  - bson
-- package: gopkg.in/olivere/elastic.v5
-  version: 3113f9b9ad37509fe5f8a0e5e91c96fdc4435e26
-- package: gopkg.in/tomb.v1
-  version: dd632973f1e7218eb1089048e0798ec9ae7dceb8
-- package: gopkg.in/yaml.v2
-  version: 4c78c975fe7c825c6d1466c42be594d1d6f3aba6
diff --git a/testing/telegraf/telegraf-makefile-ldflags.patch b/testing/telegraf/telegraf-makefile-ldflags.patch
deleted file mode 100644
index 202276940b..0000000000
--- a/testing/telegraf/telegraf-makefile-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -12,7 +12,7 @@
- PATH := $(subst :,/bin:,$(GOPATH))/bin:$(PATH)
- endif
- 
--LDFLAGS := $(LDFLAGS) -X main.commit=$(COMMIT) -X main.branch=$(BRANCH)
-+LDFLAGS := -X main.commit=$(COMMIT) -X main.branch=$(BRANCH)
- ifdef VERSION
- 	LDFLAGS += -X main.version=$(VERSION)
- endif
diff --git a/testing/telegraf/telegraf.confd b/testing/telegraf/telegraf.confd
new file mode 100644
index 0000000000..b29a46ea2a
--- /dev/null
+++ b/testing/telegraf/telegraf.confd
@@ -0,0 +1,4 @@
+TELEGRAF_OPTS="-config /etc/telegraf.conf -config-directory /etc/telegraf.d"
+
+# Uncomment to enable logging to syslog.
+#error_logger="logger -t $RC_SVCNAME"
diff --git a/testing/telegraf/telegraf.initd b/testing/telegraf/telegraf.initd
index 16045bcc11..9855687f03 100644
--- a/testing/telegraf/telegraf.initd
+++ b/testing/telegraf/telegraf.initd
@@ -1,41 +1,19 @@
 #!/sbin/openrc-run
 
-NAME=telegraf
-DAEMON=/usr/bin/${NAME}
+command="/usr/bin/telegraf"
+command_args="$TELEGRAF_OPTS"
+command_background=yes
+command_user=telegraf:telegraf
+pidfile="/run/$RC_SVCNAME.pid"
+extra_started_commands="reload"
 
 depend() {
 	need net
 	after firewall
 }
 
-start() {
-	ebegin "Starting ${NAME}"
-		start-stop-daemon --start --quiet --background \
-			--user ${NAME} --make-pidfile --pidfile /var/run/${NAME}.pid \
-			--stderr /var/log/${NAME}/${NAME}.log \
-			--exec ${DAEMON} -- ${OPTS} -config /etc/${NAME}/${NAME}.conf -config-directory /etc/${NAME}/${NAME}.d
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${NAME}"
-		start-stop-daemon --stop --quiet \
-			--exec ${DAEMON} \
-			--pidfile /var/run/${NAME}.pid \
-	eend $?
-}
-
 reload() {
-	ebegin "Reloading ${NAME}"
-	if ! service_started "${NAME}" ; then
-		eend 1 "${NAME} is not started"
-		return 1
-	fi
-	start-stop-daemon --stop --oknodo --signal HUP \
-		--exec ${DAEMON} --pidfile /var/run/${NAME}.pid
+	ebegin "Reloading ${RC_SVCNAME}"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
 	eend $?
 }
-
-start_pre() {
-        checkpath -d -o ${NAME}:${NAME} -m755 /var/lib/${NAME} /var/log/${NAME}
-}
diff --git a/testing/telegraf/telegraf.logrotate b/testing/telegraf/telegraf.logrotate
deleted file mode 100644
index ff1f8a2380..0000000000
--- a/testing/telegraf/telegraf.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/telegraf/telegraf.log {
-	daily
-	missingok
-	copytruncate
-	rotate 7
-	compress
-	notifempty
-}
diff --git a/testing/telegraf/telegraf.pre-install b/testing/telegraf/telegraf.pre-install
index bba27a5a3f..537b7e2522 100644
--- a/testing/telegraf/telegraf.pre-install
+++ b/testing/telegraf/telegraf.pre-install
@@ -1,10 +1,8 @@
 #!/bin/sh
 
-username=telegraf
-groupname="$username"
+name=telegraf
 
-addgroup -S "$groupname" 2>/dev/null
-adduser -S -D -H -h /var/lib/"$username" -s /sbin/nologin -G "$groupname" \
-        -g "$groupname" "$username" 2>/dev/null
+addgroup -S "$name" 2>/dev/null
+adduser -S -D -H -h /var/empty -s /bin/nologin -G $name -g $name $name 2>/dev/null
 
 exit 0