Update to beta3

Clean up telegraf.conf [1]

PR:	210622 [1]

3 files changed, 208 insertions, 164 deletions

diff --git a/net-mgmt/telegraf/Makefile b/net-mgmt/telegraf/Makefile
index b8725ccbcda2..57ba30e28b72 100644
--- a/net-mgmt/telegraf/Makefile
+++ b/net-mgmt/telegraf/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	telegraf
-PORTVERSION=	1.0.0.b1
+PORTVERSION=	1.0.0.b3
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	girgen@FreeBSD.org
@@ -18,70 +18,71 @@ USE_RC_SUBR=	telegraf
 
 USE_GITHUB=	yes
 
-GH_TAGNAME=	1.0.0-beta1
+GH_TAGNAME=	1.0.0-beta3
 GH_ACCOUNT=	influxdata:DEFAULT
-GH_TUPLE=	Shopify:sarama:8aadb47:sarama \
-		Sirupsen:logrus:219c8cb:logrus \
-		amir:raidman:53c1b96:raidman \
-		aws:aws-sdk-go:13a1206:aws_sdk_go \
-		beorn7:perks:3ac7bf7:perks \
-		cenkalti:backoff:4dc7767:backoff \
-		couchbase:go-couchbase:cb66431:go_couchbase \
-		couchbase:gomemcached:a5ea635:gomemcached \
+GH_TUPLE=	Shopify:sarama:9bb4a68:sarama \
+		Sirupsen:logrus:a283a10:logrus \
+		aerospike:aerospike-client-go:11f20fc:aerospike_client_go \
+		amir:raidman:c74861f:raidman \
+		aws:aws-sdk-go:5f1600d:aws_sdk_go \
+		beorn7:perks:4c0e845:perks \
+		cenkalti:backoff:cdf48bb:backoff \
+		couchbase:go-couchbase:264eacd:go_couchbase \
+		couchbase:gomemcached:6172a8c:gomemcached \
 		couchbase:goutils:5823a0c:goutils \
-		dancannon:gorethink:e7cac92:gorethink \
 		davecgh:go-spew:5215b55:go_spew \
-		docker:engine-api:8924d69:engine_api \
-		docker:go-connections:f549a93:go_connections \
-		docker:go-units:5d2041e:go_units \
+		docker:distribution:bfa0a9c:distribution \
+		docker:engine-api:16c66e8:engine_api \
+		docker:go-connections:990a1a1:go_connections \
+		docker:go-units:eb879ae:go_units \
 		eapache:go-resiliency:b86b1ec:go_resiliency \
-		eapache:queue:ded5959:queue \
-		eclipse:paho.mqtt.golang:0f7a459:paho_mqtt_golang \
-		fsouza:go-dockerclient:4ac6ea1:go_dockerclient \
-		go-sql-driver:mysql:1fca743:mysql \
-		gobwas:glob:49571a1:glob \
-		golang:protobuf:552c7b9:protobuf \
-		golang:snappy:427fb6f:snappy \
+		eapache:go-xerial-snappy:bb955e0:go_xerial_snappy \
+		eapache:queue:44cc805:queue \
+		eclipse:paho.mqtt.golang:44eec14:paho_mqtt_golang \
+		go-sql-driver:mysql:0b58b37:mysql \
+		gobwas:glob:ce6abff:glob \
+		golang:protobuf:c3cefd4:protobuf \
+		golang:snappy:d9eb7a3:snappy \
 		gonuts:go-shellquote:e842a11:go_shellquote \
-		gorilla:context:1ea2538:context \
-		gorilla:mux:c9e326e:mux \
+		gorilla:context:aed02d1:context \
+		gorilla:mux:7804150:mux \
 		hailocab:go-hostpool:e80d13c:go_hostpool \
-		hashicorp:consul:5aa9045:consul \
-		hpcloud:tail:b294095:tail \
-		influxdata:config:b79f682:config \
-		influxdata:influxdb:e094138:influxdb \
-		influxdata:toml:af4df43:toml \
+		hashicorp:consul:4d73872:consul \
+		hpcloud:tail:a30252c:tail \
+		influxdata:config:8ec4638:config \
+		influxdata:influxdb:a62fbcd:influxdb \
+		influxdata:toml:ff2a260:toml \
 		klauspost:crc32:19b0b33:crc32 \
-		lib:pq:e182dc4:pq \
-		matttproud:golang_protobuf_extensions:d0c3fe8:golang_protobuf_extensions \
-		miekg:dns:cce6c13:dns \
+		lib:pq:4dd446e:pq \
+		matttproud:golang_protobuf_extensions:c12348c:golang_protobuf_extensions \
+		miekg:dns:db96a2b:dns \
 		mreiferson:go-snappystream:028eae7:go_snappystream \
 		naoina:go-stringutil:6b638e9:go_stringutil \
-		nats-io:nats:b13fc9d:nats \
-		nats-io:nuid:4f84f5f:nuid \
-		nsqio:go-nsq:0b80d6f:go_nsq \
-		opencontainers:runc:89ab7f2:runc \
-		prometheus:client_golang:18acf99:client_golang \
+		nats-io:nats:aea6480:nats \
+		nats-io:nuid:a5152d6:nuid \
+		nsqio:go-nsq:d71fb89:go_nsq \
+		opencontainers:runc:142df38:runc \
+		prometheus:client_golang:52437c8:client_golang \
 		prometheus:client_model:fa8ad6f:client_model \
-		prometheus:common:e8eabff:common \
-		prometheus:procfs:406e5b7:procfs \
-		samuel:go-zookeeper:218e9c8:go_zookeeper \
-		shirou:gopsutil:586bb69:gopsutil \
-		soniah:gosnmp:b1b4f88:gosnmp \
-		sparrc:gdm:2b7833e:gdm \
-		streadway:amqp:b4f3cea:amqp \
-		stretchr:testify:1f4a164:testify \
-		wvanbergen:kafka:46f9a1c:kafka \
+		prometheus:common:ebdfc6d:common \
+		prometheus:procfs:abf152e:procfs \
+		samuel:go-zookeeper:e64db45:go_zookeeper \
+		shirou:gopsutil:4d0c402:gopsutil \
+		soniah:gosnmp:29f8b35:gosnmp \
+		streadway:amqp:2e25825:amqp \
+		stretchr:testify:d77da35:testify \
+		vjeantet:grok:83bfdfd:grok \
+		wvanbergen:kafka:6df90f1:kafka \
 		wvanbergen:kazoo-go:0f76871:kazoo_go \
+		yuin:gopher-lua:e57b640:gopher_lua \
 		zensqlmonitor:go-mssqldb:ffe5510:go_mssqldb \
-		golang:crypto:5dc8cb4:crypto \
-		golang:net:6acef71:net \
-		golang:text:a71fd10:text \
-		golang:tools:b41cbfc:tools \
-		dancannon:gorethink:7d1af5b:gorethink_v1 \
-		fatih:pool:cba550e:pool_v2 \
-		go-mgo:mgo:d90005c:mgo \
-		go-yaml:yaml:a83829b:yaml
+		golang:crypto:7a1054f:crypto \
+		golang:net:7c62cfd:net \
+		golang:text:2910a50:text \
+		dancannon:gorethink:edc7a6a:gorethink_v1 \
+		fatih:pool:20a0a42:pool_v2 \
+		go-mgo:mgo:0108465:mgo \
+		go-yaml:yaml:e4d366f:yaml
 
 SUB_FILES=	telegraf
 SUB_LIST+=	TELEGRAF_PIDDIR=${TELEGRAF_PIDDIR}
@@ -94,6 +95,7 @@ post-patch:
 	${WRKSRC}/src/git.eclipse.org/gitroot \
 	${WRKSRC}/src/github.com/Shopify \
 	${WRKSRC}/src/github.com/Sirupsen \
+	${WRKSRC}/src/github.com/aerospike \
 	${WRKSRC}/src/github.com/amir \
 	${WRKSRC}/src/github.com/aws \
 	${WRKSRC}/src/github.com/beorn7 \
@@ -130,18 +132,22 @@ post-patch:
 	${WRKSRC}/src/github.com/sparrc \
 	${WRKSRC}/src/github.com/streadway \
 	${WRKSRC}/src/github.com/stretchr \
+	${WRKSRC}/src/github.com/vjeantet \
 	${WRKSRC}/src/github.com/wvanbergen \
+	${WRKSRC}/src/github.com/yuin \
 	${WRKSRC}/src/github.com/zensqlmonitor \
 	${WRKSRC}/src/golang.org/x \
 	${WRKSRC}/src/gopkg.in/dancannon \
 	${WRKSRC}/src/gopkg.in/fatih
 	cd ${WRKSRC} && ${MV} CHANGELOG.md CONTRIBUTING.md Godeps Godeps_windows \
-	LICENSE Makefile README.md accumulator.go agent circle.yml cmd docs etc \
-	input.go internal metric.go metric_test.go output.go plugins scripts testutil \
+		LICENSE Makefile README.md accumulator.go agent circle.yml cmd docs etc filter \
+		input.go internal metric.go metric_test.go output.go plugins scripts testutil \
 		${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME}
 	@${LN} -s ${WRKSRC}/src/github.com/eclipse/paho.mqtt.golang ${WRKSRC}/src/git.eclipse.org/gitroot/paho
+	@${LN} -s ${WRKSRC}/src/github.com/aerospike/aerospike-client-go ${WRKSRC}/src/github.com/sparrc/aerospike-client-go
 	@${MV} ${WRKSRC_sarama} ${WRKSRC}/src/github.com/Shopify/sarama ;\
 	${MV} ${WRKSRC_logrus} ${WRKSRC}/src/github.com/Sirupsen/logrus ;\
+	${MV} ${WRKSRC_aerospike_client_go} ${WRKSRC}/src/github.com/aerospike/aerospike-client-go ;\
 	${MV} ${WRKSRC_raidman} ${WRKSRC}/src/github.com/amir/raidman ;\
 	${MV} ${WRKSRC_aws_sdk_go} ${WRKSRC}/src/github.com/aws/aws-sdk-go ;\
 	${MV} ${WRKSRC_perks} ${WRKSRC}/src/github.com/beorn7/perks ;\
@@ -149,15 +155,15 @@ post-patch:
 	${MV} ${WRKSRC_go_couchbase} ${WRKSRC}/src/github.com/couchbase/go-couchbase ;\
 	${MV} ${WRKSRC_gomemcached} ${WRKSRC}/src/github.com/couchbase/gomemcached ;\
 	${MV} ${WRKSRC_goutils} ${WRKSRC}/src/github.com/couchbase/goutils ;\
-	${MV} ${WRKSRC_gorethink} ${WRKSRC}/src/github.com/dancannon/gorethink ;\
 	${MV} ${WRKSRC_go_spew} ${WRKSRC}/src/github.com/davecgh/go-spew ;\
+	${MV} ${WRKSRC_distribution} ${WRKSRC}/src/github.com/docker/distribution ;\
 	${MV} ${WRKSRC_engine_api} ${WRKSRC}/src/github.com/docker/engine-api ;\
 	${MV} ${WRKSRC_go_connections} ${WRKSRC}/src/github.com/docker/go-connections ;\
 	${MV} ${WRKSRC_go_units} ${WRKSRC}/src/github.com/docker/go-units ;\
 	${MV} ${WRKSRC_go_resiliency} ${WRKSRC}/src/github.com/eapache/go-resiliency ;\
+	${MV} ${WRKSRC_go_xerial_snappy} ${WRKSRC}/src/github.com/eapache/go-xerial-snappy ;\
 	${MV} ${WRKSRC_queue} ${WRKSRC}/src/github.com/eapache/queue ;\
 	${MV} ${WRKSRC_paho_mqtt_golang} ${WRKSRC}/src/github.com/eclipse/paho.mqtt.golang ;\
-	${MV} ${WRKSRC_go_dockerclient} ${WRKSRC}/src/github.com/fsouza/go-dockerclient ;\
 	${MV} ${WRKSRC_mysql} ${WRKSRC}/src/github.com/go-sql-driver/mysql ;\
 	${MV} ${WRKSRC_glob} ${WRKSRC}/src/github.com/gobwas/glob ;\
 	${MV} ${WRKSRC_protobuf} ${WRKSRC}/src/github.com/golang/protobuf ;\
@@ -188,16 +194,16 @@ post-patch:
 	${MV} ${WRKSRC_go_zookeeper} ${WRKSRC}/src/github.com/samuel/go-zookeeper ;\
 	${MV} ${WRKSRC_gopsutil} ${WRKSRC}/src/github.com/shirou/gopsutil ;\
 	${MV} ${WRKSRC_gosnmp} ${WRKSRC}/src/github.com/soniah/gosnmp ;\
-	${MV} ${WRKSRC_gdm} ${WRKSRC}/src/github.com/sparrc/gdm ;\
 	${MV} ${WRKSRC_amqp} ${WRKSRC}/src/github.com/streadway/amqp ;\
 	${MV} ${WRKSRC_testify} ${WRKSRC}/src/github.com/stretchr/testify ;\
+	${MV} ${WRKSRC_grok} ${WRKSRC}/src/github.com/vjeantet/grok ;\
 	${MV} ${WRKSRC_kafka} ${WRKSRC}/src/github.com/wvanbergen/kafka ;\
 	${MV} ${WRKSRC_kazoo_go} ${WRKSRC}/src/github.com/wvanbergen/kazoo-go ;\
+	${MV} ${WRKSRC_gopher_lua} ${WRKSRC}/src/github.com/yuin/gopher-lua ;\
 	${MV} ${WRKSRC_go_mssqldb} ${WRKSRC}/src/github.com/zensqlmonitor/go-mssqldb ;\
 	${MV} ${WRKSRC_crypto} ${WRKSRC}/src/golang.org/x/crypto ;\
 	${MV} ${WRKSRC_net} ${WRKSRC}/src/golang.org/x/net ;\
 	${MV} ${WRKSRC_text} ${WRKSRC}/src/golang.org/x/text ;\
-	${MV} ${WRKSRC_tools} ${WRKSRC}/src/golang.org/x/tools ;\
 	${MV} ${WRKSRC_gorethink_v1} ${WRKSRC}/src/gopkg.in/dancannon/gorethink.v1 ;\
 	${MV} ${WRKSRC_pool_v2} ${WRKSRC}/src/gopkg.in/fatih/pool.v2 ;\
 	${MV} ${WRKSRC_mgo} ${WRKSRC}/src/gopkg.in/mgo.v2 ;\
diff --git a/net-mgmt/telegraf/distinfo b/net-mgmt/telegraf/distinfo
index 0d4c86d237f5..a8eeb667eb31 100644
--- a/net-mgmt/telegraf/distinfo
+++ b/net-mgmt/telegraf/distinfo
@@ -1,127 +1,131 @@
-TIMESTAMP = 1465334431
-SHA256 (influxdata-telegraf-1.0.0.b1-1.0.0-beta1_GH0.tar.gz) = 8b8d9fdcd49bddd9d0a5c62fdaad15c40effa25bd0de031a6004859af3542e4b
-SIZE (influxdata-telegraf-1.0.0.b1-1.0.0-beta1_GH0.tar.gz) = 513050
-SHA256 (Shopify-sarama-8aadb47_GH0.tar.gz) = 4d5c1a1771719b72b20944601586bdb54c33e77456ba28386cbfa9a24a717d2c
-SIZE (Shopify-sarama-8aadb47_GH0.tar.gz) = 107944
-SHA256 (Sirupsen-logrus-219c8cb_GH0.tar.gz) = 69fc1b5e03ac00f1f8af7cdfa6e8c382b1189c63697059a2fcda9e19e8fbb6ad
-SIZE (Sirupsen-logrus-219c8cb_GH0.tar.gz) = 21514
-SHA256 (amir-raidman-53c1b96_GH0.tar.gz) = f2403080454e11a936b77c5efc8ea40918c29c251b21d3ceddef357a7138ab4d
-SIZE (amir-raidman-53c1b96_GH0.tar.gz) = 6549
-SHA256 (aws-aws-sdk-go-13a1206_GH0.tar.gz) = 4f2cbe0f285e7fb6e38542dcf884be11fa3db552c2408eba44ecac2933fee39b
-SIZE (aws-aws-sdk-go-13a1206_GH0.tar.gz) = 2981133
-SHA256 (beorn7-perks-3ac7bf7_GH0.tar.gz) = bf6cd6798ead260629e6d05e551570799e906518e5bbdbb707133807b6921726
-SIZE (beorn7-perks-3ac7bf7_GH0.tar.gz) = 10435
-SHA256 (cenkalti-backoff-4dc7767_GH0.tar.gz) = 80bb5f22c44945cbd88e93cd6192bda69ad34487c7c92e2b5b6541bcf06497d7
-SIZE (cenkalti-backoff-4dc7767_GH0.tar.gz) = 7949
-SHA256 (couchbase-go-couchbase-cb66431_GH0.tar.gz) = c1f0686415a22973b4734b62ca084b800f6774a5276c69d9daf6cb64de27b4c6
-SIZE (couchbase-go-couchbase-cb66431_GH0.tar.gz) = 68280
-SHA256 (couchbase-gomemcached-a5ea635_GH0.tar.gz) = d1f1e01da7c437ca16c5ae71b220a4cbcf01062ca7d6b47ddc84ee79acc8f453
-SIZE (couchbase-gomemcached-a5ea635_GH0.tar.gz) = 30251
+TIMESTAMP = 1470401258
+SHA256 (influxdata-telegraf-1.0.0.b3-1.0.0-beta3_GH0.tar.gz) = 969ce38fcc2021b773ecb93e9fa78f7eabc7e727981ce42988da569a33f3b232
+SIZE (influxdata-telegraf-1.0.0.b3-1.0.0-beta3_GH0.tar.gz) = 536111
+SHA256 (Shopify-sarama-9bb4a68_GH0.tar.gz) = d487b2e77299f113af06259d14934960ab4bc2d1892d095e05af2c4f31e16fd0
+SIZE (Shopify-sarama-9bb4a68_GH0.tar.gz) = 113820
+SHA256 (Sirupsen-logrus-a283a10_GH0.tar.gz) = 731382c2c9695b1258a18bd6e48764af5b81ae017753206be9e584d83f59a547
+SIZE (Sirupsen-logrus-a283a10_GH0.tar.gz) = 22725
+SHA256 (aerospike-aerospike-client-go-11f20fc_GH0.tar.gz) = 70579072d2d882f0cc8dddd1af672ccb04cfc671be63e6be8968d984cb993fdc
+SIZE (aerospike-aerospike-client-go-11f20fc_GH0.tar.gz) = 193266
+SHA256 (amir-raidman-c74861f_GH0.tar.gz) = 7b5e6ac2fa53df931c104924957e36fee230b6a575fcfb0dc04b4b34311909d4
+SIZE (amir-raidman-c74861f_GH0.tar.gz) = 6580
+SHA256 (aws-aws-sdk-go-5f1600d_GH0.tar.gz) = 7df24203dc06dd7f8515ffd5378d5ffd6806c670f1be6c78818c0fb144d51f0c
+SIZE (aws-aws-sdk-go-5f1600d_GH0.tar.gz) = 3807455
+SHA256 (beorn7-perks-4c0e845_GH0.tar.gz) = 2d0c7784d2695b09c87710bc8c3c3d5b88ffeece31a650ed901763d215615478
+SIZE (beorn7-perks-4c0e845_GH0.tar.gz) = 10593
+SHA256 (cenkalti-backoff-cdf48bb_GH0.tar.gz) = 54bb52890a500a0a8a21199b515d531f23459114d72be44f3452eda098938e1c
+SIZE (cenkalti-backoff-cdf48bb_GH0.tar.gz) = 7132
+SHA256 (couchbase-go-couchbase-264eacd_GH0.tar.gz) = f192ecc088de93b3387ebe8c1c9d011148c5f042abfdaf360b1c901a03f2269e
+SIZE (couchbase-go-couchbase-264eacd_GH0.tar.gz) = 73071
+SHA256 (couchbase-gomemcached-6172a8c_GH0.tar.gz) = 310e69a7dfccd296074961b90826412bb935cf54b79355bc996ab99025168744
+SIZE (couchbase-gomemcached-6172a8c_GH0.tar.gz) = 30677
 SHA256 (couchbase-goutils-5823a0c_GH0.tar.gz) = 653dea41d42bd96572c8763c1902c2e0fbbd20f9e71e70318da8803e2d924f69
 SIZE (couchbase-goutils-5823a0c_GH0.tar.gz) = 8518
-SHA256 (dancannon-gorethink-e7cac92_GH0.tar.gz) = 2bd7dc2e322cb0538c79d4c109d8ce2cf3073f7d2e8f6a9e0ca5b6350196c202
-SIZE (dancannon-gorethink-e7cac92_GH0.tar.gz) = 112279
 SHA256 (davecgh-go-spew-5215b55_GH0.tar.gz) = a73d6352d8172dfb648e6aa25a8b81ed5c1895295090c876bef01d017264cbac
 SIZE (davecgh-go-spew-5215b55_GH0.tar.gz) = 41794
-SHA256 (docker-engine-api-8924d69_GH0.tar.gz) = 44910fcfadcb1c6a2753213660fd1ae50327d20ca11ba0f195d03c412557f844
-SIZE (docker-engine-api-8924d69_GH0.tar.gz) = 58709
-SHA256 (docker-go-connections-f549a93_GH0.tar.gz) = ef9d19fa20add8318dd58c416eabbade0370c3f72cf9a41dd8b55f6e12807103
-SIZE (docker-go-connections-f549a93_GH0.tar.gz) = 21447
-SHA256 (docker-go-units-5d2041e_GH0.tar.gz) = dc9c2d6f2886180daa526e52268659394c9fbc3142c139c492a6f9bf302c4c29
-SIZE (docker-go-units-5d2041e_GH0.tar.gz) = 16156
+SHA256 (docker-distribution-bfa0a9c_GH0.tar.gz) = 3269917aab3d5f10558a6ab86ba2d5cb0f6da287e165aa1bdc944c932a583631
+SIZE (docker-distribution-bfa0a9c_GH0.tar.gz) = 1641172
+SHA256 (docker-engine-api-16c66e8_GH0.tar.gz) = d4e104321f8db50c77bbcbe0db25b53a08a3c77c35f536fd14bee4011274bda3
+SIZE (docker-engine-api-16c66e8_GH0.tar.gz) = 87482
+SHA256 (docker-go-connections-990a1a1_GH0.tar.gz) = 9c2fb80c452d0facf51e030c06752f493c766c0738410f2bf4c6652bc582d852
+SIZE (docker-go-connections-990a1a1_GH0.tar.gz) = 21640
+SHA256 (docker-go-units-eb879ae_GH0.tar.gz) = 5f85e1b6596338604a25a5098b5b852e883f9029a3fffd64fd4028bbce890fdc
+SIZE (docker-go-units-eb879ae_GH0.tar.gz) = 10447
 SHA256 (eapache-go-resiliency-b86b1ec_GH0.tar.gz) = deab03d384a48b22bb4fdb9aad7007ca98d233cece7a17faab50026599747a04
 SIZE (eapache-go-resiliency-b86b1ec_GH0.tar.gz) = 9584
-SHA256 (eapache-queue-ded5959_GH0.tar.gz) = a3aa9c17d3c0a563d1b52bc0c50ec825cfeb94606defc27076b97418c3771ded
-SIZE (eapache-queue-ded5959_GH0.tar.gz) = 3261
-SHA256 (eclipse-paho.mqtt.golang-0f7a459_GH0.tar.gz) = 77e2d418d33c43248b65d720d988326ac4ad6af1a35020b26cf1060e51d430c2
-SIZE (eclipse-paho.mqtt.golang-0f7a459_GH0.tar.gz) = 66432
-SHA256 (fsouza-go-dockerclient-4ac6ea1_GH0.tar.gz) = c7b13c0bb694f487769b7684338b0c5e76a3a8cc759ec22368bcb3373b64a76d
-SIZE (fsouza-go-dockerclient-4ac6ea1_GH0.tar.gz) = 720781
-SHA256 (go-sql-driver-mysql-1fca743_GH0.tar.gz) = d3018ed045230d851a309ac750d06447c1c50723889bccb49923581ad8d08a7a
-SIZE (go-sql-driver-mysql-1fca743_GH0.tar.gz) = 56642
-SHA256 (gobwas-glob-49571a1_GH0.tar.gz) = 5ac7a23180744f3cab8774ee9d98405db4b5b01dff80b8e267bd003f1b86705b
-SIZE (gobwas-glob-49571a1_GH0.tar.gz) = 25151
-SHA256 (golang-protobuf-552c7b9_GH0.tar.gz) = 15244394c5205ecb4776182b0f56a6946c6deeed63ebfcb3eefc657663d4cf7c
-SIZE (golang-protobuf-552c7b9_GH0.tar.gz) = 203827
-SHA256 (golang-snappy-427fb6f_GH0.tar.gz) = f9af47f0b908a37bf7e904e110efb50d9849687cfaa1c3760a8cf96e1e996dd0
-SIZE (golang-snappy-427fb6f_GH0.tar.gz) = 32498
+SHA256 (eapache-go-xerial-snappy-bb955e0_GH0.tar.gz) = 242d92498c5c86c2b10b520b40528d3f91ca49a97720c54a61f13bd1afd7229c
+SIZE (eapache-go-xerial-snappy-bb955e0_GH0.tar.gz) = 4099
+SHA256 (eapache-queue-44cc805_GH0.tar.gz) = 124fe636312c324533005b2b0c1132119243e7f86201d4bc1cbe5503e26f4b29
+SIZE (eapache-queue-44cc805_GH0.tar.gz) = 3502
+SHA256 (eclipse-paho.mqtt.golang-44eec14_GH0.tar.gz) = a92b3dda4ec02aa1329975a5d5ca1c8cba72bc49add2962ff8a403685c56ae17
+SIZE (eclipse-paho.mqtt.golang-44eec14_GH0.tar.gz) = 66358
+SHA256 (go-sql-driver-mysql-0b58b37_GH0.tar.gz) = 598a167689346a487902a900f03ea3e9d8fbc7d7dcd9a8e86d0014aa8483be62
+SIZE (go-sql-driver-mysql-0b58b37_GH0.tar.gz) = 56689
+SHA256 (gobwas-glob-ce6abff_GH0.tar.gz) = 3e59c82d3437c47cf68c3f3844bf8b89d35c99e3ad6ad1ea4593505911775193
+SIZE (gobwas-glob-ce6abff_GH0.tar.gz) = 25051
+SHA256 (golang-protobuf-c3cefd4_GH0.tar.gz) = 3b8193b42d90d909eef8557b41453541cb62298604895546497ee82a68ae3c52
+SIZE (golang-protobuf-c3cefd4_GH0.tar.gz) = 221526
+SHA256 (golang-snappy-d9eb7a3_GH0.tar.gz) = 857fd1a142bc62ed05610c9daec12c6f6e4ff68b6cd5594311496b96bd8cbc2d
+SIZE (golang-snappy-d9eb7a3_GH0.tar.gz) = 62041
 SHA256 (gonuts-go-shellquote-e842a11_GH0.tar.gz) = 52ab78eb46f479b2e6ae5cb104f84d156817bc96051d221e26f8491fd08600ef
 SIZE (gonuts-go-shellquote-e842a11_GH0.tar.gz) = 3405
-SHA256 (gorilla-context-1ea2538_GH0.tar.gz) = 178b6d2f3f208a609d86729c7d21b0e72c60fb8c555e0b37b0a8657b793cae15
-SIZE (gorilla-context-1ea2538_GH0.tar.gz) = 4368
-SHA256 (gorilla-mux-c9e326e_GH0.tar.gz) = 70b1cc12e5a1e80738004d1c03e09ca948c3ba75c19b3b941a0a5b8990c7964a
-SIZE (gorilla-mux-c9e326e_GH0.tar.gz) = 23685
+SHA256 (gorilla-context-aed02d1_GH0.tar.gz) = d2954089ea8e54370c6569f9c510212a34ffc9e0d84fe1c3c99bc95258c80ed7
+SIZE (gorilla-context-aed02d1_GH0.tar.gz) = 4381
+SHA256 (gorilla-mux-7804150_GH0.tar.gz) = f2a710e35a09a76a5a025cdaf916a1a198f9ca91eee49cace1fb2e5df4c7fe6f
+SIZE (gorilla-mux-7804150_GH0.tar.gz) = 25784
 SHA256 (hailocab-go-hostpool-e80d13c_GH0.tar.gz) = 9c0ca4a9c0bba2ec0f9b3844c0fd65291efcc5530fb5ec517f2cb4054a5049b9
 SIZE (hailocab-go-hostpool-e80d13c_GH0.tar.gz) = 7031
-SHA256 (hashicorp-consul-5aa9045_GH0.tar.gz) = 64d7228132928d67aaebf39e71097b8d77ad4f3a4de01d3981f3b6648f2f55e9
-SIZE (hashicorp-consul-5aa9045_GH0.tar.gz) = 1866255
-SHA256 (hpcloud-tail-b294095_GH0.tar.gz) = 8dd698aedd3f4c13496491a8184464063eaad2bd91b39f2db37a18d5fd3360a4
-SIZE (hpcloud-tail-b294095_GH0.tar.gz) = 37108
-SHA256 (influxdata-config-b79f682_GH0.tar.gz) = 0ad6bc6c8046b08b8e3dd0526955e8e1414c4fa00ae0bf13faa2b1173c209de8
-SIZE (influxdata-config-b79f682_GH0.tar.gz) = 3689
-SHA256 (influxdata-influxdb-e094138_GH0.tar.gz) = c20157df146e7c0033eadfb8e698404f7b3568995257aa6183ad06dcd2aaab33
-SIZE (influxdata-influxdb-e094138_GH0.tar.gz) = 1185684
-SHA256 (influxdata-toml-af4df43_GH0.tar.gz) = 86231e74617206c8df2f9a69d1d735b7a30b1c51e9013f3d28f7c32f9d253f09
-SIZE (influxdata-toml-af4df43_GH0.tar.gz) = 34582
+SHA256 (hashicorp-consul-4d73872_GH0.tar.gz) = dc27530af339a464ab387cc3d8d40a5e8f7e8a15888dd87ab6f0a9497afffd46
+SIZE (hashicorp-consul-4d73872_GH0.tar.gz) = 4053805
+SHA256 (hpcloud-tail-a30252c_GH0.tar.gz) = dbaa10849f037dccae167cef4020e42d8916a2a31a29c7f50f54587539aea017
+SIZE (hpcloud-tail-a30252c_GH0.tar.gz) = 37815
+SHA256 (influxdata-config-8ec4638_GH0.tar.gz) = 54f8a78651298b55e0a7faa406a5b9b7e7e31e551f76e201db351491d6a28451
+SIZE (influxdata-config-8ec4638_GH0.tar.gz) = 4341
+SHA256 (influxdata-influxdb-a62fbcd_GH0.tar.gz) = 73d578709fb8bb3bceeb1d1308de58c80f75a9ae5817dca11a1446f07f974fdb
+SIZE (influxdata-influxdb-a62fbcd_GH0.tar.gz) = 1368669
+SHA256 (influxdata-telegraf-03d02fa_GH0.tar.gz) = 9d9538918612733eba6f009a6e7bda2e8ebf24a027963ddff206a62e8681fd7d
+SIZE (influxdata-telegraf-03d02fa_GH0.tar.gz) = 535909
+SHA256 (influxdata-toml-ff2a260_GH0.tar.gz) = ab4c5a9fa9b17f31560ea3d1b64ec49bb679a393005fcdfbe7576ea7bea6887b
+SIZE (influxdata-toml-ff2a260_GH0.tar.gz) = 35474
 SHA256 (klauspost-crc32-19b0b33_GH0.tar.gz) = 37d90652654594b94485e2208fe221a145fab13004e88c74f8701ec58d5465a2
 SIZE (klauspost-crc32-19b0b33_GH0.tar.gz) = 9087
-SHA256 (lib-pq-e182dc4_GH0.tar.gz) = 3889fcbb148b97fc013a6d0344c5e36872219c243c702b44e11beee0852edb29
-SIZE (lib-pq-e182dc4_GH0.tar.gz) = 68821
-SHA256 (matttproud-golang_protobuf_extensions-d0c3fe8_GH0.tar.gz) = f78680b1ceb9e2f17cb2c4053cbe86051b8f79c203ed4914d39db83036b15f9b
-SIZE (matttproud-golang_protobuf_extensions-d0c3fe8_GH0.tar.gz) = 10721
-SHA256 (miekg-dns-cce6c13_GH0.tar.gz) = 93e5d3de9b1b572c65d7dcfa474d69cb4d4bfbf5a5f0826b840fbf31249b29a7
-SIZE (miekg-dns-cce6c13_GH0.tar.gz) = 161532
+SHA256 (lib-pq-4dd446e_GH0.tar.gz) = 511a5897df951ff7bf58035a15c5c16fba9f628899749814d293ae80b4dd7331
+SIZE (lib-pq-4dd446e_GH0.tar.gz) = 70812
+SHA256 (matttproud-golang_protobuf_extensions-c12348c_GH0.tar.gz) = da165c9275b77a0994b815bc7d761dcb2e4799a90fe49eec08d8bdff3a683f48
+SIZE (matttproud-golang_protobuf_extensions-c12348c_GH0.tar.gz) = 37200
+SHA256 (miekg-dns-db96a2b_GH0.tar.gz) = fb49a8c55f350e60048014fec7f5beb61f9e73d0440ff49ae749fdebc1ee0409
+SIZE (miekg-dns-db96a2b_GH0.tar.gz) = 168329
 SHA256 (mreiferson-go-snappystream-028eae7_GH0.tar.gz) = 0c7c8340c92b591a9175c7717a7fe9e3916975225d83dfc2cde4cb4c39d8920c
 SIZE (mreiferson-go-snappystream-028eae7_GH0.tar.gz) = 30794
 SHA256 (naoina-go-stringutil-6b638e9_GH0.tar.gz) = 0c3a0c9110ed9d0b60334d4604837fa296fc9c8c9f16b88a877adac4cfed2739
 SIZE (naoina-go-stringutil-6b638e9_GH0.tar.gz) = 6133
-SHA256 (nats-io-nats-b13fc9d_GH0.tar.gz) = a00d32762896c4624250479dfceb91c8239bb51a4e9efa087c258454f55c3be5
-SIZE (nats-io-nats-b13fc9d_GH0.tar.gz) = 68896
-SHA256 (nats-io-nuid-4f84f5f_GH0.tar.gz) = 70b407d72337fd3cd632669ce81dec70e2ddf41ba0aaf7075855448905eb508c
-SIZE (nats-io-nuid-4f84f5f_GH0.tar.gz) = 3650
-SHA256 (nsqio-go-nsq-0b80d6f_GH0.tar.gz) = b7ddada1783ca5cd540038473fb0db9b0f7dfd37a35b84e08114c03832abcc4e
-SIZE (nsqio-go-nsq-0b80d6f_GH0.tar.gz) = 44391
-SHA256 (opencontainers-runc-89ab7f2_GH0.tar.gz) = 562b918c804e33cb1a9d64cc6b95cb04882c2bc25178c6137aba251f55a4f751
-SIZE (opencontainers-runc-89ab7f2_GH0.tar.gz) = 535839
-SHA256 (prometheus-client_golang-18acf99_GH0.tar.gz) = 9107b0d2a6e4ec34cf02e8d44c6aac5ca97291d584d39e3ec2e7374a25f06a8a
-SIZE (prometheus-client_golang-18acf99_GH0.tar.gz) = 65381
+SHA256 (nats-io-nats-aea6480_GH0.tar.gz) = f8bff7f36a926fd433c8d4316747d5807535c875afff3c53d4a4f3a307b86782
+SIZE (nats-io-nats-aea6480_GH0.tar.gz) = 78155
+SHA256 (nats-io-nuid-a5152d6_GH0.tar.gz) = a8f31c2a3525eb1d62a7bda776d37c7b939cb77dc617667fcd155bd7c3de4596
+SIZE (nats-io-nuid-a5152d6_GH0.tar.gz) = 3943
+SHA256 (nsqio-go-nsq-d71fb89_GH0.tar.gz) = e9af0a034140a5a4af8d88633dc4784ae7f1e472f1d4a544ab40c3cb8c6dbd09
+SIZE (nsqio-go-nsq-d71fb89_GH0.tar.gz) = 44627
+SHA256 (opencontainers-runc-142df38_GH0.tar.gz) = fa00eba3b72c2affd59f5494029d9bd6cc7f8c6e2c542470752e378518da2e68
+SIZE (opencontainers-runc-142df38_GH0.tar.gz) = 537281
+SHA256 (prometheus-client_golang-52437c8_GH0.tar.gz) = 083312d01257ca3bce87844719900c38f9ca413c0b471c411671429140797f6f
+SIZE (prometheus-client_golang-52437c8_GH0.tar.gz) = 65845
 SHA256 (prometheus-client_model-fa8ad6f_GH0.tar.gz) = 726ebe6d3aba7c99ffc30788972ef693d0521072c6a33794a9d8ee1f26389466
 SIZE (prometheus-client_model-fa8ad6f_GH0.tar.gz) = 54787
-SHA256 (prometheus-common-e8eabff_GH0.tar.gz) = 497d6653fc1ecb4eddeb594bdeddef9159a1cdc60b0711c608ebea6dfedba7cd
-SIZE (prometheus-common-e8eabff_GH0.tar.gz) = 62798
-SHA256 (prometheus-procfs-406e5b7_GH0.tar.gz) = 814cea06f2be5178a1527dab653b53d11d145bd27e914ea1387d556d6adc3ab8
-SIZE (prometheus-procfs-406e5b7_GH0.tar.gz) = 18538
-SHA256 (samuel-go-zookeeper-218e9c8_GH0.tar.gz) = 075c160c8fa56404ca2fe45467e88aff27b7f66a4221cf63e29fdd196c0ad27c
-SIZE (samuel-go-zookeeper-218e9c8_GH0.tar.gz) = 29296
-SHA256 (shirou-gopsutil-586bb69_GH0.tar.gz) = 06cf2c72496fc6ec949351f1b9fa4df2422187789ed2d4f746cc686e2431ce0f
-SIZE (shirou-gopsutil-586bb69_GH0.tar.gz) = 70124
-SHA256 (soniah-gosnmp-b1b4f88_GH0.tar.gz) = 248218aa545187eb7a9644165b1d8b384dfb3f4b50c40734a2cd76288bd4f5fe
-SIZE (soniah-gosnmp-b1b4f88_GH0.tar.gz) = 38542
-SHA256 (sparrc-gdm-2b7833e_GH0.tar.gz) = 2c00f8e4419cab7b8e940798838d3825d61e9938d5f7de26e2f5985377d8111d
-SIZE (sparrc-gdm-2b7833e_GH0.tar.gz) = 8655
-SHA256 (streadway-amqp-b4f3cea_GH0.tar.gz) = e7536c75aa99fb3285bdac9cd4e2013fe63dafb4c5c36172d5cba9e90c9ad230
-SIZE (streadway-amqp-b4f3cea_GH0.tar.gz) = 79666
-SHA256 (stretchr-testify-1f4a164_GH0.tar.gz) = 89a936fa213d9b7358563ecf1aa7052eaf2fe4ef6443d8fe7b5c998d0e136578
-SIZE (stretchr-testify-1f4a164_GH0.tar.gz) = 81055
-SHA256 (wvanbergen-kafka-46f9a1c_GH0.tar.gz) = c5cf3ec419fad5ebec6b7c2e94b4fe13b12ee63266c7312a03fa62ee788cab84
-SIZE (wvanbergen-kafka-46f9a1c_GH0.tar.gz) = 15647
+SHA256 (prometheus-common-ebdfc6d_GH0.tar.gz) = fdbfb11768783e843144a2606253c11d571371730475f1f5c7c87c37aac06674
+SIZE (prometheus-common-ebdfc6d_GH0.tar.gz) = 56970
+SHA256 (prometheus-procfs-abf152e_GH0.tar.gz) = 92bfc09a8aeb2058e14e9d00a111a10a5c4ea2441bd59e4eece996f808abbb59
+SIZE (prometheus-procfs-abf152e_GH0.tar.gz) = 18527
+SHA256 (samuel-go-zookeeper-e64db45_GH0.tar.gz) = c47d9b093cd06629df946b559533828dc712520b5e0cff2335fed70d77a89635
+SIZE (samuel-go-zookeeper-e64db45_GH0.tar.gz) = 30052
+SHA256 (shirou-gopsutil-4d0c402_GH0.tar.gz) = a5a6df8eed689ea38c98b97b7ab8445baa38e88e9393bf329de88298a9680b29
+SIZE (shirou-gopsutil-4d0c402_GH0.tar.gz) = 71117
+SHA256 (soniah-gosnmp-29f8b35_GH0.tar.gz) = 353e39fb16695b6e469b5a40ddaa8d5a4ad16581d16e1e519db52a3841b9898f
+SIZE (soniah-gosnmp-29f8b35_GH0.tar.gz) = 39565
+SHA256 (streadway-amqp-2e25825_GH0.tar.gz) = 89ba742ea6102a67fd850ca80d0c8f9b22b783f0e0b4b24eb445d758e3196104
+SIZE (streadway-amqp-2e25825_GH0.tar.gz) = 79659
+SHA256 (stretchr-testify-d77da35_GH0.tar.gz) = e6e7a64ca6e279091fc4036c99a9e1d51d884db9df221c0287afa9b5f280c40b
+SIZE (stretchr-testify-d77da35_GH0.tar.gz) = 81794
+SHA256 (vjeantet-grok-83bfdfd_GH0.tar.gz) = 22b321fd72a3c028944804bf4e586c4d00685ee0828bcaba6f4155bc5d825735
+SIZE (vjeantet-grok-83bfdfd_GH0.tar.gz) = 25714
+SHA256 (wvanbergen-kafka-6df90f1_GH0.tar.gz) = 72282a320276682b09275f140ce358ab1b9bdb1ca27cd63358612afc60a526a3
+SIZE (wvanbergen-kafka-6df90f1_GH0.tar.gz) = 15855
 SHA256 (wvanbergen-kazoo-go-0f76871_GH0.tar.gz) = 4436c1781ad18d521c88cc743c7a911c3a66d3db63e1ce5d5ab85d39986de2c2
 SIZE (wvanbergen-kazoo-go-0f76871_GH0.tar.gz) = 13152
+SHA256 (yuin-gopher-lua-e57b640_GH0.tar.gz) = ccba6b3a4ea7d27139e1451e93f954c26c9c1a8a89d53f88e453f08252ec0301
+SIZE (yuin-gopher-lua-e57b640_GH0.tar.gz) = 146505
 SHA256 (zensqlmonitor-go-mssqldb-ffe5510_GH0.tar.gz) = 864b1b900c73b7243f19eb39f4551bda26d32e5bb33c215fe767111e3d36b1c4
 SIZE (zensqlmonitor-go-mssqldb-ffe5510_GH0.tar.gz) = 449977
-SHA256 (golang-crypto-5dc8cb4_GH0.tar.gz) = 7b88733ae16c53e5178ca15a1b3b62580df89e02783c925c6e5855ea5208fd8a
-SIZE (golang-crypto-5dc8cb4_GH0.tar.gz) = 902313
-SHA256 (golang-net-6acef71_GH0.tar.gz) = aeea3d55a6e2f29329dfac8330817ccd449ffcb930b496fec0a47f011fa53f19
-SIZE (golang-net-6acef71_GH0.tar.gz) = 741883
-SHA256 (golang-text-a71fd10_GH0.tar.gz) = 8b8bfda09d60729c50162b67f5f3451980e7ce5c6580769c99a423172a6a75ad
-SIZE (golang-text-a71fd10_GH0.tar.gz) = 4030980
-SHA256 (golang-tools-b41cbfc_GH0.tar.gz) = fb4d8ccf55cd4d75869a3602043656fb3ef71ff6d55bbfdc56ce15421bdb15d6
-SIZE (golang-tools-b41cbfc_GH0.tar.gz) = 1539334
-SHA256 (dancannon-gorethink-7d1af5b_GH0.tar.gz) = db2cea166de8e4d6535fe27d262bc00e1dd3aab916a3329ddfb840f84f39fe62
-SIZE (dancannon-gorethink-7d1af5b_GH0.tar.gz) = 112289
-SHA256 (fatih-pool-cba550e_GH0.tar.gz) = fdcbcf67872333b16b74647bc4c8aa8100de81f58f0ea99ff83a519bf142e4cb
-SIZE (fatih-pool-cba550e_GH0.tar.gz) = 4854
-SHA256 (go-mgo-mgo-d90005c_GH0.tar.gz) = 61b770093578bb8fba54b9c2cdd6b2501376a2a62560f2394d28dd3f1f727ff4
-SIZE (go-mgo-mgo-d90005c_GH0.tar.gz) = 174137
-SHA256 (go-yaml-yaml-a83829b_GH0.tar.gz) = f28814393a025308c4ea49d6fec94feff9e0c7dc51b22ffdc62fe53736bef707
-SIZE (go-yaml-yaml-a83829b_GH0.tar.gz) = 63064
+SHA256 (golang-crypto-7a1054f_GH0.tar.gz) = e723af39f9bcb6fcd29d4dc9b04a73bc46e24d57a428164c0c54c9d8efb9172f
+SIZE (golang-crypto-7a1054f_GH0.tar.gz) = 1028907
+SHA256 (golang-net-7c62cfd_GH0.tar.gz) = 953a938d843fd04b5353d2f2be9de5b10b979dcd7070631f9c2bbc72c05b2f3d
+SIZE (golang-net-7c62cfd_GH0.tar.gz) = 728182
+SHA256 (golang-text-2910a50_GH0.tar.gz) = 91c042ac255182741398ff868828c04f0c757f2dbe6630e02dafda6b0fb08e6b
+SIZE (golang-text-2910a50_GH0.tar.gz) = 4099789
+SHA256 (dancannon-gorethink-edc7a6a_GH0.tar.gz) = 3f39b498e216f338be1bf301435edb04df5a4a6635eb39dba2f2238646ef1e66
+SIZE (dancannon-gorethink-edc7a6a_GH0.tar.gz) = 115524
+SHA256 (fatih-pool-20a0a42_GH0.tar.gz) = f2dc5649df86403b24e0efc531355db2ef170941992565748e2ce04a3df51fd0
+SIZE (fatih-pool-20a0a42_GH0.tar.gz) = 4842
+SHA256 (go-mgo-mgo-0108465_GH0.tar.gz) = be7a65dcb81649bb787f5916db3c7c3bca8632919cfa52ed12912aa6658cb472
+SIZE (go-mgo-mgo-0108465_GH0.tar.gz) = 376688
+SHA256 (go-yaml-yaml-e4d366f_GH0.tar.gz) = 78a35aa4812b6ddba5d110ab8a10266764f803c9b5ac41cfa75058fc89166664
+SIZE (go-yaml-yaml-e4d366f_GH0.tar.gz) = 60511
diff --git a/net-mgmt/telegraf/files/patch-telegraf-conf b/net-mgmt/telegraf/files/patch-telegraf-conf
new file mode 100644
index 000000000000..a45aee643ca4
--- /dev/null
+++ b/net-mgmt/telegraf/files/patch-telegraf-conf
@@ -0,0 +1,34 @@
+--- etc/telegraf.conf.orig	2016-08-05 15:00:27.853909704 +0200
++++ etc/telegraf.conf	2016-08-05 15:03:19.238897451 +0200
+@@ -55,7 +55,7 @@
+   ## By default, precision will be set to the same timestamp order as the
+   ## collection interval, with the maximum being 1s.
+   ## Precision will NOT be used for service inputs, such as logparser and statsd.
+-  ## Valid values are "Nns", "Nus" (or "Nµs"), "Nms", "Ns".
++  ## Valid values are "Nns", "Nus", "Nms", "Ns".
+   precision = ""
+   ## Run telegraf in debug mode
+   debug = false
+@@ -906,19 +906,19 @@
+ #   ## List of metrics collected on above servers
+ #   ## Each metric consists in a name, a jmx path and either
+ #   ## a pass or drop slice attribute.
+-#   ## This collect all heap memory usage metrics.
++#   ## This collect all heap memory usage metrics.
+ #   [[inputs.jolokia.metrics]]
+ #     name = "heap_memory_usage"
+ #     mbean  = "java.lang:type=Memory"
+ #     attribute = "HeapMemoryUsage"
+ #
+-#   ## This collect thread counts metrics.
++#   ## This collect thread counts metrics.
+ #   [[inputs.jolokia.metrics]]
+ #     name = "thread_count"
+ #     mbean  = "java.lang:type=Threading"
+ #     attribute = "TotalStartedThreadCount,ThreadCount,DaemonThreadCount,PeakThreadCount"
+ #
+-#   ## This collect number of class loaded/unloaded counts metrics.
++#   ## This collect number of class loaded/unloaded counts metrics.
+ #   [[inputs.jolokia.metrics]]
+ #     name = "class_count"
+ #     mbean  = "java.lang:type=ClassLoading"