collectd: update 5.4.1 -> 5.7.0 and add sensors support

To avoid mistakes in future updates, reorganize the configure options,
add missing options and list all plugins separately.

This update adds support for the sensors plugin, which reads sensor data
through lm_sensors.

Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

1 files changed, 155 insertions, 126 deletions

diff --git a/rules/collectd.make b/rules/collectd.make
index 2ef50e725..8d693f80b 100644
--- a/rules/collectd.make
+++ b/rules/collectd.make
@@ -1,6 +1,7 @@
 # -*-makefile-*-
 #
 # Copyright (C) 2014 by Markus Pargmann <mpa@pengutronix.de>
+# Copyright (C) 2016 by Clemens Gruber <clemens.gruber@pqgruber.com>
 #
 # See CREDITS for details about who has contributed to this project.
 #
@@ -16,11 +17,11 @@ PACKAGES-$(PTXCONF_COLLECTD) += collectd
 #
 # Paths and names
 #
-COLLECTD_VERSION	:= 5.4.1
+COLLECTD_VERSION	:= 5.7.0
 COLLECTD		:= collectd-$(COLLECTD_VERSION)
 COLLECTD_SUFFIX		:= tar.bz2
 COLLECTD_URL		:= http://collectd.org/files/${COLLECTD}.${COLLECTD_SUFFIX}
-COLLECTD_MD5		:= 6f56c71c96573a7f4f7fb3bfab185974
+COLLECTD_MD5		:= c5cbe74a5638cac793caa13b3df60ce1
 COLLECTD_DIR		:= $(BUILDDIR)/$(COLLECTD)
 COLLECTD_SOURCE		:= $(SRCDIR)/$(COLLECTD).$(COLLECTD_SUFFIX)
 COLLECTD_LICENSE	:= GPL2
@@ -29,11 +30,6 @@ COLLECTD_LICENSE	:= GPL2
 # Prepare
 # ----------------------------------------------------------------------------
 
-COLLECTD_ENABLE-$(PTXCONF_COLLECTD_LOGFILE)	+= logfile
-COLLECTD_ENABLE-$(PTXCONF_COLLECTD_SYSLOG)	+= syslog
-COLLECTD_ENABLE-$(PTXCONF_COLLECTD_RRDTOOL)	+= rrdtool
-COLLECTD_ENABLE-$(PTXCONF_COLLECTD_CPU)		+= cpu
-
 # 'noyywrap' is set, so no lex library is needed
 COLLECTD_CONF_ENV	:= \
 	$(CROSS_ENV) \
@@ -46,133 +42,167 @@ COLLECTD_CONF_TOOL	:= autoconf
 COLLECTD_CONF_OPT	:= $(CROSS_AUTOCONF_USR) \
 	$(GLOBAL_LARGE_FILE_OPTION) \
 	--disable-standards \
-	--disable-glibtest \
+	--disable-xfs \
 	--disable-debug \
 	--enable-daemon \
 	--disable-getifaddrs \
+	--disable-werror \
 	--disable-all-plugins \
 	--with-included-ltdl \
 	--with-nan-emulation \
 	--with-fp-layout=nothing \
-	\
-	--disable-aggregation \
-	--disable-amqp \
-	--disable-apache \
-	--disable-apcups \
-	--disable-apple_sensors \
-	--disable-aquaero \
-	--disable-ascent \
-	--disable-battery \
-	--disable-bind \
-	--disable-conntrack \
-	--disable-contextswitch \
-	--disable-cpufreq \
-	--disable-csv \
-	--disable-curl \
-	--disable-curl_json \
-	--disable-curl_xml \
-	--disable-cgroups \
-	--disable-dbi \
-	--disable-df \
-	--disable-disk \
-	--disable-dns \
-	--disable-email \
-	--disable-entropy \
-	--disable-ethstat \
-	--disable-exec \
-	--disable-filecount \
-	--disable-fscache \
-	--disable-gmond \
-	--disable-hddtemp \
-	--disable-interface \
-	--disable-ipmi \
-	--disable-iptables \
-	--disable-ipvs \
-	--disable-irq \
-	--disable-java \
-	--disable-libvirt \
-	--disable-load \
-	--disable-lpar \
-	--disable-lvm \
-	--disable-madwifi \
-	--disable-match_empty_counter \
-	--disable-match_hashed \
-	--disable-match_regex \
-	--disable-match_timediff \
-	--disable-match_value \
-	--disable-mbmon \
-	--disable-md \
-	--disable-memcachec \
-	--disable-memcached \
-	--disable-memory \
-	--disable-mic \
-	--disable-modbus \
-	--disable-multimeter \
-	--disable-mysql \
-	--disable-netapp \
-	--disable-netlink \
-	--disable-network \
-	--disable-nfs \
-	--disable-nginx \
-	--disable-notify_desktop \
-	--disable-notify_email \
-	--disable-ntpd \
-	--disable-numa \
-	--disable-nut \
-	--disable-olsrd \
-	--disable-onewire \
-	--disable-openvpn \
-	--disable-oracle \
-	--disable-perl \
-	--disable-pf \
-	--disable-pinba \
-	--disable-ping \
-	--disable-postgresql \
-	--disable-powerdns \
-	--disable-processes \
-	--disable-protocols \
-	--disable-python \
-	--disable-redis \
-	--disable-routeros \
-	--disable-rrdcached \
-	--disable-sensors \
-	--disable-serial \
-	--disable-sigrok \
-	--disable-snmp \
-	--disable-statsd \
-	--disable-swap \
-	--disable-table \
-	--disable-tail \
-	--disable-tail_csv \
-	--disable-tape \
-	--disable-target_notification \
-	--disable-target_replace \
-	--disable-target_scale \
-	--disable-target_set \
-	--disable-target_v5upgrade \
-	--disable-tcpconns \
-	--disable-teamspeak2 \
-	--disable-ted \
-	--disable-thermal \
-	--disable-threshold \
-	--disable-tokyotyrant \
-	--disable-unixsock \
-	--disable-uptime \
-	--disable-users \
-	--disable-uuid \
-	--disable-varnish \
-	--disable-vmem \
-	--disable-vserver \
-	--disable-wireless \
-	--disable-write_graphite \
-	--disable-write_http \
-	--disable-write_mongodb \
-	--disable-write_redis \
-	--disable-write_riemann \
-	--disable-xmms \
-	--disable-zfs_arc \
+	--without-libdpdk \
 	--without-perl-bindings
 
+# Plugins
+COLLECTD_ENABLE-				+= aggregation
+COLLECTD_ENABLE-				+= amqp
+COLLECTD_ENABLE-				+= apache
+COLLECTD_ENABLE-				+= apcups
+COLLECTD_ENABLE-				+= apple_sensors
+COLLECTD_ENABLE-				+= aquaero
+COLLECTD_ENABLE-				+= ascent
+COLLECTD_ENABLE-				+= barometer
+COLLECTD_ENABLE-				+= battery
+COLLECTD_ENABLE-				+= bind
+COLLECTD_ENABLE-				+= ceph
+COLLECTD_ENABLE-				+= cgroups
+COLLECTD_ENABLE-				+= chrony
+COLLECTD_ENABLE-				+= conntrack
+COLLECTD_ENABLE-				+= contextswitch
+COLLECTD_ENABLE-$(PTXCONF_COLLECTD_CPU)		+= cpu
+COLLECTD_ENABLE-				+= cpufreq
+COLLECTD_ENABLE-				+= cpusleep
+COLLECTD_ENABLE-				+= csv
+COLLECTD_ENABLE-				+= curl
+COLLECTD_ENABLE-				+= curl_json
+COLLECTD_ENABLE-				+= curl_xml
+COLLECTD_ENABLE-				+= dbi
+COLLECTD_ENABLE-				+= df
+COLLECTD_ENABLE-				+= disk
+COLLECTD_ENABLE-				+= dns
+COLLECTD_ENABLE-				+= dpdkstat
+COLLECTD_ENABLE-				+= drbd
+COLLECTD_ENABLE-				+= email
+COLLECTD_ENABLE-				+= entropy
+COLLECTD_ENABLE-				+= ethstat
+COLLECTD_ENABLE-				+= exec
+COLLECTD_ENABLE-				+= fhcount
+COLLECTD_ENABLE-				+= filecount
+COLLECTD_ENABLE-				+= fscache
+COLLECTD_ENABLE-				+= gmond
+COLLECTD_ENABLE-				+= gps
+COLLECTD_ENABLE-				+= grpc
+COLLECTD_ENABLE-				+= hddtemp
+COLLECTD_ENABLE-				+= hugepages
+COLLECTD_ENABLE-				+= intel_rdt
+COLLECTD_ENABLE-				+= interface
+COLLECTD_ENABLE-				+= ipc
+COLLECTD_ENABLE-				+= ipmi
+COLLECTD_ENABLE-				+= iptables
+COLLECTD_ENABLE-				+= ipvs
+COLLECTD_ENABLE-				+= irq
+COLLECTD_ENABLE-				+= java
+COLLECTD_ENABLE-				+= load
+COLLECTD_ENABLE-				+= log_logstash
+COLLECTD_ENABLE-$(PTXCONF_COLLECTD_LOGFILE)	+= logfile
+COLLECTD_ENABLE-				+= lpar
+COLLECTD_ENABLE-				+= lua
+COLLECTD_ENABLE-				+= lvm
+COLLECTD_ENABLE-				+= madwifi
+COLLECTD_ENABLE-				+= match_empty_counter
+COLLECTD_ENABLE-				+= match_hashed
+COLLECTD_ENABLE-				+= match_regex
+COLLECTD_ENABLE-				+= match_timediff
+COLLECTD_ENABLE-				+= match_value
+COLLECTD_ENABLE-				+= mbmon
+COLLECTD_ENABLE-				+= md
+COLLECTD_ENABLE-				+= memcachec
+COLLECTD_ENABLE-				+= memcached
+COLLECTD_ENABLE-				+= memory
+COLLECTD_ENABLE-				+= mic
+COLLECTD_ENABLE-				+= modbus
+COLLECTD_ENABLE-				+= mqtt
+COLLECTD_ENABLE-				+= multimeter
+COLLECTD_ENABLE-				+= mysql
+COLLECTD_ENABLE-				+= netapp
+COLLECTD_ENABLE-				+= netlink
+COLLECTD_ENABLE-				+= network
+COLLECTD_ENABLE-				+= nfs
+COLLECTD_ENABLE-				+= nginx
+COLLECTD_ENABLE-				+= notify_desktop
+COLLECTD_ENABLE-				+= notify_email
+COLLECTD_ENABLE-				+= notify_nagios
+COLLECTD_ENABLE-				+= ntpd
+COLLECTD_ENABLE-				+= numa
+COLLECTD_ENABLE-				+= nut
+COLLECTD_ENABLE-				+= olsrd
+COLLECTD_ENABLE-				+= onewire
+COLLECTD_ENABLE-				+= openldap
+COLLECTD_ENABLE-				+= openvpn
+COLLECTD_ENABLE-				+= oracle
+COLLECTD_ENABLE-				+= perl
+COLLECTD_ENABLE-				+= pf
+COLLECTD_ENABLE-				+= pinba
+COLLECTD_ENABLE-				+= ping
+COLLECTD_ENABLE-				+= postgresql
+COLLECTD_ENABLE-				+= powerdns
+COLLECTD_ENABLE-				+= processes
+COLLECTD_ENABLE-				+= protocols
+COLLECTD_ENABLE-				+= python
+COLLECTD_ENABLE-				+= redis
+COLLECTD_ENABLE-				+= routeros
+COLLECTD_ENABLE-				+= rrdcached
+COLLECTD_ENABLE-$(PTXCONF_COLLECTD_RRDTOOL)	+= rrdtool
+COLLECTD_ENABLE-$(PTXCONF_COLLECTD_SENSORS)	+= sensors
+COLLECTD_ENABLE-				+= serial
+COLLECTD_ENABLE-				+= sigrok
+COLLECTD_ENABLE-				+= smart
+COLLECTD_ENABLE-				+= snmp
+COLLECTD_ENABLE-				+= statsd
+COLLECTD_ENABLE-				+= swap
+COLLECTD_ENABLE-$(PTXCONF_COLLECTD_SYSLOG)	+= syslog
+COLLECTD_ENABLE-				+= table
+COLLECTD_ENABLE-				+= tail
+COLLECTD_ENABLE-				+= tail_csv
+COLLECTD_ENABLE-				+= tape
+COLLECTD_ENABLE-				+= target_notification
+COLLECTD_ENABLE-				+= target_replace
+COLLECTD_ENABLE-				+= target_scale
+COLLECTD_ENABLE-				+= target_set
+COLLECTD_ENABLE-				+= target_v5upgrade
+COLLECTD_ENABLE-				+= tcpconns
+COLLECTD_ENABLE-				+= teamspeak2
+COLLECTD_ENABLE-				+= ted
+COLLECTD_ENABLE-				+= thermal
+COLLECTD_ENABLE-				+= threshold
+COLLECTD_ENABLE-				+= tokyotyrant
+COLLECTD_ENABLE-				+= turbostat
+COLLECTD_ENABLE-				+= unixsock
+COLLECTD_ENABLE-				+= uptime
+COLLECTD_ENABLE-				+= users
+COLLECTD_ENABLE-				+= uuid
+COLLECTD_ENABLE-				+= varnish
+COLLECTD_ENABLE-				+= virt
+COLLECTD_ENABLE-				+= vmem
+COLLECTD_ENABLE-				+= vserver
+COLLECTD_ENABLE-				+= wireless
+COLLECTD_ENABLE-				+= write_graphite
+COLLECTD_ENABLE-				+= write_http
+COLLECTD_ENABLE-				+= write_kafka
+COLLECTD_ENABLE-				+= write_log
+COLLECTD_ENABLE-				+= write_mongodb
+COLLECTD_ENABLE-				+= write_prometheus
+COLLECTD_ENABLE-				+= write_redis
+COLLECTD_ENABLE-				+= write_riemann
+COLLECTD_ENABLE-				+= write_sensu
+COLLECTD_ENABLE-				+= write_tsdb
+COLLECTD_ENABLE-				+= xencpu
+COLLECTD_ENABLE-				+= xmms
+COLLECTD_ENABLE-				+= zfs_arc
+COLLECTD_ENABLE-				+= zone
+COLLECTD_ENABLE-				+= zookeeper
+
 ifneq ($(call remove_quotes,$(COLLECTD_ENABLE-y)),)
 COLLECTD_CONF_OPT += --enable-$(subst $(space),$(space)--enable-,$(strip $(COLLECTD_ENABLE-y)))
 endif
@@ -198,7 +228,6 @@ $(STATEDIR)/collectd.targetinstall:
 	@$(call install_lib, collectd, 0, 0, 0644, libcollectdclient)
 	@$(call install_copy, collectd, 0, 0, 0755, -, /usr/sbin/collectd)
 	@$(call install_alternative, collectd, 0, 0, 0644, /etc/collectd.conf)
-	@$(call install_copy, collectd, 0, 0, 0644, /etc/collectd)
 	@$(call install_copy, collectd, 0, 0, 0644, -, /usr/share/collectd/types.db)
 	@$(call install_copy, collectd, 0, 0, 0755, /usr/lib/collectd)