Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 11 Sep 2015 03:32:14 +0000 (UTC)
From:      Jason Unovitch <junovitch@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r396645 - head/net-mgmt/collectd5
Message-ID:  <201509110332.t8B3WEox074343@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: junovitch
Date: Fri Sep 11 03:32:13 2015
New Revision: 396645
URL: https://svnweb.freebsd.org/changeset/ports/396645

Log:
  net-mgmt/collectd5: add support for write_kafka plugin
  
  While here, also sort OPTIONS_GROUP_OUTPUT and two DESC items
  
  PR:		202487
  Submitted by:	xoan333@yahoo.com
  Approved by:	Krzysztof <ports@bsdserwis.com> (maintainer), feld (mentor)

Modified:
  head/net-mgmt/collectd5/Makefile
  head/net-mgmt/collectd5/pkg-plist

Modified: head/net-mgmt/collectd5/Makefile
==============================================================================
--- head/net-mgmt/collectd5/Makefile	Fri Sep 11 03:29:52 2015	(r396644)
+++ head/net-mgmt/collectd5/Makefile	Fri Sep 11 03:32:13 2015	(r396645)
@@ -3,7 +3,7 @@
 
 PORTNAME=	collectd
 PORTVERSION=	5.5.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://collectd.org/files/ \
 		http://collectd.org/files/
@@ -24,7 +24,7 @@ GNU_CONFIGURE=	yes
 
 OPTIONS_DEFINE=		CGI DEBUG GCRYPT LOGSTASH VIRT
 OPTIONS_GROUP=		INPUT OUTPUT
-OPTIONS_GROUP_OUTPUT=	RRDTOOL NOTIFYEMAIL NOTIFYDESKTOP RIEMANN
+OPTIONS_GROUP_OUTPUT=	KAFKA NOTIFYDESKTOP NOTIFYEMAIL RIEMANN RRDTOOL
 OPTIONS_GROUP_INPUT=	CURL DBI IPMI JSON MEMCACHEC MODBUS MONGODB MYSQL \
 			NUTUPS OLSRD ONEWIRE OPENLDAP PERL PGSQL PINBA PING \
 			PYTHON RABBITMQ REDIS ROUTEROS SIGROK SNMP STATGRAB \
@@ -32,18 +32,19 @@ OPTIONS_GROUP_INPUT=	CURL DBI IPMI JSON 
 
 CGI_DESC=		Install collection.cgi (requires rrdtool)
 CURL_DESC=		Enable curl-based plugins (apache, nginx, etc)
-DEBUG_DESC=		Enable debugging
 DBI_DESC=		Enable dbi plugin
+DEBUG_DESC=		Enable debugging
 GCRYPT_DESC=		Build with libgcrypt
 IPMI_DESC=		Enable OpenIPMI plugin
 JSON_DESC=		Enable JSON plugins
+KAFKA_DESC=		Enable write_kafka plugin
 LOGSTASH_DESC=		Enable log_logstash plugin (requires json)
 MEMCACHEC_DESC=		Enable memcachec plugin
 MODBUS_DESC=		Enable modbus plugin
 MONGODB_DESC=		Enable MongoDB-based plugins
 MYSQL_DESC=		Enable mysql-based plugins
-NOTIFYEMAIL_DESC=	Enable notifications via email
 NOTIFYDESKTOP_DESC=	Enable desktop notifications
+NOTIFYEMAIL_DESC=	Enable notifications via email
 NUTUPS_DESC=		Enable nut (ups) plugin
 OLSRD_DESC=		Enable olsrd plugin
 ONEWIRE_DESC=		Eanble onewire plugin (via owfs)
@@ -99,7 +100,6 @@ CONFIGURE_ARGS=	--localstatedir=/var \
 		--without-libnetapp \
 		--without-libowcapi \
 		--without-libperfstat \
-		--without-librdkafka \
 		--without-libsensors \
 		--without-libvarnish \
 		--without-lvm \
@@ -251,6 +251,15 @@ CONFIGURE_ARGS+=--with-libyajl=${LOCALBA
 CONFIGURE_ARGS+=--without-libyajl
 .endif
 
+.if ${PORT_OPTIONS:MKAFKA}
+LIB_DEPENDS+=	librdkafka.so:${PORTSDIR}/net/librdkafka
+CONFIGURE_ARGS+=--enable-write_kafka
+PLIST_SUB+=	KAFKA=""
+.else
+CONFIGURE_ARGS+=--disable-write_kafka
+PLIST_SUB+=	KAFKA="@comment "
+.endif
+
 .if ${PORT_OPTIONS:MLOGSTASH}
 CONFIGURE_ARGS+=--enable-log_logstash
 PLIST_SUB+=	LOGSTASH=""

Modified: head/net-mgmt/collectd5/pkg-plist
==============================================================================
--- head/net-mgmt/collectd5/pkg-plist	Fri Sep 11 03:29:52 2015	(r396644)
+++ head/net-mgmt/collectd5/pkg-plist	Fri Sep 11 03:32:13 2015	(r396645)
@@ -97,6 +97,7 @@ lib/collectd/uuid.so
 lib/collectd/write_graphite.so
 %%CURL%%lib/collectd/write_http.so
 lib/collectd/write_log.so
+%%KAFKA%%lib/collectd/write_kafka.so
 %%MONGODB%%lib/collectd/write_mongodb.so
 %%REDIS%%lib/collectd/write_redis.so
 %%RIEMANN%%lib/collectd/write_riemann.so



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509110332.t8B3WEox074343>