From: Hannu Nyman <redacted>
Date: Sun, 5 Apr 2020 15:14:22 +0000 (+0300)
Subject: Revert "collectd: disable nut plugin temporarily"
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=18cf4a15ca4fc6dcdd4af21dc00c6a55c07c1a9f;p=openwrt-packages.git

Revert "collectd: disable nut plugin temporarily"

This reverts commit 97dbc515e59b09c069d34e9a5dea7e5efec4f077.

libgd has been been fixed to provide correct pkgconfig info,
so that nut again compiles in buildbot. Thus the nut plugin
can be re-enabled in collectd.

Signed-off-by: Hannu Nyman <redacted>
---

diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile
index 5aca2e7d6..4639baedc 100644
--- a/utils/collectd/Makefile
+++ b/utils/collectd/Makefile
@@ -79,7 +79,6 @@ COLLECTD_PLUGINS_DISABLED:= \
 	notify_email \
 	notify_nagios \
 	numa \
-	nut \
 	onewire \
 	openldap \
 	openvz \
@@ -170,6 +169,7 @@ COLLECTD_PLUGINS_SELECTED:= \
 	network \
 	nginx \
 	ntpd \
+	nut \
 	olsrd \
 	openvpn \
 	ping \
@@ -406,7 +406,7 @@ $(eval $(call BuildPlugin,netlink,netlink input,netlink,+PACKAGE_collectd-mod-ne
 $(eval $(call BuildPlugin,network,network input/output,network,+PACKAGE_COLLECTD_ENCRYPTED_NETWORK:libgcrypt))
 $(eval $(call BuildPlugin,nginx,nginx status input,nginx,+PACKAGE_collectd-mod-nginx:libcurl))
 $(eval $(call BuildPlugin,ntpd,NTP daemon status input,ntpd,))
-#$(eval $(call BuildPlugin,nut,UPS monitoring input,nut,+PACKAGE_collectd-mod-nut:nut-common))
+$(eval $(call BuildPlugin,nut,UPS monitoring input,nut,+PACKAGE_collectd-mod-nut:nut-common))
 $(eval $(call BuildPlugin,olsrd,OLSRd status input,olsrd,))
 $(eval $(call BuildPlugin,openvpn,OpenVPN traffic/compression input,openvpn,))
 $(eval $(call BuildPlugin,ping,ping status input,ping,+PACKAGE_collectd-mod-ping:liboping))