From: Florian Forster Date: Sat, 21 Jan 2012 17:26:17 +0000 (+0100) Subject: Merge branch 'collectd-5.0' X-Git-Tag: collectd-5.1.0~45 X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=3dffa6fb50c66249fb3da7592c7a9385edb74677;hp=-c;p=collectd.git Merge branch 'collectd-5.0' --- 3dffa6fb50c66249fb3da7592c7a9385edb74677 diff --combined ChangeLog index 234a3113,4642da9b..2e6b6e97 --- a/ChangeLog +++ b/ChangeLog @@@ -1,3 -1,54 +1,54 @@@ + 2012-01-21, Version 5.0.2 + * curl_xml plugin: Fix handling of file:// and other URLs (which don't + follow HTTP status codes). Thanks to Fabien Wernli for his patch! + * df plugin: Fix handling of negative "available" counts. This can + occur with some file systems, for example UFS. Thanks to Toni Ylenius + for his patch. + * interface plugin: "mac" interfaces are now ignored on Solaris. These + pseudo-interfaces occur multiple times, causing warnings. Also switch + to 64-bit counters on Solaris, improving overflow behavior for + high-speed interfaces. Thanks to Eddy Geez and Fabien Wernli for + their patches. + * memory plugin: Account kernel and unused memory under Solaris. Thanks + to Fabien Wernli for his patch. + * network plugin: A bug in the interaction between the Network plugin + and filter chains has been fixed: When a filter modified a field such + as the hostname, subsequent values in the same network packets could + have ended up using the modified name rather than the original name. + Thanks to Sebastian Harl for identifying the problem. + * oracle plugin: A memory leak has been fixed in the parameter handling. + * python plugin: A memory leak has been fixed. Thanks to Sven Trenkel + for fixing this bug! + + 2011-10-07, Version 5.0.1 + * collectd: A mutex leak has been fixed in the meta data code. Thanks + to Rafal Lesniak for his patch. + * collectd: Compatibility fixes for GCC 4.6 have been applied. Thanks + to Peter Green for his patch. + * csv plugin: The line buffer size has been increased. Thanks to Colin + McCabe for the patch. + * curl_json plugin: Don't use the "parent" node to build the type + instance, if it is empty. Compatibility with libyajl 2 has been + added. Thanks to "spupykin" of the Arch Linux project for the initial + code. Formatting of time has been fixed in the JSON module. + * exec plugin: Fix the timestamp value passed to notification scripts. + Thanks to Alexander Kovalenko for fixing this. + * iptables plugin: Fix linking with some versions of libiptc. + * irq plugin: Fix support for interrupts under Linux. The old code + assumed that interrupts have a numeric value -- this is no longer + true for Linux. Thanks to Bostjan Skufca for implementing this. + * notify_desktop plugin: Compatibility with libnotify 0.7 has been + added. Thanks to Samuli Suominen for his patch. + * processes plugin: Fix handling of regular expressions containing + spaces. Thanks for Sebastian Harl for fixing this. + * rrdtool, rrdcached plugins: Improve precision of the XFF parameter. + Previously, values like 0.999 would have been rounded to 1.0. Thanks + to Francois-Xavier Bourlet for fixing this. + * varnish plugin: Fix data type handling of some metrics. Some values + were submitted as gauge even though they were derives. + * Various plugin: Set a multi-threading flag in libcurl. Thanks to Mike + Flisher for the fix. + 2011-03-28, Version 5.0.0 * collectd: The "FQDNLookup" option is now enabled by default. * collectd: The internal representation of time has been changed to @@@ -43,7 -94,7 +94,7 @@@ technique of POWER CPUs. Thanks to Aurélien Reynaud for his code and patience. * modbus plugin: Support for libmodbus 2.9.2 has been added and the - license has been changes to LGPLv2.1. + license has been changed to LGPLv2.1. * mysql plugin: Backwards compatibility code has been removed. The data sets used have been improved. * network plugin: The default buffer size has been increased to @@@ -68,6 -119,53 +119,53 @@@ * v5upgrade target: Target for converting v4 data sets to the v5 schema. + 2012-01-21, Version 4.10.5 + * curl_xml plugin: Fix handling of file:// and other URLs (which don't + follow HTTP status codes). Thanks to Fabien Wernli for his patch! + * df plugin: Fix handling of negative "available" counts. This can + occur with some file systems, for example UFS. Thanks to Toni Ylenius + for his patch. + * interface plugin: "mac" interfaces are now ignored on Solaris. These + pseudo-interfaces occur multiple times, causing warnings. Also switch + to 64-bit counters on Solaris, improving overflow behavior for + high-speed interfaces. Thanks to Eddy Geez and Fabien Wernli for + their patches. + * memory plugin: Account kernel and unused memory under Solaris. Thanks + to Fabien Wernli for his patch. + * network plugin: A bug in the interaction between the Network plugin + and filter chains has been fixed: When a filter modified a field such + as the hostname, subsequent values in the same network packets could + have ended up using the modified name rather than the original name. + Thanks to Sebastian Harl for identifying the problem. + * oracle plugin: A memory leak has been fixed in the parameter handling. + * python plugin: A memory leak has been fixed. Thanks to Sven Trenkel + for fixing this bug! + + 2011-10-14, Version 4.10.4 + * collectd: A mutex leak has been fixed in the meta data code. Thanks + to Rafal Lesniak for his patch. + * collectd: Compatibility fixes for GCC 4.6 have been applied. Thanks + to Peter Green for his patch. + * csv plugin: The line buffer size has been increased. Thanks to Colin + McCabe for the patch. + * curl_json plugin: Don't use the "parent" node to build the type + instance, if it is empty. Compatibility with libyajl 2 has been + added. Thanks to "spupykin" of the Arch Linux project for the initial + code. + * iptables plugin: Fix linking with some versions of libiptc. + * irq plugin: Fix support for interrupts under Linux. The old code + assumed that interrupts have a numeric value -- this is no longer + true for Linux. Thanks to Bostjan Skufca for implementing this. + * notify_desktop plugin: Compatibility with libnotify 0.7 has been + added. Thanks to Samuli Suominen for his patch. + * processes plugin: Fix handling of regular expressions containing + spaces. Thanks for Sebastian Harl for fixing this. + * rrdtool, rrdcached plugins: Improve precision of the XFF parameter. + Previously, values like 0.999 would have been rounded to 1.0. Thanks + to Francois-Xavier Bourlet for fixing this. + * Various plugin: Set a multi-threading flag in libcurl. Thanks to Mike + Flisher for the fix. + 2011-03-26, Version 4.10.3 * Documentation: Several updates and additions. Thanks to Sebastian Harl. * collectd: Build issues (compiler warnings) have been fixed. Thanks to diff --combined src/collectd.conf.in index 94cf2a93,f514f4a7..33e9660c --- a/src/collectd.conf.in +++ b/src/collectd.conf.in @@@ -108,14 -108,18 +108,18 @@@ #@BUILD_PLUGIN_ONEWIRE_TRUE@LoadPlugin onewire #@BUILD_PLUGIN_OPENVPN_TRUE@LoadPlugin openvpn #@BUILD_PLUGIN_ORACLE_TRUE@LoadPlugin oracle - #@BUILD_PLUGIN_PERL_TRUE@LoadPlugin perl + #@BUILD_PLUGIN_PERL_TRUE@ + #@BUILD_PLUGIN_PERL_TRUE@ Globals true + #@BUILD_PLUGIN_PERL_TRUE@ #@BUILD_PLUGIN_PINBA_TRUE@LoadPlugin pinba #@BUILD_PLUGIN_PING_TRUE@LoadPlugin ping #@BUILD_PLUGIN_POSTGRESQL_TRUE@LoadPlugin postgresql #@BUILD_PLUGIN_POWERDNS_TRUE@LoadPlugin powerdns #@BUILD_PLUGIN_PROCESSES_TRUE@LoadPlugin processes #@BUILD_PLUGIN_PROTOCOLS_TRUE@LoadPlugin protocols - #@BUILD_PLUGIN_PYTHON_TRUE@LoadPlugin python + #@BUILD_PLUGIN_PYTHON_TRUE@ + #@BUILD_PLUGIN_PYTHON_TRUE@ Globals true + #@BUILD_PLUGIN_PYTHON_TRUE@ #@BUILD_PLUGIN_REDIS_TRUE@LoadPlugin redis #@BUILD_PLUGIN_ROUTEROS_TRUE@LoadPlugin routeros #@BUILD_PLUGIN_RRDCACHED_TRUE@LoadPlugin rrdcached @@@ -842,10 -846,6 +846,10 @@@ # # +# +# ReportByDevice false +# + # # # Instance "slabinfo" diff --combined src/collectd.conf.pod index b0f8dfea,3d811105..91a8493a --- a/src/collectd.conf.pod +++ b/src/collectd.conf.pod @@@ -823,7 -823,7 +823,7 @@@ The B uses B In the B block, there may be one or more B blocks, each defining a - URL to be fetched via HTTP (using libcurl). Within each B block there are + URL to be fetched using libcurl. Within each B block there are options which specify the connection parameters, for example authentication information, and one or more B blocks. @@@ -1933,11 -1933,11 +1933,11 @@@ Configures the base register to read fr B has been set to B or B, this and the next register will be read (the register number is increased by one). -=item B B|B|B +=item B B|B|B|B|B -Specifies what kind of data is returned by the device. If the type is B -or B, two 16Ebit registers will be read and the data is combined -into one value. Defaults to B. +Specifies what kind of data is returned by the device. If the type is B, +B or B, two 16Ebit registers will be read and the data is +combined into one value. Defaults to B. =item B I @@@ -4177,19 -4177,19 +4177,19 @@@ L. Please see there f =head2 Plugin C The I collects information about used and available swap space. On -I, the following options are available: +I and I, the following options are available: =over 4 =item B B|B -Configures how to report physical swap devices. If set to B is used (the +Configures how to report physical swap devices. If set to B (the default), the summary over all swap devices is reported only, i.e. the globally used and available space over all devices. If B is configured, the used and available space of each device will be reported separately. -This option is only available if the I can use the L -mechanism under I. +This option is only available if the I can read C +(under Linux) or use the L mechanism (under I). =back