Browse Source

collectd: add option for sensors plugin

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Peter Korsgaard 11 years ago
parent
commit
7c611d5b52
2 changed files with 9 additions and 1 deletions
  1. 6 0
      package/collectd/Config.in
  2. 3 1
      package/collectd/collectd.mk

+ 6 - 0
package/collectd/Config.in

@@ -277,6 +277,12 @@ config BR2_PACKAGE_COLLECTD_PROTOCOLS
 	help
 	help
 	  Collects information about the network protocols.
 	  Collects information about the network protocols.
 
 
+config BR2_PACKAGE_COLLECTD_SENSORS
+	bool "sensors"
+	select BR2_PACKAGE_LM_SENSORS
+	help
+	  Collects data from lm-sensors.
+
 config BR2_PACKAGE_COLLECTD_SERIAL
 config BR2_PACKAGE_COLLECTD_SERIAL
 	bool "serial"
 	bool "serial"
 	help
 	help

+ 3 - 1
package/collectd/collectd.mk

@@ -18,7 +18,7 @@ COLLECTD_PLUGINS_DISABLE = amqp apple_sensors aquaero ascent dbi email \
 		memcachec modbus multimeter netapp netlink nginx \
 		memcachec modbus multimeter netapp netlink nginx \
 		notify_desktop notify_email numa nut onewire oracle perl pf \
 		notify_desktop notify_email numa nut onewire oracle perl pf \
 		pinba postgresql powerdns python redis routeros rrdcached \
 		pinba postgresql powerdns python redis routeros rrdcached \
-		sensors sigrok tape target_v5upgrade teamspeak2 ted \
+		sigrok tape target_v5upgrade teamspeak2 ted \
 		tokyotyrant uuid varnish vserver write_mongodb write_redis \
 		tokyotyrant uuid varnish vserver write_mongodb write_redis \
 		xmms zfs_arc
 		xmms zfs_arc
 
 
@@ -74,6 +74,7 @@ COLLECTD_CONF_OPT += --with-nan-emulation --with-fp-layout=nothing \
 	$(if $(BR2_PACKAGE_COLLECTD_RIEMANN),--enable-write_riemann,--disable-write_riemann) \
 	$(if $(BR2_PACKAGE_COLLECTD_RIEMANN),--enable-write_riemann,--disable-write_riemann) \
 	$(if $(BR2_PACKAGE_COLLECTD_RRDTOOL),--enable-rrdtool,--disable-rrdtool) \
 	$(if $(BR2_PACKAGE_COLLECTD_RRDTOOL),--enable-rrdtool,--disable-rrdtool) \
 	$(if $(BR2_PACKAGE_COLLECTD_SCALE),--enable-target_scale,--disable-target_scale) \
 	$(if $(BR2_PACKAGE_COLLECTD_SCALE),--enable-target_scale,--disable-target_scale) \
+	$(if $(BR2_PACKAGE_COLLECTD_SENSORS),--enable-sensors,--disable-sensors) \
 	$(if $(BR2_PACKAGE_COLLECTD_SERIAL),--enable-serial,--disable-serial) \
 	$(if $(BR2_PACKAGE_COLLECTD_SERIAL),--enable-serial,--disable-serial) \
 	$(if $(BR2_PACKAGE_COLLECTD_STATSD),--enable-statsd,--disable-statsd) \
 	$(if $(BR2_PACKAGE_COLLECTD_STATSD),--enable-statsd,--disable-statsd) \
 	$(if $(BR2_PACKAGE_COLLECTD_SET),--enable-target_set,--disable-target_set) \
 	$(if $(BR2_PACKAGE_COLLECTD_SET),--enable-target_set,--disable-target_set) \
@@ -108,6 +109,7 @@ COLLECTD_DEPENDENCIES = host-pkgconf \
 	$(if $(BR2_PACKAGE_COLLECTD_PING),liboping) \
 	$(if $(BR2_PACKAGE_COLLECTD_PING),liboping) \
 	$(if $(BR2_PACKAGE_COLLECTD_RIEMANN),protobuf-c) \
 	$(if $(BR2_PACKAGE_COLLECTD_RIEMANN),protobuf-c) \
 	$(if $(BR2_PACKAGE_COLLECTD_RRDTOOL),rrdtool) \
 	$(if $(BR2_PACKAGE_COLLECTD_RRDTOOL),rrdtool) \
+	$(if $(BR2_PACKAGE_COLLECTD_SENSORS),lm-sensors) \
 	$(if $(BR2_PACKAGE_COLLECTD_SNMP),netsnmp) \
 	$(if $(BR2_PACKAGE_COLLECTD_SNMP),netsnmp) \
 	$(if $(BR2_PACKAGE_COLLECTD_WRITEHTTP),libcurl)
 	$(if $(BR2_PACKAGE_COLLECTD_WRITEHTTP),libcurl)