Attachment #166370 for bug #206660




# $FreeBSD: head/net-mgmt/collectd5/Makefile 404774 2015-12-29 18:48:03Z junovitch $

PORTNAME=	collectd
PORTVERSION=	5.5.1
PORTREVISION=	5
CATEGORIES=	net-mgmt
MASTER_SITES=	https://collectd.org/files/ \
		http://collectd.org/files/


USE_LDCONFIG=	yes

CONFLICTS=	collectd-4.[0-9]*

CPPFLAGS+=	-I${LOCALBASE}/include
LIBS+=		-L${LOCALBASE}/lib


		--disable-all-plugins \
		--disable-static \
		--without-amqp \
		--disable-ceph \
		--disable-cgroups \
		--disable-fhcount \
		--without-java \
		--without-libaquaero5 \
		--without-libganglia \

		--without-libkstat \
		--without-libldap \
		--without-libmnl \
		--without-libmodbus \
		--without-libnetlink \
		--without-libnetapp \
		--without-libowcapi \


MODBUS_LIB_DEPENDS=		libmodbus.so:${PORTSDIR}/comms/libmodbus
MODBUS_CONFIGURE_ENABLE=	modbus
MODBUS_CONFIGURE_WITH=		libmodbus=use_pkgconfig

MONGODB_LIB_DEPENDS=		libmongoc-1.0.so:${PORTSDIR}/devel/mongo-c-driver
MONGODB_CONFIGURE_ENABLE=	write_mongodb

		--enable-dns \
		--enable-email \
		--enable-exec \
		--enable-fhcount \
		--enable-filecount \
		--enable-load \
		--enable-logfile \

Lines 1-2 Link Here

(-)net-mgmt/collectd5.new/distinfo (-2 / +2 lines)
1	SHA256 (collectd-5.5.0.tar.bz2) = 847684cf5c10de1dc34145078af3fcf6e0d168ba98c14f1343b1062a4b569e88	1	SHA256 (collectd-5.5.1.tar.bz2) = f9c5d526e1f0429a7db1ccd90bdf9e23923a2fd43b7285cfda8f0341e5c0bc3f
2	SIZE (collectd-5.5.0.tar.bz2) = 1824495	2	SIZE (collectd-5.5.1.tar.bz2) = 1797852

Lines 1-6 Link Here

(-)net-mgmt/collectd5.new/files/patch-Makefile.am (-2 / +2 lines)
1	--- Makefile.am.orig 2015-03-09 09:38:22 UTC	1	--- Makefile.am.orig 2016-01-22 08:33:25 UTC
2	+++ Makefile.am	2	+++ Makefile.am
3	@@ -8,7 +8,6 @@ EXTRA_DIST = contrib version-gen.sh	3	@@ -14,7 +14,6 @@ EXTRA_DIST = contrib version-gen.sh
4		4
5	install-exec-hook:	5	install-exec-hook:
6	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run	6	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run




--- configure.ac.orig	2016-01-22 09:51:17 UTC
+++ configure.ac
@@ -155,7 +155,7 @@ then
 fi
 
 # Where to install .pc files.

 AC_SUBST(pkgconfigdir)
 
 # Check for standards compliance mode
@@ -715,7 +715,7 @@ SAVE_CFLAGS="$CFLAGS"
 # Emulate behavior of src/Makefile.am
 if test "x$GCC" = "xyes"
 then

 fi
 
 AC_CACHE_CHECK([for strtok_r],
@@ -844,7 +844,7 @@ AC_CHECK_FUNCS(getutxent, [have_getutxen
 if test "x$GCC" = "xyes"
 then
 	SAVE_CFLAGS="$CFLAGS"

 fi
 
 AC_CHECK_FUNCS(strptime, [have_strptime="yes"], [have_strptime="no"])
@@ -1571,6 +1571,7 @@ if test "x$with_kstat" = "xyes"
 then
 	AC_CHECK_LIB(kstat, kstat_open, [with_kstat="yes"], [with_kstat="no (libkstat not found)"], [])
 fi

 if test "x$with_kstat" = "xyes"
 then
 	AC_CHECK_LIB(devinfo, di_init, [with_devinfo="yes"], [with_devinfo="no (not found)"], [])
@@ -1580,6 +1581,8 @@ if test "x$with_kstat" = "xyes"
 then
 	AC_DEFINE(HAVE_LIBKSTAT, 1,
 		  [Define to 1 if you have the 'kstat' library (-lkstat)])

 fi
 AM_CONDITIONAL(BUILD_WITH_LIBKSTAT, test "x$with_kstat" = "xyes")
 AM_CONDITIONAL(BUILD_WITH_LIBDEVINFO, test "x$with_devinfo" = "xyes")
@@ -2624,8 +2627,8 @@ AC_ARG_WITH(libmongoc, [AS_HELP_STRING([
 	 with_libmongoc="no"
  else
 	 with_libmongoc="yes"
-	 LIBMONGOC_CPPFLAGS="$LIBMONGOC_CPPFLAGS -I$withval/include"
-	 LIBMONGOC_LDFLAGS="$LIBMONGOC_LDFLAGS -L$withval/lib"
+	 LIBMONGOC_CPPFLAGS="$LIBMONGOC_CPPFLAGS -I$withval/include/libmongoc-1.0 -I$withval/include/libbson-1.0"
+	 LIBMONGOC_LDFLAGS="$LIBMONGOC_LDFLAGS -L$withval/lib -lsasl2 -lssl -lcrypto  -lmongoc-1.0 -lbson-1.0"
  fi; fi
 ],
 [with_libmongoc="yes"])
@@ -2642,7 +2645,7 @@ then
 	then
 		AC_MSG_NOTICE([libmongoc CPPFLAGS: $LIBMONGOC_CPPFLAGS])
 	fi
-	AC_CHECK_HEADERS(mongo.h,
+	AC_CHECK_HEADERS(mongoc.h,
 	[with_libmongoc="yes"],
 	[with_libmongoc="no ('mongo.h' not found)"],
 [#if HAVE_STDINT_H
@@ -2658,7 +2661,7 @@ then
 	then
 		AC_MSG_NOTICE([libmongoc LDFLAGS: $LIBMONGOC_LDFLAGS])
 	fi
-	AC_CHECK_LIB(mongoc, mongo_run_command,
+	AC_CHECK_LIB(mongoc-1.0, mongoc_client_command,
 	[with_libmongoc="yes"],
 	[with_libmongoc="no (symbol 'mongo_run_command' not found)"])
 fi
@@ -3415,7 +3418,7 @@ then
 	SAVE_LIBS="$LIBS"
 	# trigger an error if Perl_load_module*() uses __attribute__nonnull__(3)
 	# (see issues #41 and #42)

 	LIBS="$LIBS $PERL_LIBS"
 
 	AC_CACHE_CHECK([for broken Perl_load_module()],
@@ -3645,7 +3648,7 @@ fi
 if test "x$with_python" = "xyes"
 then
 	AC_MSG_CHECKING([for Python CPPFLAGS])

 	python_config_status=$?
 
 	if test "$python_config_status" -ne 0 || test "x$python_include_path" = "x"
@@ -3668,7 +3671,7 @@ fi
 if test "x$with_python" = "xyes"
 then
 	AC_MSG_CHECKING([for Python LDFLAGS])

 	python_config_status=$?
 
 	if test "$python_config_status" -ne 0 || test "x$python_library_path" = "x"
@@ -3683,7 +3686,7 @@ fi
 if test "x$with_python" = "xyes"
 then
 	AC_MSG_CHECKING([for Python LIBS])

 	python_config_status=$?
 
 	if test "$python_config_status" -ne 0 || test "x$python_library_flags" = "x"
@@ -3698,7 +3701,7 @@ fi
 if test "x$with_python" = "xyes"
 then
 	LDFLAGS="-L$python_library_path $LDFLAGS"

 
 	AC_CHECK_FUNC(PyObject_CallFunction,
 		      [with_python="yes"],
@@ -4761,8 +4764,8 @@ AC_ARG_WITH(libvarnish, [AS_HELP_STRING(
 	else if test -d "$with_libvarnish/lib"
 	then
 		AC_MSG_NOTICE([Not checking for libvarnish: Manually configured])

 		with_libvarnish="yes"
 	fi; fi; fi
 ],
@@ -5334,6 +5337,7 @@ fi
 
 if test "x$ac_system" = "xFreeBSD"
 then
+	plugin_disk="yes"
 	plugin_zfs_arc="yes"
 fi
 




--- src/Makefile.am.orig	2016-01-22 09:51:17 UTC
+++ src/Makefile.am
@@ -7,14 +7,14 @@ SUBDIRS += daemon
 PLUGIN_LDFLAGS = -module -avoid-version -export-symbols-regex '\<module_register\>'

 endif
 if BUILD_WITH_LIBDEVINFO
 cpu_la_LIBADD += -ldevinfo
@@ -301,7 +301,7 @@ disk_la_CFLAGS = $(AM_CFLAGS)
 disk_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 disk_la_LIBADD =
 if BUILD_WITH_LIBKSTAT

 endif
 if BUILD_WITH_LIBDEVINFO
 disk_la_LIBADD += -ldevinfo
@@ -319,6 +319,9 @@ endif
 if BUILD_WITH_PERFSTAT
 disk_la_LIBADD += -lperfstat
 endif

 endif
 
 if BUILD_PLUGIN_DNS
@@ -405,7 +408,7 @@ interface_la_CFLAGS += $(BUILD_WITH_LIBS
 interface_la_LIBADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
 else
 if BUILD_WITH_LIBKSTAT

 endif
 if BUILD_WITH_LIBDEVINFO
 interface_la_LIBADD += -ldevinfo
@@ -584,7 +587,7 @@ memory_la_CFLAGS = $(AM_CFLAGS)
 memory_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 memory_la_LIBADD =
 if BUILD_WITH_LIBKSTAT

 endif
 if BUILD_WITH_LIBDEVINFO
 memory_la_LIBADD += -ldevinfo
@@ -951,7 +954,7 @@ swap_la_CFLAGS = $(AM_CFLAGS)
 swap_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 swap_la_LIBADD =
 if BUILD_WITH_LIBKSTAT

 endif
 if BUILD_WITH_LIBDEVINFO
 swap_la_LIBADD += -ldevinfo
@@ -997,7 +1000,7 @@ if BUILD_PLUGIN_TAPE
 pkglib_LTLIBRARIES += tape.la
 tape_la_SOURCES = tape.c
 tape_la_LDFLAGS = $(PLUGIN_LDFLAGS)

 endif
 
 if BUILD_PLUGIN_TARGET_NOTIFICATION
@@ -1102,7 +1105,7 @@ uptime_la_CFLAGS = $(AM_CFLAGS)
 uptime_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 uptime_la_LIBADD =
 if BUILD_WITH_LIBKSTAT

 endif
 if BUILD_WITH_PERFSTAT
 uptime_la_LIBADD += -lperfstat
@@ -1260,7 +1263,7 @@ if BUILD_LINUX
 # zfs_arc requires no library on linux
 else
 # solaris

 endif
 endif
 endif
@@ -1354,12 +1357,7 @@ endif
 
 install-exec-hook:
 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)




--- src/Makefile.in.orig	2016-01-22 09:55:46 UTC
+++ src/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.14.1 from Makefile.am.
+# Makefile.in generated by automake 1.15 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+# Copyright (C) 1994-2014 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -16,7 +16,17 @@
 
 
 VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
 am__make_running_with_option = \
   case $${target_option-} in \
       ?) ;; \
@@ -112,7 +122,7 @@ bin_PROGRAMS = collectd-nagios$(EXEEXT) 
 @BUILD_PLUGIN_CONTEXTSWITCH_TRUE@am__append_28 = contextswitch.la
 @BUILD_PLUGIN_CONTEXTSWITCH_TRUE@@BUILD_WITH_PERFSTAT_TRUE@am__append_29 = -lperfstat
 @BUILD_PLUGIN_CPU_TRUE@am__append_30 = cpu.la
-@BUILD_PLUGIN_CPU_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__append_31 = -lkstat
+@BUILD_PLUGIN_CPU_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__append_31 = $(BUILD_WITH_LIBKSTAT_LIBS)
 @BUILD_PLUGIN_CPU_TRUE@@BUILD_WITH_LIBDEVINFO_TRUE@am__append_32 = -ldevinfo
 @BUILD_PLUGIN_CPU_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_33 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
 @BUILD_PLUGIN_CPU_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_34 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
@@ -129,191 +139,196 @@ bin_PROGRAMS = collectd-nagios$(EXEEXT) 
 @BUILD_PLUGIN_DBI_TRUE@am__append_45 = dbi.la
 @BUILD_PLUGIN_DF_TRUE@am__append_46 = df.la
 @BUILD_PLUGIN_DISK_TRUE@am__append_47 = disk.la
-@BUILD_PLUGIN_DISK_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__append_48 = -lkstat
+@BUILD_PLUGIN_DISK_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__append_48 = $(BUILD_WITH_LIBKSTAT_LIBS)
 @BUILD_PLUGIN_DISK_TRUE@@BUILD_WITH_LIBDEVINFO_TRUE@am__append_49 = -ldevinfo
 @BUILD_PLUGIN_DISK_TRUE@@BUILD_WITH_LIBIOKIT_TRUE@am__append_50 = -framework IOKit
 @BUILD_PLUGIN_DISK_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_51 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
 @BUILD_PLUGIN_DISK_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_52 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
 @BUILD_PLUGIN_DISK_TRUE@@BUILD_WITH_LIBUDEV_TRUE@am__append_53 = -ludev
 @BUILD_PLUGIN_DISK_TRUE@@BUILD_WITH_PERFSTAT_TRUE@am__append_54 = -lperfstat
-@BUILD_PLUGIN_DNS_TRUE@am__append_55 = dns.la
-@BUILD_PLUGIN_DRBD_TRUE@am__append_56 = drbd.la
-@BUILD_PLUGIN_EMAIL_TRUE@am__append_57 = email.la
-@BUILD_PLUGIN_ENTROPY_TRUE@am__append_58 = entropy.la
-@BUILD_PLUGIN_EXEC_TRUE@am__append_59 = exec.la
-@BUILD_PLUGIN_ETHSTAT_TRUE@am__append_60 = ethstat.la
-@BUILD_PLUGIN_FHCOUNT_TRUE@am__append_61 = fhcount.la
-@BUILD_PLUGIN_FILECOUNT_TRUE@am__append_62 = filecount.la
-@BUILD_PLUGIN_GMOND_TRUE@am__append_63 = gmond.la
-@BUILD_PLUGIN_HDDTEMP_TRUE@am__append_64 = hddtemp.la
-@BUILD_PLUGIN_HDDTEMP_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_65 = -lsocket
-@BUILD_PLUGIN_INTERFACE_TRUE@am__append_66 = interface.la
-@BUILD_PLUGIN_INTERFACE_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_67 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
-@BUILD_PLUGIN_INTERFACE_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_68 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
-@BUILD_PLUGIN_INTERFACE_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@@BUILD_WITH_LIBSTATGRAB_FALSE@am__append_69 = -lkstat
-@BUILD_PLUGIN_INTERFACE_TRUE@@BUILD_WITH_LIBDEVINFO_TRUE@@BUILD_WITH_LIBSTATGRAB_FALSE@am__append_70 = -ldevinfo
-@BUILD_PLUGIN_INTERFACE_TRUE@@BUILD_WITH_PERFSTAT_TRUE@am__append_71 = -lperfstat
-@BUILD_PLUGIN_IPC_TRUE@am__append_72 = ipc.la
-@BUILD_PLUGIN_IPTABLES_TRUE@am__append_73 = iptables.la
-@BUILD_PLUGIN_IPMI_TRUE@am__append_74 = ipmi.la
-@BUILD_PLUGIN_IPVS_TRUE@am__append_75 = ipvs.la
-@BUILD_PLUGIN_IRQ_TRUE@am__append_76 = irq.la
-@BUILD_PLUGIN_JAVA_TRUE@am__append_77 = java.la
-@BUILD_PLUGIN_LOAD_TRUE@am__append_78 = load.la
-@BUILD_PLUGIN_LOAD_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_79 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
-@BUILD_PLUGIN_LOAD_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_80 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
-@BUILD_PLUGIN_LOAD_TRUE@@BUILD_WITH_PERFSTAT_TRUE@am__append_81 = -lperfstat
-@BUILD_PLUGIN_LOGFILE_TRUE@am__append_82 = logfile.la
-@BUILD_PLUGIN_LOG_LOGSTASH_TRUE@am__append_83 = log_logstash.la
-@BUILD_PLUGIN_LPAR_TRUE@am__append_84 = lpar.la
-@BUILD_PLUGIN_LVM_TRUE@am__append_85 = lvm.la
-@BUILD_PLUGIN_MADWIFI_TRUE@am__append_86 = madwifi.la
-@BUILD_PLUGIN_MATCH_EMPTY_COUNTER_TRUE@am__append_87 = match_empty_counter.la
-@BUILD_PLUGIN_MATCH_HASHED_TRUE@am__append_88 = match_hashed.la
-@BUILD_PLUGIN_MATCH_REGEX_TRUE@am__append_89 = match_regex.la
-@BUILD_PLUGIN_MATCH_TIMEDIFF_TRUE@am__append_90 = match_timediff.la
-@BUILD_PLUGIN_MATCH_VALUE_TRUE@am__append_91 = match_value.la
-@BUILD_PLUGIN_MBMON_TRUE@am__append_92 = mbmon.la
-@BUILD_PLUGIN_MBMON_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_93 = -lsocket
-@BUILD_PLUGIN_MD_TRUE@am__append_94 = md.la
-@BUILD_PLUGIN_MEMCACHEC_TRUE@am__append_95 = memcachec.la
-@BUILD_PLUGIN_MEMCACHED_TRUE@am__append_96 = memcached.la
-@BUILD_PLUGIN_MEMCACHED_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_97 = -lsocket
-@BUILD_PLUGIN_MEMORY_TRUE@am__append_98 = memory.la
-@BUILD_PLUGIN_MEMORY_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__append_99 = -lkstat
-@BUILD_PLUGIN_MEMORY_TRUE@@BUILD_WITH_LIBDEVINFO_TRUE@am__append_100 = -ldevinfo
-@BUILD_PLUGIN_MEMORY_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_101 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
-@BUILD_PLUGIN_MEMORY_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_102 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
-@BUILD_PLUGIN_MEMORY_TRUE@@BUILD_WITH_PERFSTAT_TRUE@am__append_103 = -lperfstat
-@BUILD_PLUGIN_MIC_TRUE@am__append_104 = mic.la
-@BUILD_PLUGIN_MODBUS_TRUE@am__append_105 = modbus.la
-@BUILD_PLUGIN_MULTIMETER_TRUE@am__append_106 = multimeter.la
-@BUILD_PLUGIN_MYSQL_TRUE@am__append_107 = mysql.la
-@BUILD_PLUGIN_MYSQL_TRUE@@BUILD_WITH_LIBMYSQL_TRUE@am__append_108 = $(BUILD_WITH_LIBMYSQL_CFLAGS)
-@BUILD_PLUGIN_MYSQL_TRUE@@BUILD_WITH_LIBMYSQL_TRUE@am__append_109 = $(BUILD_WITH_LIBMYSQL_LIBS)
-@BUILD_PLUGIN_NETAPP_TRUE@am__append_110 = netapp.la
-@BUILD_PLUGIN_NETLINK_TRUE@am__append_111 = netlink.la
-@BUILD_PLUGIN_NETWORK_TRUE@am__append_112 = network.la
-@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_113 = -lsocket
-@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBGCRYPT_TRUE@am__append_114 = $(GCRYPT_CPPFLAGS)
-@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBGCRYPT_TRUE@am__append_115 = $(GCRYPT_LDFLAGS)
-@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBGCRYPT_TRUE@am__append_116 = $(GCRYPT_LIBS)
-@BUILD_PLUGIN_NFS_TRUE@am__append_117 = nfs.la
-@BUILD_PLUGIN_FSCACHE_TRUE@am__append_118 = fscache.la
-@BUILD_PLUGIN_NGINX_TRUE@am__append_119 = nginx.la
-@BUILD_PLUGIN_NGINX_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__append_120 = $(BUILD_WITH_LIBCURL_CFLAGS)
-@BUILD_PLUGIN_NGINX_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__append_121 = $(BUILD_WITH_LIBCURL_LIBS)
-@BUILD_PLUGIN_NOTIFY_DESKTOP_TRUE@am__append_122 = notify_desktop.la
-@BUILD_PLUGIN_NOTIFY_EMAIL_TRUE@am__append_123 = notify_email.la
-@BUILD_PLUGIN_NTPD_TRUE@am__append_124 = ntpd.la
-@BUILD_PLUGIN_NTPD_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_125 = -lsocket
-@BUILD_PLUGIN_NUMA_TRUE@am__append_126 = numa.la
-@BUILD_PLUGIN_NUT_TRUE@am__append_127 = nut.la
-@BUILD_PLUGIN_OLSRD_TRUE@am__append_128 = olsrd.la
-@BUILD_PLUGIN_OLSRD_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_129 = -lsocket
-@BUILD_PLUGIN_ONEWIRE_TRUE@am__append_130 = onewire.la
-@BUILD_PLUGIN_OPENLDAP_TRUE@am__append_131 = openldap.la
-@BUILD_PLUGIN_OPENVPN_TRUE@am__append_132 = openvpn.la
-@BUILD_PLUGIN_ORACLE_TRUE@am__append_133 = oracle.la
-@BUILD_PLUGIN_PERL_TRUE@am__append_134 = perl.la
+@BUILD_FREEBSD_TRUE@@BUILD_PLUGIN_DISK_TRUE@am__append_55 = -ldevstat -lgeom
+@BUILD_PLUGIN_DNS_TRUE@am__append_56 = dns.la
+@BUILD_PLUGIN_DRBD_TRUE@am__append_57 = drbd.la
+@BUILD_PLUGIN_EMAIL_TRUE@am__append_58 = email.la
+@BUILD_PLUGIN_ENTROPY_TRUE@am__append_59 = entropy.la
+@BUILD_PLUGIN_EXEC_TRUE@am__append_60 = exec.la
+@BUILD_PLUGIN_ETHSTAT_TRUE@am__append_61 = ethstat.la
+@BUILD_PLUGIN_FHCOUNT_TRUE@am__append_62 = fhcount.la
+@BUILD_PLUGIN_FILECOUNT_TRUE@am__append_63 = filecount.la
+@BUILD_PLUGIN_GMOND_TRUE@am__append_64 = gmond.la
+@BUILD_PLUGIN_HDDTEMP_TRUE@am__append_65 = hddtemp.la
+@BUILD_PLUGIN_HDDTEMP_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_66 = -lsocket
+@BUILD_PLUGIN_INTERFACE_TRUE@am__append_67 = interface.la
+@BUILD_PLUGIN_INTERFACE_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_68 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
+@BUILD_PLUGIN_INTERFACE_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_69 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
+@BUILD_PLUGIN_INTERFACE_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@@BUILD_WITH_LIBSTATGRAB_FALSE@am__append_70 = $(BUILD_WITH_LIBKSTAT_LIBS)
+@BUILD_PLUGIN_INTERFACE_TRUE@@BUILD_WITH_LIBDEVINFO_TRUE@@BUILD_WITH_LIBSTATGRAB_FALSE@am__append_71 = -ldevinfo
+@BUILD_PLUGIN_INTERFACE_TRUE@@BUILD_WITH_PERFSTAT_TRUE@am__append_72 = -lperfstat
+@BUILD_PLUGIN_IPC_TRUE@am__append_73 = ipc.la
+@BUILD_PLUGIN_IPTABLES_TRUE@am__append_74 = iptables.la
+@BUILD_PLUGIN_IPMI_TRUE@am__append_75 = ipmi.la
+@BUILD_PLUGIN_IPVS_TRUE@am__append_76 = ipvs.la
+@BUILD_PLUGIN_IRQ_TRUE@am__append_77 = irq.la
+@BUILD_PLUGIN_JAVA_TRUE@am__append_78 = java.la
+@BUILD_PLUGIN_LOAD_TRUE@am__append_79 = load.la
+@BUILD_PLUGIN_LOAD_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_80 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
+@BUILD_PLUGIN_LOAD_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_81 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
+@BUILD_PLUGIN_LOAD_TRUE@@BUILD_WITH_PERFSTAT_TRUE@am__append_82 = -lperfstat
+@BUILD_PLUGIN_LOGFILE_TRUE@am__append_83 = logfile.la
+@BUILD_PLUGIN_LOG_LOGSTASH_TRUE@am__append_84 = log_logstash.la
+@BUILD_PLUGIN_LPAR_TRUE@am__append_85 = lpar.la
+@BUILD_PLUGIN_LVM_TRUE@am__append_86 = lvm.la
+@BUILD_PLUGIN_MADWIFI_TRUE@am__append_87 = madwifi.la
+@BUILD_PLUGIN_MATCH_EMPTY_COUNTER_TRUE@am__append_88 = match_empty_counter.la
+@BUILD_PLUGIN_MATCH_HASHED_TRUE@am__append_89 = match_hashed.la
+@BUILD_PLUGIN_MATCH_REGEX_TRUE@am__append_90 = match_regex.la
+@BUILD_PLUGIN_MATCH_TIMEDIFF_TRUE@am__append_91 = match_timediff.la
+@BUILD_PLUGIN_MATCH_VALUE_TRUE@am__append_92 = match_value.la
+@BUILD_PLUGIN_MBMON_TRUE@am__append_93 = mbmon.la
+@BUILD_PLUGIN_MBMON_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_94 = -lsocket
+@BUILD_PLUGIN_MD_TRUE@am__append_95 = md.la
+@BUILD_PLUGIN_MEMCACHEC_TRUE@am__append_96 = memcachec.la
+@BUILD_PLUGIN_MEMCACHED_TRUE@am__append_97 = memcached.la
+@BUILD_PLUGIN_MEMCACHED_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_98 = -lsocket
+@BUILD_PLUGIN_MEMORY_TRUE@am__append_99 = memory.la
+@BUILD_PLUGIN_MEMORY_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__append_100 = $(BUILD_WITH_LIBKSTAT_LIBS)
+@BUILD_PLUGIN_MEMORY_TRUE@@BUILD_WITH_LIBDEVINFO_TRUE@am__append_101 = -ldevinfo
+@BUILD_PLUGIN_MEMORY_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_102 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
+@BUILD_PLUGIN_MEMORY_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_103 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
+@BUILD_PLUGIN_MEMORY_TRUE@@BUILD_WITH_PERFSTAT_TRUE@am__append_104 = -lperfstat
+@BUILD_PLUGIN_MIC_TRUE@am__append_105 = mic.la
+@BUILD_PLUGIN_MODBUS_TRUE@am__append_106 = modbus.la
+@BUILD_PLUGIN_MULTIMETER_TRUE@am__append_107 = multimeter.la
+@BUILD_PLUGIN_MYSQL_TRUE@am__append_108 = mysql.la
+@BUILD_PLUGIN_MYSQL_TRUE@@BUILD_WITH_LIBMYSQL_TRUE@am__append_109 = $(BUILD_WITH_LIBMYSQL_CFLAGS)
+@BUILD_PLUGIN_MYSQL_TRUE@@BUILD_WITH_LIBMYSQL_TRUE@am__append_110 = $(BUILD_WITH_LIBMYSQL_LIBS)
+@BUILD_PLUGIN_NETAPP_TRUE@am__append_111 = netapp.la
+@BUILD_PLUGIN_NETLINK_TRUE@am__append_112 = netlink.la
+@BUILD_PLUGIN_NETWORK_TRUE@am__append_113 = network.la
+@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_114 = -lsocket
+@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBGCRYPT_TRUE@am__append_115 = $(GCRYPT_CPPFLAGS)
+@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBGCRYPT_TRUE@am__append_116 = $(GCRYPT_LDFLAGS)
+@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBGCRYPT_TRUE@am__append_117 = $(GCRYPT_LIBS)
+@BUILD_PLUGIN_NFS_TRUE@am__append_118 = nfs.la
+@BUILD_PLUGIN_FSCACHE_TRUE@am__append_119 = fscache.la
+@BUILD_PLUGIN_NGINX_TRUE@am__append_120 = nginx.la
+@BUILD_PLUGIN_NGINX_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__append_121 = $(BUILD_WITH_LIBCURL_CFLAGS)
+@BUILD_PLUGIN_NGINX_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__append_122 = $(BUILD_WITH_LIBCURL_LIBS)
+@BUILD_PLUGIN_NOTIFY_DESKTOP_TRUE@am__append_123 = notify_desktop.la
+@BUILD_PLUGIN_NOTIFY_EMAIL_TRUE@am__append_124 = notify_email.la
+@BUILD_PLUGIN_NTPD_TRUE@am__append_125 = ntpd.la
+@BUILD_PLUGIN_NTPD_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_126 = -lsocket
+@BUILD_PLUGIN_NUMA_TRUE@am__append_127 = numa.la
+@BUILD_PLUGIN_NUT_TRUE@am__append_128 = nut.la
+@BUILD_PLUGIN_OLSRD_TRUE@am__append_129 = olsrd.la
+@BUILD_PLUGIN_OLSRD_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_130 = -lsocket
+@BUILD_PLUGIN_ONEWIRE_TRUE@am__append_131 = onewire.la
+@BUILD_PLUGIN_OPENLDAP_TRUE@am__append_132 = openldap.la
+@BUILD_PLUGIN_OPENVPN_TRUE@am__append_133 = openvpn.la
+@BUILD_PLUGIN_ORACLE_TRUE@am__append_134 = oracle.la
+@BUILD_PLUGIN_PERL_TRUE@am__append_135 = perl.la
 # Work-around for issues #41 and #42 - Perl 5.10 incorrectly introduced
 # __attribute__nonnull__(3) for Perl_load_module().
-@BUILD_PLUGIN_PERL_TRUE@@HAVE_BROKEN_PERL_LOAD_MODULE_TRUE@am__append_135 = -Wno-nonnull
-@BUILD_PLUGIN_PF_TRUE@am__append_136 = pf.la
-@BUILD_PLUGIN_PINBA_TRUE@am__append_137 = pinba.la
-@BUILD_PLUGIN_PING_TRUE@am__append_138 = ping.la
-@BUILD_PLUGIN_POSTGRESQL_TRUE@am__append_139 = postgresql.la
-@BUILD_PLUGIN_POWERDNS_TRUE@am__append_140 = powerdns.la
-@BUILD_PLUGIN_PYTHON_TRUE@am__append_141 = python.la
-@BUILD_PLUGIN_PYTHON_TRUE@@COMPILER_IS_GCC_TRUE@am__append_142 = -fno-strict-aliasing -Wno-strict-aliasing
-@BUILD_PLUGIN_PROCESSES_TRUE@am__append_143 = processes.la
-@BUILD_PLUGIN_PROCESSES_TRUE@@BUILD_WITH_LIBKVM_GETPROCS_TRUE@am__append_144 = -lkvm
-@BUILD_PLUGIN_PROTOCOLS_TRUE@am__append_145 = protocols.la
-@BUILD_PLUGIN_REDIS_TRUE@am__append_146 = redis.la
-@BUILD_PLUGIN_ROUTEROS_TRUE@am__append_147 = routeros.la
-@BUILD_PLUGIN_RRDCACHED_TRUE@am__append_148 = rrdcached.la
-@BUILD_PLUGIN_RRDTOOL_TRUE@am__append_149 = rrdtool.la
-@BUILD_PLUGIN_SENSORS_TRUE@am__append_150 = sensors.la
-@BUILD_PLUGIN_SERIAL_TRUE@am__append_151 = serial.la
-@BUILD_PLUGIN_SIGROK_TRUE@am__append_152 = sigrok.la
-@BUILD_PLUGIN_SMART_TRUE@@BUILD_WITH_LIBUDEV_TRUE@am__append_153 = smart.la
-@BUILD_PLUGIN_SNMP_TRUE@am__append_154 = snmp.la
-@BUILD_PLUGIN_SNMP_TRUE@@BUILD_WITH_LIBNETSNMP_TRUE@am__append_155 = $(BUILD_WITH_LIBSNMP_CFLAGS)
-@BUILD_PLUGIN_SNMP_TRUE@@BUILD_WITH_LIBNETSNMP_TRUE@am__append_156 = $(BUILD_WITH_LIBSNMP_LIBS)
-@BUILD_PLUGIN_SNMP_TRUE@@BUILD_WITH_LIBPTHREAD_TRUE@am__append_157 = -lpthread
-@BUILD_PLUGIN_STATSD_TRUE@am__append_158 = statsd.la
-@BUILD_PLUGIN_SWAP_TRUE@am__append_159 = swap.la
-@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__append_160 = -lkstat
-@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBDEVINFO_TRUE@am__append_161 = -ldevinfo
-@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBKVM_GETSWAPINFO_TRUE@am__append_162 = -lkvm
-@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_163 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
-@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_164 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
-@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_PERFSTAT_TRUE@am__append_165 = -lperfstat
-@BUILD_PLUGIN_SYSLOG_TRUE@am__append_166 = syslog.la
-@BUILD_PLUGIN_TABLE_TRUE@am__append_167 = table.la
-@BUILD_PLUGIN_TAIL_TRUE@am__append_168 = tail.la
-@BUILD_PLUGIN_TAIL_CSV_TRUE@am__append_169 = tail_csv.la
-@BUILD_PLUGIN_TAPE_TRUE@am__append_170 = tape.la
-@BUILD_PLUGIN_TARGET_NOTIFICATION_TRUE@am__append_171 = target_notification.la
-@BUILD_PLUGIN_TARGET_REPLACE_TRUE@am__append_172 = target_replace.la
-@BUILD_PLUGIN_TARGET_SCALE_TRUE@am__append_173 = target_scale.la
-@BUILD_PLUGIN_TARGET_SET_TRUE@am__append_174 = target_set.la
-@BUILD_PLUGIN_TARGET_V5UPGRADE_TRUE@am__append_175 = target_v5upgrade.la
-@BUILD_PLUGIN_TCPCONNS_TRUE@am__append_176 = tcpconns.la
-@BUILD_PLUGIN_TCPCONNS_TRUE@@BUILD_WITH_LIBKVM_NLIST_TRUE@am__append_177 = -lkvm
-@BUILD_PLUGIN_TEAMSPEAK2_TRUE@am__append_178 = teamspeak2.la
-@BUILD_PLUGIN_TED_TRUE@am__append_179 = ted.la
-@BUILD_PLUGIN_THERMAL_TRUE@am__append_180 = thermal.la
-@BUILD_PLUGIN_THRESHOLD_TRUE@am__append_181 = threshold.la
-@BUILD_PLUGIN_TOKYOTYRANT_TRUE@am__append_182 = tokyotyrant.la
-@BUILD_PLUGIN_TOKYOTYRANT_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_183 = -lsocket
-@BUILD_PLUGIN_TURBOSTAT_TRUE@am__append_184 = turbostat.la
-@BUILD_PLUGIN_UNIXSOCK_TRUE@am__append_185 = unixsock.la
-@BUILD_PLUGIN_UPTIME_TRUE@am__append_186 = uptime.la
-@BUILD_PLUGIN_UPTIME_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__append_187 = -lkstat
-@BUILD_PLUGIN_UPTIME_TRUE@@BUILD_WITH_PERFSTAT_TRUE@am__append_188 = -lperfstat
-@BUILD_PLUGIN_USERS_TRUE@am__append_189 = users.la
-@BUILD_PLUGIN_USERS_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_190 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
-@BUILD_PLUGIN_USERS_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_191 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
-@BUILD_PLUGIN_UUID_TRUE@am__append_192 = uuid.la
-@BUILD_PLUGIN_VARNISH_TRUE@am__append_193 = varnish.la
-@BUILD_PLUGIN_VIRT_TRUE@am__append_194 = virt.la
-@BUILD_PLUGIN_VMEM_TRUE@am__append_195 = vmem.la
-@BUILD_PLUGIN_VSERVER_TRUE@am__append_196 = vserver.la
-@BUILD_PLUGIN_WIRELESS_TRUE@am__append_197 = wireless.la
-@BUILD_PLUGIN_WRITE_GRAPHITE_TRUE@am__append_198 = write_graphite.la
-@BUILD_PLUGIN_WRITE_HTTP_TRUE@am__append_199 = write_http.la
-@BUILD_PLUGIN_WRITE_HTTP_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__append_200 = $(BUILD_WITH_LIBCURL_CFLAGS)
-@BUILD_PLUGIN_WRITE_HTTP_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__append_201 = $(BUILD_WITH_LIBCURL_LIBS)
-@BUILD_PLUGIN_WRITE_KAFKA_TRUE@am__append_202 = write_kafka.la
-@BUILD_PLUGIN_WRITE_LOG_TRUE@am__append_203 = write_log.la
-@BUILD_PLUGIN_WRITE_MONGODB_TRUE@am__append_204 = write_mongodb.la
-@BUILD_PLUGIN_WRITE_REDIS_TRUE@am__append_205 = write_redis.la
-@BUILD_PLUGIN_WRITE_RIEMANN_TRUE@am__append_206 = write_riemann.la
-@BUILD_PLUGIN_WRITE_SENSU_TRUE@am__append_207 = write_sensu.la
-@BUILD_PLUGIN_WRITE_TSDB_TRUE@am__append_208 = write_tsdb.la
-@BUILD_PLUGIN_XMMS_TRUE@am__append_209 = xmms.la
-@BUILD_PLUGIN_ZFS_ARC_TRUE@am__append_210 = zfs_arc.la
-@BUILD_PLUGIN_ZOOKEEPER_TRUE@am__append_211 = zookeeper.la
-@BUILD_PLUGIN_PINBA_TRUE@am__append_212 = pinba.pb-c.c pinba.pb-c.h
+@BUILD_PLUGIN_PERL_TRUE@@HAVE_BROKEN_PERL_LOAD_MODULE_TRUE@am__append_136 = -Wno-nonnull
+@BUILD_PLUGIN_PF_TRUE@am__append_137 = pf.la
+@BUILD_PLUGIN_PINBA_TRUE@am__append_138 = pinba.la
+@BUILD_PLUGIN_PING_TRUE@am__append_139 = ping.la
+@BUILD_PLUGIN_POSTGRESQL_TRUE@am__append_140 = postgresql.la
+@BUILD_PLUGIN_POWERDNS_TRUE@am__append_141 = powerdns.la
+@BUILD_PLUGIN_PYTHON_TRUE@am__append_142 = python.la
+@BUILD_PLUGIN_PYTHON_TRUE@@COMPILER_IS_GCC_TRUE@am__append_143 = -fno-strict-aliasing -Wno-strict-aliasing
+@BUILD_PLUGIN_PROCESSES_TRUE@am__append_144 = processes.la
+@BUILD_PLUGIN_PROCESSES_TRUE@@BUILD_WITH_LIBKVM_GETPROCS_TRUE@am__append_145 = -lkvm
+@BUILD_PLUGIN_PROTOCOLS_TRUE@am__append_146 = protocols.la
+@BUILD_PLUGIN_REDIS_TRUE@am__append_147 = redis.la
+@BUILD_PLUGIN_ROUTEROS_TRUE@am__append_148 = routeros.la
+@BUILD_PLUGIN_RRDCACHED_TRUE@am__append_149 = rrdcached.la
+@BUILD_PLUGIN_RRDTOOL_TRUE@am__append_150 = rrdtool.la
+@BUILD_PLUGIN_SENSORS_TRUE@am__append_151 = sensors.la
+@BUILD_PLUGIN_SERIAL_TRUE@am__append_152 = serial.la
+@BUILD_PLUGIN_SIGROK_TRUE@am__append_153 = sigrok.la
+@BUILD_PLUGIN_SMART_TRUE@@BUILD_WITH_LIBUDEV_TRUE@am__append_154 = smart.la
+@BUILD_PLUGIN_SNMP_TRUE@am__append_155 = snmp.la
+@BUILD_PLUGIN_SNMP_TRUE@@BUILD_WITH_LIBNETSNMP_TRUE@am__append_156 = $(BUILD_WITH_LIBSNMP_CFLAGS)
+@BUILD_PLUGIN_SNMP_TRUE@@BUILD_WITH_LIBNETSNMP_TRUE@am__append_157 = $(BUILD_WITH_LIBSNMP_LIBS)
+@BUILD_PLUGIN_SNMP_TRUE@@BUILD_WITH_LIBPTHREAD_TRUE@am__append_158 = -lpthread
+@BUILD_PLUGIN_STATSD_TRUE@am__append_159 = statsd.la
+@BUILD_PLUGIN_SWAP_TRUE@am__append_160 = swap.la
+@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__append_161 = $(BUILD_WITH_LIBKSTAT_LIBS)
+@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBDEVINFO_TRUE@am__append_162 = -ldevinfo
+@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBKVM_GETSWAPINFO_TRUE@am__append_163 = -lkvm
+@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_164 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
+@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_165 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
+@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_PERFSTAT_TRUE@am__append_166 = -lperfstat
+@BUILD_PLUGIN_SYSLOG_TRUE@am__append_167 = syslog.la
+@BUILD_PLUGIN_TABLE_TRUE@am__append_168 = table.la
+@BUILD_PLUGIN_TAIL_TRUE@am__append_169 = tail.la
+@BUILD_PLUGIN_TAIL_CSV_TRUE@am__append_170 = tail_csv.la
+@BUILD_PLUGIN_TAPE_TRUE@am__append_171 = tape.la
+@BUILD_PLUGIN_TARGET_NOTIFICATION_TRUE@am__append_172 = target_notification.la
+@BUILD_PLUGIN_TARGET_REPLACE_TRUE@am__append_173 = target_replace.la
+@BUILD_PLUGIN_TARGET_SCALE_TRUE@am__append_174 = target_scale.la
+@BUILD_PLUGIN_TARGET_SET_TRUE@am__append_175 = target_set.la
+@BUILD_PLUGIN_TARGET_V5UPGRADE_TRUE@am__append_176 = target_v5upgrade.la
+@BUILD_PLUGIN_TCPCONNS_TRUE@am__append_177 = tcpconns.la
+@BUILD_PLUGIN_TCPCONNS_TRUE@@BUILD_WITH_LIBKVM_NLIST_TRUE@am__append_178 = -lkvm
+@BUILD_PLUGIN_TEAMSPEAK2_TRUE@am__append_179 = teamspeak2.la
+@BUILD_PLUGIN_TED_TRUE@am__append_180 = ted.la
+@BUILD_PLUGIN_THERMAL_TRUE@am__append_181 = thermal.la
+@BUILD_PLUGIN_THRESHOLD_TRUE@am__append_182 = threshold.la
+@BUILD_PLUGIN_TOKYOTYRANT_TRUE@am__append_183 = tokyotyrant.la
+@BUILD_PLUGIN_TOKYOTYRANT_TRUE@@BUILD_WITH_LIBSOCKET_TRUE@am__append_184 = -lsocket
+@BUILD_PLUGIN_TURBOSTAT_TRUE@am__append_185 = turbostat.la
+@BUILD_PLUGIN_UNIXSOCK_TRUE@am__append_186 = unixsock.la
+@BUILD_PLUGIN_UPTIME_TRUE@am__append_187 = uptime.la
+@BUILD_PLUGIN_UPTIME_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__append_188 = $(BUILD_WITH_LIBKSTAT_LIBS)
+@BUILD_PLUGIN_UPTIME_TRUE@@BUILD_WITH_PERFSTAT_TRUE@am__append_189 = -lperfstat
+@BUILD_PLUGIN_USERS_TRUE@am__append_190 = users.la
+@BUILD_PLUGIN_USERS_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_191 = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
+@BUILD_PLUGIN_USERS_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__append_192 = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
+@BUILD_PLUGIN_UUID_TRUE@am__append_193 = uuid.la
+@BUILD_PLUGIN_VARNISH_TRUE@am__append_194 = varnish.la
+@BUILD_PLUGIN_VIRT_TRUE@am__append_195 = virt.la
+@BUILD_PLUGIN_VMEM_TRUE@am__append_196 = vmem.la
+@BUILD_PLUGIN_VSERVER_TRUE@am__append_197 = vserver.la
+@BUILD_PLUGIN_WIRELESS_TRUE@am__append_198 = wireless.la
+@BUILD_PLUGIN_WRITE_GRAPHITE_TRUE@am__append_199 = write_graphite.la
+@BUILD_PLUGIN_WRITE_HTTP_TRUE@am__append_200 = write_http.la
+@BUILD_PLUGIN_WRITE_HTTP_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__append_201 = $(BUILD_WITH_LIBCURL_CFLAGS)
+@BUILD_PLUGIN_WRITE_HTTP_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__append_202 = $(BUILD_WITH_LIBCURL_LIBS)
+@BUILD_PLUGIN_WRITE_KAFKA_TRUE@am__append_203 = write_kafka.la
+@BUILD_PLUGIN_WRITE_LOG_TRUE@am__append_204 = write_log.la
+@BUILD_PLUGIN_WRITE_MONGODB_TRUE@am__append_205 = write_mongodb.la
+@BUILD_PLUGIN_WRITE_REDIS_TRUE@am__append_206 = write_redis.la
+@BUILD_PLUGIN_WRITE_RIEMANN_TRUE@am__append_207 = write_riemann.la
+@BUILD_PLUGIN_WRITE_SENSU_TRUE@am__append_208 = write_sensu.la
+@BUILD_PLUGIN_WRITE_TSDB_TRUE@am__append_209 = write_tsdb.la
+@BUILD_PLUGIN_XMMS_TRUE@am__append_210 = xmms.la
+@BUILD_PLUGIN_ZFS_ARC_TRUE@am__append_211 = zfs_arc.la
+@BUILD_PLUGIN_ZOOKEEPER_TRUE@am__append_212 = zookeeper.la
 @BUILD_PLUGIN_PINBA_TRUE@am__append_213 = pinba.pb-c.c pinba.pb-c.h
-@BUILD_PLUGIN_WRITE_RIEMANN_TRUE@am__append_214 = riemann.pb-c.c riemann.pb-c.h
+@BUILD_PLUGIN_PINBA_TRUE@am__append_214 = pinba.pb-c.c pinba.pb-c.h
 @BUILD_PLUGIN_WRITE_RIEMANN_TRUE@am__append_215 = riemann.pb-c.c riemann.pb-c.h
+@BUILD_PLUGIN_WRITE_RIEMANN_TRUE@am__append_216 = riemann.pb-c.c riemann.pb-c.h
 check_PROGRAMS = test_utils_mount$(EXEEXT) \
 	test_utils_vl_lookup$(EXEEXT) $(am__EXEEXT_1)
 TESTS = test_utils_mount$(EXEEXT) test_utils_vl_lookup$(EXEEXT) \
 	$(am__EXEEXT_1)
-@BUILD_PLUGIN_CEPH_TRUE@am__append_216 = test_plugin_ceph
 @BUILD_PLUGIN_CEPH_TRUE@am__append_217 = test_plugin_ceph
+@BUILD_PLUGIN_CEPH_TRUE@am__append_218 = test_plugin_ceph
 subdir = src
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(srcdir)/config.h.in $(srcdir)/collectd.conf.in \
-	$(top_srcdir)/libltdl/config/depcomp $(dist_man_MANS) \
-	$(top_srcdir)/libltdl/config/test-driver
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/libltdl/m4/libtool.m4 \
+	$(top_srcdir)/libltdl/m4/ltargz.m4 \
+	$(top_srcdir)/libltdl/m4/ltdl.m4 \
+	$(top_srcdir)/libltdl/m4/ltoptions.m4 \
+	$(top_srcdir)/libltdl/m4/ltsugar.m4 \
+	$(top_srcdir)/libltdl/m4/ltversion.m4 \
+	$(top_srcdir)/libltdl/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = collectd.conf
@@ -495,10 +510,11 @@ contextswitch_la_LINK = $(LIBTOOL) $(AM_
 	-o $@
 @BUILD_PLUGIN_CONTEXTSWITCH_TRUE@am_contextswitch_la_rpath = -rpath \
 @BUILD_PLUGIN_CONTEXTSWITCH_TRUE@	$(pkglibdir)
-@BUILD_PLUGIN_CPU_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
-@BUILD_PLUGIN_CPU_TRUE@cpu_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+@BUILD_PLUGIN_CPU_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__DEPENDENCIES_3 = $(am__DEPENDENCIES_1)
+@BUILD_PLUGIN_CPU_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1)
+@BUILD_PLUGIN_CPU_TRUE@cpu_la_DEPENDENCIES = $(am__DEPENDENCIES_3) \
 @BUILD_PLUGIN_CPU_TRUE@	$(am__DEPENDENCIES_1) \
-@BUILD_PLUGIN_CPU_TRUE@	$(am__DEPENDENCIES_3) \
+@BUILD_PLUGIN_CPU_TRUE@	$(am__DEPENDENCIES_4) \
 @BUILD_PLUGIN_CPU_TRUE@	$(am__DEPENDENCIES_1)
 am__cpu_la_SOURCES_DIST = cpu.c
 @BUILD_PLUGIN_CPU_TRUE@am_cpu_la_OBJECTS = cpu_la-cpu.lo
@@ -523,8 +539,8 @@ csv_la_LINK = $(LIBTOOL) $(AM_V_lt) --ta
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(csv_la_LDFLAGS) $(LDFLAGS) -o $@
 @BUILD_PLUGIN_CSV_TRUE@am_csv_la_rpath = -rpath $(pkglibdir)
-@BUILD_PLUGIN_CURL_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_1)
-@BUILD_PLUGIN_CURL_TRUE@curl_la_DEPENDENCIES = $(am__DEPENDENCIES_4)
+@BUILD_PLUGIN_CURL_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1)
+@BUILD_PLUGIN_CURL_TRUE@curl_la_DEPENDENCIES = $(am__DEPENDENCIES_5)
 am__curl_la_SOURCES_DIST = curl.c
 @BUILD_PLUGIN_CURL_TRUE@am_curl_la_OBJECTS = curl_la-curl.lo
 curl_la_OBJECTS = $(am_curl_la_OBJECTS)
@@ -532,10 +548,10 @@ curl_la_LINK = $(LIBTOOL) $(AM_V_lt) --t
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(curl_la_CFLAGS) \
 	$(CFLAGS) $(curl_la_LDFLAGS) $(LDFLAGS) -o $@
 @BUILD_PLUGIN_CURL_TRUE@am_curl_la_rpath = -rpath $(pkglibdir)
-@BUILD_PLUGIN_CURL_JSON_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__DEPENDENCIES_5 = $(am__DEPENDENCIES_1)
+@BUILD_PLUGIN_CURL_JSON_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
 @BUILD_PLUGIN_CURL_JSON_TRUE@curl_json_la_DEPENDENCIES =  \
 @BUILD_PLUGIN_CURL_JSON_TRUE@	$(am__DEPENDENCIES_1) \
-@BUILD_PLUGIN_CURL_JSON_TRUE@	$(am__DEPENDENCIES_5)
+@BUILD_PLUGIN_CURL_JSON_TRUE@	$(am__DEPENDENCIES_6)
 am__curl_json_la_SOURCES_DIST = curl_json.c
 @BUILD_PLUGIN_CURL_JSON_TRUE@am_curl_json_la_OBJECTS =  \
 @BUILD_PLUGIN_CURL_JSON_TRUE@	curl_json_la-curl_json.lo
@@ -573,10 +589,12 @@ df_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(df_la_LDFLAGS) $(LDFLAGS) -o $@
 @BUILD_PLUGIN_DF_TRUE@am_df_la_rpath = -rpath $(pkglibdir)
-@BUILD_PLUGIN_DISK_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_1)
-@BUILD_PLUGIN_DISK_TRUE@disk_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+@BUILD_PLUGIN_DISK_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+@BUILD_PLUGIN_DISK_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1)
+@BUILD_PLUGIN_DISK_TRUE@disk_la_DEPENDENCIES = $(am__DEPENDENCIES_7) \
+@BUILD_PLUGIN_DISK_TRUE@	$(am__DEPENDENCIES_1) \
+@BUILD_PLUGIN_DISK_TRUE@	$(am__DEPENDENCIES_8) \
 @BUILD_PLUGIN_DISK_TRUE@	$(am__DEPENDENCIES_1) \
-@BUILD_PLUGIN_DISK_TRUE@	$(am__DEPENDENCIES_6) \
 @BUILD_PLUGIN_DISK_TRUE@	$(am__DEPENDENCIES_1) \
 @BUILD_PLUGIN_DISK_TRUE@	$(am__DEPENDENCIES_1)
 am__disk_la_SOURCES_DIST = disk.c
@@ -682,10 +700,11 @@ hddtemp_la_LINK = $(LIBTOOL) $(AM_V_lt) 
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(hddtemp_la_LDFLAGS) $(LDFLAGS) -o $@
 @BUILD_PLUGIN_HDDTEMP_TRUE@am_hddtemp_la_rpath = -rpath $(pkglibdir)
-@BUILD_PLUGIN_INTERFACE_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__DEPENDENCIES_7 = $(am__DEPENDENCIES_1)
+@BUILD_PLUGIN_INTERFACE_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__DEPENDENCIES_9 = $(am__DEPENDENCIES_1)
+@BUILD_PLUGIN_INTERFACE_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@@BUILD_WITH_LIBSTATGRAB_FALSE@am__DEPENDENCIES_10 = $(am__DEPENDENCIES_1)
 @BUILD_PLUGIN_INTERFACE_TRUE@interface_la_DEPENDENCIES =  \
-@BUILD_PLUGIN_INTERFACE_TRUE@	$(am__DEPENDENCIES_7) \
-@BUILD_PLUGIN_INTERFACE_TRUE@	$(am__DEPENDENCIES_1) \
+@BUILD_PLUGIN_INTERFACE_TRUE@	$(am__DEPENDENCIES_9) \
+@BUILD_PLUGIN_INTERFACE_TRUE@	$(am__DEPENDENCIES_10) \
 @BUILD_PLUGIN_INTERFACE_TRUE@	$(am__DEPENDENCIES_1) \
 @BUILD_PLUGIN_INTERFACE_TRUE@	$(am__DEPENDENCIES_1)
 am__interface_la_SOURCES_DIST = interface.c
@@ -753,8 +772,8 @@ liblookup_la_OBJECTS = $(am_liblookup_la
 libmount_la_DEPENDENCIES = daemon/libcommon.la
 am_libmount_la_OBJECTS = utils_mount.lo
 libmount_la_OBJECTS = $(am_libmount_la_OBJECTS)
-@BUILD_PLUGIN_LOAD_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__DEPENDENCIES_8 = $(am__DEPENDENCIES_1)
-@BUILD_PLUGIN_LOAD_TRUE@load_la_DEPENDENCIES = $(am__DEPENDENCIES_8) \
+@BUILD_PLUGIN_LOAD_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__DEPENDENCIES_11 = $(am__DEPENDENCIES_1)
+@BUILD_PLUGIN_LOAD_TRUE@load_la_DEPENDENCIES = $(am__DEPENDENCIES_11) \
 @BUILD_PLUGIN_LOAD_TRUE@	$(am__DEPENDENCIES_1)
 am__load_la_SOURCES_DIST = load.c
 @BUILD_PLUGIN_LOAD_TRUE@am_load_la_OBJECTS = load_la-load.lo
@@ -899,11 +918,12 @@ memcached_la_LINK = $(LIBTOOL) $(AM_V_lt
 	$(memcached_la_LDFLAGS) $(LDFLAGS) -o $@
 @BUILD_PLUGIN_MEMCACHED_TRUE@am_memcached_la_rpath = -rpath \
 @BUILD_PLUGIN_MEMCACHED_TRUE@	$(pkglibdir)
-@BUILD_PLUGIN_MEMORY_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__DEPENDENCIES_9 = $(am__DEPENDENCIES_1)
+@BUILD_PLUGIN_MEMORY_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__DEPENDENCIES_12 = $(am__DEPENDENCIES_1)
+@BUILD_PLUGIN_MEMORY_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__DEPENDENCIES_13 = $(am__DEPENDENCIES_1)
 @BUILD_PLUGIN_MEMORY_TRUE@memory_la_DEPENDENCIES =  \
+@BUILD_PLUGIN_MEMORY_TRUE@	$(am__DEPENDENCIES_12) \
 @BUILD_PLUGIN_MEMORY_TRUE@	$(am__DEPENDENCIES_1) \
-@BUILD_PLUGIN_MEMORY_TRUE@	$(am__DEPENDENCIES_1) \
-@BUILD_PLUGIN_MEMORY_TRUE@	$(am__DEPENDENCIES_9) \
+@BUILD_PLUGIN_MEMORY_TRUE@	$(am__DEPENDENCIES_13) \
 @BUILD_PLUGIN_MEMORY_TRUE@	$(am__DEPENDENCIES_1)
 am__memory_la_SOURCES_DIST = memory.c
 @BUILD_PLUGIN_MEMORY_TRUE@am_memory_la_OBJECTS = memory_la-memory.lo
@@ -939,9 +959,9 @@ multimeter_la_LINK = $(LIBTOOL) $(AM_V_l
 	$(multimeter_la_LDFLAGS) $(LDFLAGS) -o $@
 @BUILD_PLUGIN_MULTIMETER_TRUE@am_multimeter_la_rpath = -rpath \
 @BUILD_PLUGIN_MULTIMETER_TRUE@	$(pkglibdir)
-@BUILD_PLUGIN_MYSQL_TRUE@@BUILD_WITH_LIBMYSQL_TRUE@am__DEPENDENCIES_10 = $(am__DEPENDENCIES_1)
+@BUILD_PLUGIN_MYSQL_TRUE@@BUILD_WITH_LIBMYSQL_TRUE@am__DEPENDENCIES_14 = $(am__DEPENDENCIES_1)
 @BUILD_PLUGIN_MYSQL_TRUE@mysql_la_DEPENDENCIES =  \
-@BUILD_PLUGIN_MYSQL_TRUE@	$(am__DEPENDENCIES_10)
+@BUILD_PLUGIN_MYSQL_TRUE@	$(am__DEPENDENCIES_14)
 am__mysql_la_SOURCES_DIST = mysql.c
 @BUILD_PLUGIN_MYSQL_TRUE@am_mysql_la_OBJECTS = mysql_la-mysql.lo
 mysql_la_OBJECTS = $(am_mysql_la_OBJECTS)
@@ -968,10 +988,10 @@ netlink_la_LINK = $(LIBTOOL) $(AM_V_lt) 
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(netlink_la_CFLAGS) \
 	$(CFLAGS) $(netlink_la_LDFLAGS) $(LDFLAGS) -o $@
 @BUILD_PLUGIN_NETLINK_TRUE@am_netlink_la_rpath = -rpath $(pkglibdir)
-@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBGCRYPT_TRUE@am__DEPENDENCIES_11 = $(am__DEPENDENCIES_1)
+@BUILD_PLUGIN_NETWORK_TRUE@@BUILD_WITH_LIBGCRYPT_TRUE@am__DEPENDENCIES_15 = $(am__DEPENDENCIES_1)
 @BUILD_PLUGIN_NETWORK_TRUE@network_la_DEPENDENCIES =  \
 @BUILD_PLUGIN_NETWORK_TRUE@	$(am__DEPENDENCIES_1) \
-@BUILD_PLUGIN_NETWORK_TRUE@	$(am__DEPENDENCIES_11)
+@BUILD_PLUGIN_NETWORK_TRUE@	$(am__DEPENDENCIES_15)
 am__network_la_SOURCES_DIST = network.c network.h utils_fbhash.c \
 	utils_fbhash.h
 @BUILD_PLUGIN_NETWORK_TRUE@am_network_la_OBJECTS =  \
@@ -990,9 +1010,9 @@ nfs_la_LINK = $(LIBTOOL) $(AM_V_lt) --ta
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(nfs_la_LDFLAGS) $(LDFLAGS) -o $@
 @BUILD_PLUGIN_NFS_TRUE@am_nfs_la_rpath = -rpath $(pkglibdir)
-@BUILD_PLUGIN_NGINX_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__DEPENDENCIES_12 = $(am__DEPENDENCIES_1)
+@BUILD_PLUGIN_NGINX_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__DEPENDENCIES_16 = $(am__DEPENDENCIES_1)
 @BUILD_PLUGIN_NGINX_TRUE@nginx_la_DEPENDENCIES =  \
-@BUILD_PLUGIN_NGINX_TRUE@	$(am__DEPENDENCIES_12)
+@BUILD_PLUGIN_NGINX_TRUE@	$(am__DEPENDENCIES_16)
 am__nginx_la_SOURCES_DIST = nginx.c
 @BUILD_PLUGIN_NGINX_TRUE@am_nginx_la_OBJECTS = nginx_la-nginx.lo
 nginx_la_OBJECTS = $(am_nginx_la_OBJECTS)
@@ -1254,8 +1274,8 @@ smart_la_LINK = $(LIBTOOL) $(AM_V_lt) --
 @BUILD_PLUGIN_SMART_TRUE@@BUILD_WITH_LIBUDEV_TRUE@am_smart_la_rpath =  \
 @BUILD_PLUGIN_SMART_TRUE@@BUILD_WITH_LIBUDEV_TRUE@	-rpath \
 @BUILD_PLUGIN_SMART_TRUE@@BUILD_WITH_LIBUDEV_TRUE@	$(pkglibdir)
-@BUILD_PLUGIN_SNMP_TRUE@@BUILD_WITH_LIBNETSNMP_TRUE@am__DEPENDENCIES_13 = $(am__DEPENDENCIES_1)
-@BUILD_PLUGIN_SNMP_TRUE@snmp_la_DEPENDENCIES = $(am__DEPENDENCIES_13) \
+@BUILD_PLUGIN_SNMP_TRUE@@BUILD_WITH_LIBNETSNMP_TRUE@am__DEPENDENCIES_17 = $(am__DEPENDENCIES_1)
+@BUILD_PLUGIN_SNMP_TRUE@snmp_la_DEPENDENCIES = $(am__DEPENDENCIES_17) \
 @BUILD_PLUGIN_SNMP_TRUE@	$(am__DEPENDENCIES_1)
 am__snmp_la_SOURCES_DIST = snmp.c
 @BUILD_PLUGIN_SNMP_TRUE@am_snmp_la_OBJECTS = snmp_la-snmp.lo
@@ -1273,11 +1293,12 @@ statsd_la_LINK = $(LIBTOOL) $(AM_V_lt) -
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(statsd_la_LDFLAGS) $(LDFLAGS) -o $@
 @BUILD_PLUGIN_STATSD_TRUE@am_statsd_la_rpath = -rpath $(pkglibdir)
-@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__DEPENDENCIES_14 = $(am__DEPENDENCIES_1)
-@BUILD_PLUGIN_SWAP_TRUE@swap_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__DEPENDENCIES_18 = $(am__DEPENDENCIES_1)
+@BUILD_PLUGIN_SWAP_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__DEPENDENCIES_19 = $(am__DEPENDENCIES_1)
+@BUILD_PLUGIN_SWAP_TRUE@swap_la_DEPENDENCIES = $(am__DEPENDENCIES_18) \
 @BUILD_PLUGIN_SWAP_TRUE@	$(am__DEPENDENCIES_1) \
 @BUILD_PLUGIN_SWAP_TRUE@	$(am__DEPENDENCIES_1) \
-@BUILD_PLUGIN_SWAP_TRUE@	$(am__DEPENDENCIES_14) \
+@BUILD_PLUGIN_SWAP_TRUE@	$(am__DEPENDENCIES_19) \
 @BUILD_PLUGIN_SWAP_TRUE@	$(am__DEPENDENCIES_1)
 am__swap_la_SOURCES_DIST = swap.c
 @BUILD_PLUGIN_SWAP_TRUE@am_swap_la_OBJECTS = swap_la-swap.lo
@@ -1318,7 +1339,7 @@ tail_csv_la_LINK = $(LIBTOOL) $(AM_V_lt)
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(tail_csv_la_LDFLAGS) $(LDFLAGS) -o $@
 @BUILD_PLUGIN_TAIL_CSV_TRUE@am_tail_csv_la_rpath = -rpath $(pkglibdir)
-tape_la_DEPENDENCIES =
+@BUILD_PLUGIN_TAPE_TRUE@tape_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am__tape_la_SOURCES_DIST = tape.c
 @BUILD_PLUGIN_TAPE_TRUE@am_tape_la_OBJECTS = tape.lo
 tape_la_OBJECTS = $(am_tape_la_OBJECTS)
@@ -1466,8 +1487,9 @@ unixsock_la_LINK = $(LIBTOOL) $(AM_V_lt)
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(unixsock_la_LDFLAGS) $(LDFLAGS) -o $@
 @BUILD_PLUGIN_UNIXSOCK_TRUE@am_unixsock_la_rpath = -rpath $(pkglibdir)
+@BUILD_PLUGIN_UPTIME_TRUE@@BUILD_WITH_LIBKSTAT_TRUE@am__DEPENDENCIES_20 = $(am__DEPENDENCIES_1)
 @BUILD_PLUGIN_UPTIME_TRUE@uptime_la_DEPENDENCIES =  \
-@BUILD_PLUGIN_UPTIME_TRUE@	$(am__DEPENDENCIES_1) \
+@BUILD_PLUGIN_UPTIME_TRUE@	$(am__DEPENDENCIES_20) \
 @BUILD_PLUGIN_UPTIME_TRUE@	$(am__DEPENDENCIES_1)
 am__uptime_la_SOURCES_DIST = uptime.c
 @BUILD_PLUGIN_UPTIME_TRUE@am_uptime_la_OBJECTS = uptime_la-uptime.lo
@@ -1476,9 +1498,9 @@ uptime_la_LINK = $(LIBTOOL) $(AM_V_lt) -
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(uptime_la_CFLAGS) \
 	$(CFLAGS) $(uptime_la_LDFLAGS) $(LDFLAGS) -o $@
 @BUILD_PLUGIN_UPTIME_TRUE@am_uptime_la_rpath = -rpath $(pkglibdir)
-@BUILD_PLUGIN_USERS_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__DEPENDENCIES_15 = $(am__DEPENDENCIES_1)
+@BUILD_PLUGIN_USERS_TRUE@@BUILD_WITH_LIBSTATGRAB_TRUE@am__DEPENDENCIES_21 = $(am__DEPENDENCIES_1)
 @BUILD_PLUGIN_USERS_TRUE@users_la_DEPENDENCIES =  \
-@BUILD_PLUGIN_USERS_TRUE@	$(am__DEPENDENCIES_15)
+@BUILD_PLUGIN_USERS_TRUE@	$(am__DEPENDENCIES_21)
 am__users_la_SOURCES_DIST = users.c
 @BUILD_PLUGIN_USERS_TRUE@am_users_la_OBJECTS = users_la-users.lo
 users_la_OBJECTS = $(am_users_la_OBJECTS)
@@ -1552,9 +1574,9 @@ write_graphite_la_LINK = $(LIBTOOL) $(AM
 	-o $@
 @BUILD_PLUGIN_WRITE_GRAPHITE_TRUE@am_write_graphite_la_rpath = -rpath \
 @BUILD_PLUGIN_WRITE_GRAPHITE_TRUE@	$(pkglibdir)
-@BUILD_PLUGIN_WRITE_HTTP_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__DEPENDENCIES_16 = $(am__DEPENDENCIES_1)
+@BUILD_PLUGIN_WRITE_HTTP_TRUE@@BUILD_WITH_LIBCURL_TRUE@am__DEPENDENCIES_22 = $(am__DEPENDENCIES_1)
 @BUILD_PLUGIN_WRITE_HTTP_TRUE@write_http_la_DEPENDENCIES =  \
-@BUILD_PLUGIN_WRITE_HTTP_TRUE@	$(am__DEPENDENCIES_16)
+@BUILD_PLUGIN_WRITE_HTTP_TRUE@	$(am__DEPENDENCIES_22)
 am__write_http_la_SOURCES_DIST = write_http.c utils_format_json.c \
 	utils_format_json.h
 @BUILD_PLUGIN_WRITE_HTTP_TRUE@am_write_http_la_OBJECTS =  \
@@ -1662,7 +1684,7 @@ xmms_la_LINK = $(LIBTOOL) $(AM_V_lt) --t
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(xmms_la_CFLAGS) \
 	$(CFLAGS) $(xmms_la_LDFLAGS) $(LDFLAGS) -o $@
 @BUILD_PLUGIN_XMMS_TRUE@am_xmms_la_rpath = -rpath $(pkglibdir)
-zfs_arc_la_DEPENDENCIES =
+@BUILD_FREEBSD_FALSE@@BUILD_LINUX_FALSE@@BUILD_PLUGIN_ZFS_ARC_TRUE@zfs_arc_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am__zfs_arc_la_SOURCES_DIST = zfs_arc.c
 @BUILD_PLUGIN_ZFS_ARC_TRUE@am_zfs_arc_la_OBJECTS =  \
 @BUILD_PLUGIN_ZFS_ARC_TRUE@	zfs_arc_la-zfs_arc.lo
@@ -2124,6 +2146,10 @@ TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)
 TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
 	$(TEST_LOG_FLAGS)
 DIST_SUBDIRS = libcollectdclient liboconfig daemon
+am__DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.in \
+	$(srcdir)/collectd.conf.in $(srcdir)/config.h.in \
+	$(top_srcdir)/libltdl/config/depcomp \
+	$(top_srcdir)/libltdl/config/test-driver
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -2154,7 +2180,6 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
-ARGZ_H = @ARGZ_H@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -2175,6 +2200,7 @@ BUILD_WITH_LIBHIREDIS_CPPFLAGS = @BUILD_
 BUILD_WITH_LIBHIREDIS_LDFLAGS = @BUILD_WITH_LIBHIREDIS_LDFLAGS@
 BUILD_WITH_LIBIPTC_CPPFLAGS = @BUILD_WITH_LIBIPTC_CPPFLAGS@
 BUILD_WITH_LIBIPTC_LDFLAGS = @BUILD_WITH_LIBIPTC_LDFLAGS@
+BUILD_WITH_LIBKSTAT_LIBS = @BUILD_WITH_LIBKSTAT_LIBS@
 BUILD_WITH_LIBLDAP_CPPFLAGS = @BUILD_WITH_LIBLDAP_CPPFLAGS@
 BUILD_WITH_LIBLDAP_LDFLAGS = @BUILD_WITH_LIBLDAP_LDFLAGS@
 BUILD_WITH_LIBLVM2APP_CPPFLAGS = @BUILD_WITH_LIBLVM2APP_CPPFLAGS@
@@ -2326,9 +2352,11 @@ LTDLDEPS = @LTDLDEPS@
 LTDLINCL = @LTDLINCL@
 LTDLOPEN = @LTDLOPEN@
 LTLIBOBJS = @LTLIBOBJS@
+LT_ARGZ_H = @LT_ARGZ_H@
 LT_CONFIG_H = @LT_CONFIG_H@
 LT_DLLOADERS = @LT_DLLOADERS@
 LT_DLPREOPEN = @LT_DLPREOPEN@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
@@ -2422,11 +2450,11 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = libcollectdclient $(am__append_1) daemon
 PLUGIN_LDFLAGS = -module -avoid-version -export-symbols-regex '\<module_register\>'
-@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall -Werror
+@COMPILER_IS_GCC_TRUE@AM_CFLAGS = -Wall 
 AM_CPPFLAGS = -I$(srcdir)/daemon -DPREFIX='"${prefix}"' \
 	-DCONFIGFILE='"${sysconfdir}/${PACKAGE_NAME}.conf"' \
 	-DLOCALSTATEDIR='"${localstatedir}"' \

 	$(am__append_2) -DPLUGINDIR='"${pkglibdir}"' \
 	-DPKGDATADIR='"${pkgdatadir}"'
 AUTOMAKE_OPTIONS = subdir-objects
@@ -2461,45 +2489,45 @@ pkglib_LTLIBRARIES = $(am__append_11) $(
 	$(am__append_30) $(am__append_36) $(am__append_37) \
 	$(am__append_38) $(am__append_41) $(am__append_44) \
 	$(am__append_45) $(am__append_46) $(am__append_47) \
-	$(am__append_55) $(am__append_56) $(am__append_57) \
-	$(am__append_58) $(am__append_59) $(am__append_60) \
-	$(am__append_61) $(am__append_62) $(am__append_63) \
-	$(am__append_64) $(am__append_66) $(am__append_72) \
-	$(am__append_73) $(am__append_74) $(am__append_75) \
-	$(am__append_76) $(am__append_77) $(am__append_78) \
-	$(am__append_82) $(am__append_83) $(am__append_84) \
-	$(am__append_85) $(am__append_86) $(am__append_87) \
-	$(am__append_88) $(am__append_89) $(am__append_90) \
-	$(am__append_91) $(am__append_92) $(am__append_94) \
-	$(am__append_95) $(am__append_96) $(am__append_98) \
-	$(am__append_104) $(am__append_105) $(am__append_106) \
-	$(am__append_107) $(am__append_110) $(am__append_111) \
-	$(am__append_112) $(am__append_117) $(am__append_118) \
-	$(am__append_119) $(am__append_122) $(am__append_123) \
-	$(am__append_124) $(am__append_126) $(am__append_127) \
-	$(am__append_128) $(am__append_130) $(am__append_131) \
-	$(am__append_132) $(am__append_133) $(am__append_134) \
-	$(am__append_136) $(am__append_137) $(am__append_138) \
-	$(am__append_139) $(am__append_140) $(am__append_141) \
-	$(am__append_143) $(am__append_145) $(am__append_146) \
-	$(am__append_147) $(am__append_148) $(am__append_149) \
-	$(am__append_150) $(am__append_151) $(am__append_152) \
-	$(am__append_153) $(am__append_154) $(am__append_158) \
-	$(am__append_159) $(am__append_166) $(am__append_167) \
-	$(am__append_168) $(am__append_169) $(am__append_170) \
-	$(am__append_171) $(am__append_172) $(am__append_173) \
-	$(am__append_174) $(am__append_175) $(am__append_176) \
-	$(am__append_178) $(am__append_179) $(am__append_180) \
-	$(am__append_181) $(am__append_182) $(am__append_184) \
-	$(am__append_185) $(am__append_186) $(am__append_189) \
-	$(am__append_192) $(am__append_193) $(am__append_194) \
-	$(am__append_195) $(am__append_196) $(am__append_197) \
-	$(am__append_198) $(am__append_199) $(am__append_202) \
-	$(am__append_203) $(am__append_204) $(am__append_205) \
-	$(am__append_206) $(am__append_207) $(am__append_208) \
-	$(am__append_209) $(am__append_210) $(am__append_211)
-BUILT_SOURCES = $(dist_man_MANS) $(am__append_213) $(am__append_215)
-CLEANFILES = $(am__append_212) $(am__append_214)
+	$(am__append_56) $(am__append_57) $(am__append_58) \
+	$(am__append_59) $(am__append_60) $(am__append_61) \
+	$(am__append_62) $(am__append_63) $(am__append_64) \
+	$(am__append_65) $(am__append_67) $(am__append_73) \
+	$(am__append_74) $(am__append_75) $(am__append_76) \
+	$(am__append_77) $(am__append_78) $(am__append_79) \
+	$(am__append_83) $(am__append_84) $(am__append_85) \
+	$(am__append_86) $(am__append_87) $(am__append_88) \
+	$(am__append_89) $(am__append_90) $(am__append_91) \
+	$(am__append_92) $(am__append_93) $(am__append_95) \
+	$(am__append_96) $(am__append_97) $(am__append_99) \
+	$(am__append_105) $(am__append_106) $(am__append_107) \
+	$(am__append_108) $(am__append_111) $(am__append_112) \
+	$(am__append_113) $(am__append_118) $(am__append_119) \
+	$(am__append_120) $(am__append_123) $(am__append_124) \
+	$(am__append_125) $(am__append_127) $(am__append_128) \
+	$(am__append_129) $(am__append_131) $(am__append_132) \
+	$(am__append_133) $(am__append_134) $(am__append_135) \
+	$(am__append_137) $(am__append_138) $(am__append_139) \
+	$(am__append_140) $(am__append_141) $(am__append_142) \
+	$(am__append_144) $(am__append_146) $(am__append_147) \
+	$(am__append_148) $(am__append_149) $(am__append_150) \
+	$(am__append_151) $(am__append_152) $(am__append_153) \
+	$(am__append_154) $(am__append_155) $(am__append_159) \
+	$(am__append_160) $(am__append_167) $(am__append_168) \
+	$(am__append_169) $(am__append_170) $(am__append_171) \
+	$(am__append_172) $(am__append_173) $(am__append_174) \
+	$(am__append_175) $(am__append_176) $(am__append_177) \
+	$(am__append_179) $(am__append_180) $(am__append_181) \
+	$(am__append_182) $(am__append_183) $(am__append_185) \
+	$(am__append_186) $(am__append_187) $(am__append_190) \
+	$(am__append_193) $(am__append_194) $(am__append_195) \
+	$(am__append_196) $(am__append_197) $(am__append_198) \
+	$(am__append_199) $(am__append_200) $(am__append_203) \
+	$(am__append_204) $(am__append_205) $(am__append_206) \
+	$(am__append_207) $(am__append_208) $(am__append_209) \
+	$(am__append_210) $(am__append_211) $(am__append_212)
+BUILT_SOURCES = $(dist_man_MANS) $(am__append_214) $(am__append_216)
+CLEANFILES = $(am__append_213) $(am__append_215)
 @BUILD_PLUGIN_AGGREGATION_TRUE@aggregation_la_SOURCES = aggregation.c \
 @BUILD_PLUGIN_AGGREGATION_TRUE@                         utils_vl_lookup.c utils_vl_lookup.h
 
@@ -2606,7 +2634,8 @@ CLEANFILES = $(am__append_212) $(am__app
 @BUILD_PLUGIN_DISK_TRUE@	$(am__append_50)
 @BUILD_PLUGIN_DISK_TRUE@disk_la_LIBADD = $(am__append_48) \
 @BUILD_PLUGIN_DISK_TRUE@	$(am__append_49) $(am__append_52) \
-@BUILD_PLUGIN_DISK_TRUE@	$(am__append_53) $(am__append_54)
+@BUILD_PLUGIN_DISK_TRUE@	$(am__append_53) $(am__append_54) \
+@BUILD_PLUGIN_DISK_TRUE@	$(am__append_55)
 @BUILD_PLUGIN_DNS_TRUE@dns_la_SOURCES = dns.c utils_dns.c utils_dns.h
 @BUILD_PLUGIN_DNS_TRUE@dns_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 @BUILD_PLUGIN_DNS_TRUE@dns_la_LIBADD = -lpcap -lpthread
@@ -2637,14 +2666,14 @@ CLEANFILES = $(am__append_212) $(am__app
 @BUILD_PLUGIN_GMOND_TRUE@gmond_la_LIBADD = $(GANGLIA_LIBS)
 @BUILD_PLUGIN_HDDTEMP_TRUE@hddtemp_la_SOURCES = hddtemp.c
 @BUILD_PLUGIN_HDDTEMP_TRUE@hddtemp_la_LDFLAGS = $(PLUGIN_LDFLAGS)
-@BUILD_PLUGIN_HDDTEMP_TRUE@hddtemp_la_LIBADD = $(am__append_65)
+@BUILD_PLUGIN_HDDTEMP_TRUE@hddtemp_la_LIBADD = $(am__append_66)
 @BUILD_PLUGIN_INTERFACE_TRUE@interface_la_SOURCES = interface.c
 @BUILD_PLUGIN_INTERFACE_TRUE@interface_la_CFLAGS = $(AM_CFLAGS) \
-@BUILD_PLUGIN_INTERFACE_TRUE@	$(am__append_67)
+@BUILD_PLUGIN_INTERFACE_TRUE@	$(am__append_68)
 @BUILD_PLUGIN_INTERFACE_TRUE@interface_la_LDFLAGS = $(PLUGIN_LDFLAGS)
-@BUILD_PLUGIN_INTERFACE_TRUE@interface_la_LIBADD = $(am__append_68) \
-@BUILD_PLUGIN_INTERFACE_TRUE@	$(am__append_69) $(am__append_70) \
-@BUILD_PLUGIN_INTERFACE_TRUE@	$(am__append_71)
+@BUILD_PLUGIN_INTERFACE_TRUE@interface_la_LIBADD = $(am__append_69) \
+@BUILD_PLUGIN_INTERFACE_TRUE@	$(am__append_70) $(am__append_71) \
+@BUILD_PLUGIN_INTERFACE_TRUE@	$(am__append_72)
 @BUILD_PLUGIN_IPC_TRUE@ipc_la_SOURCES = ipc.c
 @BUILD_PLUGIN_IPC_TRUE@ipc_la_CFLAGS = $(AM_CFLAGS)
 @BUILD_PLUGIN_IPC_TRUE@ipc_la_LDFLAGS = $(PLUGIN_LDFLAGS)
@@ -2667,10 +2696,10 @@ CLEANFILES = $(am__append_212) $(am__app
 @BUILD_PLUGIN_JAVA_TRUE@java_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(JAVA_LDFLAGS)
 @BUILD_PLUGIN_JAVA_TRUE@java_la_LIBADD = $(JAVA_LIBS)
 @BUILD_PLUGIN_LOAD_TRUE@load_la_SOURCES = load.c
-@BUILD_PLUGIN_LOAD_TRUE@load_la_CFLAGS = $(AM_CFLAGS) $(am__append_79)
+@BUILD_PLUGIN_LOAD_TRUE@load_la_CFLAGS = $(AM_CFLAGS) $(am__append_80)
 @BUILD_PLUGIN_LOAD_TRUE@load_la_LDFLAGS = $(PLUGIN_LDFLAGS)
-@BUILD_PLUGIN_LOAD_TRUE@load_la_LIBADD = $(am__append_80) \
-@BUILD_PLUGIN_LOAD_TRUE@	$(am__append_81)
+@BUILD_PLUGIN_LOAD_TRUE@load_la_LIBADD = $(am__append_81) \
+@BUILD_PLUGIN_LOAD_TRUE@	$(am__append_82)
 @BUILD_PLUGIN_LOGFILE_TRUE@logfile_la_SOURCES = logfile.c
 @BUILD_PLUGIN_LOGFILE_TRUE@logfile_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 @BUILD_PLUGIN_LOG_LOGSTASH_TRUE@log_logstash_la_SOURCES = log_logstash.c
@@ -2698,7 +2727,7 @@ CLEANFILES = $(am__append_212) $(am__app
 @BUILD_PLUGIN_MATCH_VALUE_TRUE@match_value_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 @BUILD_PLUGIN_MBMON_TRUE@mbmon_la_SOURCES = mbmon.c
 @BUILD_PLUGIN_MBMON_TRUE@mbmon_la_LDFLAGS = $(PLUGIN_LDFLAGS)
-@BUILD_PLUGIN_MBMON_TRUE@mbmon_la_LIBADD = $(am__append_93)
+@BUILD_PLUGIN_MBMON_TRUE@mbmon_la_LIBADD = $(am__append_94)
 @BUILD_PLUGIN_MD_TRUE@md_la_SOURCES = md.c
 @BUILD_PLUGIN_MD_TRUE@md_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 @BUILD_PLUGIN_MEMCACHEC_TRUE@memcachec_la_SOURCES = memcachec.c
@@ -2707,14 +2736,14 @@ CLEANFILES = $(am__append_212) $(am__app
 @BUILD_PLUGIN_MEMCACHEC_TRUE@memcachec_la_LIBADD = $(BUILD_WITH_LIBMEMCACHED_LIBS)
 @BUILD_PLUGIN_MEMCACHED_TRUE@memcached_la_SOURCES = memcached.c
 @BUILD_PLUGIN_MEMCACHED_TRUE@memcached_la_LDFLAGS = $(PLUGIN_LDFLAGS)
-@BUILD_PLUGIN_MEMCACHED_TRUE@memcached_la_LIBADD = $(am__append_97)
+@BUILD_PLUGIN_MEMCACHED_TRUE@memcached_la_LIBADD = $(am__append_98)
 @BUILD_PLUGIN_MEMORY_TRUE@memory_la_SOURCES = memory.c
 @BUILD_PLUGIN_MEMORY_TRUE@memory_la_CFLAGS = $(AM_CFLAGS) \
-@BUILD_PLUGIN_MEMORY_TRUE@	$(am__append_101)
+@BUILD_PLUGIN_MEMORY_TRUE@	$(am__append_102)
 @BUILD_PLUGIN_MEMORY_TRUE@memory_la_LDFLAGS = $(PLUGIN_LDFLAGS)
-@BUILD_PLUGIN_MEMORY_TRUE@memory_la_LIBADD = $(am__append_99) \
-@BUILD_PLUGIN_MEMORY_TRUE@	$(am__append_100) $(am__append_102) \
-@BUILD_PLUGIN_MEMORY_TRUE@	$(am__append_103)
+@BUILD_PLUGIN_MEMORY_TRUE@memory_la_LIBADD = $(am__append_100) \
+@BUILD_PLUGIN_MEMORY_TRUE@	$(am__append_101) $(am__append_103) \
+@BUILD_PLUGIN_MEMORY_TRUE@	$(am__append_104)
 @BUILD_PLUGIN_MIC_TRUE@mic_la_SOURCES = mic.c
 @BUILD_PLUGIN_MIC_TRUE@mic_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_MIC_LIBPATH)
 @BUILD_PLUGIN_MIC_TRUE@mic_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_MIC_CPPFLAGS)
@@ -2728,8 +2757,8 @@ CLEANFILES = $(am__append_212) $(am__app
 @BUILD_PLUGIN_MYSQL_TRUE@mysql_la_SOURCES = mysql.c
 @BUILD_PLUGIN_MYSQL_TRUE@mysql_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 @BUILD_PLUGIN_MYSQL_TRUE@mysql_la_CFLAGS = $(AM_CFLAGS) \
-@BUILD_PLUGIN_MYSQL_TRUE@	$(am__append_108)
-@BUILD_PLUGIN_MYSQL_TRUE@mysql_la_LIBADD = $(am__append_109)
+@BUILD_PLUGIN_MYSQL_TRUE@	$(am__append_109)
+@BUILD_PLUGIN_MYSQL_TRUE@mysql_la_LIBADD = $(am__append_110)
 @BUILD_PLUGIN_NETAPP_TRUE@netapp_la_SOURCES = netapp.c
 @BUILD_PLUGIN_NETAPP_TRUE@netapp_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBNETAPP_CPPFLAGS)
 @BUILD_PLUGIN_NETAPP_TRUE@netapp_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(LIBNETAPP_LDFLAGS)
@@ -2742,19 +2771,19 @@ CLEANFILES = $(am__append_212) $(am__app
 @BUILD_PLUGIN_NETWORK_TRUE@		     utils_fbhash.c utils_fbhash.h
 
 @BUILD_PLUGIN_NETWORK_TRUE@network_la_CPPFLAGS = $(AM_CPPFLAGS) \
-@BUILD_PLUGIN_NETWORK_TRUE@	$(am__append_114)
-@BUILD_PLUGIN_NETWORK_TRUE@network_la_LDFLAGS = $(PLUGIN_LDFLAGS) \
 @BUILD_PLUGIN_NETWORK_TRUE@	$(am__append_115)
+@BUILD_PLUGIN_NETWORK_TRUE@network_la_LDFLAGS = $(PLUGIN_LDFLAGS) \
+@BUILD_PLUGIN_NETWORK_TRUE@	$(am__append_116)
 @BUILD_PLUGIN_NETWORK_TRUE@network_la_LIBADD = -lpthread \
-@BUILD_PLUGIN_NETWORK_TRUE@	$(am__append_113) $(am__append_116)
+@BUILD_PLUGIN_NETWORK_TRUE@	$(am__append_114) $(am__append_117)
 @BUILD_PLUGIN_NFS_TRUE@nfs_la_SOURCES = nfs.c
 @BUILD_PLUGIN_NFS_TRUE@nfs_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 @BUILD_PLUGIN_FSCACHE_TRUE@fscache_la_SOURCES = fscache.c
 @BUILD_PLUGIN_FSCACHE_TRUE@fscache_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 @BUILD_PLUGIN_NGINX_TRUE@nginx_la_SOURCES = nginx.c
 @BUILD_PLUGIN_NGINX_TRUE@nginx_la_CFLAGS = $(AM_CFLAGS) \
-@BUILD_PLUGIN_NGINX_TRUE@	$(am__append_120)
-@BUILD_PLUGIN_NGINX_TRUE@nginx_la_LIBADD = $(am__append_121)
+@BUILD_PLUGIN_NGINX_TRUE@	$(am__append_121)
+@BUILD_PLUGIN_NGINX_TRUE@nginx_la_LIBADD = $(am__append_122)
 @BUILD_PLUGIN_NGINX_TRUE@nginx_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 @BUILD_PLUGIN_NOTIFY_DESKTOP_TRUE@notify_desktop_la_SOURCES = notify_desktop.c
 @BUILD_PLUGIN_NOTIFY_DESKTOP_TRUE@notify_desktop_la_CFLAGS = $(AM_CFLAGS) $(LIBNOTIFY_CFLAGS)
@@ -2765,7 +2794,7 @@ CLEANFILES = $(am__append_212) $(am__app
 @BUILD_PLUGIN_NOTIFY_EMAIL_TRUE@notify_email_la_LIBADD = -lesmtp -lssl -lcrypto -lpthread
 @BUILD_PLUGIN_NTPD_TRUE@ntpd_la_SOURCES = ntpd.c
 @BUILD_PLUGIN_NTPD_TRUE@ntpd_la_LDFLAGS = $(PLUGIN_LDFLAGS)
-@BUILD_PLUGIN_NTPD_TRUE@ntpd_la_LIBADD = $(am__append_125)
+@BUILD_PLUGIN_NTPD_TRUE@ntpd_la_LIBADD = $(am__append_126)
 @BUILD_PLUGIN_NUMA_TRUE@numa_la_SOURCES = numa.c
 @BUILD_PLUGIN_NUMA_TRUE@numa_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 @BUILD_PLUGIN_NUT_TRUE@nut_la_SOURCES = nut.c
@@ -2774,7 +2803,7 @@ CLEANFILES = $(am__append_212) $(am__app
 @BUILD_PLUGIN_NUT_TRUE@nut_la_LIBADD = -lpthread $(BUILD_WITH_LIBUPSCLIENT_LIBS)
 @BUILD_PLUGIN_OLSRD_TRUE@olsrd_la_SOURCES = olsrd.c
 @BUILD_PLUGIN_OLSRD_TRUE@olsrd_la_LDFLAGS = $(PLUGIN_LDFLAGS)
-@BUILD_PLUGIN_OLSRD_TRUE@olsrd_la_LIBADD = $(am__append_129)
+@BUILD_PLUGIN_OLSRD_TRUE@olsrd_la_LIBADD = $(am__append_130)
 @BUILD_PLUGIN_ONEWIRE_TRUE@onewire_la_SOURCES = onewire.c
 @BUILD_PLUGIN_ONEWIRE_TRUE@onewire_la_CFLAGS = $(AM_CFLAGS)
 @BUILD_PLUGIN_ONEWIRE_TRUE@onewire_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBOWCAPI_CPPFLAGS)
@@ -2801,7 +2830,7 @@ CLEANFILES = $(am__append_212) $(am__app
 @BUILD_PLUGIN_PERL_TRUE@perl_la_CFLAGS = $(AM_CFLAGS) $(PERL_CFLAGS) \
 @BUILD_PLUGIN_PERL_TRUE@	-DXS_VERSION=\"$(VERSION)\" \
 @BUILD_PLUGIN_PERL_TRUE@	-DVERSION=\"$(VERSION)\" \
-@BUILD_PLUGIN_PERL_TRUE@	$(am__append_135)
+@BUILD_PLUGIN_PERL_TRUE@	$(am__append_136)
 @BUILD_PLUGIN_PERL_TRUE@perl_la_LDFLAGS = $(PLUGIN_LDFLAGS) \
 @BUILD_PLUGIN_PERL_TRUE@		$(PERL_LDFLAGS)
 
@@ -2829,12 +2858,12 @@ CLEANFILES = $(am__append_212) $(am__app
 @BUILD_PLUGIN_PYTHON_TRUE@python_la_SOURCES = python.c pyconfig.c pyvalues.c cpython.h
 @BUILD_PLUGIN_PYTHON_TRUE@python_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_PYTHON_CPPFLAGS)
 @BUILD_PLUGIN_PYTHON_TRUE@python_la_CFLAGS = $(AM_CFLAGS) \
-@BUILD_PLUGIN_PYTHON_TRUE@	$(am__append_142)
+@BUILD_PLUGIN_PYTHON_TRUE@	$(am__append_143)
 @BUILD_PLUGIN_PYTHON_TRUE@python_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_PYTHON_LDFLAGS)
 @BUILD_PLUGIN_PYTHON_TRUE@python_la_LIBADD = $(BUILD_WITH_PYTHON_LIBS)
 @BUILD_PLUGIN_PROCESSES_TRUE@processes_la_SOURCES = processes.c
 @BUILD_PLUGIN_PROCESSES_TRUE@processes_la_LDFLAGS = $(PLUGIN_LDFLAGS)
-@BUILD_PLUGIN_PROCESSES_TRUE@processes_la_LIBADD = $(am__append_144)
+@BUILD_PLUGIN_PROCESSES_TRUE@processes_la_LIBADD = $(am__append_145)
 @BUILD_PLUGIN_PROTOCOLS_TRUE@protocols_la_SOURCES = protocols.c
 @BUILD_PLUGIN_PROTOCOLS_TRUE@protocols_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 @BUILD_PLUGIN_REDIS_TRUE@redis_la_SOURCES = redis.c
@@ -2870,9 +2899,9 @@ CLEANFILES = $(am__append_212) $(am__app
 @BUILD_PLUGIN_SNMP_TRUE@snmp_la_SOURCES = snmp.c
 @BUILD_PLUGIN_SNMP_TRUE@snmp_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 @BUILD_PLUGIN_SNMP_TRUE@snmp_la_CFLAGS = $(AM_CFLAGS) \
-@BUILD_PLUGIN_SNMP_TRUE@	$(am__append_155)
-@BUILD_PLUGIN_SNMP_TRUE@snmp_la_LIBADD = $(am__append_156) \
-@BUILD_PLUGIN_SNMP_TRUE@	$(am__append_157)
+@BUILD_PLUGIN_SNMP_TRUE@	$(am__append_156)
+@BUILD_PLUGIN_SNMP_TRUE@snmp_la_LIBADD = $(am__append_157) \
+@BUILD_PLUGIN_SNMP_TRUE@	$(am__append_158)
 @BUILD_PLUGIN_STATSD_TRUE@statsd_la_SOURCES = statsd.c \
 @BUILD_PLUGIN_STATSD_TRUE@                    utils_latency.h utils_latency.c
 
@@ -2880,11 +2909,11 @@ CLEANFILES = $(am__append_212) $(am__app
 @BUILD_PLUGIN_STATSD_TRUE@statsd_la_LIBADD = -lpthread -lm
 @BUILD_PLUGIN_SWAP_TRUE@swap_la_SOURCES = swap.c
 @BUILD_PLUGIN_SWAP_TRUE@swap_la_CFLAGS = $(AM_CFLAGS) \
-@BUILD_PLUGIN_SWAP_TRUE@	$(am__append_163)
+@BUILD_PLUGIN_SWAP_TRUE@	$(am__append_164)
 @BUILD_PLUGIN_SWAP_TRUE@swap_la_LDFLAGS = $(PLUGIN_LDFLAGS)
-@BUILD_PLUGIN_SWAP_TRUE@swap_la_LIBADD = $(am__append_160) \
-@BUILD_PLUGIN_SWAP_TRUE@	$(am__append_161) $(am__append_162) \
-@BUILD_PLUGIN_SWAP_TRUE@	$(am__append_164) $(am__append_165)
+@BUILD_PLUGIN_SWAP_TRUE@swap_la_LIBADD = $(am__append_161) \
+@BUILD_PLUGIN_SWAP_TRUE@	$(am__append_162) $(am__append_163) \
+@BUILD_PLUGIN_SWAP_TRUE@	$(am__append_165) $(am__append_166)
 @BUILD_PLUGIN_SYSLOG_TRUE@syslog_la_SOURCES = syslog.c
 @BUILD_PLUGIN_SYSLOG_TRUE@syslog_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 @BUILD_PLUGIN_TABLE_TRUE@table_la_SOURCES = table.c
@@ -2895,7 +2924,7 @@ CLEANFILES = $(am__append_212) $(am__app
 @BUILD_PLUGIN_TAIL_CSV_TRUE@tail_csv_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 @BUILD_PLUGIN_TAPE_TRUE@tape_la_SOURCES = tape.c
 @BUILD_PLUGIN_TAPE_TRUE@tape_la_LDFLAGS = $(PLUGIN_LDFLAGS)
-@BUILD_PLUGIN_TAPE_TRUE@tape_la_LIBADD = -lkstat -ldevinfo
+@BUILD_PLUGIN_TAPE_TRUE@tape_la_LIBADD = $(BUILD_WITH_LIBKSTAT_LIBS) -ldevinfo
 @BUILD_PLUGIN_TARGET_NOTIFICATION_TRUE@target_notification_la_SOURCES = target_notification.c
 @BUILD_PLUGIN_TARGET_NOTIFICATION_TRUE@target_notification_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 @BUILD_PLUGIN_TARGET_REPLACE_TRUE@target_replace_la_SOURCES = target_replace.c
@@ -2908,7 +2937,7 @@ CLEANFILES = $(am__append_212) $(am__app
 @BUILD_PLUGIN_TARGET_V5UPGRADE_TRUE@target_v5upgrade_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 @BUILD_PLUGIN_TCPCONNS_TRUE@tcpconns_la_SOURCES = tcpconns.c
 @BUILD_PLUGIN_TCPCONNS_TRUE@tcpconns_la_LDFLAGS = $(PLUGIN_LDFLAGS)
-@BUILD_PLUGIN_TCPCONNS_TRUE@tcpconns_la_LIBADD = $(am__append_177)
+@BUILD_PLUGIN_TCPCONNS_TRUE@tcpconns_la_LIBADD = $(am__append_178)
 @BUILD_PLUGIN_TEAMSPEAK2_TRUE@teamspeak2_la_SOURCES = teamspeak2.c
 @BUILD_PLUGIN_TEAMSPEAK2_TRUE@teamspeak2_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 @BUILD_PLUGIN_TED_TRUE@ted_la_SOURCES = ted.c
@@ -2921,7 +2950,7 @@ CLEANFILES = $(am__append_212) $(am__app
 @BUILD_PLUGIN_TOKYOTYRANT_TRUE@tokyotyrant_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBTOKYOTYRANT_CPPFLAGS)
 @BUILD_PLUGIN_TOKYOTYRANT_TRUE@tokyotyrant_la_LDFLAGS = $(PLUGIN_LDFLAGS) $(BUILD_WITH_LIBTOKYOTYRANT_LDFLAGS)
 @BUILD_PLUGIN_TOKYOTYRANT_TRUE@tokyotyrant_la_LIBADD = $(BUILD_WITH_LIBTOKYOTYRANT_LIBS) \
-@BUILD_PLUGIN_TOKYOTYRANT_TRUE@	$(am__append_183)
+@BUILD_PLUGIN_TOKYOTYRANT_TRUE@	$(am__append_184)
 @BUILD_PLUGIN_TURBOSTAT_TRUE@turbostat_la_SOURCES = turbostat.c
 @BUILD_PLUGIN_TURBOSTAT_TRUE@turbostat_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 @BUILD_PLUGIN_UNIXSOCK_TRUE@unixsock_la_SOURCES = unixsock.c \
@@ -2938,13 +2967,13 @@ CLEANFILES = $(am__append_212) $(am__app
 @BUILD_PLUGIN_UPTIME_TRUE@uptime_la_SOURCES = uptime.c
 @BUILD_PLUGIN_UPTIME_TRUE@uptime_la_CFLAGS = $(AM_CFLAGS)
 @BUILD_PLUGIN_UPTIME_TRUE@uptime_la_LDFLAGS = $(PLUGIN_LDFLAGS)
-@BUILD_PLUGIN_UPTIME_TRUE@uptime_la_LIBADD = $(am__append_187) \
-@BUILD_PLUGIN_UPTIME_TRUE@	$(am__append_188)
+@BUILD_PLUGIN_UPTIME_TRUE@uptime_la_LIBADD = $(am__append_188) \
+@BUILD_PLUGIN_UPTIME_TRUE@	$(am__append_189)
 @BUILD_PLUGIN_USERS_TRUE@users_la_SOURCES = users.c
 @BUILD_PLUGIN_USERS_TRUE@users_la_CFLAGS = $(AM_CFLAGS) \
-@BUILD_PLUGIN_USERS_TRUE@	$(am__append_190)
+@BUILD_PLUGIN_USERS_TRUE@	$(am__append_191)
 @BUILD_PLUGIN_USERS_TRUE@users_la_LDFLAGS = $(PLUGIN_LDFLAGS)
-@BUILD_PLUGIN_USERS_TRUE@users_la_LIBADD = $(am__append_191)
+@BUILD_PLUGIN_USERS_TRUE@users_la_LIBADD = $(am__append_192)
 @BUILD_PLUGIN_UUID_TRUE@uuid_la_SOURCES = uuid.c
 @BUILD_PLUGIN_UUID_TRUE@uuid_la_CFLAGS = $(AM_CFLAGS) $(BUILD_WITH_LIBHAL_CFLAGS)
 @BUILD_PLUGIN_UUID_TRUE@uuid_la_LIBADD = $(BUILD_WITH_LIBHAL_LIBS)
@@ -2975,9 +3004,9 @@ CLEANFILES = $(am__append_212) $(am__app
 
 @BUILD_PLUGIN_WRITE_HTTP_TRUE@write_http_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 @BUILD_PLUGIN_WRITE_HTTP_TRUE@write_http_la_CFLAGS = $(AM_CFLAGS) \
-@BUILD_PLUGIN_WRITE_HTTP_TRUE@	$(am__append_200)
-@BUILD_PLUGIN_WRITE_HTTP_TRUE@write_http_la_LIBADD =  \
 @BUILD_PLUGIN_WRITE_HTTP_TRUE@	$(am__append_201)
+@BUILD_PLUGIN_WRITE_HTTP_TRUE@write_http_la_LIBADD =  \
+@BUILD_PLUGIN_WRITE_HTTP_TRUE@	$(am__append_202)
 @BUILD_PLUGIN_WRITE_KAFKA_TRUE@write_kafka_la_SOURCES = write_kafka.c \
 @BUILD_PLUGIN_WRITE_KAFKA_TRUE@                        utils_format_graphite.c utils_format_graphite.h \
 @BUILD_PLUGIN_WRITE_KAFKA_TRUE@                        utils_format_json.c utils_format_json.h \
@@ -3016,7 +3045,7 @@ CLEANFILES = $(am__append_212) $(am__app
 @BUILD_PLUGIN_ZFS_ARC_TRUE@zfs_arc_la_LDFLAGS = $(PLUGIN_LDFLAGS)
 # zfs_arc requires no library on linux
 # solaris
-@BUILD_FREEBSD_FALSE@@BUILD_LINUX_FALSE@@BUILD_PLUGIN_ZFS_ARC_TRUE@zfs_arc_la_LIBADD = -lkstat
+@BUILD_FREEBSD_FALSE@@BUILD_LINUX_FALSE@@BUILD_PLUGIN_ZFS_ARC_TRUE@zfs_arc_la_LIBADD = $(BUILD_WITH_LIBKSTAT_LIBS)
 @BUILD_FREEBSD_TRUE@@BUILD_PLUGIN_ZFS_ARC_TRUE@zfs_arc_la_LIBADD = -lm
 @BUILD_PLUGIN_ZOOKEEPER_TRUE@zookeeper_la_SOURCES = zookeeper.c
 @BUILD_PLUGIN_ZOOKEEPER_TRUE@zookeeper_la_LDFLAGS = $(PLUGIN_LDFLAGS)
@@ -3077,7 +3106,6 @@ $(srcdir)/Makefile.in:  $(srcdir)/Makefi
 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign src/Makefile
-.PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -4744,7 +4772,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
 	if test -n "$$am__remaking_logs"; then \
 	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
 	       "recursion detected" >&2; \
-	else \
+	elif test -n "$$redo_logs"; then \
 	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
 	fi; \
 	if $(am__make_dryrun); then :; else \
@@ -5096,6 +5124,8 @@ uninstall-man: uninstall-man1 uninstall-
 	uninstall-man1 uninstall-man5 uninstall-pkglibLTLIBRARIES \
 	uninstall-sbinPROGRAMS
 
+.PRECIOUS: Makefile
+
 
 .pod.1:
 	pod2man --release=$(VERSION) --center=$(PACKAGE) $< \
@@ -5121,12 +5151,7 @@ uninstall-man: uninstall-man1 uninstall-
 
 install-exec-hook:
 	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
-	if test -e $(DESTDIR)$(sysconfdir)/collectd.conf; \
-	then \
-		$(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.pkg-orig; \
-	else \
-		$(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf; \
-	fi; \
+	$(INSTALL) -m 0640 collectd.conf $(DESTDIR)$(sysconfdir)/collectd.conf.sample
 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
 	$(INSTALL) -m 0644 $(srcdir)/types.db $(DESTDIR)$(pkgdatadir)/types.db;
 	$(INSTALL) -m 0644 $(srcdir)/postgresql_default.conf \




--- src/daemon/Makefile.am.orig	2016-01-22 09:51:17 UTC
+++ src/daemon/Makefile.am
@@ -6,7 +6,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src
 AM_CPPFLAGS += -DPREFIX='"${prefix}"'

 if BUILD_FEATURE_DAEMON
 AM_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"'
 endif
@@ -49,7 +49,7 @@ collectd_CPPFLAGS =  $(AM_CPPFLAGS) $(LT
 collectd_CFLAGS = $(AM_CFLAGS)
 collectd_LDFLAGS = -export-dynamic
 collectd_LDADD = libavltree.la libcommon.la libheap.la -lm
-collectd_DEPENDENCIES =
+collectd_DEPENDENCIES = libavltree.la libcommon.la libheap.la
 
 # Link to these libraries..
 if BUILD_WITH_LIBRT

Lines 1-4 Link Here

(-)net-mgmt/collectd5.new/files/patch-src__daemon__collectd.h (-1 / +1 lines)
1	--- src/daemon/collectd.h.orig 2015-05-22 10:04:36 UTC	1	--- src/daemon/collectd.h.orig 2016-01-22 09:51:17 UTC
2	+++ src/daemon/collectd.h	2	+++ src/daemon/collectd.h
3	@@ -240,15 +240,15 @@ typedef int _Bool;	3	@@ -240,15 +240,15 @@ typedef int _Bool;
4	#endif	4	#endif

Lines 1-6 Link Here

(-)net-mgmt/collectd5.new/files/patch-src__dns.c (-2 / +2 lines)
1	--- src/dns.c.orig 2015-03-10 14:14:45 UTC	1	--- src/dns.c.orig 2016-01-22 09:51:17 UTC
2	+++ src/dns.c	2	+++ src/dns.c
3	@@ -224,6 +224,15 @@ static int dns_run_pcap_loop (void)	3	@@ -223,6 +223,15 @@ static int dns_run_pcap_loop (void)
4	pthread_sigmask (SIG_SETMASK, &sigmask, NULL);	4	pthread_sigmask (SIG_SETMASK, &sigmask, NULL);
5	}	5	}
6		6

Lines 1-4 Link Here

(-)net-mgmt/collectd5.new/files/patch-src__modbus.c (-2 / +2 lines)
1	--- src/modbus.c.orig 2015-05-20 12:04:47 UTC	1	--- src/modbus.c.orig 2016-01-22 09:51:17 UTC
2	+++ src/modbus.c	2	+++ src/modbus.c
3	@@ -25,6 +25,9 @@	3	@@ -25,6 +25,9 @@
4	#include "plugin.h"	4	#include "plugin.h"
Lines 9-12 Link Here
9	+	9	+
10	#include <netdb.h>	10	#include <netdb.h>
11		11
12	#include <modbus/modbus.h>	12	#include <modbus.h>




commit 0eebd2655842fbb634f67afd44fa4fdcf4e6f189
Author: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date:   Sat Jul 4 22:49:49 2015 +0200

    varnish: fix leak on read
    
    Since VSM_Close doesn't free the object we leak a few bytes
    every interval

commit b208ddc7d08978f4cf52364c1935e94a0479ee42
Author: Marc Fournier <marc.fournier@camptocamp.com>
Date:   Wed Nov 4 21:12:36 2015 +0100

    varnish: isolate varnish v2 code
    
    Segregating v2-specific code will allow reworking the v3 and v4 parts,
    while ensuring backwards compatibility with v2.
    
    The downside is that this leads to a large chunk of mostly duplicate
    code. That said, my suggestion would be to drop support for varnish v2
    in collectd 5.6.
    
    NB: this commit breaks v3 and v4 support.

commit d010d9eff882765201359959a583033dae4b373c
Author: Marc Fournier <marc.fournier@camptocamp.com>
Date:   Wed Nov 4 22:57:00 2015 +0100

    varnish: rework v3 and v4 support
    
    By using VSC_Iter() to loop over the list of metrics exposed by varnish,
    we can pick those we're interested *if they are found*.
    
    Not explicitly referring to metrics in the VSC_C_main struct makes the
    plugin more resilient to small differences between minor varnish
    versions.
    
    It also opens the possibility to monitor non-MAIN metrics, such as
    per-backend or per-storage engine stats.
    
    This patch should be compatible with the previous way of doing, from the
    user point of view.
    
    Fix #1302

commit 08bd4dd86e0fcb6828819cdf6bb3ae2115b1b8f4
Author: Marc Fournier <marc.fournier@camptocamp.com>
Date:   Thu Nov 5 10:23:19 2015 +0100

    varnish: remove unused variable
    
    This was used in a DEBUG statement I didn't check in.

--- src/varnish.c.orig	2015-03-10 14:14:45 UTC
+++ src/varnish.c
@@ -135,6 +135,397 @@ static int varnish_submit_derive (const 
 	return (varnish_submit (plugin_instance, category, type, type_instance, value));
 } /* }}} int varnish_submit_derive */
 
+#if HAVE_VARNISH_V3 || HAVE_VARNISH_V4
+static int varnish_monitor (void *priv, const struct VSC_point * const pt) /* {{{ */
+{
+	uint64_t val;
+	const user_config_t *conf;
+	const char *class;
+	const char *name;
+
+	if (pt == NULL)
+		return (0);
+
+	conf = priv;
+
+#if HAVE_VARNISH_V4
+	class = pt->section->fantom->type;
+	name  = pt->desc->name;
+
+	if (strcmp(class, "MAIN") != 0)
+		return (0);
+
+#elif HAVE_VARNISH_V3
+	class = pt->class;
+	name  = pt->name;
+
+	if (strcmp(class, "") != 0)
+		return (0);
+#endif
+
+	val = *(const volatile uint64_t*) pt->ptr;
+
+	if (conf->collect_cache)
+	{
+		if (strcmp(name, "cache_hit") == 0)
+			return varnish_submit_derive (conf->instance, "cache", "cache_result", "hit",     val);
+		else if (strcmp(name, "cache_miss") == 0)
+			return varnish_submit_derive (conf->instance, "cache", "cache_result", "miss",    val);
+		else if (strcmp(name, "cache_hitpass") == 0)
+			return varnish_submit_derive (conf->instance, "cache", "cache_result", "hitpass", val);
+	}
+
+	if (conf->collect_connections)
+	{
+		if (strcmp(name, "client_conn") == 0)
+			return varnish_submit_derive (conf->instance, "connections", "connections", "accepted", val);
+		else if (strcmp(name, "client_drop") == 0)
+			return varnish_submit_derive (conf->instance, "connections", "connections", "dropped" , val);
+		else if (strcmp(name, "client_req") == 0)
+			return varnish_submit_derive (conf->instance, "connections", "connections", "received", val);
+	}
+
+#ifdef HAVE_VARNISH_V3
+	if (conf->collect_dirdns)
+	{
+		if (strcmp(name, "dir_dns_lookups") == 0)
+			return varnish_submit_derive (conf->instance, "dirdns", "cache_operation", "lookups",    val);
+		else if (strcmp(name, "dir_dns_failed") == 0)
+			return varnish_submit_derive (conf->instance, "dirdns", "cache_result",    "failed",     val);
+		else if (strcmp(name, "dir_dns_hit") == 0)
+			return varnish_submit_derive (conf->instance, "dirdns", "cache_result",    "hits",       val);
+		else if (strcmp(name, "dir_dns_cache_full") == 0)
+			return varnish_submit_derive (conf->instance, "dirdns", "cache_result",    "cache_full", val);
+	}
+#endif
+
+	if (conf->collect_esi)
+	{
+		if (strcmp(name, "esi_errors") == 0)
+			return varnish_submit_derive (conf->instance, "esi", "total_operations", "error",   val);
+		else if (strcmp(name, "esi_parse") == 0)
+			return varnish_submit_derive (conf->instance, "esi", "total_operations", "parsed",  val);
+		else if (strcmp(name, "esi_warnings") == 0)
+			return varnish_submit_derive (conf->instance, "esi", "total_operations", "warning", val);
+	}
+
+	if (conf->collect_backend)
+	{
+		if (strcmp(name, "backend_conn") == 0)
+			return varnish_submit_derive (conf->instance, "backend", "connections", "success",       val);
+		else if (strcmp(name, "backend_unhealthy") == 0)
+			return varnish_submit_derive (conf->instance, "backend", "connections", "not-attempted", val);
+		else if (strcmp(name, "backend_busy") == 0)
+			return varnish_submit_derive (conf->instance, "backend", "connections", "too-many",      val);
+		else if (strcmp(name, "backend_fail") == 0)
+			return varnish_submit_derive (conf->instance, "backend", "connections", "failures",      val);
+		else if (strcmp(name, "backend_reuse") == 0)
+			return varnish_submit_derive (conf->instance, "backend", "connections", "reuses",        val);
+		else if (strcmp(name, "backend_toolate") == 0)
+			return varnish_submit_derive (conf->instance, "backend", "connections", "was-closed",    val);
+		else if (strcmp(name, "backend_recycle") == 0)
+			return varnish_submit_derive (conf->instance, "backend", "connections", "recycled",      val);
+		else if (strcmp(name, "backend_unused") == 0)
+			return varnish_submit_derive (conf->instance, "backend", "connections", "unused",        val);
+		else if (strcmp(name, "backend_retry") == 0)
+			return varnish_submit_derive (conf->instance, "backend", "connections", "retries",       val);
+		else if (strcmp(name, "backend_req") == 0)
+			return varnish_submit_derive (conf->instance, "backend", "http_requests", "requests",    val);
+		else if (strcmp(name, "n_backend") == 0)
+			return varnish_submit_gauge  (conf->instance, "backend", "backends", "n_backends",       val);
+	}
+
+	if (conf->collect_fetch)
+	{
+		if (strcmp(name, "fetch_head") == 0)
+			return varnish_submit_derive (conf->instance, "fetch", "http_requests", "head",        val);
+		else if (strcmp(name, "fetch_length") == 0)
+			return varnish_submit_derive (conf->instance, "fetch", "http_requests", "length",      val);
+		else if (strcmp(name, "fetch_chunked") == 0)
+			return varnish_submit_derive (conf->instance, "fetch", "http_requests", "chunked",     val);
+		else if (strcmp(name, "fetch_eof") == 0)
+			return varnish_submit_derive (conf->instance, "fetch", "http_requests", "eof",         val);
+		else if (strcmp(name, "fetch_bad") == 0)
+			return varnish_submit_derive (conf->instance, "fetch", "http_requests", "bad_headers", val);
+		else if (strcmp(name, "fetch_close") == 0)
+			return varnish_submit_derive (conf->instance, "fetch", "http_requests", "close",       val);
+		else if (strcmp(name, "fetch_oldhttp") == 0)
+			return varnish_submit_derive (conf->instance, "fetch", "http_requests", "oldhttp",     val);
+		else if (strcmp(name, "fetch_zero") == 0)
+			return varnish_submit_derive (conf->instance, "fetch", "http_requests", "zero",        val);
+		else if (strcmp(name, "fetch_failed") == 0)
+			return varnish_submit_derive (conf->instance, "fetch", "http_requests", "failed",      val);
+		else if (strcmp(name, "fetch_1xx") == 0)
+			return varnish_submit_derive (conf->instance, "fetch", "http_requests", "no_body_1xx", val);
+		else if (strcmp(name, "fetch_204") == 0)
+			return varnish_submit_derive (conf->instance, "fetch", "http_requests", "no_body_204", val);
+		else if (strcmp(name, "fetch_304") == 0)
+			return varnish_submit_derive (conf->instance, "fetch", "http_requests", "no_body_304", val);
+	}
+
+	if (conf->collect_hcb)
+	{
+		if (strcmp(name, "hcb_nolock") == 0)
+			return varnish_submit_derive (conf->instance, "hcb", "cache_operation", "lookup_nolock", val);
+		else if (strcmp(name, "hcb_lock") == 0)
+			return varnish_submit_derive (conf->instance, "hcb", "cache_operation", "lookup_lock",   val);
+		else if (strcmp(name, "hcb_insert") == 0)
+			return varnish_submit_derive (conf->instance, "hcb", "cache_operation", "insert",        val);
+	}
+
+	if (conf->collect_objects)
+	{
+		if (strcmp(name, "n_expired") == 0)
+			return varnish_submit_derive (conf->instance, "objects", "total_objects", "expired",            val);
+		else if (strcmp(name, "n_lru_nuked") == 0)
+			return varnish_submit_derive (conf->instance, "objects", "total_objects", "lru_nuked",          val);
+		else if (strcmp(name, "n_lru_saved") == 0)
+			return varnish_submit_derive (conf->instance, "objects", "total_objects", "lru_saved",          val);
+		else if (strcmp(name, "n_lru_moved") == 0)
+			return varnish_submit_derive (conf->instance, "objects", "total_objects", "lru_moved",          val);
+		else if (strcmp(name, "n_deathrow") == 0)
+			return varnish_submit_derive (conf->instance, "objects", "total_objects", "deathrow",           val);
+		else if (strcmp(name, "losthdr") == 0)
+			return varnish_submit_derive (conf->instance, "objects", "total_objects", "header_overflow",    val);
+		else if (strcmp(name, "n_obj_purged") == 0)
+			return varnish_submit_derive (conf->instance, "objects", "total_objects", "purged",             val);
+		else if (strcmp(name, "n_objsendfile") == 0)
+			return varnish_submit_derive (conf->instance, "objects", "total_objects", "sent_sendfile",      val);
+		else if (strcmp(name, "n_objwrite") == 0)
+			return varnish_submit_derive (conf->instance, "objects", "total_objects", "sent_write",         val);
+		else if (strcmp(name, "n_objoverflow") == 0)
+			return varnish_submit_derive (conf->instance, "objects", "total_objects", "workspace_overflow", val);
+	}
+
+#if HAVE_VARNISH_V3
+	if (conf->collect_ban)
+	{
+		if (strcmp(name, "n_ban") == 0)
+			return varnish_submit_derive (conf->instance, "ban", "total_operations", "total",          val);
+		else if (strcmp(name, "n_ban_add") == 0)
+			return varnish_submit_derive (conf->instance, "ban", "total_operations", "added",          val);
+		else if (strcmp(name, "n_ban_retire") == 0)
+			return varnish_submit_derive (conf->instance, "ban", "total_operations", "deleted",        val);
+		else if (strcmp(name, "n_ban_obj_test") == 0)
+			return varnish_submit_derive (conf->instance, "ban", "total_operations", "objects_tested", val);
+		else if (strcmp(name, "n_ban_re_test") == 0)
+			return varnish_submit_derive (conf->instance, "ban", "total_operations", "regexps_tested", val);
+		else if (strcmp(name, "n_ban_dups") == 0)
+			return varnish_submit_derive (conf->instance, "ban", "total_operations", "duplicate",      val);
+	}
+#endif
+#if HAVE_VARNISH_V4
+	if (conf->collect_ban)
+	{
+		if (strcmp(name, "bans") == 0)
+			return varnish_submit_derive (conf->instance, "ban", "total_operations", "total",     val);
+		else if (strcmp(name, "bans_added") == 0)
+			return varnish_submit_derive (conf->instance, "ban", "total_operations", "added",     val);
+		else if (strcmp(name, "bans_obj") == 0)
+			return varnish_submit_derive (conf->instance, "ban", "total_operations", "obj",       val);
+		else if (strcmp(name, "bans_req") == 0)
+			return varnish_submit_derive (conf->instance, "ban", "total_operations", "req",       val);
+		else if (strcmp(name, "bans_completed") == 0)
+			return varnish_submit_derive (conf->instance, "ban", "total_operations", "completed", val);
+		else if (strcmp(name, "bans_deleted") == 0)
+			return varnish_submit_derive (conf->instance, "ban", "total_operations", "deleted",   val);
+		else if (strcmp(name, "bans_tested") == 0)
+			return varnish_submit_derive (conf->instance, "ban", "total_operations", "tested",    val);
+		else if (strcmp(name, "bans_dups") == 0)
+			return varnish_submit_derive (conf->instance, "ban", "total_operations", "duplicate", val);
+	}
+#endif
+
+	if (conf->collect_session)
+	{
+		if (strcmp(name, "sess_closed") == 0)
+			return varnish_submit_derive (conf->instance, "session", "total_operations", "closed",    val);
+		else if (strcmp(name, "sess_pipeline") == 0)
+			return varnish_submit_derive (conf->instance, "session", "total_operations", "pipeline",  val);
+		else if (strcmp(name, "sess_readahead") == 0)
+			return varnish_submit_derive (conf->instance, "session", "total_operations", "readahead", val);
+		else if (strcmp(name, "sess_conn") == 0)
+			return varnish_submit_derive (conf->instance, "session", "total_operations", "accepted",  val);
+		else if (strcmp(name, "sess_drop") == 0)
+			return varnish_submit_derive (conf->instance, "session", "total_operations", "dropped",   val);
+		else if (strcmp(name, "sess_fail") == 0)
+			return varnish_submit_derive (conf->instance, "session", "total_operations", "failed",    val);
+		else if (strcmp(name, "sess_pipe_overflow") == 0)
+			return varnish_submit_derive (conf->instance, "session", "total_operations", "overflow",  val);
+		else if (strcmp(name, "sess_queued") == 0)
+			return varnish_submit_derive (conf->instance, "session", "total_operations", "queued",    val);
+		else if (strcmp(name, "sess_linger") == 0)
+			return varnish_submit_derive (conf->instance, "session", "total_operations", "linger",    val);
+		else if (strcmp(name, "sess_herd") == 0)
+			return varnish_submit_derive (conf->instance, "session", "total_operations", "herd",      val);
+	}
+
+	if (conf->collect_shm)
+	{
+		if (strcmp(name, "shm_records") == 0)
+			return varnish_submit_derive (conf->instance, "shm", "total_operations", "records",    val);
+		else if (strcmp(name, "shm_writes") == 0)
+			return varnish_submit_derive (conf->instance, "shm", "total_operations", "writes",     val);
+		else if (strcmp(name, "shm_flushes") == 0)
+			return varnish_submit_derive (conf->instance, "shm", "total_operations", "flushes",    val);
+		else if (strcmp(name, "shm_cont") == 0)
+			return varnish_submit_derive (conf->instance, "shm", "total_operations", "contention", val);
+		else if (strcmp(name, "shm_cycles") == 0)
+			return varnish_submit_derive (conf->instance, "shm", "total_operations", "cycles",     val);
+	}
+
+	if (conf->collect_sms)
+	{
+		if (strcmp(name, "sms_nreq") == 0)
+			return varnish_submit_derive (conf->instance, "sms", "total_requests", "allocator", val);
+		else if (strcmp(name, "sms_nobj") == 0)
+			return varnish_submit_gauge (conf->instance,  "sms", "requests", "outstanding",     val);
+		else if (strcmp(name, "sms_nbytes") == 0)
+			return varnish_submit_gauge (conf->instance,  "sms", "bytes", "outstanding",        val);
+		else if (strcmp(name, "sms_balloc") == 0)
+			return varnish_submit_derive (conf->instance,  "sms", "total_bytes", "allocated",   val);
+		else if (strcmp(name, "sms_bfree") == 0)
+			return varnish_submit_derive (conf->instance,  "sms", "total_bytes", "free",        val);
+	}
+
+	if (conf->collect_struct)
+	{
+		if (strcmp(name, "n_sess_mem") == 0)
+			return varnish_submit_gauge (conf->instance, "struct", "current_sessions", "sess_mem",  val);
+		else if (strcmp(name, "n_sess") == 0)
+			return varnish_submit_gauge (conf->instance, "struct", "current_sessions", "sess",      val);
+		else if (strcmp(name, "n_object") == 0)
+			return varnish_submit_gauge (conf->instance, "struct", "objects", "object",             val);
+		else if (strcmp(name, "n_vampireobject") == 0)
+			return varnish_submit_gauge (conf->instance, "struct", "objects", "vampireobject",      val);
+		else if (strcmp(name, "n_objectcore") == 0)
+			return varnish_submit_gauge (conf->instance, "struct", "objects", "objectcore",         val);
+		else if (strcmp(name, "n_waitinglist") == 0)
+			return varnish_submit_gauge (conf->instance, "struct", "objects", "waitinglist",        val);
+		else if (strcmp(name, "n_objecthead") == 0)
+			return varnish_submit_gauge (conf->instance, "struct", "objects", "objecthead",         val);
+		else if (strcmp(name, "n_smf") == 0)
+			return varnish_submit_gauge (conf->instance, "struct", "objects", "smf",                val);
+		else if (strcmp(name, "n_smf_frag") == 0)
+			return varnish_submit_gauge (conf->instance, "struct", "objects", "smf_frag",           val);
+		else if (strcmp(name, "n_smf_large") == 0)
+			return varnish_submit_gauge (conf->instance, "struct", "objects", "smf_large",          val);
+		else if (strcmp(name, "n_vbe_conn") == 0)
+			return varnish_submit_gauge (conf->instance, "struct", "objects", "vbe_conn",           val);
+	}
+
+	if (conf->collect_totals)
+	{
+		if (strcmp(name, "s_sess") == 0)
+			return varnish_submit_derive (conf->instance, "totals", "total_sessions", "sessions",  val);
+		else if (strcmp(name, "s_req") == 0)
+			return varnish_submit_derive (conf->instance, "totals", "total_requests", "requests",  val);
+		else if (strcmp(name, "s_pipe") == 0)
+			return varnish_submit_derive (conf->instance, "totals", "total_operations", "pipe",    val);
+		else if (strcmp(name, "s_pass") == 0)
+			return varnish_submit_derive (conf->instance, "totals", "total_operations", "pass",    val);
+		else if (strcmp(name, "s_fetch") == 0)
+			return varnish_submit_derive (conf->instance, "totals", "total_operations", "fetches", val);
+		else if (strcmp(name, "s_synth") == 0)
+			return varnish_submit_derive (conf->instance, "totals", "total_bytes", "synth",        val);
+		else if (strcmp(name, "s_req_hdrbytes") == 0)
+			return varnish_submit_derive (conf->instance, "totals", "total_bytes", "req_header",   val);
+		else if (strcmp(name, "s_req_bodybytes") == 0)
+			return varnish_submit_derive (conf->instance, "totals", "total_bytes", "req_body",     val);
+		else if (strcmp(name, "s_resp_hdrbytes") == 0)
+			return varnish_submit_derive (conf->instance, "totals", "total_bytes", "resp_header",  val);
+		else if (strcmp(name, "s_resp_bodybytes") == 0)
+			return varnish_submit_derive (conf->instance, "totals", "total_bytes", "resp_body",    val);
+		else if (strcmp(name, "s_pipe_hdrbytes") == 0)
+			return varnish_submit_derive (conf->instance, "totals", "total_bytes", "pipe_header",  val);
+		else if (strcmp(name, "s_pipe_in") == 0)
+			return varnish_submit_derive (conf->instance, "totals", "total_bytes", "pipe_in",      val);
+		else if (strcmp(name, "s_pipe_out") == 0)
+			return varnish_submit_derive (conf->instance, "totals", "total_bytes", "pipe_out",     val);
+		else if (strcmp(name, "n_purges") == 0)
+			return varnish_submit_derive (conf->instance, "totals", "total_operations", "purges",  val);
+		else if (strcmp(name, "s_hdrbytes") == 0)
+			return varnish_submit_derive (conf->instance, "totals", "total_bytes", "header-bytes", val);
+		else if (strcmp(name, "s_bodybytes") == 0)
+			return varnish_submit_derive (conf->instance, "totals", "total_bytes", "body-bytes",   val);
+		else if (strcmp(name, "n_gzip") == 0)
+			return varnish_submit_derive (conf->instance, "totals", "total_operations", "gzip",    val);
+		else if (strcmp(name, "n_gunzip") == 0)
+			return varnish_submit_derive (conf->instance, "totals", "total_operations", "gunzip",  val);
+	}
+
+	if (conf->collect_uptime)
+	{
+		if (strcmp(name, "uptime") == 0)
+			return varnish_submit_gauge (conf->instance, "uptime", "uptime", "client_uptime", val);
+	}
+
+	if (conf->collect_vcl)
+	{
+		if (strcmp(name, "n_vcl") == 0)
+			return varnish_submit_gauge (conf->instance, "vcl", "vcl", "total_vcl",     val);
+		else if (strcmp(name, "n_vcl_avail") == 0)
+			return varnish_submit_gauge (conf->instance, "vcl", "vcl", "avail_vcl",     val);
+		else if (strcmp(name, "n_vcl_discard") == 0)
+			return varnish_submit_gauge (conf->instance, "vcl", "vcl", "discarded_vcl", val);
+		else if (strcmp(name, "vmods") == 0)
+			return varnish_submit_gauge (conf->instance, "vcl", "objects", "vmod",      val);
+	}
+
+	if (conf->collect_workers)
+	{
+		if (strcmp(name, "threads") == 0)
+			return varnish_submit_gauge (conf->instance, "workers", "threads", "worker",               val);
+		else if (strcmp(name, "threads_created") == 0)
+			return varnish_submit_derive (conf->instance, "workers", "total_threads", "created",       val);
+		else if (strcmp(name, "threads_failed") == 0)
+			return varnish_submit_derive (conf->instance, "workers", "total_threads", "failed",        val);
+		else if (strcmp(name, "threads_limited") == 0)
+			return varnish_submit_derive (conf->instance, "workers", "total_threads", "limited",       val);
+		else if (strcmp(name, "threads_destroyed") == 0)
+			return varnish_submit_derive (conf->instance, "workers", "total_threads", "dropped",       val);
+		else if (strcmp(name, "thread_queue_len") == 0)
+			return varnish_submit_derive (conf->instance, "workers", "queue_length",  "threads",       val);
+		else if (strcmp(name, "n_wrk") == 0)
+			return varnish_submit_gauge (conf->instance, "workers", "threads", "worker",               val);
+		else if (strcmp(name, "n_wrk_create") == 0)
+			return varnish_submit_derive (conf->instance, "workers", "total_threads", "created",       val);
+		else if (strcmp(name, "n_wrk_failed") == 0)
+			return varnish_submit_derive (conf->instance, "workers", "total_threads", "failed",        val);
+		else if (strcmp(name, "n_wrk_max") == 0)
+			return varnish_submit_derive (conf->instance, "workers", "total_threads", "limited",       val);
+		else if (strcmp(name, "n_wrk_drop") == 0)
+			return varnish_submit_derive (conf->instance, "workers", "total_threads", "dropped",       val);
+		else if (strcmp(name, "n_wrk_queue") == 0)
+			return varnish_submit_derive (conf->instance, "workers", "total_requests", "queued",       val);
+		else if (strcmp(name, "n_wrk_overflow") == 0)
+			return varnish_submit_derive (conf->instance, "workers", "total_requests", "overflowed",   val);
+		else if (strcmp(name, "n_wrk_queued") == 0)
+			return varnish_submit_derive (conf->instance, "workers", "total_requests", "queued",       val);
+		else if (strcmp(name, "n_wrk_lqueue") == 0)
+			return varnish_submit_derive (conf->instance, "workers", "total_requests", "queue_length", val);
+	}
+
+#if HAVE_VARNISH_V4
+	if (conf->collect_vsm)
+	{
+		if (strcmp(name, "vsm_free") == 0)
+			return varnish_submit_gauge (conf->instance, "vsm", "bytes", "free",              val);
+		else if (strcmp(name, "vsm_used") == 0)
+			return varnish_submit_gauge (conf->instance, "vsm", "bytes", "used",              val);
+		else if (strcmp(name, "vsm_cooling") == 0)
+			return varnish_submit_gauge (conf->instance, "vsm", "bytes", "cooling",           val);
+		else if (strcmp(name, "vsm_overflow") == 0)
+			return varnish_submit_gauge (conf->instance, "vsm", "bytes", "overflow",          val);
+		else if (strcmp(name, "vsm_overflowed") == 0)
+			return varnish_submit_derive (conf->instance, "vsm", "total_bytes", "overflowed", val);
+	}
+#endif
+
+	return (0);
+
+} /* }}} static int varnish_monitor */
+#else /* if HAVE_VARNISH_V2 */
 static void varnish_monitor (const user_config_t *conf, /* {{{ */
 		const c_varnish_stats_t *stats)
 {
@@ -150,41 +541,20 @@ static void varnish_monitor (const user_
 
 	if (conf->collect_connections)
 	{
-#ifndef HAVE_VARNISH_V4
 		/* Client connections accepted */
 		varnish_submit_derive (conf->instance, "connections", "connections", "accepted", stats->client_conn);
 		/* Connection dropped, no sess */
 		varnish_submit_derive (conf->instance, "connections", "connections", "dropped" , stats->client_drop);
-#endif
 		/* Client requests received    */
 		varnish_submit_derive (conf->instance, "connections", "connections", "received", stats->client_req);
 	}
 
-#ifdef HAVE_VARNISH_V3
-	if (conf->collect_dirdns)
-	{
-		/* DNS director lookups */
-		varnish_submit_derive (conf->instance, "dirdns", "cache_operation", "lookups",    stats->dir_dns_lookups);
-		/* DNS director failed lookups */
-		varnish_submit_derive (conf->instance, "dirdns", "cache_result",    "failed",     stats->dir_dns_failed);
-		/* DNS director cached lookups hit */
-		varnish_submit_derive (conf->instance, "dirdns", "cache_result",    "hits",       stats->dir_dns_hit);
-		/* DNS director full dnscache */
-		varnish_submit_derive (conf->instance, "dirdns", "cache_result",    "cache_full", stats->dir_dns_cache_full);
-	}
-#endif
-
 	if (conf->collect_esi)
 	{
 		/* ESI parse errors (unlock)   */
 		varnish_submit_derive (conf->instance, "esi", "total_operations", "error",   stats->esi_errors);
-#if HAVE_VARNISH_V2
 		/* Objects ESI parsed (unlock) */
 		varnish_submit_derive (conf->instance, "esi", "total_operations", "parsed",  stats->esi_parse);
-#else
-		/* ESI parse warnings (unlock) */
-		varnish_submit_derive (conf->instance, "esi", "total_operations", "warning", stats->esi_warnings);
-#endif
 	}
 
 	if (conf->collect_backend)
@@ -203,13 +573,8 @@ static void varnish_monitor (const user_
 		varnish_submit_derive (conf->instance, "backend", "connections", "was-closed"   , stats->backend_toolate);
 		/* Backend conn. recycles      */
 		varnish_submit_derive (conf->instance, "backend", "connections", "recycled"     , stats->backend_recycle);
-#if HAVE_VARNISH_V2
 		/* Backend conn. unused        */
 		varnish_submit_derive (conf->instance, "backend", "connections", "unused"       , stats->backend_unused);
-#else
-		/* Backend conn. retry         */
-		varnish_submit_derive (conf->instance, "backend", "connections", "retries"      , stats->backend_retry);
-#endif
 		/* Backend requests mades      */
 		varnish_submit_derive (conf->instance, "backend", "http_requests", "requests"   , stats->backend_req);
 		/* N backends                  */
@@ -236,14 +601,6 @@ static void varnish_monitor (const user_
 		varnish_submit_derive (conf->instance, "fetch", "http_requests", "zero"       , stats->fetch_zero);
 		/* Fetch failed              */
 		varnish_submit_derive (conf->instance, "fetch", "http_requests", "failed"     , stats->fetch_failed);
-#if HAVE_VARNISH_V3 || HAVE_VARNISH_V4
-		/* Fetch no body (1xx)       */
-		varnish_submit_derive (conf->instance, "fetch", "http_requests", "no_body_1xx", stats->fetch_1xx);
-		/* Fetch no body (204)       */
-		varnish_submit_derive (conf->instance, "fetch", "http_requests", "no_body_204", stats->fetch_204);
-		/* Fetch no body (304)       */
-		varnish_submit_derive (conf->instance, "fetch", "http_requests", "no_body_304", stats->fetch_304);
-#endif
 	}
 
 	if (conf->collect_hcb)
@@ -262,32 +619,22 @@ static void varnish_monitor (const user_
 		varnish_submit_derive (conf->instance, "objects", "total_objects", "expired",            stats->n_expired);
 		/* N LRU nuked objects           */
 		varnish_submit_derive (conf->instance, "objects", "total_objects", "lru_nuked",          stats->n_lru_nuked);
-#if HAVE_VARNISH_V2
 		/* N LRU saved objects           */
 		varnish_submit_derive (conf->instance, "objects", "total_objects", "lru_saved",          stats->n_lru_saved);
-#endif
 		/* N LRU moved objects           */
 		varnish_submit_derive (conf->instance, "objects", "total_objects", "lru_moved",          stats->n_lru_moved);
-#if HAVE_VARNISH_V2
 		/* N objects on deathrow         */
 		varnish_submit_derive (conf->instance, "objects", "total_objects", "deathrow",           stats->n_deathrow);
-#endif
 		/* HTTP header overflows         */
 		varnish_submit_derive (conf->instance, "objects", "total_objects", "header_overflow",    stats->losthdr);
-#if HAVE_VARNISH_V4
-		/* N purged objects              */
-		varnish_submit_derive (conf->instance, "objects", "total_objects", "purged",             stats->n_obj_purged);
-#else
 		/* Objects sent with sendfile    */
 		varnish_submit_derive (conf->instance, "objects", "total_objects", "sent_sendfile",      stats->n_objsendfile);
 		/* Objects sent with write       */
 		varnish_submit_derive (conf->instance, "objects", "total_objects", "sent_write",         stats->n_objwrite);
 		/* Objects overflowing workspace */
 		varnish_submit_derive (conf->instance, "objects", "total_objects", "workspace_overflow", stats->n_objoverflow);
-#endif
 	}
 
-#if HAVE_VARNISH_V2
 	if (conf->collect_purge)
 	{
 		/* N total active purges      */
@@ -303,45 +650,6 @@ static void varnish_monitor (const user_
 		/* N duplicate purges removed */
 		varnish_submit_derive (conf->instance, "purge", "total_operations", "duplicate",        stats->n_purge_dups);
 	}
-#endif
-#if HAVE_VARNISH_V3
-	if (conf->collect_ban)
-	{
-		/* N total active bans      */
-		varnish_submit_derive (conf->instance, "ban", "total_operations", "total",          stats->n_ban);
-		/* N new bans added         */
-		varnish_submit_derive (conf->instance, "ban", "total_operations", "added",          stats->n_ban_add);
-		/* N old bans deleted       */
-		varnish_submit_derive (conf->instance, "ban", "total_operations", "deleted",        stats->n_ban_retire);
-		/* N objects tested         */
-		varnish_submit_derive (conf->instance, "ban", "total_operations", "objects_tested", stats->n_ban_obj_test);
-		/* N regexps tested against */
-		varnish_submit_derive (conf->instance, "ban", "total_operations", "regexps_tested", stats->n_ban_re_test);
-		/* N duplicate bans removed */
-		varnish_submit_derive (conf->instance, "ban", "total_operations", "duplicate",      stats->n_ban_dups);
-	}
-#endif
-#if HAVE_VARNISH_V4
-	if (conf->collect_ban)
-	{
-		/* N total active bans      */
-		varnish_submit_derive (conf->instance, "ban", "total_operations", "total",          stats->bans);
-		/* N new bans added         */
-		varnish_submit_derive (conf->instance, "ban", "total_operations", "added",          stats->bans_added);
-		/* N bans using obj */
-		varnish_submit_derive (conf->instance, "ban", "total_operations", "obj",            stats->bans_obj);
-		/* N bans using req */
-		varnish_submit_derive (conf->instance, "ban", "total_operations", "req",            stats->bans_req);
-		/* N new bans completed     */
-		varnish_submit_derive (conf->instance, "ban", "total_operations", "completed",      stats->bans_completed);
-		/* N old bans deleted       */
-		varnish_submit_derive (conf->instance, "ban", "total_operations", "deleted",        stats->bans_deleted);
-		/* N objects tested         */
-		varnish_submit_derive (conf->instance, "ban", "total_operations", "tested",         stats->bans_tested);
-		/* N duplicate bans removed */
-		varnish_submit_derive (conf->instance, "ban", "total_operations", "duplicate",      stats->bans_dups);
-	}
-#endif
 
 	if (conf->collect_session)
 	{
@@ -351,21 +659,8 @@ static void varnish_monitor (const user_
 		varnish_submit_derive (conf->instance, "session", "total_operations", "pipeline",  stats->sess_pipeline);
 		/* Session Read Ahead */
 		varnish_submit_derive (conf->instance, "session", "total_operations", "readahead", stats->sess_readahead);
-#if HAVE_VARNISH_V4
-		/* Sessions accepted */
-		varnish_submit_derive (conf->instance, "session", "total_operations", "accepted",  stats->sess_conn);
-		/* Sessions dropped for thread */
-		varnish_submit_derive (conf->instance, "session", "total_operations", "dropped",   stats->sess_drop);
-		/* Sessions accept failure */
-		varnish_submit_derive (conf->instance, "session", "total_operations", "failed",    stats->sess_fail);
-		/* Sessions pipe overflow */
-		varnish_submit_derive (conf->instance, "session", "total_operations", "overflow",  stats->sess_pipe_overflow);
-		/* Sessions queued for thread */
-		varnish_submit_derive (conf->instance, "session", "total_operations", "queued",    stats->sess_queued);
-#else
 		/* Session Linger     */
 		varnish_submit_derive (conf->instance, "session", "total_operations", "linger",    stats->sess_linger);
-#endif
 		/* Session herd       */
 		varnish_submit_derive (conf->instance, "session", "total_operations", "herd",      stats->sess_herd);
 	}
@@ -384,7 +679,6 @@ static void varnish_monitor (const user_
 		varnish_submit_derive (conf->instance, "shm", "total_operations", "cycles"    , stats->shm_cycles);
 	}
 
-#if HAVE_VARNISH_V2
 	if (conf->collect_sm)
 	{
 		/* allocator requests */
@@ -410,7 +704,6 @@ static void varnish_monitor (const user_
 		/* SMA bytes free */
 		varnish_submit_derive (conf->instance,  "sma", "total_bytes", "free" ,     stats->sma_bfree);
 	}
-#endif
 
 	if (conf->collect_sms)
 	{
@@ -428,25 +721,14 @@ static void varnish_monitor (const user_
 
 	if (conf->collect_struct)
 	{
-#if !HAVE_VARNISH_V4
 		/* N struct sess_mem       */
 		varnish_submit_gauge (conf->instance, "struct", "current_sessions", "sess_mem",  stats->n_sess_mem);
 		/* N struct sess           */
 		varnish_submit_gauge (conf->instance, "struct", "current_sessions", "sess",      stats->n_sess);
-#endif
 		/* N struct object         */
 		varnish_submit_gauge (conf->instance, "struct", "objects", "object",             stats->n_object);
-#if HAVE_VARNISH_V3 || HAVE_VARNISH_V4
-		/* N unresurrected objects */
-		varnish_submit_gauge (conf->instance, "struct", "objects", "vampireobject",      stats->n_vampireobject);
-		/* N struct objectcore     */
-		varnish_submit_gauge (conf->instance, "struct", "objects", "objectcore",         stats->n_objectcore);
-		/* N struct waitinglist    */
-		varnish_submit_gauge (conf->instance, "struct", "objects", "waitinglist",        stats->n_waitinglist);
-#endif
 		/* N struct objecthead     */
 		varnish_submit_gauge (conf->instance, "struct", "objects", "objecthead",         stats->n_objecthead);
-#ifdef HAVE_VARNISH_V2
 		/* N struct smf            */
 		varnish_submit_gauge (conf->instance, "struct", "objects", "smf",                stats->n_smf);
 		/* N small free smf         */
@@ -455,7 +737,6 @@ static void varnish_monitor (const user_
 		varnish_submit_gauge (conf->instance, "struct", "objects", "smf_large",          stats->n_smf_large);
 		/* N struct vbe_conn        */
 		varnish_submit_gauge (conf->instance, "struct", "objects", "vbe_conn",           stats->n_vbe_conn);
-#endif
 	}
 
 	if (conf->collect_totals)
@@ -470,47 +751,12 @@ static void varnish_monitor (const user_
 		varnish_submit_derive (conf->instance, "totals", "total_operations", "pass",    stats->s_pass);
 		/* Total fetch */
 		varnish_submit_derive (conf->instance, "totals", "total_operations", "fetches", stats->s_fetch);
-#if HAVE_VARNISH_V4
-		/* Total synth */
-		varnish_submit_derive (conf->instance, "totals", "total_bytes", "synth",       stats->s_synth);
-		/* Request header bytes */
-		varnish_submit_derive (conf->instance, "totals", "total_bytes", "req_header",  stats->s_req_hdrbytes);
-		/* Request body byte */
-		varnish_submit_derive (conf->instance, "totals", "total_bytes", "req_body",    stats->s_req_bodybytes);
-		/* Response header bytes */
-		varnish_submit_derive (conf->instance, "totals", "total_bytes", "resp_header", stats->s_resp_hdrbytes);
-		/* Response body byte */
-		varnish_submit_derive (conf->instance, "totals", "total_bytes", "resp_body",   stats->s_resp_bodybytes);
-		/* Pipe request header bytes */
-		varnish_submit_derive (conf->instance, "totals", "total_bytes", "pipe_header", stats->s_pipe_hdrbytes);
-		/* Piped bytes from client */
-		varnish_submit_derive (conf->instance, "totals", "total_bytes", "pipe_in",     stats->s_pipe_in);
-		/* Piped bytes to client */
-		varnish_submit_derive (conf->instance, "totals", "total_bytes", "pipe_out",    stats->s_pipe_out);
-		/* Number of purge operations */
-		varnish_submit_derive (conf->instance, "totals", "total_operations", "purges", stats->n_purges);
-#else
 		/* Total header bytes */
 		varnish_submit_derive (conf->instance, "totals", "total_bytes", "header-bytes", stats->s_hdrbytes);
 		/* Total body byte */
 		varnish_submit_derive (conf->instance, "totals", "total_bytes", "body-bytes",   stats->s_bodybytes);
-#endif
-#if HAVE_VARNISH_V3 || HAVE_VARNISH_V4
-		/* Gzip operations */
-		varnish_submit_derive (conf->instance, "totals", "total_operations", "gzip",    stats->n_gzip);
-		/* Gunzip operations */
-		varnish_submit_derive (conf->instance, "totals", "total_operations", "gunzip",  stats->n_gunzip);
-#endif
 	}
 
-#if HAVE_VARNISH_V3 || HAVE_VARNISH_V4
-	if (conf->collect_uptime)
-	{
-		/* Client uptime */
-		varnish_submit_gauge (conf->instance, "uptime", "uptime", "client_uptime", stats->uptime);
-	}
-#endif
-
 	if (conf->collect_vcl)
 	{
 		/* N vcl total     */
@@ -519,28 +765,10 @@ static void varnish_monitor (const user_
 		varnish_submit_gauge (conf->instance, "vcl", "vcl", "avail_vcl",     stats->n_vcl_avail);
 		/* N vcl discarded */
 		varnish_submit_gauge (conf->instance, "vcl", "vcl", "discarded_vcl", stats->n_vcl_discard);
-#if HAVE_VARNISH_V3 || HAVE_VARNISH_V4
-		/* Loaded VMODs */
-		varnish_submit_gauge (conf->instance, "vcl", "objects", "vmod",      stats->vmods);
-#endif
 	}
 
 	if (conf->collect_workers)
 	{
-#ifdef HAVE_VARNISH_V4
-		/* total number of threads */
-		varnish_submit_gauge (conf->instance, "workers", "threads", "worker",             stats->threads);
-		/* threads created */
-		varnish_submit_derive (conf->instance, "workers", "total_threads", "created",     stats->threads_created);
-		/* thread creation failed */
-		varnish_submit_derive (conf->instance, "workers", "total_threads", "failed",      stats->threads_failed);
-		/* threads hit max */
-		varnish_submit_derive (conf->instance, "workers", "total_threads", "limited",     stats->threads_limited);
-		/* threads destroyed */
-		varnish_submit_derive (conf->instance, "workers", "total_threads", "dropped",     stats->threads_destroyed);
-		/* length of session queue */
-		varnish_submit_derive (conf->instance, "workers", "queue_length",  "threads",     stats->thread_queue_len);
-#else
 		/* worker threads */
 		varnish_submit_gauge (conf->instance, "workers", "threads", "worker",             stats->n_wrk);
 		/* worker threads created */
@@ -551,37 +779,14 @@ static void varnish_monitor (const user_
 		varnish_submit_derive (conf->instance, "workers", "total_threads", "limited",     stats->n_wrk_max);
 		/* dropped work requests */
 		varnish_submit_derive (conf->instance, "workers", "total_threads", "dropped",     stats->n_wrk_drop);
-#ifdef HAVE_VARNISH_V2
 		/* queued work requests */
 		varnish_submit_derive (conf->instance, "workers", "total_requests", "queued",     stats->n_wrk_queue);
 		/* overflowed work requests */
 		varnish_submit_derive (conf->instance, "workers", "total_requests", "overflowed", stats->n_wrk_overflow);
-#else /* HAVE_VARNISH_V3 */
-		/* queued work requests */
-		varnish_submit_derive (conf->instance, "workers", "total_requests", "queued",       stats->n_wrk_queued);
-		/* work request queue length */
-		varnish_submit_derive (conf->instance, "workers", "total_requests", "queue_length", stats->n_wrk_lqueue);
-#endif
-#endif
-	}
-
-#if HAVE_VARNISH_V4
-	if (conf->collect_vsm)
-	{
-		/* Free VSM space */
-		varnish_submit_gauge (conf->instance, "vsm", "bytes", "free",              stats->vsm_free);
-		/* Used VSM space */
-		varnish_submit_gauge (conf->instance, "vsm", "bytes", "used",              stats->vsm_used);
-		/* Cooling VSM space */
-		varnish_submit_gauge (conf->instance, "vsm", "bytes", "cooling",           stats->vsm_cooling);
-		/* Overflow VSM space */
-		varnish_submit_gauge (conf->instance, "vsm", "bytes", "overflow",          stats->vsm_overflow);
-		/* Total overflowed VSM space */
-		varnish_submit_derive (conf->instance, "vsm", "total_bytes", "overflowed", stats->vsm_overflowed);
 	}
-#endif
 
 } /* }}} void varnish_monitor */
+#endif
 
 #if HAVE_VARNISH_V3 || HAVE_VARNISH_V4
 static int varnish_read (user_data_t *ud) /* {{{ */
@@ -632,8 +837,12 @@ static int varnish_read (user_data_t *ud
 	stats = VSC_Main(vd, NULL);
 #endif
 
-	varnish_monitor (conf, stats);
-	VSM_Close (vd);
+#if HAVE_VARNISH_V3
+	VSC_Iter (vd, varnish_monitor, conf);
+#else /* if HAVE_VARNISH_V4 */
+	VSC_Iter (vd, NULL, varnish_monitor, conf);
+#endif
+        VSM_Delete (vd);
 
 	return (0);
 } /* }}} */




--- src/config.h.in.orig	2016-01-22 09:56:33 UTC
+++ src/config.h.in
@@ -562,8 +562,8 @@
 /* Define to 1 if you have the <modbus.h> header file. */
 #undef HAVE_MODBUS_H
 
-/* Define to 1 if you have the <mongo.h> header file. */
-#undef HAVE_MONGO_H
+/* Define to 1 if you have the <mongoc.h> header file. */
+#undef HAVE_MONGOC_H
 
 /* Define to 1 if you have the <mysql.h> header file. */
 #undef HAVE_MYSQL_H
@@ -1541,13 +1541,15 @@
    module search path. */
 #undef LT_MODULE_PATH_VAR
 
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
 #undef LT_OBJDIR
 
 /* Define to the shared library suffix, say, ".dylib". */
 #undef LT_SHARED_EXT
 
+/* Define to the shared archive member specification, say "(shr.o)". */
+#undef LT_SHARED_LIB_MEMBER
+
 /* Define if NAN is defined by default and can initialize static variables. */
 #undef NAN_STATIC_DEFAULT
 
@@ -1644,7 +1646,7 @@
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 
-/* Define to a type to use for `error_t' if it is not otherwise available. */
+/* Define to a type to use for 'error_t' if it is not otherwise available. */
 #undef error_t
 
 /* Define to `int' if <sys/types.h> doesn't define. */




--- src/disk.c.orig	2016-01-22 09:51:17 UTC
+++ src/disk.c
@@ -53,6 +53,10 @@
 #if HAVE_IOKIT_IOBSD_H

 #elif HAVE_LIBKSTAT
 	kstat_t *ksp_chain;
 
@@ -395,173 +417,223 @@ static int disk_read (void)
 	io_registry_entry_t	disk;
 	io_registry_entry_t	disk_child;
 	io_iterator_t		disk_list;
-	CFDictionaryRef		props_dict;
+	CFMutableDictionaryRef	props_dict, child_dict;
 	CFDictionaryRef		stats_dict;
-	CFDictionaryRef		child_dict;
 	CFStringRef		tmp_cf_string_ref;
 	kern_return_t		status;
 
-	signed long long read_ops;
-	signed long long read_byt;
-	signed long long read_tme;
-	signed long long write_ops;
-	signed long long write_byt;
-	signed long long write_tme;
+	signed long long read_ops, read_byt, read_tme;
+	signed long long write_ops, write_byt, write_tme;
 
-	int  disk_major;
-	int  disk_minor;
+	int  disk_major, disk_minor;
 	char disk_name[DATA_MAX_NAME_LEN];
-	char disk_name_bsd[DATA_MAX_NAME_LEN];
+	char child_disk_name_bsd[DATA_MAX_NAME_LEN], props_disk_name_bsd[DATA_MAX_NAME_LEN];
 
 	/* Get the list of all disk objects. */
-	if (IOServiceGetMatchingServices (io_master_port,
-				IOServiceMatching (kIOBlockStorageDriverClass),
-				&disk_list) != kIOReturnSuccess)
-	{
+	if (IOServiceGetMatchingServices (io_master_port, IOServiceMatching (kIOBlockStorageDriverClass), &disk_list) != kIOReturnSuccess) {
 		ERROR ("disk plugin: IOServiceGetMatchingServices failed.");
 		return (-1);
 	}
 
-	while ((disk = IOIteratorNext (disk_list)) != 0)
-	{
+	while ((disk = IOIteratorNext (disk_list)) != 0) {
 		props_dict = NULL;
 		stats_dict = NULL;
 		child_dict = NULL;
 
-		/* `disk_child' must be released */
-		if ((status = IORegistryEntryGetChildEntry (disk, kIOServicePlane, &disk_child))
-			       	!= kIOReturnSuccess)
-		{
-			/* This fails for example for DVD/CD drives.. */
+		/* get child of disk entry and corresponding property dictionary */
+		if ((status = IORegistryEntryGetChildEntry (disk, kIOServicePlane, &disk_child)) != kIOReturnSuccess) {
+			/* This fails for example for DVD/CD drives, which we want to ignore anyway */
 			DEBUG ("IORegistryEntryGetChildEntry (disk) failed: 0x%08x", status);
 			IOObjectRelease (disk);
 			continue;
 		}
-
-		/* We create `props_dict' => we need to release it later */
-		if (IORegistryEntryCreateCFProperties (disk,
-					(CFMutableDictionaryRef *) &props_dict,
-					kCFAllocatorDefault,
-					kNilOptions)
-				!= kIOReturnSuccess)
-		{
-			ERROR ("disk-plugin: IORegistryEntryCreateCFProperties failed.");
+		if (IORegistryEntryCreateCFProperties (disk_child, (CFMutableDictionaryRef *) &child_dict, kCFAllocatorDefault, kNilOptions) != kIOReturnSuccess || child_dict == NULL) {
+			ERROR ("disk plugin: IORegistryEntryCreateCFProperties (disk_child) failed.");
 			IOObjectRelease (disk_child);
 			IOObjectRelease (disk);
 			continue;
 		}
 
-		if (props_dict == NULL)
-		{
-			DEBUG ("IORegistryEntryCreateCFProperties (disk) failed.");
-			IOObjectRelease (disk_child);
-			IOObjectRelease (disk);
-			continue;
+		/* extract name and major/minor numbers */
+		memset (child_disk_name_bsd, 0, sizeof (child_disk_name_bsd));
+		tmp_cf_string_ref = (CFStringRef) CFDictionaryGetValue (child_dict, CFSTR(kIOBSDNameKey));
+		if (tmp_cf_string_ref) {
+			assert (CFGetTypeID (tmp_cf_string_ref) == CFStringGetTypeID ());
+			CFStringGetCString (tmp_cf_string_ref, child_disk_name_bsd, sizeof (child_disk_name_bsd), kCFStringEncodingUTF8);
 		}
+		disk_major = (int) dict_get_value (child_dict, kIOBSDMajorKey);
+		disk_minor = (int) dict_get_value (child_dict, kIOBSDMinorKey);
+		DEBUG ("disk plugin: child_disk_name_bsd=\"%s\" major=%d minor=%d", child_disk_name_bsd, disk_major, disk_minor);
+		CFRelease (child_dict);
+		IOObjectRelease (disk_child);
 
-		/* tmp_cf_string_ref doesn't need to be released. */
-		tmp_cf_string_ref = (CFStringRef) CFDictionaryGetValue (props_dict,
-				CFSTR(kIOBSDNameKey));
-		if (!tmp_cf_string_ref)
-		{
-			DEBUG ("disk plugin: CFDictionaryGetValue("
-					"kIOBSDNameKey) failed.");
-			CFRelease (props_dict);
-			IOObjectRelease (disk_child);
+		/* get property dictionary of the disk entry itself */
+		if (IORegistryEntryCreateCFProperties (disk, (CFMutableDictionaryRef *) &props_dict, kCFAllocatorDefault, kNilOptions) != kIOReturnSuccess || props_dict == NULL) {
+			ERROR ("disk-plugin: IORegistryEntryCreateCFProperties failed.");
 			IOObjectRelease (disk);
 			continue;
 		}
-		assert (CFGetTypeID (tmp_cf_string_ref) == CFStringGetTypeID ());
 
-		memset (disk_name_bsd, 0, sizeof (disk_name_bsd));
-		CFStringGetCString (tmp_cf_string_ref,
-				disk_name_bsd, sizeof (disk_name_bsd),
-				kCFStringEncodingUTF8);
-		if (disk_name_bsd[0] == 0)
-		{
-			ERROR ("disk plugin: CFStringGetCString() failed.");
-			CFRelease (props_dict);
-			IOObjectRelease (disk_child);
-			IOObjectRelease (disk);
-			continue;
+		/* extract name and stats dictionary */
+		memset (props_disk_name_bsd, 0, sizeof (props_disk_name_bsd));
+		tmp_cf_string_ref = (CFStringRef) CFDictionaryGetValue (props_dict, CFSTR(kIOBSDNameKey));
+		if (tmp_cf_string_ref) {
+			assert (CFGetTypeID (tmp_cf_string_ref) == CFStringGetTypeID ());
+			CFStringGetCString (tmp_cf_string_ref, props_disk_name_bsd, sizeof (props_disk_name_bsd), kCFStringEncodingUTF8);
 		}
-		DEBUG ("disk plugin: disk_name_bsd = \"%s\"", disk_name_bsd);
-
-		stats_dict = (CFDictionaryRef) CFDictionaryGetValue (props_dict,
-				CFSTR (kIOBlockStorageDriverStatisticsKey));
-
-		if (stats_dict == NULL)
-		{
-			DEBUG ("disk plugin: CFDictionaryGetValue ("
-					"%s) failed.",
-				       	kIOBlockStorageDriverStatisticsKey);
+		stats_dict = (CFDictionaryRef) CFDictionaryGetValue (props_dict, CFSTR (kIOBlockStorageDriverStatisticsKey));
+		if (stats_dict == NULL) {
+			ERROR ("disk plugin: CFDictionaryGetValue (%s) failed.", kIOBlockStorageDriverStatisticsKey);
 			CFRelease (props_dict);
-			IOObjectRelease (disk_child);
 			IOObjectRelease (disk);
 			continue;
 		}
+		DEBUG ("disk plugin: props_disk_name_bsd=\"%s\"", props_disk_name_bsd);
 
-		if (IORegistryEntryCreateCFProperties (disk_child,
-					(CFMutableDictionaryRef *) &child_dict,
-					kCFAllocatorDefault,
-					kNilOptions)
-				!= kIOReturnSuccess)
-		{
-			DEBUG ("disk plugin: IORegistryEntryCreateCFProperties ("
-					"disk_child) failed.");
-			IOObjectRelease (disk_child);
-			CFRelease (props_dict);
-			IOObjectRelease (disk);
-			continue;
+		/* choose name */
+		if (use_bsd_name) {
+			if (child_disk_name_bsd[0] != 0)
+				sstrncpy (disk_name, child_disk_name_bsd, sizeof (disk_name));
+			else if (props_disk_name_bsd[0] != 0)
+				sstrncpy (disk_name, props_disk_name_bsd, sizeof (disk_name));
+			else {
+				ERROR ("disk plugin: can't find bsd disk name.");
+				ssnprintf (disk_name, sizeof (disk_name), "%i-%i", disk_major, disk_minor);
+			}
 		}
+		else
+			ssnprintf (disk_name, sizeof (disk_name), "%i-%i", disk_major, disk_minor);
 
-		/* kIOBSDNameKey */
-		disk_major = (int) dict_get_value (child_dict,
-			       	kIOBSDMajorKey);
-		disk_minor = (int) dict_get_value (child_dict,
-			       	kIOBSDMinorKey);
-		read_ops  = dict_get_value (stats_dict,
-				kIOBlockStorageDriverStatisticsReadsKey);
-		read_byt  = dict_get_value (stats_dict,
-				kIOBlockStorageDriverStatisticsBytesReadKey);
-		read_tme  = dict_get_value (stats_dict,
-				kIOBlockStorageDriverStatisticsTotalReadTimeKey);
-		write_ops = dict_get_value (stats_dict,
-				kIOBlockStorageDriverStatisticsWritesKey);
-		write_byt = dict_get_value (stats_dict,
-				kIOBlockStorageDriverStatisticsBytesWrittenKey);
-		/* This property describes the number of nanoseconds spent
-		 * performing writes since the block storage driver was
-		 * instantiated. It is one of the statistic entries listed
-		 * under the top-level kIOBlockStorageDriverStatisticsKey
-		 * property table. It has an OSNumber value. */
-		write_tme = dict_get_value (stats_dict,
-				kIOBlockStorageDriverStatisticsTotalWriteTimeKey);
+		/* extract the stats */
+		read_ops  = dict_get_value (stats_dict, kIOBlockStorageDriverStatisticsReadsKey);
+		read_byt  = dict_get_value (stats_dict, kIOBlockStorageDriverStatisticsBytesReadKey);
+		read_tme  = dict_get_value (stats_dict, kIOBlockStorageDriverStatisticsTotalReadTimeKey);
+		write_ops = dict_get_value (stats_dict, kIOBlockStorageDriverStatisticsWritesKey);
+		write_byt = dict_get_value (stats_dict, kIOBlockStorageDriverStatisticsBytesWrittenKey);
+		write_tme = dict_get_value (stats_dict, kIOBlockStorageDriverStatisticsTotalWriteTimeKey);
+		CFRelease (props_dict);
+		IOObjectRelease (disk);
 
-		if (use_bsd_name)
-			sstrncpy (disk_name, disk_name_bsd, sizeof (disk_name));
-		else
-			ssnprintf (disk_name, sizeof (disk_name), "%i-%i",
-					disk_major, disk_minor);
+		/* and submit */
 		DEBUG ("disk plugin: disk_name = \"%s\"", disk_name);
-
 		if ((read_byt != -1LL) || (write_byt != -1LL))
 			disk_submit (disk_name, "disk_octets", read_byt, write_byt);
 		if ((read_ops != -1LL) || (write_ops != -1LL))
 			disk_submit (disk_name, "disk_ops", read_ops, write_ops);
 		if ((read_tme != -1LL) || (write_tme != -1LL))
-			disk_submit (disk_name, "disk_time",
-					read_tme / 1000,
-					write_tme / 1000);
+			disk_submit (disk_name, "disk_time", read_tme / 1000, write_tme / 1000);
 
-		CFRelease (child_dict);
-		IOObjectRelease (disk_child);
-		CFRelease (props_dict);
-		IOObjectRelease (disk);
 	}
 	IOObjectRelease (disk_list);
 /* #endif HAVE_IOKIT_IOKITLIB_H */
 
+#elif KERNEL_FREEBSD
+	int retry, dirty;
+
+	void *snap = NULL;
+	struct devstat *snap_iter;
+
+	struct gident *geom_id;
+
+	const char *disk_name;
+	long double read_time, write_time;
+
+	for (retry = 0, dirty = 1; retry < 5 && dirty == 1; retry++) {
+		if (snap != NULL)
+			geom_stats_snapshot_free(snap);
+
+		/* Get a fresh copy of stats snapshot */
+		snap = geom_stats_snapshot_get();
+		if (snap == NULL) {
+			ERROR("disk plugin: geom_stats_snapshot_get() failed.");
+			return (-1);
+		}
+
+		/* Check if we have dirty read from this snapshot */
+		dirty = 0;
+		geom_stats_snapshot_reset(snap);
+		while ((snap_iter = geom_stats_snapshot_next(snap)) != NULL) {
+			if (snap_iter->id == NULL)
+				continue;
+			geom_id = geom_lookupid(&geom_tree, snap_iter->id);
+
+			/* New device? refresh GEOM tree */
+			if (geom_id == NULL) {
+				geom_deletetree(&geom_tree);
+				if (geom_gettree(&geom_tree) != 0) {
+					ERROR("disk plugin: geom_gettree() failed");
+					geom_stats_snapshot_free(snap);
+					return (-1);
+				}
+				geom_id = geom_lookupid(&geom_tree, snap_iter->id);
+			}
+			/*
+			 * This should be rare: the device come right before we take the
+			 * snapshot and went away right after it.  We will handle this
+			 * case later, so don't mark dirty but silently ignore it.
+			 */
+			if (geom_id == NULL)
+				continue;
+
+			/* Only collect PROVIDER data */
+			if (geom_id->lg_what != ISPROVIDER)
+				continue;
+
+			/* Only collect data when rank is 1 (physical devices) */
+			if (((struct gprovider *)(geom_id->lg_ptr))->lg_geom->lg_rank != 1)
+				continue;
+
+			/* Check if this is a dirty read quit for another try */
+			if (snap_iter->sequence0 != snap_iter->sequence1) {
+				dirty = 1;
+				break;
+			}
+		}
+	}
+
+	/* Reset iterator */
+	geom_stats_snapshot_reset(snap);
+	for (;;) {
+		snap_iter = geom_stats_snapshot_next(snap);
+		if (snap_iter == NULL)
+			break;
+
+		if (snap_iter->id == NULL)
+			continue;
+		geom_id = geom_lookupid(&geom_tree, snap_iter->id);
+		if (geom_id == NULL)
+			continue;
+		if (geom_id->lg_what != ISPROVIDER)
+			continue;
+		if (((struct gprovider *)(geom_id->lg_ptr))->lg_geom->lg_rank != 1)
+			continue;
+		/* Skip dirty reads, if present */
+		if (dirty && (snap_iter->sequence0 != snap_iter->sequence1))
+			continue;
+
+		disk_name = ((struct gprovider *)geom_id->lg_ptr)->lg_name;
+
+		if ((snap_iter->bytes[1] != 0) || (snap_iter->bytes[2] != 0)) {
+			disk_submit(disk_name, "disk_octets",
+					(derive_t)snap_iter->bytes[1],
+					(derive_t)snap_iter->bytes[2]);
+		}
+
+		if ((snap_iter->operations[1] != 0) || (snap_iter->operations[2] != 0)) {
+			disk_submit(disk_name, "disk_ops",
+					(derive_t)snap_iter->operations[1],
+					(derive_t)snap_iter->operations[2]);
+		}
+
+		read_time = devstat_compute_etime(&snap_iter->duration[DEVSTAT_READ], NULL);
+		write_time = devstat_compute_etime(&snap_iter->duration[DEVSTAT_WRITE], NULL);
+		if ((read_time != 0) || (write_time != 0)) {
+			disk_submit (disk_name, "disk_time",
+					(derive_t)(read_time*1000), (derive_t)(write_time*1000));
+		}
+	}
+	geom_stats_snapshot_free(snap);
+
 #elif KERNEL_LINUX
 	FILE *fh;
 	char buffer[1024];

Line 0 Link Here

(-)net-mgmt/collectd5.new/files/patch-src_write__mongodb.c (+11 lines)
	1	--- src/write_mongodb.c.orig 2015-12-01 15:28:11 UTC
	2	+++ src/write_mongodb.c
	3	@@ -41,7 +41,7 @@
	4	#else
	5	# define MONGO_USE_LONG_LONG_INT 1
	6	#endif
	7	-#include <mongo.h>
	8	+#include <mongoc.h>
	9
	10	#if (MONGO_MAJOR == 0) && (MONGO_MINOR < 8)
	11	# define bson_alloc() bson_create()

Lines 1-10 Link Here

(-)net-mgmt/collectd5.new/files/patch-src_zfs__arc.c (-3 / +7 lines)
1	--- src/zfs_arc.c.orig 2015-05-20 12:04:47 UTC	1	--- src/zfs_arc.c.orig 2016-01-22 09:51:17 UTC
2	+++ src/zfs_arc.c	2	+++ src/zfs_arc.c
3	@@ -264,7 +264,6 @@ static int za_read (void)	3	@@ -270,8 +270,11 @@ static int za_read (void)
4	za_read_derive (ksp, "deleted", "cache_operation", "deleted");	4	za_read_derive (ksp, "deleted", "cache_operation", "deleted");
5	#if __FreeBSD__	5	#if __FreeBSD__
6	za_read_derive (ksp, "allocated","cache_operation", "allocated");	6	za_read_derive (ksp, "allocated","cache_operation", "allocated");
7	- za_read_derive (ksp, "stolen", "cache_operation", "stolen");	7	+#if defined(__FreeBSD_version) && (__FreeBSD_version < 1002000)
		8	+ /* stolen removed from sysctl kstat.zfs.misc.arcstats on FreeBSD 10.2+ */
		9	za_read_derive (ksp, "stolen", "cache_operation", "stolen");
8	#endif	10	#endif
		11	+#endif
9		12
10	/* Issue indicators */	13	/* Issue indicators */
		14	za_read_derive (ksp, "mutex_miss", "mutex_operations", "miss");

Lines 1-9 Link Here

(-)net-mgmt/collectd5.new/files/patch-version-gen.sh (-3 / +3 lines)
1	--- version-gen.sh.orig 2015-05-26 20:23:28 UTC	1	--- version-gen.sh.orig 2016-01-22 09:51:17 UTC
2	+++ version-gen.sh	2	+++ version-gen.sh
3	@@ -1,13 +1,3 @@	3	@@ -1,13 +1,3 @@
4	#!/bin/sh	4	#!/bin/sh
5		5
6	-DEFAULT_VERSION="5.5.0.git"	6	-DEFAULT_VERSION="5.5.1.git"
7	-	7	-
8	-VERSION="`git describe 2> /dev/null \| grep collectd \| sed -e 's/^collectd-//'`"	8	-VERSION="`git describe 2> /dev/null \| grep collectd \| sed -e 's/^collectd-//'`"
9	-	9	-
Lines 14-17 Link Here
14	-VERSION="`echo \"$VERSION\" \| sed -e 's/-/./g'`"	14	-VERSION="`echo \"$VERSION\" \| sed -e 's/-/./g'`"
15	-	15	-
16	-printf "%s" "$VERSION"	16	-printf "%s" "$VERSION"
17	+echo -n "5.5.0.git"	17	+echo -n "5.5.1.git"

Lines 30-36 Link Here

(-)net-mgmt/collectd5.new/pkg-plist (-1 lines)
30	lib/collectd/dns.so	30	lib/collectd/dns.so
31	lib/collectd/email.so	31	lib/collectd/email.so
32	lib/collectd/exec.so	32	lib/collectd/exec.so
33	lib/collectd/fhcount.so
34	lib/collectd/filecount.so	33	lib/collectd/filecount.so
35	%%STATGRAB%%lib/collectd/interface.so	34	%%STATGRAB%%lib/collectd/interface.so
36	%%IPMI%%lib/collectd/ipmi.so	35	%%IPMI%%lib/collectd/ipmi.so

Return to bug 206660

Lines 2-9 Link Here

(-)net-mgmt/collectd5.new/Makefile (-7 / +5 lines)
2	# $FreeBSD: head/net-mgmt/collectd5/Makefile 404774 2015-12-29 18:48:03Z junovitch $	2	# $FreeBSD: head/net-mgmt/collectd5/Makefile 404774 2015-12-29 18:48:03Z junovitch $
3		3
4	PORTNAME= collectd	4	PORTNAME= collectd
5	PORTVERSION= 5.5.0	5	PORTVERSION= 5.5.1
6	PORTREVISION= 5
7	CATEGORIES= net-mgmt	6	CATEGORIES= net-mgmt
8	MASTER_SITES= https://collectd.org/files/ \	7	MASTER_SITES= https://collectd.org/files/ \
9	http://collectd.org/files/	8	http://collectd.org/files/
Lines 79-86 Link Here
79		78
80	USE_LDCONFIG= yes	79	USE_LDCONFIG= yes
81		80
82	CONFLICTS= collectd-4.[0-9]*
83
84	CPPFLAGS+= -I${LOCALBASE}/include	81	CPPFLAGS+= -I${LOCALBASE}/include
85	LIBS+= -L${LOCALBASE}/lib	82	LIBS+= -L${LOCALBASE}/lib
86		83
Lines 89-94 Link Here
89	--disable-all-plugins \	86	--disable-all-plugins \
90	--disable-static \	87	--disable-static \
91	--without-amqp \	88	--without-amqp \
		89	--disable-ceph \
		90	--disable-cgroups \
		91	--disable-fhcount \
92	--without-java \	92	--without-java \
93	--without-libaquaero5 \	93	--without-libaquaero5 \
94	--without-libganglia \	94	--without-libganglia \
Lines 98-104 Link Here
98	--without-libkstat \	98	--without-libkstat \
99	--without-libldap \	99	--without-libldap \
100	--without-libmnl \	100	--without-libmnl \
101	--without-libmodbus \
102	--without-libnetlink \	101	--without-libnetlink \
103	--without-libnetapp \	102	--without-libnetapp \
104	--without-libowcapi \	103	--without-libowcapi \
Lines 154-160 Link Here
154		153
155	MODBUS_LIB_DEPENDS= libmodbus.so:${PORTSDIR}/comms/libmodbus	154	MODBUS_LIB_DEPENDS= libmodbus.so:${PORTSDIR}/comms/libmodbus
156	MODBUS_CONFIGURE_ENABLE= modbus	155	MODBUS_CONFIGURE_ENABLE= modbus
157	MODBUS_CONFIGURE_WITH= libmodbus=${LOCALBASE}	156	MODBUS_CONFIGURE_WITH= libmodbus=use_pkgconfig
158		157
159	MONGODB_LIB_DEPENDS= libmongoc-1.0.so:${PORTSDIR}/devel/mongo-c-driver	158	MONGODB_LIB_DEPENDS= libmongoc-1.0.so:${PORTSDIR}/devel/mongo-c-driver
160	MONGODB_CONFIGURE_ENABLE= write_mongodb	159	MONGODB_CONFIGURE_ENABLE= write_mongodb
Lines 277-283 Link Here
277	--enable-dns \	276	--enable-dns \
278	--enable-email \	277	--enable-email \
279	--enable-exec \	278	--enable-exec \
280	--enable-fhcount \
281	--enable-filecount \	279	--enable-filecount \
282	--enable-load \	280	--enable-load \
283	--enable-logfile \	281	--enable-logfile \

Lines 1-6 Link Here

(-)net-mgmt/collectd5.new/files/patch-configure.ac (-14 / +43 lines)
1	--- configure.ac.orig 2015-05-27 07:51:35 UTC	1	--- configure.ac.orig 2016-01-22 09:51:17 UTC
2	+++ configure.ac	2	+++ configure.ac
3	@@ -120,7 +120,7 @@ then	3	@@ -155,7 +155,7 @@ then
4	fi	4	fi
5		5
6	# Where to install .pc files.	6	# Where to install .pc files.
Lines 9-15 Link Here
9	AC_SUBST(pkgconfigdir)	9	AC_SUBST(pkgconfigdir)
10		10
11	# Check for standards compliance mode	11	# Check for standards compliance mode
12	@@ -641,7 +641,7 @@ SAVE_CFLAGS="$CFLAGS"	12	@@ -715,7 +715,7 @@ SAVE_CFLAGS="$CFLAGS"
13	# Emulate behavior of src/Makefile.am	13	# Emulate behavior of src/Makefile.am
14	if test "x$GCC" = "xyes"	14	if test "x$GCC" = "xyes"
15	then	15	then
Lines 18-24 Link Here
18	fi	18	fi
19		19
20	AC_CACHE_CHECK([for strtok_r],	20	AC_CACHE_CHECK([for strtok_r],
21	@@ -770,7 +770,7 @@ AC_CHECK_FUNCS(getutxent, [have_getutxen	21	@@ -844,7 +844,7 @@ AC_CHECK_FUNCS(getutxent, [have_getutxen
22	if test "x$GCC" = "xyes"	22	if test "x$GCC" = "xyes"
23	then	23	then
24	SAVE_CFLAGS="$CFLAGS"	24	SAVE_CFLAGS="$CFLAGS"
Lines 27-33 Link Here
27	fi	27	fi
28		28
29	AC_CHECK_FUNCS(strptime, [have_strptime="yes"], [have_strptime="no"])	29	AC_CHECK_FUNCS(strptime, [have_strptime="yes"], [have_strptime="no"])
30	@@ -1495,6 +1495,7 @@ if test "x$with_kstat" = "xyes"	30	@@ -1571,6 +1571,7 @@ if test "x$with_kstat" = "xyes"
31	then	31	then
32	AC_CHECK_LIB(kstat, kstat_open, [with_kstat="yes"], [with_kstat="no (libkstat not found)"], [])	32	AC_CHECK_LIB(kstat, kstat_open, [with_kstat="yes"], [with_kstat="no (libkstat not found)"], [])
33	fi	33	fi
Lines 35-41 Link Here
35	if test "x$with_kstat" = "xyes"	35	if test "x$with_kstat" = "xyes"
36	then	36	then
37	AC_CHECK_LIB(devinfo, di_init, [with_devinfo="yes"], [with_devinfo="no (not found)"], [])	37	AC_CHECK_LIB(devinfo, di_init, [with_devinfo="yes"], [with_devinfo="no (not found)"], [])
38	@@ -1504,6 +1505,8 @@ if test "x$with_kstat" = "xyes"	38	@@ -1580,6 +1581,8 @@ if test "x$with_kstat" = "xyes"
39	then	39	then
40	AC_DEFINE(HAVE_LIBKSTAT, 1,	40	AC_DEFINE(HAVE_LIBKSTAT, 1,
41	[Define to 1 if you have the 'kstat' library (-lkstat)])	41	[Define to 1 if you have the 'kstat' library (-lkstat)])
Lines 44-50 Link Here
44	fi	44	fi
45	AM_CONDITIONAL(BUILD_WITH_LIBKSTAT, test "x$with_kstat" = "xyes")	45	AM_CONDITIONAL(BUILD_WITH_LIBKSTAT, test "x$with_kstat" = "xyes")
46	AM_CONDITIONAL(BUILD_WITH_LIBDEVINFO, test "x$with_devinfo" = "xyes")	46	AM_CONDITIONAL(BUILD_WITH_LIBDEVINFO, test "x$with_devinfo" = "xyes")
47	@@ -3346,7 +3349,7 @@ then	47	@@ -2624,8 +2627,8 @@ AC_ARG_WITH(libmongoc, [AS_HELP_STRING([
		48	with_libmongoc="no"
		49	else
		50	with_libmongoc="yes"
		51	- LIBMONGOC_CPPFLAGS="$LIBMONGOC_CPPFLAGS -I$withval/include"
		52	- LIBMONGOC_LDFLAGS="$LIBMONGOC_LDFLAGS -L$withval/lib"
		53	+ LIBMONGOC_CPPFLAGS="$LIBMONGOC_CPPFLAGS -I$withval/include/libmongoc-1.0 -I$withval/include/libbson-1.0"
		54	+ LIBMONGOC_LDFLAGS="$LIBMONGOC_LDFLAGS -L$withval/lib -lsasl2 -lssl -lcrypto -lmongoc-1.0 -lbson-1.0"
		55	fi; fi
		56	],
		57	[with_libmongoc="yes"])
		58	@@ -2642,7 +2645,7 @@ then
		59	then
		60	AC_MSG_NOTICE([libmongoc CPPFLAGS: $LIBMONGOC_CPPFLAGS])
		61	fi
		62	- AC_CHECK_HEADERS(mongo.h,
		63	+ AC_CHECK_HEADERS(mongoc.h,
		64	[with_libmongoc="yes"],
		65	[with_libmongoc="no ('mongo.h' not found)"],
		66	[#if HAVE_STDINT_H
		67	@@ -2658,7 +2661,7 @@ then
		68	then
		69	AC_MSG_NOTICE([libmongoc LDFLAGS: $LIBMONGOC_LDFLAGS])
		70	fi
		71	- AC_CHECK_LIB(mongoc, mongo_run_command,
		72	+ AC_CHECK_LIB(mongoc-1.0, mongoc_client_command,
		73	[with_libmongoc="yes"],
		74	[with_libmongoc="no (symbol 'mongo_run_command' not found)"])
		75	fi
		76	@@ -3415,7 +3418,7 @@ then
48	SAVE_LIBS="$LIBS"	77	SAVE_LIBS="$LIBS"
49	# trigger an error if Perl_load_module*() uses __attribute__nonnull__(3)	78	# trigger an error if Perl_load_module*() uses __attribute__nonnull__(3)
50	# (see issues #41 and #42)	79	# (see issues #41 and #42)
Lines 53-59 Link Here
53	LIBS="$LIBS $PERL_LIBS"	82	LIBS="$LIBS $PERL_LIBS"
54		83
55	AC_CACHE_CHECK([for broken Perl_load_module()],	84	AC_CACHE_CHECK([for broken Perl_load_module()],
56	@@ -3576,7 +3579,7 @@ fi	85	@@ -3645,7 +3648,7 @@ fi
57	if test "x$with_python" = "xyes"	86	if test "x$with_python" = "xyes"
58	then	87	then
59	AC_MSG_CHECKING([for Python CPPFLAGS])	88	AC_MSG_CHECKING([for Python CPPFLAGS])
Lines 62-68 Link Here
62	python_config_status=$?	91	python_config_status=$?
63		92
64	if test "$python_config_status" -ne 0 \|\| test "x$python_include_path" = "x"	93	if test "$python_config_status" -ne 0 \|\| test "x$python_include_path" = "x"
65	@@ -3599,7 +3602,7 @@ fi	94	@@ -3668,7 +3671,7 @@ fi
66	if test "x$with_python" = "xyes"	95	if test "x$with_python" = "xyes"
67	then	96	then
68	AC_MSG_CHECKING([for Python LDFLAGS])	97	AC_MSG_CHECKING([for Python LDFLAGS])
Lines 71-77 Link Here
71	python_config_status=$?	100	python_config_status=$?
72		101
73	if test "$python_config_status" -ne 0 \|\| test "x$python_library_path" = "x"	102	if test "$python_config_status" -ne 0 \|\| test "x$python_library_path" = "x"
74	@@ -3614,7 +3617,7 @@ fi	103	@@ -3683,7 +3686,7 @@ fi
75	if test "x$with_python" = "xyes"	104	if test "x$with_python" = "xyes"
76	then	105	then
77	AC_MSG_CHECKING([for Python LIBS])	106	AC_MSG_CHECKING([for Python LIBS])
Lines 80-86 Link Here
80	python_config_status=$?	109	python_config_status=$?
81		110
82	if test "$python_config_status" -ne 0 \|\| test "x$python_library_flags" = "x"	111	if test "$python_config_status" -ne 0 \|\| test "x$python_library_flags" = "x"
83	@@ -3629,7 +3632,7 @@ fi	112	@@ -3698,7 +3701,7 @@ fi
84	if test "x$with_python" = "xyes"	113	if test "x$with_python" = "xyes"
85	then	114	then
86	LDFLAGS="-L$python_library_path $LDFLAGS"	115	LDFLAGS="-L$python_library_path $LDFLAGS"
Lines 89-95 Link Here
89		118
90	AC_CHECK_FUNC(PyObject_CallFunction,	119	AC_CHECK_FUNC(PyObject_CallFunction,
91	[with_python="yes"],	120	[with_python="yes"],
92	@@ -4692,8 +4695,8 @@ AC_ARG_WITH(libvarnish, [AS_HELP_STRING(	121	@@ -4761,8 +4764,8 @@ AC_ARG_WITH(libvarnish, [AS_HELP_STRING(
93	else if test -d "$with_libvarnish/lib"	122	else if test -d "$with_libvarnish/lib"
94	then	123	then
95	AC_MSG_NOTICE([Not checking for libvarnish: Manually configured])	124	AC_MSG_NOTICE([Not checking for libvarnish: Manually configured])
Lines 100-110 Link Here
100	with_libvarnish="yes"	129	with_libvarnish="yes"
101	fi; fi; fi	130	fi; fi; fi
102	],	131	],
103	@@ -5263,6 +5266,7 @@ fi	132	@@ -5334,6 +5337,7 @@ fi
104		133
105	if test "x$ac_system" = "xFreeBSD"	134	if test "x$ac_system" = "xFreeBSD"
106	then	135	then
107	+ plugin_disk="yes"	136	+ plugin_disk="yes"
108	plugin_zfs_arc="yes"	137	plugin_zfs_arc="yes"
109	fi	138	fi
110		139

Lines 1-4 Link Here

(-)net-mgmt/collectd5.new/files/patch-src__Makefile.am (-10 / +10 lines)
1	--- src/Makefile.am.orig 2015-05-26 19:38:14 UTC	1	--- src/Makefile.am.orig 2016-01-22 09:51:17 UTC
2	+++ src/Makefile.am	2	+++ src/Makefile.am
3	@@ -7,14 +7,14 @@ SUBDIRS += daemon	3	@@ -7,14 +7,14 @@ SUBDIRS += daemon
4	PLUGIN_LDFLAGS = -module -avoid-version -export-symbols-regex '\<module_register\>'	4	PLUGIN_LDFLAGS = -module -avoid-version -export-symbols-regex '\<module_register\>'
Lines 26-32 Link Here
26	endif	26	endif
27	if BUILD_WITH_LIBDEVINFO	27	if BUILD_WITH_LIBDEVINFO
28	cpu_la_LIBADD += -ldevinfo	28	cpu_la_LIBADD += -ldevinfo
29	@@ -303,7 +303,7 @@ disk_la_CFLAGS = $(AM_CFLAGS)	29	@@ -301,7 +301,7 @@ disk_la_CFLAGS = $(AM_CFLAGS)
30	disk_la_LDFLAGS = $(PLUGIN_LDFLAGS)	30	disk_la_LDFLAGS = $(PLUGIN_LDFLAGS)
31	disk_la_LIBADD =	31	disk_la_LIBADD =
32	if BUILD_WITH_LIBKSTAT	32	if BUILD_WITH_LIBKSTAT
Lines 35-41 Link Here
35	endif	35	endif
36	if BUILD_WITH_LIBDEVINFO	36	if BUILD_WITH_LIBDEVINFO
37	disk_la_LIBADD += -ldevinfo	37	disk_la_LIBADD += -ldevinfo
38	@@ -321,6 +321,9 @@ endif	38	@@ -319,6 +319,9 @@ endif
39	if BUILD_WITH_PERFSTAT	39	if BUILD_WITH_PERFSTAT
40	disk_la_LIBADD += -lperfstat	40	disk_la_LIBADD += -lperfstat
41	endif	41	endif
Lines 45-51 Link Here
45	endif	45	endif
46		46
47	if BUILD_PLUGIN_DNS	47	if BUILD_PLUGIN_DNS
48	@@ -408,7 +411,7 @@ interface_la_CFLAGS += $(BUILD_WITH_LIBS	48	@@ -405,7 +408,7 @@ interface_la_CFLAGS += $(BUILD_WITH_LIBS
49	interface_la_LIBADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)	49	interface_la_LIBADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
50	else	50	else
51	if BUILD_WITH_LIBKSTAT	51	if BUILD_WITH_LIBKSTAT
Lines 54-60 Link Here
54	endif	54	endif
55	if BUILD_WITH_LIBDEVINFO	55	if BUILD_WITH_LIBDEVINFO
56	interface_la_LIBADD += -ldevinfo	56	interface_la_LIBADD += -ldevinfo
57	@@ -591,7 +594,7 @@ memory_la_CFLAGS = $(AM_CFLAGS)	57	@@ -584,7 +587,7 @@ memory_la_CFLAGS = $(AM_CFLAGS)
58	memory_la_LDFLAGS = $(PLUGIN_LDFLAGS)	58	memory_la_LDFLAGS = $(PLUGIN_LDFLAGS)
59	memory_la_LIBADD =	59	memory_la_LIBADD =
60	if BUILD_WITH_LIBKSTAT	60	if BUILD_WITH_LIBKSTAT
Lines 63-69 Link Here
63	endif	63	endif
64	if BUILD_WITH_LIBDEVINFO	64	if BUILD_WITH_LIBDEVINFO
65	memory_la_LIBADD += -ldevinfo	65	memory_la_LIBADD += -ldevinfo
66	@@ -964,7 +967,7 @@ swap_la_CFLAGS = $(AM_CFLAGS)	66	@@ -951,7 +954,7 @@ swap_la_CFLAGS = $(AM_CFLAGS)
67	swap_la_LDFLAGS = $(PLUGIN_LDFLAGS)	67	swap_la_LDFLAGS = $(PLUGIN_LDFLAGS)
68	swap_la_LIBADD =	68	swap_la_LIBADD =
69	if BUILD_WITH_LIBKSTAT	69	if BUILD_WITH_LIBKSTAT
Lines 72-78 Link Here
72	endif	72	endif
73	if BUILD_WITH_LIBDEVINFO	73	if BUILD_WITH_LIBDEVINFO
74	swap_la_LIBADD += -ldevinfo	74	swap_la_LIBADD += -ldevinfo
75	@@ -1010,7 +1013,7 @@ if BUILD_PLUGIN_TAPE	75	@@ -997,7 +1000,7 @@ if BUILD_PLUGIN_TAPE
76	pkglib_LTLIBRARIES += tape.la	76	pkglib_LTLIBRARIES += tape.la
77	tape_la_SOURCES = tape.c	77	tape_la_SOURCES = tape.c
78	tape_la_LDFLAGS = $(PLUGIN_LDFLAGS)	78	tape_la_LDFLAGS = $(PLUGIN_LDFLAGS)
Lines 81-87 Link Here
81	endif	81	endif
82		82
83	if BUILD_PLUGIN_TARGET_NOTIFICATION	83	if BUILD_PLUGIN_TARGET_NOTIFICATION
84	@@ -1116,7 +1119,7 @@ uptime_la_CFLAGS = $(AM_CFLAGS)	84	@@ -1102,7 +1105,7 @@ uptime_la_CFLAGS = $(AM_CFLAGS)
85	uptime_la_LDFLAGS = $(PLUGIN_LDFLAGS)	85	uptime_la_LDFLAGS = $(PLUGIN_LDFLAGS)
86	uptime_la_LIBADD =	86	uptime_la_LIBADD =
87	if BUILD_WITH_LIBKSTAT	87	if BUILD_WITH_LIBKSTAT
Lines 90-96 Link Here
90	endif	90	endif
91	if BUILD_WITH_PERFSTAT	91	if BUILD_WITH_PERFSTAT
92	uptime_la_LIBADD += -lperfstat	92	uptime_la_LIBADD += -lperfstat
93	@@ -1275,7 +1278,7 @@ if BUILD_LINUX	93	@@ -1260,7 +1263,7 @@ if BUILD_LINUX
94	# zfs_arc requires no library on linux	94	# zfs_arc requires no library on linux
95	else	95	else
96	# solaris	96	# solaris
Lines 99-105 Link Here
99	endif	99	endif
100	endif	100	endif
101	endif	101	endif
102	@@ -1364,12 +1367,7 @@ endif	102	@@ -1354,12 +1357,7 @@ endif
103		103
104	install-exec-hook:	104	install-exec-hook:
105	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)	105	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)

Lines 1-4 Link Here

(-)net-mgmt/collectd5.new/files/patch-src__daemon__Makefile.am (-10 / +1 lines)
1	--- src/daemon/Makefile.am.orig 2015-05-26 19:38:31 UTC	1	--- src/daemon/Makefile.am.orig 2016-01-22 09:51:17 UTC
2	+++ src/daemon/Makefile.am	2	+++ src/daemon/Makefile.am
3	@@ -6,7 +6,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src	3	@@ -6,7 +6,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src
4	AM_CPPFLAGS += -DPREFIX='"${prefix}"'	4	AM_CPPFLAGS += -DPREFIX='"${prefix}"'
Lines 9-20 Link Here
9	if BUILD_FEATURE_DAEMON	9	if BUILD_FEATURE_DAEMON
10	AM_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"'	10	AM_CPPFLAGS += -DPIDFILE='"${localstatedir}/run/${PACKAGE_NAME}.pid"'
11	endif	11	endif
12	@@ -49,7 +49,7 @@ collectd_CPPFLAGS = $(AM_CPPFLAGS) $(LT
13	collectd_CFLAGS = $(AM_CFLAGS)
14	collectd_LDFLAGS = -export-dynamic
15	collectd_LDADD = libavltree.la libcommon.la libheap.la -lm
16	-collectd_DEPENDENCIES =
17	+collectd_DEPENDENCIES = libavltree.la libcommon.la libheap.la
18
19	# Link to these libraries..
20	if BUILD_WITH_LIBRT

Line 0 Link Here

(-)net-mgmt/collectd5.new/files/patch-src_config.h.in (+40 lines)
	1	--- src/config.h.in.orig 2016-01-22 09:56:33 UTC
	2	+++ src/config.h.in
	3	@@ -562,8 +562,8 @@
	4	/* Define to 1 if you have the <modbus.h> header file. */
	5	#undef HAVE_MODBUS_H
	6
	7	-/* Define to 1 if you have the <mongo.h> header file. */
	8	-#undef HAVE_MONGO_H
	9	+/* Define to 1 if you have the <mongoc.h> header file. */
	10	+#undef HAVE_MONGOC_H
	11
	12	/* Define to 1 if you have the <mysql.h> header file. */
	13	#undef HAVE_MYSQL_H
	14	@@ -1541,13 +1541,15 @@
	15	module search path. */
	16	#undef LT_MODULE_PATH_VAR
	17
	18	-/* Define to the sub-directory in which libtool stores uninstalled libraries.
	19	- */
	20	+/* Define to the sub-directory where libtool stores uninstalled libraries. */
	21	#undef LT_OBJDIR
	22
	23	/* Define to the shared library suffix, say, ".dylib". */
	24	#undef LT_SHARED_EXT
	25
	26	+/* Define to the shared archive member specification, say "(shr.o)". */
	27	+#undef LT_SHARED_LIB_MEMBER
	28	+
	29	/* Define if NAN is defined by default and can initialize static variables. */
	30	#undef NAN_STATIC_DEFAULT
	31
	32	@@ -1644,7 +1646,7 @@
	33	/* Define to empty if `const' does not conform to ANSI C. */
	34	#undef const
	35
	36	-/* Define to a type to use for `error_t' if it is not otherwise available. */
	37	+/* Define to a type to use for 'error_t' if it is not otherwise available. */
	38	#undef error_t
	39
	40	/* Define to `int' if <sys/types.h> doesn't define. */

Lines 1-4 Link Here

(-)net-mgmt/collectd5.new/files/patch-src_disk.c (-341 / +1 lines)
1	--- src/disk.c.orig 2015-03-10 14:14:45 UTC	1	--- src/disk.c.orig 2016-01-22 09:51:17 UTC
2	+++ src/disk.c	2	+++ src/disk.c
3	@@ -53,6 +53,10 @@	3	@@ -53,6 +53,10 @@
4	#if HAVE_IOKIT_IOBSD_H	4	#if HAVE_IOKIT_IOBSD_H
Lines 43-385 Link Here
43	#elif HAVE_LIBKSTAT	43	#elif HAVE_LIBKSTAT
44	kstat_t *ksp_chain;	44	kstat_t *ksp_chain;
45		45
46	@@ -395,173 +417,223 @@ static int disk_read (void)
47	io_registry_entry_t disk;
48	io_registry_entry_t disk_child;
49	io_iterator_t disk_list;
50	- CFDictionaryRef props_dict;
51	+ CFMutableDictionaryRef props_dict, child_dict;
52	CFDictionaryRef stats_dict;
53	- CFDictionaryRef child_dict;
54	CFStringRef tmp_cf_string_ref;
55	kern_return_t status;
56
57	- signed long long read_ops;
58	- signed long long read_byt;
59	- signed long long read_tme;
60	- signed long long write_ops;
61	- signed long long write_byt;
62	- signed long long write_tme;
63	+ signed long long read_ops, read_byt, read_tme;
64	+ signed long long write_ops, write_byt, write_tme;
65
66	- int disk_major;
67	- int disk_minor;
68	+ int disk_major, disk_minor;
69	char disk_name[DATA_MAX_NAME_LEN];
70	- char disk_name_bsd[DATA_MAX_NAME_LEN];
71	+ char child_disk_name_bsd[DATA_MAX_NAME_LEN], props_disk_name_bsd[DATA_MAX_NAME_LEN];
72
73	/* Get the list of all disk objects. */
74	- if (IOServiceGetMatchingServices (io_master_port,
75	- IOServiceMatching (kIOBlockStorageDriverClass),
76	- &disk_list) != kIOReturnSuccess)
77	- {
78	+ if (IOServiceGetMatchingServices (io_master_port, IOServiceMatching (kIOBlockStorageDriverClass), &disk_list) != kIOReturnSuccess) {
79	ERROR ("disk plugin: IOServiceGetMatchingServices failed.");
80	return (-1);
81	}
82
83	- while ((disk = IOIteratorNext (disk_list)) != 0)
84	- {
85	+ while ((disk = IOIteratorNext (disk_list)) != 0) {
86	props_dict = NULL;
87	stats_dict = NULL;
88	child_dict = NULL;
89
90	- /* `disk_child' must be released */
91	- if ((status = IORegistryEntryGetChildEntry (disk, kIOServicePlane, &disk_child))
92	- != kIOReturnSuccess)
93	- {
94	- /* This fails for example for DVD/CD drives.. */
95	+ /* get child of disk entry and corresponding property dictionary */
96	+ if ((status = IORegistryEntryGetChildEntry (disk, kIOServicePlane, &disk_child)) != kIOReturnSuccess) {
97	+ /* This fails for example for DVD/CD drives, which we want to ignore anyway */
98	DEBUG ("IORegistryEntryGetChildEntry (disk) failed: 0x%08x", status);
99	IOObjectRelease (disk);
100	continue;
101	}
102	-
103	- /* We create `props_dict' => we need to release it later */
104	- if (IORegistryEntryCreateCFProperties (disk,
105	- (CFMutableDictionaryRef *) &props_dict,
106	- kCFAllocatorDefault,
107	- kNilOptions)
108	- != kIOReturnSuccess)
109	- {
110	- ERROR ("disk-plugin: IORegistryEntryCreateCFProperties failed.");
111	+ if (IORegistryEntryCreateCFProperties (disk_child, (CFMutableDictionaryRef *) &child_dict, kCFAllocatorDefault, kNilOptions) != kIOReturnSuccess \|\| child_dict == NULL) {
112	+ ERROR ("disk plugin: IORegistryEntryCreateCFProperties (disk_child) failed.");
113	IOObjectRelease (disk_child);
114	IOObjectRelease (disk);
115	continue;
116	}
117
118	- if (props_dict == NULL)
119	- {
120	- DEBUG ("IORegistryEntryCreateCFProperties (disk) failed.");
121	- IOObjectRelease (disk_child);
122	- IOObjectRelease (disk);
123	- continue;
124	+ /* extract name and major/minor numbers */
125	+ memset (child_disk_name_bsd, 0, sizeof (child_disk_name_bsd));
126	+ tmp_cf_string_ref = (CFStringRef) CFDictionaryGetValue (child_dict, CFSTR(kIOBSDNameKey));
127	+ if (tmp_cf_string_ref) {
128	+ assert (CFGetTypeID (tmp_cf_string_ref) == CFStringGetTypeID ());
129	+ CFStringGetCString (tmp_cf_string_ref, child_disk_name_bsd, sizeof (child_disk_name_bsd), kCFStringEncodingUTF8);
130	}
131	+ disk_major = (int) dict_get_value (child_dict, kIOBSDMajorKey);
132	+ disk_minor = (int) dict_get_value (child_dict, kIOBSDMinorKey);
133	+ DEBUG ("disk plugin: child_disk_name_bsd=\"%s\" major=%d minor=%d", child_disk_name_bsd, disk_major, disk_minor);
134	+ CFRelease (child_dict);
135	+ IOObjectRelease (disk_child);
136
137	- /* tmp_cf_string_ref doesn't need to be released. */
138	- tmp_cf_string_ref = (CFStringRef) CFDictionaryGetValue (props_dict,
139	- CFSTR(kIOBSDNameKey));
140	- if (!tmp_cf_string_ref)
141	- {
142	- DEBUG ("disk plugin: CFDictionaryGetValue("
143	- "kIOBSDNameKey) failed.");
144	- CFRelease (props_dict);
145	- IOObjectRelease (disk_child);
146	+ /* get property dictionary of the disk entry itself */
147	+ if (IORegistryEntryCreateCFProperties (disk, (CFMutableDictionaryRef *) &props_dict, kCFAllocatorDefault, kNilOptions) != kIOReturnSuccess \|\| props_dict == NULL) {
148	+ ERROR ("disk-plugin: IORegistryEntryCreateCFProperties failed.");
149	IOObjectRelease (disk);
150	continue;
151	}
152	- assert (CFGetTypeID (tmp_cf_string_ref) == CFStringGetTypeID ());
153
154	- memset (disk_name_bsd, 0, sizeof (disk_name_bsd));
155	- CFStringGetCString (tmp_cf_string_ref,
156	- disk_name_bsd, sizeof (disk_name_bsd),
157	- kCFStringEncodingUTF8);
158	- if (disk_name_bsd[0] == 0)
159	- {
160	- ERROR ("disk plugin: CFStringGetCString() failed.");
161	- CFRelease (props_dict);
162	- IOObjectRelease (disk_child);
163	- IOObjectRelease (disk);
164	- continue;
165	+ /* extract name and stats dictionary */
166	+ memset (props_disk_name_bsd, 0, sizeof (props_disk_name_bsd));
167	+ tmp_cf_string_ref = (CFStringRef) CFDictionaryGetValue (props_dict, CFSTR(kIOBSDNameKey));
168	+ if (tmp_cf_string_ref) {
169	+ assert (CFGetTypeID (tmp_cf_string_ref) == CFStringGetTypeID ());
170	+ CFStringGetCString (tmp_cf_string_ref, props_disk_name_bsd, sizeof (props_disk_name_bsd), kCFStringEncodingUTF8);
171	}
172	- DEBUG ("disk plugin: disk_name_bsd = \"%s\"", disk_name_bsd);
173	-
174	- stats_dict = (CFDictionaryRef) CFDictionaryGetValue (props_dict,
175	- CFSTR (kIOBlockStorageDriverStatisticsKey));
176	-
177	- if (stats_dict == NULL)
178	- {
179	- DEBUG ("disk plugin: CFDictionaryGetValue ("
180	- "%s) failed.",
181	- kIOBlockStorageDriverStatisticsKey);
182	+ stats_dict = (CFDictionaryRef) CFDictionaryGetValue (props_dict, CFSTR (kIOBlockStorageDriverStatisticsKey));
183	+ if (stats_dict == NULL) {
184	+ ERROR ("disk plugin: CFDictionaryGetValue (%s) failed.", kIOBlockStorageDriverStatisticsKey);
185	CFRelease (props_dict);
186	- IOObjectRelease (disk_child);
187	IOObjectRelease (disk);
188	continue;
189	}
190	+ DEBUG ("disk plugin: props_disk_name_bsd=\"%s\"", props_disk_name_bsd);
191
192	- if (IORegistryEntryCreateCFProperties (disk_child,
193	- (CFMutableDictionaryRef *) &child_dict,
194	- kCFAllocatorDefault,
195	- kNilOptions)
196	- != kIOReturnSuccess)
197	- {
198	- DEBUG ("disk plugin: IORegistryEntryCreateCFProperties ("
199	- "disk_child) failed.");
200	- IOObjectRelease (disk_child);
201	- CFRelease (props_dict);
202	- IOObjectRelease (disk);
203	- continue;
204	+ /* choose name */
205	+ if (use_bsd_name) {
206	+ if (child_disk_name_bsd[0] != 0)
207	+ sstrncpy (disk_name, child_disk_name_bsd, sizeof (disk_name));
208	+ else if (props_disk_name_bsd[0] != 0)
209	+ sstrncpy (disk_name, props_disk_name_bsd, sizeof (disk_name));
210	+ else {
211	+ ERROR ("disk plugin: can't find bsd disk name.");
212	+ ssnprintf (disk_name, sizeof (disk_name), "%i-%i", disk_major, disk_minor);
213	+ }
214	}
215	+ else
216	+ ssnprintf (disk_name, sizeof (disk_name), "%i-%i", disk_major, disk_minor);
217
218	- /* kIOBSDNameKey */
219	- disk_major = (int) dict_get_value (child_dict,
220	- kIOBSDMajorKey);
221	- disk_minor = (int) dict_get_value (child_dict,
222	- kIOBSDMinorKey);
223	- read_ops = dict_get_value (stats_dict,
224	- kIOBlockStorageDriverStatisticsReadsKey);
225	- read_byt = dict_get_value (stats_dict,
226	- kIOBlockStorageDriverStatisticsBytesReadKey);
227	- read_tme = dict_get_value (stats_dict,
228	- kIOBlockStorageDriverStatisticsTotalReadTimeKey);
229	- write_ops = dict_get_value (stats_dict,
230	- kIOBlockStorageDriverStatisticsWritesKey);
231	- write_byt = dict_get_value (stats_dict,
232	- kIOBlockStorageDriverStatisticsBytesWrittenKey);
233	- /* This property describes the number of nanoseconds spent
234	- * performing writes since the block storage driver was
235	- * instantiated. It is one of the statistic entries listed
236	- * under the top-level kIOBlockStorageDriverStatisticsKey
237	- * property table. It has an OSNumber value. */
238	- write_tme = dict_get_value (stats_dict,
239	- kIOBlockStorageDriverStatisticsTotalWriteTimeKey);
240	+ /* extract the stats */
241	+ read_ops = dict_get_value (stats_dict, kIOBlockStorageDriverStatisticsReadsKey);
242	+ read_byt = dict_get_value (stats_dict, kIOBlockStorageDriverStatisticsBytesReadKey);
243	+ read_tme = dict_get_value (stats_dict, kIOBlockStorageDriverStatisticsTotalReadTimeKey);
244	+ write_ops = dict_get_value (stats_dict, kIOBlockStorageDriverStatisticsWritesKey);
245	+ write_byt = dict_get_value (stats_dict, kIOBlockStorageDriverStatisticsBytesWrittenKey);
246	+ write_tme = dict_get_value (stats_dict, kIOBlockStorageDriverStatisticsTotalWriteTimeKey);
247	+ CFRelease (props_dict);
248	+ IOObjectRelease (disk);
249
250	- if (use_bsd_name)
251	- sstrncpy (disk_name, disk_name_bsd, sizeof (disk_name));
252	- else
253	- ssnprintf (disk_name, sizeof (disk_name), "%i-%i",
254	- disk_major, disk_minor);
255	+ /* and submit */
256	DEBUG ("disk plugin: disk_name = \"%s\"", disk_name);
257	-
258	if ((read_byt != -1LL) \|\| (write_byt != -1LL))
259	disk_submit (disk_name, "disk_octets", read_byt, write_byt);
260	if ((read_ops != -1LL) \|\| (write_ops != -1LL))
261	disk_submit (disk_name, "disk_ops", read_ops, write_ops);
262	if ((read_tme != -1LL) \|\| (write_tme != -1LL))
263	- disk_submit (disk_name, "disk_time",
264	- read_tme / 1000,
265	- write_tme / 1000);
266	+ disk_submit (disk_name, "disk_time", read_tme / 1000, write_tme / 1000);
267
268	- CFRelease (child_dict);
269	- IOObjectRelease (disk_child);
270	- CFRelease (props_dict);
271	- IOObjectRelease (disk);
272	}
273	IOObjectRelease (disk_list);
274	/* #endif HAVE_IOKIT_IOKITLIB_H */
275
276	+#elif KERNEL_FREEBSD
277	+ int retry, dirty;
278	+
279	+ void *snap = NULL;
280	+ struct devstat *snap_iter;
281	+
282	+ struct gident *geom_id;
283	+
284	+ const char *disk_name;
285	+ long double read_time, write_time;
286	+
287	+ for (retry = 0, dirty = 1; retry < 5 && dirty == 1; retry++) {
288	+ if (snap != NULL)
289	+ geom_stats_snapshot_free(snap);
290	+
291	+ /* Get a fresh copy of stats snapshot */
292	+ snap = geom_stats_snapshot_get();
293	+ if (snap == NULL) {
294	+ ERROR("disk plugin: geom_stats_snapshot_get() failed.");
295	+ return (-1);
296	+ }
297	+
298	+ /* Check if we have dirty read from this snapshot */
299	+ dirty = 0;
300	+ geom_stats_snapshot_reset(snap);
301	+ while ((snap_iter = geom_stats_snapshot_next(snap)) != NULL) {
302	+ if (snap_iter->id == NULL)
303	+ continue;
304	+ geom_id = geom_lookupid(&geom_tree, snap_iter->id);
305	+
306	+ /* New device? refresh GEOM tree */
307	+ if (geom_id == NULL) {
308	+ geom_deletetree(&geom_tree);
309	+ if (geom_gettree(&geom_tree) != 0) {
310	+ ERROR("disk plugin: geom_gettree() failed");
311	+ geom_stats_snapshot_free(snap);
312	+ return (-1);
313	+ }
314	+ geom_id = geom_lookupid(&geom_tree, snap_iter->id);
315	+ }
316	+ /*
317	+ * This should be rare: the device come right before we take the
318	+ * snapshot and went away right after it. We will handle this
319	+ * case later, so don't mark dirty but silently ignore it.
320	+ */
321	+ if (geom_id == NULL)
322	+ continue;
323	+
324	+ /* Only collect PROVIDER data */
325	+ if (geom_id->lg_what != ISPROVIDER)
326	+ continue;
327	+
328	+ /* Only collect data when rank is 1 (physical devices) */
329	+ if (((struct gprovider *)(geom_id->lg_ptr))->lg_geom->lg_rank != 1)
330	+ continue;
331	+
332	+ /* Check if this is a dirty read quit for another try */
333	+ if (snap_iter->sequence0 != snap_iter->sequence1) {
334	+ dirty = 1;
335	+ break;
336	+ }
337	+ }
338	+ }
339	+
340	+ /* Reset iterator */
341	+ geom_stats_snapshot_reset(snap);
342	+ for (;;) {
343	+ snap_iter = geom_stats_snapshot_next(snap);
344	+ if (snap_iter == NULL)
345	+ break;
346	+
347	+ if (snap_iter->id == NULL)
348	+ continue;
349	+ geom_id = geom_lookupid(&geom_tree, snap_iter->id);
350	+ if (geom_id == NULL)
351	+ continue;
352	+ if (geom_id->lg_what != ISPROVIDER)
353	+ continue;
354	+ if (((struct gprovider *)(geom_id->lg_ptr))->lg_geom->lg_rank != 1)
355	+ continue;
356	+ /* Skip dirty reads, if present */
357	+ if (dirty && (snap_iter->sequence0 != snap_iter->sequence1))
358	+ continue;
359	+
360	+ disk_name = ((struct gprovider *)geom_id->lg_ptr)->lg_name;
361	+
362	+ if ((snap_iter->bytes[1] != 0) \|\| (snap_iter->bytes[2] != 0)) {
363	+ disk_submit(disk_name, "disk_octets",
364	+ (derive_t)snap_iter->bytes[1],
365	+ (derive_t)snap_iter->bytes[2]);
366	+ }
367	+
368	+ if ((snap_iter->operations[1] != 0) \|\| (snap_iter->operations[2] != 0)) {
369	+ disk_submit(disk_name, "disk_ops",
370	+ (derive_t)snap_iter->operations[1],
371	+ (derive_t)snap_iter->operations[2]);
372	+ }
373	+
374	+ read_time = devstat_compute_etime(&snap_iter->duration[DEVSTAT_READ], NULL);
375	+ write_time = devstat_compute_etime(&snap_iter->duration[DEVSTAT_WRITE], NULL);
376	+ if ((read_time != 0) \|\| (write_time != 0)) {
377	+ disk_submit (disk_name, "disk_time",
378	+ (derive_t)(read_time1000), (derive_t)(write_time1000));
379	+ }
380	+ }
381	+ geom_stats_snapshot_free(snap);
382	+
383	#elif KERNEL_LINUX
384	FILE *fh;
385	char buffer[1024];