Attachment 170432 Details for Bug 209601 – Patch to update influxdb to 0.13.0

[patch] Patch to update influxdb to 0.13.0

telegraf-0.13.0.patch (text/plain), 32.37 KB, created by cheffo on 2016-05-18 11:00:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: cheffo

Created: 2016-05-18 11:00:23 UTC

Size: 32.37 KB

patch

obsolete

>diff -urN telegraf.orig/Makefile telegraf/Makefile
>--- telegraf.orig/Makefile	2016-05-18 11:32:07.675383170 +0300
>+++ telegraf/Makefile	2016-05-18 12:49:06.876068453 +0300
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	telegraf
>-PORTVERSION=	0.12.1
>-PORTREVISION=	1
>+PORTVERSION=	0.13.0
> CATEGORIES=	net-mgmt
> 
> MAINTAINER=	girgen@FreeBSD.org
>@@ -20,61 +19,64 @@
> USE_GITHUB=	yes
> 
> 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 \
>+GH_TUPLE=	Shopify:sarama:97511b2:sarama \
>+		Sirupsen:logrus:cd7d1bb:logrus \
>+		amir:raidman:91c20f3:raidman \
>+		aws:aws-sdk-go:8fd3586:aws_sdk_go \
> 		beorn7:perks:3ac7bf7:perks \
>-		cenkalti:backoff:4dc7767:backoff \
>-		couchbase:go-couchbase:cb66431:go_couchbase \
>-		couchbase:gomemcached:a5ea635:gomemcached \
>+		cenkalti:backoff:c29158a:backoff \
>+		couchbase:go-couchbase:4ec8442:go_couchbase \
>+		couchbase:gomemcached:3ff4bc0:gomemcached \
> 		couchbase:goutils:5823a0c:goutils \
>-		dancannon:gorethink:e7cac92:gorethink \
>+		dancannon:gorethink:3ba11fc:gorethink \
> 		davecgh:go-spew:5215b55:go_spew \
>-		docker:engine-api:8924d69:engine_api \
>-		docker:go-connections:f549a93:go_connections \
>+		docker:engine-api:1f09e8f:engine_api \
>+		docker:go-connections:5b7154b:go_connections \
>+		docker:distribution:4a915d6:distribution \
> 		docker:go-units:5d2041e:go_units \
> 		eapache:go-resiliency:b86b1ec:go_resiliency \
> 		eapache:queue:ded5959:queue \
>-		eclipse:paho.mqtt.golang:0f7a459:paho_mqtt_golang \
>-		go-sql-driver:mysql:1fca743:mysql \
>-		golang:protobuf:552c7b9:protobuf \
>-		golang:snappy:427fb6f:snappy \
>+		eclipse:paho.mqtt.golang:2dac3f5:paho_mqtt_golang \
>+		go-sql-driver:mysql:7ebe0a5:mysql \
>+		gobwas:glob:49571a1:glob \
>+		golang:protobuf:7cc19b7:protobuf \
>+		golang:snappy:d7b1e15:snappy \
> 		gonuts:go-shellquote:e842a11:go_shellquote \
>-		gorilla:context:1ea2538:context \
>-		gorilla:mux:c9e326e:mux \
>+		gorilla:context:a8d44e7:context \
>+		gorilla:mux:9c19ed5:mux \
> 		hailocab:go-hostpool:e80d13c:go_hostpool \
>-		influxdata:config:b79f682:config \
>-		influxdata:influxdb:e3fef55:influxdb \
>-		influxdata:toml:af4df43:toml \
>+		hpcloud:tail:a30252c:tail \
>+		influxdata:config:8ec4638:config \
>+		influxdata:influxdb:e57fb88: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:ee1442b:pq \
>+		matttproud:golang_protobuf_extensions:c12348c:golang_protobuf_extensions \
>+		miekg:dns:48ab660: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:fc85f44:nats \
>+		nats-io:nuid:a5152d6:nuid \
>+		nsqio:go-nsq:642a3f9:go_nsq \
>+		opencontainers:runc:fdc9fb8:runc \
>+		prometheus:client_golang:d38f1ef:client_golang \
> 		prometheus:client_model:fa8ad6f:client_model \
>-		prometheus:common:e8eabff:common \
>-		prometheus:procfs:406e5b7:procfs \
>-		samuel:go-zookeeper:218e9c8:go_zookeeper \
>-		shirou:gopsutil:1f32ce1:gopsutil \
>-		soniah:gosnmp:b1b4f88:gosnmp \
>-		sparrc:gdm:2b0dfaa:gdm \
>-		streadway:amqp:b4f3cea:amqp \
>-		stretchr:testify:1f4a164:testify \
>-		wvanbergen:kafka:46f9a1c:kafka \
>+		prometheus:common:ba1c918:common \
>+		prometheus:procfs:abf152e:procfs \
>+		samuel:go-zookeeper:5250732:go_zookeeper \
>+		shirou:gopsutil:bae75fa:gopsutil \
>+		soniah:gosnmp:169fb6c:gosnmp \
>+		sparrc:gdm:2b7833e:gdm \
>+		streadway:amqp:2e25825:amqp \
>+		stretchr:testify:6cb3b85:testify \
>+		wvanbergen:kafka:1ff806b:kafka \
> 		wvanbergen:kazoo-go:0f76871:kazoo_go \
> 		zensqlmonitor:go-mssqldb:ffe5510:go_mssqldb \
>-		golang:crypto:5dc8cb4:crypto \
>-		golang:net:6acef71:net \
>-		golang:text:a71fd10:text \
>-		golang:tools:764c4cc:tools \
>-		dancannon:gorethink:7d1af5b:gorethink_v1 \
>+		golang:crypto:b6789ab:crypto \
>+		golang:net:76e74a3:net \
>+		golang:text:f773ec0:text \
>+		golang:tools:c86fe59:tools \
>+		dancannon:gorethink:edc7a6a:gorethink_v1 \
> 		fatih:pool:cba550e:pool_v2 \
> 		go-mgo:mgo:d90005c:mgo \
> 		go-yaml:yaml:a83829b:yaml
>@@ -100,10 +102,12 @@
> 	${WRKSRC}/src/github.com/eapache \
> 	${WRKSRC}/src/github.com/eclipse \
> 	${WRKSRC}/src/github.com/go-sql-driver \
>+	${WRKSRC}/src/github.com/gobwas \
> 	${WRKSRC}/src/github.com/golang \
> 	${WRKSRC}/src/github.com/gonuts \
> 	${WRKSRC}/src/github.com/gorilla \
> 	${WRKSRC}/src/github.com/hailocab \
>+	${WRKSRC}/src/github.com/hpcloud \
> 	${WRKSRC}/src/github.com/influxdata \
> 	${WRKSRC}/src/github.com/klauspost \
> 	${WRKSRC}/src/github.com/lib \
>@@ -143,17 +147,20 @@
> 	${MV} ${WRKSRC_go_spew} ${WRKSRC}/src/github.com/davecgh/go-spew ;\
> 	${MV} ${WRKSRC_engine_api} ${WRKSRC}/src/github.com/docker/engine-api ;\
> 	${MV} ${WRKSRC_go_connections} ${WRKSRC}/src/github.com/docker/go-connections ;\
>+	${MV} ${WRKSRC_distribution} ${WRKSRC}/src/github.com/docker/distribution ;\
> 	${MV} ${WRKSRC_go_units} ${WRKSRC}/src/github.com/docker/go-units ;\
> 	${MV} ${WRKSRC_go_resiliency} ${WRKSRC}/src/github.com/eapache/go-resiliency ;\
> 	${MV} ${WRKSRC_queue} ${WRKSRC}/src/github.com/eapache/queue ;\
> 	${MV} ${WRKSRC_paho_mqtt_golang} ${WRKSRC}/src/github.com/eclipse/paho.mqtt.golang ;\
> 	${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 ;\
> 	${MV} ${WRKSRC_snappy} ${WRKSRC}/src/github.com/golang/snappy ;\
> 	${MV} ${WRKSRC_go_shellquote} ${WRKSRC}/src/github.com/gonuts/go-shellquote ;\
> 	${MV} ${WRKSRC_context} ${WRKSRC}/src/github.com/gorilla/context ;\
> 	${MV} ${WRKSRC_mux} ${WRKSRC}/src/github.com/gorilla/mux ;\
> 	${MV} ${WRKSRC_go_hostpool} ${WRKSRC}/src/github.com/hailocab/go-hostpool ;\
>+	${MV} ${WRKSRC_tail} ${WRKSRC}/src/github.com/hpcloud/tail ;\
> 	${MV} ${WRKSRC_config} ${WRKSRC}/src/github.com/influxdata/config ;\
> 	${MV} ${WRKSRC_influxdb} ${WRKSRC}/src/github.com/influxdata/influxdb ;\
> 	${MV} ${WRKSRC_toml} ${WRKSRC}/src/github.com/influxdata/toml ;\
>diff -urN telegraf.orig/distinfo telegraf/distinfo
>--- telegraf.orig/distinfo	2016-05-18 11:32:07.676402294 +0300
>+++ telegraf/distinfo	2016-05-18 12:49:10.864066089 +0300
>@@ -1,115 +1,122 @@
>-SHA256 (influxdata-telegraf-0.12.1_GH0.tar.gz) = af323e4557698965f675dadf99ef46dd51662a21b704f776ad773040b48b7cd3
>-SIZE (influxdata-telegraf-0.12.1_GH0.tar.gz) = 429472
>-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
>+TIMESTAMP = 1463564950
>+SHA256 (influxdata-telegraf-0.13.0_GH0.tar.gz) = e48f01e5d217af445f8152e9aeb393bf1ba94b5ccec5d535eefe62b5ff1f2c32
>+SIZE (influxdata-telegraf-0.13.0_GH0.tar.gz) = 459070
>+SHA256 (Shopify-sarama-97511b2_GH0.tar.gz) = 09f6ee26d24e85f28063b7f853075530413b62e8451a87e66e5ba09fed44520d
>+SIZE (Shopify-sarama-97511b2_GH0.tar.gz) = 110056
>+SHA256 (Sirupsen-logrus-cd7d1bb_GH0.tar.gz) = 45cbe459097f2580128819f3fea33c9f8ecd55569e6eeaa8bbef4097f7b22eb1
>+SIZE (Sirupsen-logrus-cd7d1bb_GH0.tar.gz) = 22179
>+SHA256 (amir-raidman-91c20f3_GH0.tar.gz) = 68b3bd27bc4bca54841a291607066f971aba685f4bb63870d12bf60123b89d33
>+SIZE (amir-raidman-91c20f3_GH0.tar.gz) = 6590
>+SHA256 (aws-aws-sdk-go-8fd3586_GH0.tar.gz) = fa1aa6159a90c3a440e31cb01f670e18ff6607366cc61c6d38500935dac9fb9f
>+SIZE (aws-aws-sdk-go-8fd3586_GH0.tar.gz) = 3448443
> 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
>+SHA256 (cenkalti-backoff-c29158a_GH0.tar.gz) = ad7cbb6c38f9e725e389f4eef18b381efad4704243ed34781eb1673be5397c33
>+SIZE (cenkalti-backoff-c29158a_GH0.tar.gz) = 7001
>+SHA256 (couchbase-go-couchbase-4ec8442_GH0.tar.gz) = e03a58188365af64ed391085f5e9e37028fa3004b0469f12320b03f122a86942
>+SIZE (couchbase-go-couchbase-4ec8442_GH0.tar.gz) = 72154
>+SHA256 (couchbase-gomemcached-3ff4bc0_GH0.tar.gz) = 3c6aaece97dcadcb135521efa0150a6b31e3746834d38b915ca06c7252093fbe
>+SIZE (couchbase-gomemcached-3ff4bc0_GH0.tar.gz) = 30712
> 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 (dancannon-gorethink-3ba11fc_GH0.tar.gz) = a3017e50224571255e0b1ffdf5ca1c6018767294c01a1cfc701d59c4b4aa147b
>+SIZE (dancannon-gorethink-3ba11fc_GH0.tar.gz) = 122084
> 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-engine-api-1f09e8f_GH0.tar.gz) = 4f2d91ab8c5f88253b3ab37e1fa6fe445a90cc1e8856b18c30b8ba60b7d9dd9a
>+SIZE (docker-engine-api-1f09e8f_GH0.tar.gz) = 66869
>+SHA256 (docker-go-connections-5b7154b_GH0.tar.gz) = 77e3f6d996f1291197b0f7ac5e4ca9f87a44c95f86f72453d75d63fc882cbd80
>+SIZE (docker-go-connections-5b7154b_GH0.tar.gz) = 21451
>+SHA256 (docker-distribution-4a915d6_GH0.tar.gz) = b3ae087bbc75f98365ab508ccd5c3291f87bc993b96f78cd8cf64c61b353daa9
>+SIZE (docker-distribution-4a915d6_GH0.tar.gz) = 1315298
> SHA256 (docker-go-units-5d2041e_GH0.tar.gz) = dc9c2d6f2886180daa526e52268659394c9fbc3142c139c492a6f9bf302c4c29
> SIZE (docker-go-units-5d2041e_GH0.tar.gz) = 16156
> 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 (go-sql-driver-mysql-1fca743_GH0.tar.gz) = d3018ed045230d851a309ac750d06447c1c50723889bccb49923581ad8d08a7a
>-SIZE (go-sql-driver-mysql-1fca743_GH0.tar.gz) = 56642
>-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 (eclipse-paho.mqtt.golang-2dac3f5_GH0.tar.gz) = 43719160b228f2f7b9847933c16c2f96f0f5f118650167a74d8ae050a1f147b9
>+SIZE (eclipse-paho.mqtt.golang-2dac3f5_GH0.tar.gz) = 65908
>+SHA256 (go-sql-driver-mysql-7ebe0a5_GH0.tar.gz) = 91a522843e83fca38efe9aa2fd84f316788fd0f1ea180eede5b84a412c392aa1
>+SIZE (go-sql-driver-mysql-7ebe0a5_GH0.tar.gz) = 56774
>+SHA256 (gobwas-glob-49571a1_GH0.tar.gz) = 5ac7a23180744f3cab8774ee9d98405db4b5b01dff80b8e267bd003f1b86705b
>+SIZE (gobwas-glob-49571a1_GH0.tar.gz) = 25151
>+SHA256 (golang-protobuf-7cc19b7_GH0.tar.gz) = 2534ede53f99626f0f603f0caf9c777a82108e7f9e154e526e97aeb47b96968f
>+SIZE (golang-protobuf-7cc19b7_GH0.tar.gz) = 214197
>+SHA256 (golang-snappy-d7b1e15_GH0.tar.gz) = 0492ba0757cab34aa176347a4d3f30151688a85be94047a6540b2dbe907e9d9f
>+SIZE (golang-snappy-d7b1e15_GH0.tar.gz) = 61862
> 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-a8d44e7_GH0.tar.gz) = 1aced767e96ed0755706365aa8763fb95512e60e93ecc58b89d1230033d266fb
>+SIZE (gorilla-context-a8d44e7_GH0.tar.gz) = 4375
>+SHA256 (gorilla-mux-9c19ed5_GH0.tar.gz) = 1e581dfaaba584113624dc28016bb7936b82c7cab983292c327a5286a78c2707
>+SIZE (gorilla-mux-9c19ed5_GH0.tar.gz) = 24568
> SHA256 (hailocab-go-hostpool-e80d13c_GH0.tar.gz) = 9c0ca4a9c0bba2ec0f9b3844c0fd65291efcc5530fb5ec517f2cb4054a5049b9
> SIZE (hailocab-go-hostpool-e80d13c_GH0.tar.gz) = 7031
>-SHA256 (influxdata-config-b79f682_GH0.tar.gz) = 0ad6bc6c8046b08b8e3dd0526955e8e1414c4fa00ae0bf13faa2b1173c209de8
>-SIZE (influxdata-config-b79f682_GH0.tar.gz) = 3689
>-SHA256 (influxdata-influxdb-e3fef55_GH0.tar.gz) = 029d516b80baa8bf2dc6bf20cdf1b233243038095697bd2856ea81ed280415a6
>-SIZE (influxdata-influxdb-e3fef55_GH0.tar.gz) = 1174574
>-SHA256 (influxdata-toml-af4df43_GH0.tar.gz) = 86231e74617206c8df2f9a69d1d735b7a30b1c51e9013f3d28f7c32f9d253f09
>-SIZE (influxdata-toml-af4df43_GH0.tar.gz) = 34582
>+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-e57fb88_GH0.tar.gz) = bd3eac9c3b0fd5ad63d88e3bb3d60698c23f44c8a6f8674a6d1a559554810139
>+SIZE (influxdata-influxdb-e57fb88_GH0.tar.gz) = 1216012
>+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-ee1442b_GH0.tar.gz) = 9c3e1f9fe90b1fc4711202303a04c7247e0fa2c0f97c62c33afd89d99e3dff77
>+SIZE (lib-pq-ee1442b_GH0.tar.gz) = 69261
>+SHA256 (matttproud-golang_protobuf_extensions-c12348c_GH0.tar.gz) = da165c9275b77a0994b815bc7d761dcb2e4799a90fe49eec08d8bdff3a683f48
>+SIZE (matttproud-golang_protobuf_extensions-c12348c_GH0.tar.gz) = 37200
>+SHA256 (miekg-dns-48ab660_GH0.tar.gz) = 63cb564e87adbde6c8db1c2df0ebfd241e670156323f3716420668aa47294220
>+SIZE (miekg-dns-48ab660_GH0.tar.gz) = 162882
> 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-fc85f44_GH0.tar.gz) = dc11169be86a68ae26684f203d795ac4e3c7aa525b089e740b12540ac834916e
>+SIZE (nats-io-nats-fc85f44_GH0.tar.gz) = 71201
>+SHA256 (nats-io-nuid-a5152d6_GH0.tar.gz) = a8f31c2a3525eb1d62a7bda776d37c7b939cb77dc617667fcd155bd7c3de4596
>+SIZE (nats-io-nuid-a5152d6_GH0.tar.gz) = 3943
>+SHA256 (nsqio-go-nsq-642a3f9_GH0.tar.gz) = 623bdd0d8fe1e9abda928066afb7a5b82276098e2729f2249fb581fa23fc4013
>+SIZE (nsqio-go-nsq-642a3f9_GH0.tar.gz) = 44557
>+SHA256 (opencontainers-runc-fdc9fb8_GH0.tar.gz) = 621b2d679976394df455080c5b3f372774b4f316c99bf2275889279a2002d131
>+SIZE (opencontainers-runc-fdc9fb8_GH0.tar.gz) = 510780
>+SHA256 (prometheus-client_golang-d38f1ef_GH0.tar.gz) = 602416816c090b37be8d3e438b34c0329b184b63e318b9c00bb8b50c875427d4
>+SIZE (prometheus-client_golang-d38f1ef_GH0.tar.gz) = 65675
> 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-1f32ce1_GH0.tar.gz) = 9fcf859fb38c7be2ba6e050e4e6c20bf8e170d30d78e56d4d9596fae96f65b10
>-SIZE (shirou-gopsutil-1f32ce1_GH0.tar.gz) = 64237
>-SHA256 (soniah-gosnmp-b1b4f88_GH0.tar.gz) = 248218aa545187eb7a9644165b1d8b384dfb3f4b50c40734a2cd76288bd4f5fe
>-SIZE (soniah-gosnmp-b1b4f88_GH0.tar.gz) = 38542
>-SHA256 (sparrc-gdm-2b0dfaa_GH0.tar.gz) = 4b267be7b440a1b9d0292580d9811cefe1f0233cbd3f6fd0a4a4fc608aed8141
>-SIZE (sparrc-gdm-2b0dfaa_GH0.tar.gz) = 8512
>-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-ba1c918_GH0.tar.gz) = d3eb57177692c094c25eb2e6848e7133f8e8eaf6da77cc599e9b31bd5cdf503b
>+SIZE (prometheus-common-ba1c918_GH0.tar.gz) = 63600
>+SHA256 (prometheus-procfs-abf152e_GH0.tar.gz) = 92bfc09a8aeb2058e14e9d00a111a10a5c4ea2441bd59e4eece996f808abbb59
>+SIZE (prometheus-procfs-abf152e_GH0.tar.gz) = 18527
>+SHA256 (samuel-go-zookeeper-5250732_GH0.tar.gz) = 8d949155965076642d65bd59cdc3d0aba3f38ba0c41a4dedc70c74856955fbe0
>+SIZE (samuel-go-zookeeper-5250732_GH0.tar.gz) = 30432
>+SHA256 (shirou-gopsutil-bae75fa_GH0.tar.gz) = 35da06fdb31322a3ac0f93cf4baa2160a006a7c3bfddc39fd3068dbb5c7fa73d
>+SIZE (shirou-gopsutil-bae75fa_GH0.tar.gz) = 68712
>+SHA256 (soniah-gosnmp-169fb6c_GH0.tar.gz) = b78092f34b3ccd4c3795a9685811bd00407a952bf61327afa4f1fac915e233fc
>+SIZE (soniah-gosnmp-169fb6c_GH0.tar.gz) = 39463
>+SHA256 (sparrc-gdm-2b7833e_GH0.tar.gz) = 2c00f8e4419cab7b8e940798838d3825d61e9938d5f7de26e2f5985377d8111d
>+SIZE (sparrc-gdm-2b7833e_GH0.tar.gz) = 8655
>+SHA256 (streadway-amqp-2e25825_GH0.tar.gz) = 89ba742ea6102a67fd850ca80d0c8f9b22b783f0e0b4b24eb445d758e3196104
>+SIZE (streadway-amqp-2e25825_GH0.tar.gz) = 79659
>+SHA256 (stretchr-testify-6cb3b85_GH0.tar.gz) = abae34a655da56b099f25f622e0f5db982c691cb77384e8ac0bda5fe80c7d177
>+SIZE (stretchr-testify-6cb3b85_GH0.tar.gz) = 81558
>+SHA256 (wvanbergen-kafka-1ff806b_GH0.tar.gz) = 9df11ed52bd5067ebbb77ddb92d6a513c2829fc153f3c107cbe34e08b9137892
>+SIZE (wvanbergen-kafka-1ff806b_GH0.tar.gz) = 15654
> SHA256 (wvanbergen-kazoo-go-0f76871_GH0.tar.gz) = 4436c1781ad18d521c88cc743c7a911c3a66d3db63e1ce5d5ab85d39986de2c2
> SIZE (wvanbergen-kazoo-go-0f76871_GH0.tar.gz) = 13152
> 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-764c4cc_GH0.tar.gz) = 0132b170397dc01ade4895fb0914d717972916886603f470ffad518432df890e
>-SIZE (golang-tools-764c4cc_GH0.tar.gz) = 1530729
>-SHA256 (dancannon-gorethink-7d1af5b_GH0.tar.gz) = db2cea166de8e4d6535fe27d262bc00e1dd3aab916a3329ddfb840f84f39fe62
>-SIZE (dancannon-gorethink-7d1af5b_GH0.tar.gz) = 112289
>+SHA256 (golang-crypto-b6789ab_GH0.tar.gz) = 8e59ebf79fa9bb4554f2e5c9b271e3a8774e9624019f96fe527c598109710227
>+SIZE (golang-crypto-b6789ab_GH0.tar.gz) = 1026715
>+SHA256 (golang-net-76e74a3_GH0.tar.gz) = ebd5078bd764fdc5280b882994b684b02517b469e034f14b4ad33944feec7d2d
>+SIZE (golang-net-76e74a3_GH0.tar.gz) = 772419
>+SHA256 (golang-text-f773ec0_GH0.tar.gz) = cec84b0e5679ab08755107db5b4d7b4fb3329f5d02a594c1f076069a8c8bfb92
>+SIZE (golang-text-f773ec0_GH0.tar.gz) = 4043166
>+SHA256 (golang-tools-c86fe59_GH0.tar.gz) = 8e46b1afaf35e3bcb4685d759819adf621125642b8f0730d20dd4b14d07af22e
>+SIZE (golang-tools-c86fe59_GH0.tar.gz) = 1536154
>+SHA256 (dancannon-gorethink-edc7a6a_GH0.tar.gz) = 3f39b498e216f338be1bf301435edb04df5a4a6635eb39dba2f2238646ef1e66
>+SIZE (dancannon-gorethink-edc7a6a_GH0.tar.gz) = 115524
> 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
>diff -urN telegraf.orig/files/patch-plugins_inputs_procstat_spec__processor.go telegraf/files/patch-plugins_inputs_procstat_spec__processor.go
>--- telegraf.orig/files/patch-plugins_inputs_procstat_spec__processor.go	1970-01-01 02:00:00.000000000 +0200
>+++ telegraf/files/patch-plugins_inputs_procstat_spec__processor.go	2016-05-18 13:20:15.298093877 +0300
>@@ -0,0 +1,20 @@
>+--- plugins/inputs/procstat/spec_processor.go.orig	2016-05-18 10:20:15 UTC
>++++ plugins/inputs/procstat/spec_processor.go
>+@@ -65,7 +65,7 @@ func (p *SpecProcessor) pushMetrics() {
>+ 		fields[prefix+"write_bytes"] = io.WriteCount
>+ 	}
>+ 
>+-	cpu_time, err := p.proc.CPUTimes()
>++	cpu_time, err := p.proc.Times()
>+ 	if err == nil {
>+ 		fields[prefix+"cpu_time_user"] = cpu_time.User
>+ 		fields[prefix+"cpu_time_system"] = cpu_time.System
>+@@ -80,7 +80,7 @@ func (p *SpecProcessor) pushMetrics() {
>+ 		fields[prefix+"cpu_time_guest_nice"] = cpu_time.GuestNice
>+ 	}
>+ 
>+-	cpu_perc, err := p.proc.CPUPercent(time.Duration(0))
>++	cpu_perc, err := p.proc.Percent(time.Duration(0))
>+ 	if err == nil && cpu_perc != 0 {
>+ 		fields[prefix+"cpu_usage"] = cpu_perc
>+ 	}
>diff -urN telegraf.orig/files/patch-plugins_inputs_system_cpu.go telegraf/files/patch-plugins_inputs_system_cpu.go
>--- telegraf.orig/files/patch-plugins_inputs_system_cpu.go	1970-01-01 02:00:00.000000000 +0200
>+++ telegraf/files/patch-plugins_inputs_system_cpu.go	2016-05-18 13:20:15.300986424 +0300
>@@ -0,0 +1,20 @@
>+--- plugins/inputs/system/cpu.go.orig	2016-05-18 10:20:15 UTC
>++++ plugins/inputs/system/cpu.go
>+@@ -11,7 +11,7 @@ import (
>+ 
>+ type CPUStats struct {
>+ 	ps        PS
>+-	lastStats []cpu.CPUTimesStat
>++	lastStats []cpu.TimesStat
>+ 
>+ 	PerCPU   bool `toml:"percpu"`
>+ 	TotalCPU bool `toml:"totalcpu"`
>+@@ -105,7 +105,7 @@ func (s *CPUStats) Gather(acc telegraf.A
>+ 	return nil
>+ }
>+ 
>+-func totalCpuTime(t cpu.CPUTimesStat) float64 {
>++func totalCpuTime(t cpu.TimesStat) float64 {
>+ 	total := t.User + t.System + t.Nice + t.Iowait + t.Irq + t.Softirq + t.Steal +
>+ 		t.Guest + t.GuestNice + t.Idle
>+ 	return total
>diff -urN telegraf.orig/files/patch-plugins_inputs_system_mock__PS.go telegraf/files/patch-plugins_inputs_system_mock__PS.go
>--- telegraf.orig/files/patch-plugins_inputs_system_mock__PS.go	1970-01-01 02:00:00.000000000 +0200
>+++ telegraf/files/patch-plugins_inputs_system_mock__PS.go	2016-05-18 13:20:15.303969764 +0300
>@@ -0,0 +1,83 @@
>+--- plugins/inputs/system/mock_PS.go.orig	2016-05-18 10:20:15 UTC
>++++ plugins/inputs/system/mock_PS.go
>+@@ -15,55 +15,55 @@ type MockPS struct {
>+ 	mock.Mock
>+ }
>+ 
>+-func (m *MockPS) LoadAvg() (*load.LoadAvgStat, error) {
>++func (m *MockPS) LoadAvg() (*load.AvgStat, error) {
>+ 	ret := m.Called()
>+ 
>+-	r0 := ret.Get(0).(*load.LoadAvgStat)
>++	r0 := ret.Get(0).(*load.AvgStat)
>+ 	r1 := ret.Error(1)
>+ 
>+ 	return r0, r1
>+ }
>+ 
>+-func (m *MockPS) CPUTimes(perCPU, totalCPU bool) ([]cpu.CPUTimesStat, error) {
>++func (m *MockPS) CPUTimes(perCPU, totalCPU bool) ([]cpu.TimesStat, error) {
>+ 	ret := m.Called()
>+ 
>+-	r0 := ret.Get(0).([]cpu.CPUTimesStat)
>++	r0 := ret.Get(0).([]cpu.TimesStat)
>+ 	r1 := ret.Error(1)
>+ 
>+ 	return r0, r1
>+ }
>+ 
>+-func (m *MockPS) DiskUsage(mountPointFilter []string, fstypeExclude []string) ([]*disk.DiskUsageStat, error) {
>++func (m *MockPS) DiskUsage(mountPointFilter []string, fstypeExclude []string) ([]*disk.UsageStat, error) {
>+ 	ret := m.Called(mountPointFilter, fstypeExclude)
>+ 
>+-	r0 := ret.Get(0).([]*disk.DiskUsageStat)
>++	r0 := ret.Get(0).([]*disk.UsageStat)
>+ 	r1 := ret.Error(1)
>+ 
>+ 	return r0, r1
>+ }
>+ 
>+-func (m *MockPS) NetIO() ([]net.NetIOCountersStat, error) {
>++func (m *MockPS) NetIO() ([]net.IOCountersStat, error) {
>+ 	ret := m.Called()
>+ 
>+-	r0 := ret.Get(0).([]net.NetIOCountersStat)
>++	r0 := ret.Get(0).([]net.IOCountersStat)
>+ 	r1 := ret.Error(1)
>+ 
>+ 	return r0, r1
>+ }
>+ 
>+-func (m *MockPS) NetProto() ([]net.NetProtoCountersStat, error) {
>++func (m *MockPS) NetProto() ([]net.ProtoCountersStat, error) {
>+ 	ret := m.Called()
>+ 
>+-	r0 := ret.Get(0).([]net.NetProtoCountersStat)
>++	r0 := ret.Get(0).([]net.ProtoCountersStat)
>+ 	r1 := ret.Error(1)
>+ 
>+ 	return r0, r1
>+ }
>+ 
>+-func (m *MockPS) DiskIO() (map[string]disk.DiskIOCountersStat, error) {
>++func (m *MockPS) DiskIO() (map[string]disk.IOCountersStat, error) {
>+ 	ret := m.Called()
>+ 
>+-	r0 := ret.Get(0).(map[string]disk.DiskIOCountersStat)
>++	r0 := ret.Get(0).(map[string]disk.IOCountersStat)
>+ 	r1 := ret.Error(1)
>+ 
>+ 	return r0, r1
>+@@ -87,10 +87,10 @@ func (m *MockPS) SwapStat() (*mem.SwapMe
>+ 	return r0, r1
>+ }
>+ 
>+-func (m *MockPS) NetConnections() ([]net.NetConnectionStat, error) {
>++func (m *MockPS) NetConnections() ([]net.ConnectionStat, error) {
>+ 	ret := m.Called()
>+ 
>+-	r0 := ret.Get(0).([]net.NetConnectionStat)
>++	r0 := ret.Get(0).([]net.ConnectionStat)
>+ 	r1 := ret.Error(1)
>+ 
>+ 	return r0, r1
>diff -urN telegraf.orig/files/patch-plugins_inputs_system_ps.go telegraf/files/patch-plugins_inputs_system_ps.go
>--- telegraf.orig/files/patch-plugins_inputs_system_ps.go	1970-01-01 02:00:00.000000000 +0200
>+++ telegraf/files/patch-plugins_inputs_system_ps.go	2016-05-18 13:20:15.305980634 +0300
>@@ -0,0 +1,103 @@
>+--- plugins/inputs/system/ps.go.orig	2016-05-18 10:20:15 UTC
>++++ plugins/inputs/system/ps.go
>+@@ -13,14 +13,14 @@ import (
>+ )
>+ 
>+ type PS interface {
>+-	CPUTimes(perCPU, totalCPU bool) ([]cpu.CPUTimesStat, error)
>+-	DiskUsage(mountPointFilter []string, fstypeExclude []string) ([]*disk.DiskUsageStat, error)
>+-	NetIO() ([]net.NetIOCountersStat, error)
>+-	NetProto() ([]net.NetProtoCountersStat, error)
>+-	DiskIO() (map[string]disk.DiskIOCountersStat, error)
>++	CPUTimes(perCPU, totalCPU bool) ([]cpu.TimesStat, error)
>++	DiskUsage(mountPointFilter []string, fstypeExclude []string) ([]*disk.UsageStat, error)
>++	NetIO() ([]net.IOCountersStat, error)
>++	NetProto() ([]net.ProtoCountersStat, error)
>++	DiskIO() (map[string]disk.IOCountersStat, error)
>+ 	VMStat() (*mem.VirtualMemoryStat, error)
>+ 	SwapStat() (*mem.SwapMemoryStat, error)
>+-	NetConnections() ([]net.NetConnectionStat, error)
>++	NetConnections() ([]net.ConnectionStat, error)
>+ }
>+ 
>+ func add(acc telegraf.Accumulator,
>+@@ -32,17 +32,17 @@ func add(acc telegraf.Accumulator,
>+ 
>+ type systemPS struct{}
>+ 
>+-func (s *systemPS) CPUTimes(perCPU, totalCPU bool) ([]cpu.CPUTimesStat, error) {
>+-	var cpuTimes []cpu.CPUTimesStat
>++func (s *systemPS) CPUTimes(perCPU, totalCPU bool) ([]cpu.TimesStat, error) {
>++	var cpuTimes []cpu.TimesStat
>+ 	if perCPU {
>+-		if perCPUTimes, err := cpu.CPUTimes(true); err == nil {
>++		if perCPUTimes, err := cpu.Times(true); err == nil {
>+ 			cpuTimes = append(cpuTimes, perCPUTimes...)
>+ 		} else {
>+ 			return nil, err
>+ 		}
>+ 	}
>+ 	if totalCPU {
>+-		if totalCPUTimes, err := cpu.CPUTimes(false); err == nil {
>++		if totalCPUTimes, err := cpu.Times(false); err == nil {
>+ 			cpuTimes = append(cpuTimes, totalCPUTimes...)
>+ 		} else {
>+ 			return nil, err
>+@@ -54,8 +54,8 @@ func (s *systemPS) CPUTimes(perCPU, tota
>+ func (s *systemPS) DiskUsage(
>+ 	mountPointFilter []string,
>+ 	fstypeExclude []string,
>+-) ([]*disk.DiskUsageStat, error) {
>+-	parts, err := disk.DiskPartitions(true)
>++) ([]*disk.UsageStat, error) {
>++	parts, err := disk.Partitions(true)
>+ 	if err != nil {
>+ 		return nil, err
>+ 	}
>+@@ -70,7 +70,7 @@ func (s *systemPS) DiskUsage(
>+ 		fstypeExcludeSet[filter] = true
>+ 	}
>+ 
>+-	var usage []*disk.DiskUsageStat
>++	var usage []*disk.UsageStat
>+ 
>+ 	for _, p := range parts {
>+ 		if len(mountPointFilter) > 0 {
>+@@ -83,7 +83,7 @@ func (s *systemPS) DiskUsage(
>+ 		}
>+ 		mountpoint := os.Getenv("HOST_MOUNT_PREFIX") + p.Mountpoint
>+ 		if _, err := os.Stat(mountpoint); err == nil {
>+-			du, err := disk.DiskUsage(mountpoint)
>++			du, err := disk.Usage(mountpoint)
>+ 			du.Path = p.Mountpoint
>+ 			if err != nil {
>+ 				return nil, err
>+@@ -102,20 +102,20 @@ func (s *systemPS) DiskUsage(
>+ 	return usage, nil
>+ }
>+ 
>+-func (s *systemPS) NetProto() ([]net.NetProtoCountersStat, error) {
>+-	return net.NetProtoCounters(nil)
>++func (s *systemPS) NetProto() ([]net.ProtoCountersStat, error) {
>++	return net.ProtoCounters(nil)
>+ }
>+ 
>+-func (s *systemPS) NetIO() ([]net.NetIOCountersStat, error) {
>+-	return net.NetIOCounters(true)
>++func (s *systemPS) NetIO() ([]net.IOCountersStat, error) {
>++	return net.IOCounters(true)
>+ }
>+ 
>+-func (s *systemPS) NetConnections() ([]net.NetConnectionStat, error) {
>+-	return net.NetConnections("all")
>++func (s *systemPS) NetConnections() ([]net.ConnectionStat, error) {
>++	return net.Connections("all")
>+ }
>+ 
>+-func (s *systemPS) DiskIO() (map[string]disk.DiskIOCountersStat, error) {
>+-	m, err := disk.DiskIOCounters()
>++func (s *systemPS) DiskIO() (map[string]disk.IOCountersStat, error) {
>++	m, err := disk.IOCounters()
>+ 	if err == internal.NotImplementedError {
>+ 		return nil, nil
>+ 	}
>diff -urN telegraf.orig/files/patch-plugins_inputs_system_system.go telegraf/files/patch-plugins_inputs_system_system.go
>--- telegraf.orig/files/patch-plugins_inputs_system_system.go	1970-01-01 02:00:00.000000000 +0200
>+++ telegraf/files/patch-plugins_inputs_system_system.go	2016-05-18 13:20:15.307950438 +0300
>@@ -0,0 +1,17 @@
>+--- plugins/inputs/system/system.go.orig	2016-05-18 10:20:15 UTC
>++++ plugins/inputs/system/system.go
>+@@ -22,12 +22,12 @@ func (_ *SystemStats) Description() stri
>+ func (_ *SystemStats) SampleConfig() string { return "" }
>+ 
>+ func (_ *SystemStats) Gather(acc telegraf.Accumulator) error {
>+-	loadavg, err := load.LoadAvg()
>++	loadavg, err := load.Avg()
>+ 	if err != nil {
>+ 		return err
>+ 	}
>+ 
>+-	hostinfo, err := host.HostInfo()
>++	hostinfo, err := host.Info()
>+ 	if err != nil {
>+ 		return err
>+ 	}

Actions: View | Diff

Attachments on bug 209601: 170432 | 170433 | 170434