From: Florian Forster Date: Wed, 21 Oct 2009 08:21:10 +0000 (+0200) Subject: Merge branch 'collectd-4.8' X-Git-Tag: collectd-4.9.0~48 X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=b3facabd3ed3fa40c81a8122b78daffbbbdf34a6;hp=3dd0749cee604a91aa7204d816fc4974fbcbde36;p=collectd.git Merge branch 'collectd-4.8' --- diff --git a/ChangeLog b/ChangeLog index 83980834..ecc3869d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2009-10-04, Version 4.8.1 + * Build system: Issues when building the iptables plugin have been + fixed. + * exec plugin: Clear the signal block mask before calling exec(2). + * perl plugin: Declare the “environ” variable. This solves build + issues on some platforms. + * processes plugin: Remove unnecessary call of realloc(3). Thanks to + Andrés J. Díaz for the patch. + * unixsock plugin: Fix a (well hidden) race condition related to file + descriptor handling. + 2009-09-13, Version 4.8.0 * collectd: Two new data source types, “DERIVE” and “ABSOLUTE”, have been added. “DERIVE” can be used for counters that are reset @@ -47,6 +58,17 @@ lists, where at least one data source is of type COUNTER and the counter value of all counter data sources is zero. +2009-10-03, Version 4.7.4 + * Build system: Issues when building the iptables plugin have been + fixed. + * exec plugin: Clear the signal block mask before calling exec(2). + * perl plugin: Declare the “environ” variable. This solves build + issues on some platforms. + * processes plugin: Remove unnecessary call of realloc(3). Thanks to + Andrés J. Díaz for the patch. + * unixsock plugin: Fix a (well hidden) race condition related to file + descriptor handling. + 2009-09-13, Version 4.7.3 * collectd: Fix a possible but very rare invalid “free” in the caching code. Thanks to Sebastian Harl for the patch. diff --git a/README b/README index 796fb8ff..d40fd2f0 100644 --- a/README +++ b/README @@ -180,7 +180,7 @@ Features Network UPS tools: UPS current, voltage, power, charge, utilisation, temperature, etc. See upsd(8). - - olsr + - olsrd Queries routing information from the “Optimized Link State Routing” daemon. @@ -480,9 +480,11 @@ Prerequisites * libganglia (optional) Used by the `gmond' plugin to process data received from Ganglia. + * libgcrypt (optional) Used by the `network' plugin for encryption and authentication. + * libhal (optional) If present, the uuid plugin will check for UUID from HAL. @@ -502,9 +504,11 @@ Prerequisites Library that encapsulates the `Java Virtual Machine' (JVM). This library is used by the Java plugin to execute Java bytecode. See “Configuring with libjvm” below. + (and others) * libmemcached (optional) Used by the `memcachec' plugin to connect to a memcache daemon. + * libmysqlclient (optional) Unsurprisingly used by the `mysql' plugin. @@ -567,6 +571,10 @@ Prerequisites and/or Solaris. + * libtokyotyrant (optional) + Used by the tokyotyrant plugin. + + * libupsclient/nut (optional) For the `nut' plugin which queries nut's `upsd'. diff --git a/configure.in b/configure.in index 9ab3006e..b3d9516e 100644 --- a/configure.in +++ b/configure.in @@ -1589,7 +1589,7 @@ then if test -d "$with_java_home" then AC_MSG_CHECKING([for jni.h]) - TMPDIR=`find -L "$with_java_home" -name jni.h -type f -exec 'dirname' '{}' ';' | head -n 1` + TMPDIR=`find "$with_java_home" -name jni.h -type f -exec 'dirname' '{}' ';' | head -n 1` if test "x$TMPDIR" != "x" then AC_MSG_RESULT([found in $TMPDIR]) @@ -1599,7 +1599,7 @@ then fi AC_MSG_CHECKING([for jni_md.h]) - TMPDIR=`find -L "$with_java_home" -name jni_md.h -type f -exec 'dirname' '{}' ';' | head -n 1` + TMPDIR=`find "$with_java_home" -name jni_md.h -type f -exec 'dirname' '{}' ';' | head -n 1` if test "x$TMPDIR" != "x" then AC_MSG_RESULT([found in $TMPDIR]) @@ -1609,7 +1609,7 @@ then fi AC_MSG_CHECKING([for libjvm.so]) - TMPDIR=`find -L "$with_java_home" -name libjvm.so -type f -exec 'dirname' '{}' ';' | head -n 1` + TMPDIR=`find "$with_java_home" -name libjvm.so -type f -exec 'dirname' '{}' ';' | head -n 1` if test "x$TMPDIR" != "x" then AC_MSG_RESULT([found in $TMPDIR]) @@ -1621,7 +1621,7 @@ then if test "x$JAVAC" = "x" then AC_MSG_CHECKING([for javac]) - TMPDIR=`find -L "$with_java_home" -name javac -type f | head -n 1` + TMPDIR=`find "$with_java_home" -name javac -type f | head -n 1` if test "x$TMPDIR" != "x" then JAVAC="$TMPDIR" diff --git a/src/collectd-snmp.pod b/src/collectd-snmp.pod index f34113d9..51e04813 100644 --- a/src/collectd-snmp.pod +++ b/src/collectd-snmp.pod @@ -184,7 +184,7 @@ This value is not applied to counter-values. I is added to gauge-values returned by the SNMP-agent after they have been multiplied by any B value. If, for example, a thermometer returns degrees Kelvin you could specify a shift of B<273.15> here to store values in -degrees Celsius. The default value is is course B<0.0>. +degrees Celsius. The default value is of course B<0.0>. This value is not applied to counter-values. diff --git a/src/collectd.conf.in b/src/collectd.conf.in index 11ae7485..ad13353f 100644 --- a/src/collectd.conf.in +++ b/src/collectd.conf.in @@ -82,6 +82,7 @@ FQDNLookup true #@BUILD_PLUGIN_JAVA_TRUE@LoadPlugin java #@BUILD_PLUGIN_LIBVIRT_TRUE@LoadPlugin libvirt @BUILD_PLUGIN_LOAD_TRUE@@BUILD_PLUGIN_LOAD_TRUE@LoadPlugin load +#@BUILD_PLUGIN_MADWIFI_TRUE@LoadPlugin madwifi #@BUILD_PLUGIN_MBMON_TRUE@LoadPlugin mbmon #@BUILD_PLUGIN_MEMCACHEC_TRUE@LoadPlugin memcachec #@BUILD_PLUGIN_MEMCACHED_TRUE@LoadPlugin memcached @@ -360,6 +361,17 @@ FQDNLookup true # HostnameFormat name # +# +# Interface "wlan0" +# IgnoreSelected false +# Source "SysFS" +# WatchSet "None" +# WatchAdd "node_octets" +# WatchAdd "node_rssi" +# WatchAdd "is_rx_acl" +# WatchAdd "is_scan_active" +# + # # Host "127.0.0.1" # Port "411" @@ -727,6 +739,7 @@ FQDNLookup true ############################################################################## # Load required matches: +#@BUILD_PLUGIN_MATCH_EMPTY_COUNTER_TRUE@LoadPlugin match_empty_counter #@BUILD_PLUGIN_MATCH_REGEX_TRUE@LoadPlugin match_regex #@BUILD_PLUGIN_MATCH_VALUE_TRUE@LoadPlugin match_value #@BUILD_PLUGIN_MATCH_TIMEDIFF_TRUE@LoadPlugin match_timediff diff --git a/src/gmond.c b/src/gmond.c index 3357ea0b..2ffc42a5 100644 --- a/src/gmond.c +++ b/src/gmond.c @@ -542,9 +542,9 @@ static int staging_entry_update (const char *host, const char *name, /* {{{ */ else if (ds_type == DS_TYPE_GAUGE) se->vl.values[ds_index].gauge = value.gauge; else if (ds_type == DS_TYPE_DERIVE) - se->vl.values[ds_index].DERIVE += value.derive; + se->vl.values[ds_index].derive += value.derive; else if (ds_type == DS_TYPE_ABSOLUTE) - se->vl.values[ds_index].ABSOLUTE = value.absolute; + se->vl.values[ds_index].absolute = value.absolute; se->flags |= (0x01 << ds_index); diff --git a/version-gen.sh b/version-gen.sh index f2c61f54..e0114d04 100755 --- a/version-gen.sh +++ b/version-gen.sh @@ -1,6 +1,6 @@ #!/bin/sh -DEFAULT_VERSION="4.8.0.git" +DEFAULT_VERSION="4.8.1.git" VERSION="`git describe 2> /dev/null | sed -e 's/^collectd-//'`"