From owner-svn-ports-all@freebsd.org Wed Nov 23 00:23:50 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 81323C4C0E7; Wed, 23 Nov 2016 00:23:50 +0000 (UTC) (envelope-from girgen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5E56F107; Wed, 23 Nov 2016 00:23:50 +0000 (UTC) (envelope-from girgen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAN0Nnkj029851; Wed, 23 Nov 2016 00:23:49 GMT (envelope-from girgen@FreeBSD.org) Received: (from girgen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAN0NnCx029848; Wed, 23 Nov 2016 00:23:49 GMT (envelope-from girgen@FreeBSD.org) Message-Id: <201611230023.uAN0NnCx029848@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: girgen set sender to girgen@FreeBSD.org using -f From: Palle Girgensohn Date: Wed, 23 Nov 2016 00:23:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r426880 - in head/net-mgmt/telegraf: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Nov 2016 00:23:50 -0000 Author: girgen Date: Wed Nov 23 00:23:49 2016 New Revision: 426880 URL: https://svnweb.freebsd.org/changeset/ports/426880 Log: Update telegraf to 1.1.1 Make sure both stdin and stderr are redirected since daemon(8) forks and this would otherwise leave scripted restarts haning. See #213412 and #214643 for a more complete discussion. PR: 214738, 213412, 214643 Submitted by: Stefan Lambrev Modified: head/net-mgmt/telegraf/Makefile head/net-mgmt/telegraf/distinfo head/net-mgmt/telegraf/files/telegraf.in Modified: head/net-mgmt/telegraf/Makefile ============================================================================== --- head/net-mgmt/telegraf/Makefile Tue Nov 22 23:05:21 2016 (r426879) +++ head/net-mgmt/telegraf/Makefile Wed Nov 23 00:23:49 2016 (r426880) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= telegraf -DISTVERSION= 1.0.1 +DISTVERSION= 1.1.1 CATEGORIES= net-mgmt MAINTAINER= girgen@FreeBSD.org @@ -21,7 +21,7 @@ USE_GITHUB= yes GH_ACCOUNT= influxdata:DEFAULT GH_TUPLE= Shopify:sarama:8aadb47:sarama \ Sirupsen:logrus:219c8cb:logrus \ - aerospike:aerospike-client-go:45863b7:aerospike_client_go \ + aerospike:aerospike-client-go:7f3a312:aerospike_client_go \ amir:raidman:53c1b96:raidman \ aws:aws-sdk-go:13a1206:aws_sdk_go \ beorn7:perks:3ac7bf7:perks \ @@ -40,7 +40,7 @@ GH_TUPLE= Shopify:sarama:8aadb47:sarama go-sql-driver:mysql:1fca743:mysql \ gobwas:glob:49571a1:glob \ golang:protobuf:552c7b9:protobuf \ - golang:snappy:427fb6f:snappy \ + golang:snappy:d9eb7a3:snappy \ gonuts:go-shellquote:e842a11:go_shellquote \ gorilla:context:1ea2538:context \ gorilla:mux:c9e326e:mux \ @@ -48,8 +48,9 @@ GH_TUPLE= Shopify:sarama:8aadb47:sarama hashicorp:consul:5aa9045:consul \ hpcloud:tail:b294095:tail \ influxdata:config:b79f682:config \ - influxdata:influxdb:e094138:influxdb \ + influxdata:influxdb:fc57c0f:influxdb \ influxdata:toml:af4df43:toml \ + influxdata:wlog:7c63b0a:wlog \ kardianos:osext:29ae4ff:osext \ kardianos:service:5e33559:service \ klauspost:crc32:19b0b33:crc32 \ @@ -58,8 +59,8 @@ GH_TUPLE= Shopify:sarama:8aadb47:sarama miekg:dns:cce6c13:dns \ mreiferson:go-snappystream:028eae7:go_snappystream \ naoina:go-stringutil:6b638e9:go_stringutil \ - nats-io:nats:b13fc9d:nats \ - nats-io:nuid:4f84f5f:nuid \ + nats-io:go-nats:ea8b4fd:go_nats \ + nats-io:nuid:a5152d6:nuid \ nsqio:go-nsq:0b80d6f:go_nsq \ opencontainers:runc:89ab7f2:runc \ prometheus:client_golang:18acf99:client_golang \ @@ -68,7 +69,7 @@ GH_TUPLE= Shopify:sarama:8aadb47:sarama prometheus:procfs:406e5b7:procfs \ samuel:go-zookeeper:218e9c8:go_zookeeper \ shirou:gopsutil:4d0c402:gopsutil \ - soniah:gosnmp:eb32571:gosnmp \ + soniah:gosnmp:3fe3beb:gosnmp \ sparrc:gdm:66023a5:gdm \ streadway:amqp:b4f3cea:amqp \ stretchr:testify:1f4a164:testify \ @@ -77,7 +78,7 @@ GH_TUPLE= Shopify:sarama:8aadb47:sarama wvanbergen:kazoo-go:0f76871:kazoo_go \ yuin:gopher-lua:bf3808a:gopher_lua \ zensqlmonitor:go-mssqldb:ffe5510:go_mssqldb \ - golang:crypto:5dc8cb4:crypto \ + golang:crypto:c197bcf:crypto \ golang:net:6acef71:net \ golang:text:a71fd10:text \ golang:tools:fc2b74b:tools \ @@ -141,11 +142,10 @@ post-patch: ${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 filter \ - input.go internal metric.go metric_test.go output.go plugins scripts testutil \ + LICENSE Makefile README.md accumulator.go agent aggregator.go circle.yml cmd docs etc filter \ + input.go internal logger metric.go metric_test.go output.go plugins processor.go scripts testutil \ ${WRKSRC}/src/github.com/${GH_ACCOUNT}/${PORTNAME} - @${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_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 ;\ @@ -176,6 +176,7 @@ post-patch: ${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 ;\ + ${MV} ${WRKSRC_wlog} ${WRKSRC}/src/github.com/influxdata/wlog ;\ ${MV} ${WRKSRC_osext} ${WRKSRC}/src/github.com/kardianos/osext ;\ ${MV} ${WRKSRC_service} ${WRKSRC}/src/github.com/kardianos/service ;\ ${MV} ${WRKSRC_crc32} ${WRKSRC}/src/github.com/klauspost/crc32 ;\ @@ -184,7 +185,7 @@ post-patch: ${MV} ${WRKSRC_dns} ${WRKSRC}/src/github.com/miekg/dns ;\ ${MV} ${WRKSRC_go_snappystream} ${WRKSRC}/src/github.com/mreiferson/go-snappystream ;\ ${MV} ${WRKSRC_go_stringutil} ${WRKSRC}/src/github.com/naoina/go-stringutil ;\ - ${MV} ${WRKSRC_nats} ${WRKSRC}/src/github.com/nats-io/nats ;\ + ${MV} ${WRKSRC_go_nats} ${WRKSRC}/src/github.com/nats-io/nats ;\ ${MV} ${WRKSRC_nuid} ${WRKSRC}/src/github.com/nats-io/nuid ;\ ${MV} ${WRKSRC_go_nsq} ${WRKSRC}/src/github.com/nsqio/go-nsq ;\ ${MV} ${WRKSRC_runc} ${WRKSRC}/src/github.com/opencontainers/runc ;\ Modified: head/net-mgmt/telegraf/distinfo ============================================================================== --- head/net-mgmt/telegraf/distinfo Tue Nov 22 23:05:21 2016 (r426879) +++ head/net-mgmt/telegraf/distinfo Wed Nov 23 00:23:49 2016 (r426880) @@ -1,12 +1,12 @@ -TIMESTAMP = 1475177717 -SHA256 (influxdata-telegraf-1.0.1_GH0.tar.gz) = 12fa64354ccd5fcac1ae30e38eda18090e0f6b674b62207dccf7d8920a19a535 -SIZE (influxdata-telegraf-1.0.1_GH0.tar.gz) = 565710 +TIMESTAMP = 1479816693 +SHA256 (influxdata-telegraf-1.1.1_GH0.tar.gz) = d6452e40ed78554499e9e423a11eadb51ed8c60568d82df114f346bb16f7cf4a +SIZE (influxdata-telegraf-1.1.1_GH0.tar.gz) = 609233 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 (aerospike-aerospike-client-go-45863b7_GH0.tar.gz) = 1f3654fbcdeb8b89711f6351af6b53d81a5f8dd76c1c3b6200945b89c10f1ce7 -SIZE (aerospike-aerospike-client-go-45863b7_GH0.tar.gz) = 190251 +SHA256 (aerospike-aerospike-client-go-7f3a312_GH0.tar.gz) = 293541a590ce4ed71f44c62a2fc35b2d3a167f1f133b6ac7df1625df8e8f03aa +SIZE (aerospike-aerospike-client-go-7f3a312_GH0.tar.gz) = 193906 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 @@ -43,8 +43,8 @@ SHA256 (gobwas-glob-49571a1_GH0.tar.gz) 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 (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 @@ -59,10 +59,12 @@ SHA256 (hpcloud-tail-b294095_GH0.tar.gz) 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-influxdb-fc57c0f_GH0.tar.gz) = a38b77f1bba1c80480cd914acae00a2ce06aaa808938d5151cfbc8cc9e7b0648 +SIZE (influxdata-influxdb-fc57c0f_GH0.tar.gz) = 1406092 SHA256 (influxdata-toml-af4df43_GH0.tar.gz) = 86231e74617206c8df2f9a69d1d735b7a30b1c51e9013f3d28f7c32f9d253f09 SIZE (influxdata-toml-af4df43_GH0.tar.gz) = 34582 +SHA256 (influxdata-wlog-7c63b0a_GH0.tar.gz) = fa60808c1a241f1a6f38f2c9ed40ec4d03ca6bed90d584620b34bfe00eaf94cc +SIZE (influxdata-wlog-7c63b0a_GH0.tar.gz) = 2714 SHA256 (kardianos-osext-29ae4ff_GH0.tar.gz) = ea3cb1266103fb9b07a01bfdf614b0b7384de8f6dd5573295973037165b8ce68 SIZE (kardianos-osext-29ae4ff_GH0.tar.gz) = 4618 SHA256 (kardianos-service-5e33559_GH0.tar.gz) = 08f47c6ca3ced83521a40f3804dc0832c80ea17f8f016900dcf6643d516369d4 @@ -79,10 +81,10 @@ SHA256 (mreiferson-go-snappystream-028ea 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 (nats-io-go-nats-ea8b4fd_GH0.tar.gz) = 3adf73f67e55c08fb799f46abe213418f050b35344d01e67b11cf006bedc876e +SIZE (nats-io-go-nats-ea8b4fd_GH0.tar.gz) = 78200 +SHA256 (nats-io-nuid-a5152d6_GH0.tar.gz) = a8f31c2a3525eb1d62a7bda776d37c7b939cb77dc617667fcd155bd7c3de4596 +SIZE (nats-io-nuid-a5152d6_GH0.tar.gz) = 3943 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 @@ -99,8 +101,8 @@ SHA256 (samuel-go-zookeeper-218e9c8_GH0. SIZE (samuel-go-zookeeper-218e9c8_GH0.tar.gz) = 29296 SHA256 (shirou-gopsutil-4d0c402_GH0.tar.gz) = a5a6df8eed689ea38c98b97b7ab8445baa38e88e9393bf329de88298a9680b29 SIZE (shirou-gopsutil-4d0c402_GH0.tar.gz) = 71117 -SHA256 (soniah-gosnmp-eb32571_GH0.tar.gz) = 23254362aab8fad92023d236cd3a52b8b9c1c5a536af94fc96c4bc789a65c88d -SIZE (soniah-gosnmp-eb32571_GH0.tar.gz) = 37212 +SHA256 (soniah-gosnmp-3fe3beb_GH0.tar.gz) = 48c11063edcb67198b8f2ea9978232f7ae36af8224e3f6869ff6d394d4347fc6 +SIZE (soniah-gosnmp-3fe3beb_GH0.tar.gz) = 41593 SHA256 (sparrc-gdm-66023a5_GH0.tar.gz) = 0f45e70e4c7f1cb6b3627fadc15973333a7f2cfcdc2478120f6222446ff9881e SIZE (sparrc-gdm-66023a5_GH0.tar.gz) = 8656 SHA256 (streadway-amqp-b4f3cea_GH0.tar.gz) = e7536c75aa99fb3285bdac9cd4e2013fe63dafb4c5c36172d5cba9e90c9ad230 @@ -117,8 +119,8 @@ SHA256 (yuin-gopher-lua-bf3808a_GH0.tar. SIZE (yuin-gopher-lua-bf3808a_GH0.tar.gz) = 146473 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-crypto-c197bcf_GH0.tar.gz) = 1b5885280a6290b9840aa1e5171095e690bcd8b0c9a01931d82f23562277bea6 +SIZE (golang-crypto-c197bcf_GH0.tar.gz) = 903965 SHA256 (golang-net-6acef71_GH0.tar.gz) = aeea3d55a6e2f29329dfac8330817ccd449ffcb930b496fec0a47f011fa53f19 SIZE (golang-net-6acef71_GH0.tar.gz) = 741883 SHA256 (golang-text-a71fd10_GH0.tar.gz) = 8b8bfda09d60729c50162b67f5f3451980e7ce5c6580769c99a423172a6a75ad Modified: head/net-mgmt/telegraf/files/telegraf.in ============================================================================== --- head/net-mgmt/telegraf/files/telegraf.in Tue Nov 22 23:05:21 2016 (r426879) +++ head/net-mgmt/telegraf/files/telegraf.in Wed Nov 23 00:23:49 2016 (r426880) @@ -22,14 +22,14 @@ rcvar=telegraf_enable load_rc_config $name : ${telegraf_enable:="NO"} -: ${telegraf_flags:=""} +: ${telegraf_flags:="-quiet"} : ${telegraf_conf:="%%PREFIX%%/etc/${name}.conf"} # daemon start_precmd=telegraf_prestart pidfile="/var/run/${name}.pid" command=/usr/sbin/daemon -command_args="-crP ${pidfile} %%PREFIX%%/bin/${name} ${telegraf_flags} -config=${telegraf_conf} 2>> /var/log/telegraf.log" +command_args="-crP ${pidfile} %%PREFIX%%/bin/${name} ${telegraf_flags} -config=${telegraf_conf} >> /var/log/telegraf.log 2>&1" telegraf_prestart() { # Have to empty rc_flags so they don't get passed to daemon(8)