Merge branch 'pull/collectd-4' into collectd-4

diff --git a/AUTHORS b/AUTHORS
index b10958b..2539108 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -10,6 +10,9 @@ cpufreq, multimeter and irq module by:
 hddtemp module by:
   Vincent Stehlé <vincent.stehle at free.fr>
 
+iptables module by:
+  Sjoerd van der Berg <harekiet at gmail.com>
+
 mbmon plugin by:
   Flavio Stanchina <flavio at stanchina.net>
 

diff --git a/ChangeLog b/ChangeLog
index 5fac3d6..6629ab0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,43 @@
+2007-04-02, 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.
+       * csv plugin: The new `csv' plugin handles output to `comma seperated
+         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.
+       * 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 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.
+         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.
 
 2007-03-30, Version 3.11.3
        * configure: Have the configure-script define `HAVE_LIBKSTAT' instead

diff --git a/Makefile.am b/Makefile.am
index 5015b66..34c36cc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = libltdl src
 
 INCLUDES = $(LTDLINCL)
 
-EXTRA_DIST = collectd.spec contrib
+EXTRA_DIST = contrib
 
 dist-hook:
        find $(distdir) -type d -name '.svn' | xargs rm -rf

diff --git a/configure.in b/configure.in
index 5d34652..5166ad1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(collectd, 3.11.3)
+AC_INIT(collectd, 4.0.0-rc0)
 AC_CONFIG_SRCDIR(src/collectd.c)
 AC_CONFIG_HEADERS(src/config.h)
 AM_INIT_AUTOMAKE(dist-bzip2)