Merge branch 'collectd-4.6' into collectd-4.7

Conflicts:
	ChangeLog
	src/collectd.conf.pod
	version-gen.sh

diff --git a/ChangeLog b/ChangeLog
index 3fdf0ca99885c922396659da364e270a11c6452c..ff1f8dddbfad91b168baf138eb3974211112823c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -42,26 +42,29 @@
        * uptime plugin: The new uptime plugin can collect the server's
          uptime. Thanks to Marco Chiappero for the patch.
 
-2009-05-09, Version 4.5.4
+2009-06-02, Version 4.6.3
        * Build system, various plugins: Many build fixes for FreeBSD,
          OpenBSD, NetBSD, Solaris and Mac OS X. Big thanks to Doug MacEachern
          for many fixes and providing a build system for many platforms,
          Ulf Zimmermann for providing a FreeBSD system and Simon Kuhnle for
          providing an OpenBSD system.
-       * collectd: Fix a potential race condition when creating directories.
+       * collectd: Two bugs with the threshold checking have been fixed. The
+         first one prevented thresholds to be checked at all, the second one
+         caused wrong behavior with the persistency option. Thanks to Andrés
+         J. Díaz for fixing these problems.
+       * collectd: Handling of the `Include' configuration option has been
+         fixed.
        * battery plugin: Don't complain about a missing directory every
          interval.
-       * dns plugin: Slight portability fixes.
        * exec plugin: Allow executed programs to close STDERR. Thanks to
          Thorsten von Eicken for reporting this problem.
        * irq plugin: Fix handling of overflowing 32-bit counters. Thanks to
          Tomasz Pala for the patch.
        * perl plugin: Portability build-fixes. Thanks to Doug MacEachern for
          the patch.
-       * rrdtool plugin: Fix a possible race condition: If the network plugin
-         is initialized and dispatches a value before the rrdtool plugin is
-         initialized, the daemon may crash.
        * memory plugin: Fix a potential problem under Solaris.
+       * swap plugin: A work-around for 32-bit Solaris has been added. Thanks
+         to Doug MacEachern for the patch.
 
 2009-03-18, Version 4.6.2
        * collectd: Some Solaris utility code has been improved.
@@ -162,6 +165,27 @@
        * swap plugin: Code for OpenBSD (and possibly other *BSDs) has been
          added.
 
+2009-05-09, Version 4.5.4
+       * Build system, various plugins: Many build fixes for FreeBSD,
+         OpenBSD, NetBSD, Solaris and Mac OS X. Big thanks to Doug MacEachern
+         for many fixes and providing a build system for many platforms,
+         Ulf Zimmermann for providing a FreeBSD system and Simon Kuhnle for
+         providing an OpenBSD system.
+       * collectd: Fix a potential race condition when creating directories.
+       * battery plugin: Don't complain about a missing directory every
+         interval.
+       * dns plugin: Slight portability fixes.
+       * exec plugin: Allow executed programs to close STDERR. Thanks to
+         Thorsten von Eicken for reporting this problem.
+       * irq plugin: Fix handling of overflowing 32-bit counters. Thanks to
+         Tomasz Pala for the patch.
+       * perl plugin: Portability build-fixes. Thanks to Doug MacEachern for
+         the patch.
+       * rrdtool plugin: Fix a possible race condition: If the network plugin
+         is initialized and dispatches a value before the rrdtool plugin is
+         initialized, the daemon may crash.
+       * memory plugin: Fix a potential problem under Solaris.
+
 2009-02-22, Version 4.5.3
        * build system: The check for libupsclient even when `pkg-config' is
          not available.

diff --git a/src/collectd.conf.in b/src/collectd.conf.in
index 4cbaca8ef9c9c4262d5bff937ed3888c5ee7fb94..382d6d3e74db7539755c0756b0bf461695539744 100644 (file)
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@ -281,6 +281,15 @@ FQDNLookup   true
 #      IgnoreSelected false
 #</Plugin>
 
+#<Plugin ipmi>
+#      Sensor "some_sensor"
+#      Sensor "another_one"
+#      IgnoreSelected false
+#      NotifySensorAdd false
+#      NotifySensorRemove true
+#      NotifySensorNotPresent false
+#</Plugin>
+
 #<Plugin iptables>
 #      Chain table chain
 #</Plugin>

diff --git a/src/collectd.conf.pod b/src/collectd.conf.pod
index 899daf11fa8e7371099df16ac344bc1445779947..97093c85d11c8cf69e2bd19c2324abe773ba0a7f 100644 (file)
--- a/src/collectd.conf.pod
+++ b/src/collectd.conf.pod
@@ -2171,7 +2171,7 @@ L<http://www.postgresql.org/docs/manuals/>.
 The B<Query> block defines one database query which may later be used by a
 database definition. It accepts a single mandatory argument which specifies
 the name of the query. The names of all queries have to be unique (see the
-B<MinPGVersion> and B<MaxPGVersion> options below for an exception to this
+B<MinVersion> and B<MaxVersion> options below for an exception to this
 rule). The following configuration options are available to define the query:
 
 In each B<Query> block, there is one or more B<Result> blocks. B<Result>
@@ -2290,9 +2290,9 @@ The order of the B<Column> options defines which columns of the query result
 should be used. The first option specifies the data found in the first column,
 the second option that of the second column, and so on.
 
-=item B<MinPGVersion> I<version>
+=item B<MinVersion> I<version>
 
-=item B<MaxPGVersion> I<version>
+=item B<MaxVersion> I<version>
 
 Specify the minimum or maximum version of PostgreSQL that this query should be
 used with. Some statistics might only be available with certain versions of
@@ -2304,6 +2304,13 @@ The I<version> has to be specified as the concatenation of the major, minor
 and patch-level versions, each represented as two-decimal-digit numbers. For
 example, version 8.2.3 will become 80203.
 
+=item B<MinPGVersion> I<version>
+
+=item B<MaxPGVersion> I<version>
+
+These are deprecated synonyms for B<MinVersion> and B<MaxVersion>
+respectively. They will be removed in version 5 of collectd.
+
 =back
 
 The following predefined queries are available (the definitions can be found

diff --git a/src/configfile.c b/src/configfile.c
index 0e28e92f9ed0d2e526d768e87f539794b3b5aa5a..53f3314a31113f628f57abe2dc9c7a8a4035281d 100644 (file)
--- a/src/configfile.c
+++ b/src/configfile.c
@@ -378,12 +378,12 @@ static int cf_ci_replace_child (oconfig_item_t *dst, oconfig_item_t *src,
        temp = NULL;
 
        /* If (src->children_num == 0) the array size is decreased. If offset
-        * is _not_ the last element, (offset < (src->children_num - 1)), then
+        * is _not_ the last element, (offset < (dst->children_num - 1)), then
         * we need to move the trailing elements before resizing the array. */
-       if ((src->children_num == 0) && (offset < (src->children_num - 1)))
+       if ((src->children_num == 0) && (offset < (dst->children_num - 1)))
        {
-               int nmemb = src->children_num - (offset + 1);
-               memmove (src->children + offset, src->children + offset + 1,
+               int nmemb = dst->children_num - (offset + 1);
+               memmove (dst->children + offset, dst->children + offset + 1,
                                sizeof (oconfig_item_t) * nmemb);
        }
 
@@ -415,7 +415,7 @@ static int cf_ci_replace_child (oconfig_item_t *dst, oconfig_item_t *src,
                                sizeof (oconfig_item_t) * nmemb);
        }
 
-       /* Last but not least: If there are new childrem, copy them to the
+       /* Last but not least: If there are new children, copy them to the
         * memory reserved for them. */
        if (src->children_num > 0)
        {
@@ -491,6 +491,9 @@ static int cf_include_all (oconfig_item_t *root, int depth)
                /* Now replace the i'th child in `root' with `new'. */
                cf_ci_replace_child (root, new, i);
 
+               /* ... and go back to the new i'th child. */
+               --i;
+
                sfree (new->values);
                sfree (new);
        } /* for (i = 0; i < root->children_num; i++) */