From 6ee6a614d8f40648ac4775698859dfe2b8eee70c Mon Sep 17 00:00:00 2001 From: juhosg Date: Fri, 21 Dec 2012 18:25:38 +0000 Subject: [PATCH] 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 Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/packages@34831 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- utils/collectd/Makefile | 2 +- utils/collectd/patches/130-timeleft-max.patch | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 utils/collectd/patches/130-timeleft-max.patch diff --git a/utils/collectd/Makefile b/utils/collectd/Makefile index 6e609b031..d923ab4a6 100644 --- 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 index 000000000..f26315295 --- /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 + -- 2.11.0