From: Florian Forster Date: Fri, 31 Aug 2007 14:08:37 +0000 (+0200) Subject: Merge branch 'collectd-3.11' into collectd-4.0 X-Git-Tag: collectd-4.1.0~5^2~2 X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=2b6176cab4f092354177473bbc74c5cdc2eaa2ec Merge branch 'collectd-3.11' into collectd-4.0 Conflicts: ChangeLog configure.in --- 2b6176cab4f092354177473bbc74c5cdc2eaa2ec diff --cc ChangeLog index 6c9358b6,49e5983c..1c6d8c8d --- a/ChangeLog +++ b/ChangeLog @@@ -1,98 -1,6 +1,100 @@@ +2007-08-26, Version 4.0.7 + * documentation: Some typos have been fixed and some information has + been improved. + * build system: Many fixes for detecting libraries in unusual places, + such as on RedHat systems. The affected libraries are `libcurl', + `libmysql', and `libupsclient'. + * network plugin: Allow the `Port' option to be specified as a number + (i. e. without quotes). + * nut plugin: A fix allows linking the nut plugin against + libupsclient, version >= 2.2.0. - * processes plugin: Fix a potential segmentation fault. + +2007-07-30, Version 4.0.6 + * sensors plugin: Fix the ignorelist functionality: Only the `type + instance' was used to match against the list, but the documentation + told otherwise. This release fixes the code, so it complies with the + documentation. + * syslog plugin: Call `openlog' right when the plugin is loaded, so + configuration messages will end up in the logging facility. + * conrtib/fedora: The contributed specfile for Fedora has been + updated. + +2007-07-05, Version 4.0.5 + * Portability: More fixes for OpenBSD have been included. + +2007-06-24, Version 4.0.4 + * cpu plugin: Fixed the Solaris code. + * dns plugin: Fixed a build issue for OpenBSD. + * interface plugin: Fixed the Solaris code. + * load plugin: Fixed the alternative `/proc' Linux code. + * memory plugin: Fixed the Solaris code. + * oconfig: Don't require `-lfl' anymore. + +2007-06-19, Version 4.0.3 + * cpu plugin: Fix the Darwin / Mac OS X code. + * ping plugin: Use the return value of `getpid', not its address. + * csv, rrdtool plugin: Fixed a bug that prevented an buffer to be + initialized correctly. + * configure: Added `--with-nan-emulation' to aid cross compilation. + +2007-06-12, Version 4.0.2 + * hddtemp and ntpd plugin: Corrected the parsing of port numbers when + they're given in numerically form. + +2007-06-07, Version 4.0.1 + * iptables plugin: A bug in the configuration routine has been fixed. + Setting a comment in the configfile will no longer cause a + segmentation fault. + +2007-06-03, Version 4.0.0 + * collectd: The plugin-infrastructure has been changed to allow for + more types of plugins, namely `write' and `log' plugins. + * collectd: The read-function has been changed to read many plugins in + parallel, using threads. Thus, plugins generally need to use + thread-safe functions from now on. + * collectd: The '-t' command line options allows to perform syntax tests + of the configuration file and exit immediately. + * csv plugin: The new `csv' plugin handles output to `comma separated + values'-files. + * rrdtool plugin: The new `rrdtool' plugin handles output to + RRD-files. Data can be cached to combine multiple updates into one + write to increase IO-performance. + * network plugin: The new `network' plugin handles IO via the network. + It implements a different, much more extensible protocol which can + combine many values in one packet, decreasing the number of UDP- + packets being sent. It can read from and send to the network and + with the appropriate configuration even forward packets to other + networks. + * unixsock plugin: The new `unixsock' plugin provides an interface to + communicate with the daemon while it is running. Right now the + commands `GETVAL' and `PUTVAL' are implemented, but more are to + come. + * perl plugin: The new `perl' plugin allows you to write extensions + for collectd in the scripting-language Perl. + * logfile plugin: The new `logfile' plugin writes logmessages to files + or STDOUT or STDERR. + * syslog plugin: The new `syslog' plugin sends logmessages to the + system's syslog daemon. + * entropy plugin: The new `entropy' plugin collects the amount of + entropy currently being available to the system. + * exec plugin: The new `exec' plugin forks child processes and reads + back values provided by the forked processes. + * iptables plugin: The new `iptables' plugin reads counters from + iptables rules. Thanks to Sjoerd van der Berg for contributing this + plugin. + * irq plugin: The new `irq' plugin collects the IRQ-counters. Thanks + to Peter Holik for contributing this plugin. + * nut plugin: The new `nut' plugin connects the upsd of the `network + ups tools' and reads information about the connected UPS. + * apache plugin: Support for lighttpd's `BusyServers' (aka. + connections) field was added by Florent Monbillard. + * collectd-nagios: The new `collectd-nagios' binary queries values + from collectd, parses them and exits according to Nagios-standards. + * manpages: The manpages have been improved a lot. + + 2007-08-31, Version 3.11.6 + * processes plugin: Fix a potential segmentation fault. + 2007-05-29, Version 3.11.5 * configure: Added `AC_SYS_LARGEFILE' for LFS. * ntpd plugin: Fix a potential buffer overflow. diff --cc src/collectd.conf.pod index cd3fc40b,e0fbb2a2..879c2c34 --- a/src/collectd.conf.pod +++ b/src/collectd.conf.pod @@@ -20,18 -22,19 +20,22 @@@ collectd.conf - Configuration for the s =head1 DESCRIPTION This config file controls how the system statistics collection daemon -B behaves. The most significant options are B, which controlls -if the daemon will act as client, server or will be independent in local mode, -and B which controls which plugins to load. +B behaves. The most significant option is B, which +controls which plugins to load. These plugins ultimately define collectd's +behavior. The syntax of this config file is similar to the config file of the famos -B. Each line containes either a key-value-pair or a +B. Each line contains either a key-value-pair or a section-start or -end. Empty lines and everything after the hash-symbol `#' is -ignored. +ignored. Values are either string, enclosed in double-quotes, +(floating-point-)numbers or a boolean expression, i.Ee. either B or +B. String containing of only alphanumeric characters and underscores do +not need to be quoted. + Please note that B in the library used by collectd to read the + configfile, that will lead to all lines with trailing whitespaces to be + ignored. This problem has been solved in collectdE4.0 and later. + =head1 GLOBAL OPTIONS =over 4