collectd: remove bogus maximum of 3600 seconds for 'timeleft'

The apcups and snmp plugins were using this to store time in minutes, but
nut uses seconds. Upstream wants to make them all use seconds (unlike my
first patch to make nut use minutes to be consistent with the others), so
all we need to do is fix the maximum. If we were *using* the apcups and
snmp plugins, those would probably want fixing to multiply by 60.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 34831

diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile
index 6e609b03162243d452cd55a9c52df03efca4fca1..d923ab4a68566aea983be0ec522d005bfad31ec2 100644 (file)
--- a/utils/collectd/Makefile
+++ b/utils/collectd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=collectd
 PKG_VERSION:=4.10.8
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://collectd.org/files/

diff --git a/utils/collectd/patches/130-timeleft-max.patch b/utils/collectd/patches/130-timeleft-max.patch
new file mode 100644 (file)
index 0000000..f263152
--- /dev/null
+++ b/utils/collectd/patches/130-timeleft-max.patch
@@ -0,0 +1,14 @@
+Derived from uptream commit d5b09f2b: http://octo.cx/d5b09f2
+
+--- a/src/types.db
++++ b/src/types.db
+@@ -152,7 +152,7 @@ tcp_connections            value:GAUGE:0:429496729
+ temperature           value:GAUGE:-273.15:U
+ threads                       value:GAUGE:0:U
+ time_dispersion               seconds:GAUGE:-1000000:1000000
+-timeleft              timeleft:GAUGE:0:3600
++timeleft              timeleft:GAUGE:0:U
+ time_offset           seconds:GAUGE:-1000000:1000000
+ total_bytes           value:DERIVE:0:U
+ total_requests                value:DERIVE:0:U
+