Signed-off-by: Clemens Gruber <clemens.gru...@pqgruber.com>
---
projectroot/etc/collectd.d/sensors.conf | 1 +
rules/collectd.in | 9 +++++++-
rules/collectd.make | 39 +++++++++++++++++++++++++++------
3 files changed, 41 insertions(+), 8 deletions(-)
create mode 100644 projectroot/etc/collectd.d/sensors.conf
diff --git a/projectroot/etc/collectd.d/sensors.conf
b/projectroot/etc/collectd.d/sensors.conf
new file mode 100644
index 0000000..2dc3ffe
--- /dev/null
+++ b/projectroot/etc/collectd.d/sensors.conf
@@ -0,0 +1 @@
+LoadPlugin sensors
diff --git a/rules/collectd.in b/rules/collectd.in
index bff2cb5..ba359f0 100644
--- a/rules/collectd.in
+++ b/rules/collectd.in
@@ -2,7 +2,8 @@
menuconfig COLLECTD
tristate
- select RRDTOOL if COLLECTD_RRDTOOL
+ select RRDTOOL if COLLECTD_RRDTOOL
+ select LM_SENSORS if COLLECTD_SENSORS
prompt "collectd "
help
collectd is a daemon which collects system performance statistics
@@ -43,4 +44,10 @@ config COLLECTD_CPU
The CPU plugin collects data about what your CPU is actually doing,
and if it is being idle or in the various states.
+config COLLECTD_SENSORS
+ bool
+ prompt "sensors"
+ help
+ The Sensors plugin uses lm-sensors to read hardware sensors.
+
endif
diff --git a/rules/collectd.make b/rules/collectd.make
index 2ef50e7..61f3dca 100644
--- a/rules/collectd.make
+++ b/rules/collectd.make
@@ -16,11 +16,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
@@ -33,6 +33,7 @@ COLLECTD_ENABLE-$(PTXCONF_COLLECTD_LOGFILE) += logfile
COLLECTD_ENABLE-$(PTXCONF_COLLECTD_SYSLOG) += syslog
COLLECTD_ENABLE-$(PTXCONF_COLLECTD_RRDTOOL) += rrdtool
COLLECTD_ENABLE-$(PTXCONF_COLLECTD_CPU) += cpu
+COLLECTD_ENABLE-$(PTXCONF_COLLECTD_SENSORS) += sensors
# 'noyywrap' is set, so no lex library is needed
COLLECTD_CONF_ENV := \
@@ -46,8 +47,8 @@ COLLECTD_CONF_TOOL := autoconf
COLLECTD_CONF_OPT := $(CROSS_AUTOCONF_USR) \
$(GLOBAL_LARGE_FILE_OPTION) \
--disable-standards \
- --disable-glibtest \
--disable-debug \
+ --disable-xfs \
--enable-daemon \
--disable-getifaddrs \
--disable-all-plugins \
@@ -62,20 +63,26 @@ COLLECTD_CONF_OPT := $(CROSS_AUTOCONF_USR) \
--disable-apple_sensors \
--disable-aquaero \
--disable-ascent \
+ --disable-barometer \
--disable-battery \
--disable-bind \
+ --disable-ceph \
+ --disable-cgroups \
+ --disable-chrony \
--disable-conntrack \
--disable-contextswitch \
--disable-cpufreq \
+ --disable-cpusleep \
--disable-csv \
--disable-curl \
--disable-curl_json \
--disable-curl_xml \
- --disable-cgroups \
--disable-dbi \
--disable-df \
--disable-disk \
--disable-dns \
+ --disable-dpdkstat \
+ --disable-drbd \
--disable-email \
--disable-entropy \
--disable-ethstat \
@@ -83,16 +90,22 @@ COLLECTD_CONF_OPT := $(CROSS_AUTOCONF_USR) \
--disable-filecount \
--disable-fscache \
--disable-gmond \
+ --disable-gps \
+ --disable-grpc \
--disable-hddtemp \
+ --disable-hugepages \
+ --disable-intel_rdt \
--disable-interface \
+ --disable-ipc \
--disable-ipmi \
--disable-iptables \
--disable-ipvs \
--disable-irq \
--disable-java \
- --disable-libvirt \
--disable-load \
+ --disable-log_logstash \
--disable-lpar \
+ --disable-lua \
--disable-lvm \
--disable-madwifi \
--disable-match_empty_counter \
@@ -107,6 +120,7 @@ COLLECTD_CONF_OPT := $(CROSS_AUTOCONF_USR) \
--disable-memory \
--disable-mic \
--disable-modbus \
+ --disable-mqtt \
--disable-multimeter \
--disable-mysql \
--disable-netapp \
@@ -116,11 +130,13 @@ COLLECTD_CONF_OPT := $(CROSS_AUTOCONF_USR) \
--disable-nginx \
--disable-notify_desktop \
--disable-notify_email \
+ --disable-notify_nagios \
--disable-ntpd \
--disable-numa \
--disable-nut \
--disable-olsrd \
--disable-onewire \
+ --disable-openldap \
--disable-openvpn \
--disable-oracle \
--disable-perl \
@@ -135,9 +151,9 @@ COLLECTD_CONF_OPT := $(CROSS_AUTOCONF_USR) \
--disable-redis \
--disable-routeros \
--disable-rrdcached \
- --disable-sensors \
--disable-serial \
--disable-sigrok \
+ --disable-smart \
--disable-snmp \
--disable-statsd \
--disable-swap \
@@ -156,21 +172,31 @@ COLLECTD_CONF_OPT := $(CROSS_AUTOCONF_USR) \
--disable-thermal \
--disable-threshold \
--disable-tokyotyrant \
+ --disable-turbostat \
--disable-unixsock \
--disable-uptime \
--disable-users \
--disable-uuid \
--disable-varnish \
+ --disable-virt \
--disable-vmem \
--disable-vserver \
--disable-wireless \
--disable-write_graphite \
--disable-write_http \
+ --disable-write_kafka \
--disable-write_mongodb \
+ --disable-write_prometheus \
--disable-write_redis \
--disable-write_riemann \
+ --disable-write_sensu \
+ --disable-write_tsdb \
+ --disable-xencpu \
--disable-xmms \
--disable-zfs_arc \
+ --disable-zone \
+ --disable-zonekeeper \
+ --without-libdpdk \
--without-perl-bindings
ifneq ($(call remove_quotes,$(COLLECTD_ENABLE-y)),)
@@ -198,7 +224,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)
--
2.10.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
