[collectd-changes] collectd, the system statistics collection daemon: Changes to 'collectd-5.4'

Florian Forster octo at verplant.org
Sun Jan 12 09:05:49 CET 2014


 configure.ac                            |   28 +++++++++++++++++++++++-----
 contrib/collection3/etc/collection.conf |   16 ++++++++--------
 src/Makefile.am                         |    6 +++---
 src/collectd.c                          |    2 +-
 src/collectd.conf.pod                   |    4 ++--
 src/curl.c                              |    3 ++-
 src/curl_json.c                         |    3 ++-
 src/interface.c                         |   11 ++++++-----
 src/target_replace.c                    |    4 ++--
 src/target_set.c                        |    4 ++--
 src/types.db                            |    2 +-
 src/write_graphite.c                    |   14 ++++++++------
 src/zfs_arc.c                           |    8 +++++---
 13 files changed, 65 insertions(+), 40 deletions(-)

New commits:
commit 54ef2ae58f8ef125cf1d3aefe3ac839ba7e67f8a
Merge: d9c8512 affac33
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Wed Jan 8 18:28:07 2014 +0100

    Merge branch 'collectd-5.3' into collectd-5.4
    
    Conflicts:
    	src/zfs_arc.c

commit affac33e83584e7538c358e3bd0a587d0c692bc3
Merge: 8e9bdd5 cde09b5
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Wed Jan 8 18:24:27 2014 +0100

    Merge branch 'collectd-4.10' into collectd-5.3

commit cde09b547abbeb7595d91259fcc628504d0f55a9
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Wed Jan 8 18:05:40 2014 +0100

    Revert "curl_xml.c: avoid using uninitalized variable in error message"
    
    This reverts commit bbbf37d55a3959951604c4be482e9a705a0f86d9.
    
    A different fix for this problem was commited to the collectd-5.4 branch
    (8327ee64) and conflicts with this patch. Also, initializing url the
    same way as 8327ee64 does it, to avoid a merge conflict.

commit 645dadb3fcc466e8880fda4eb23b21ad433631fc
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Tue Jan 7 16:06:10 2014 +0100

    interface.c: FreeBSD-10 support
    
    Quoting @trtrmitya in github issue #506 : "[...] it is broken on
    FreeBSD-10, in which getifaddrs() returns not only link level stats for
    a particular interface, but also entries for each IP configured on that
    interface. As a result if_submit() is called several times for each
    interface, which results in incorrect data being logged.
    
    I am attaching a patch which fixes a problem on FreeBSD (9/10), but it
    should work for every *BSD because [...] the getifaddrs implementation
    first appeared in BSDi BSD/OS."
    
    Many thanks to @trtrmitya for providing the patch !

commit bbbf37d55a3959951604c4be482e9a705a0f86d9
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Tue Jan 7 11:30:59 2014 +0100

    curl_xml.c: avoid using uninitalized variable in error message
    
    Thanks to @trtrmitya for reporting this. Fixes GH#507

commit d9c851256eec5fa49821c6f1a7f3381c90850a71
Author: Michael Hart <michael.hart at arcticwolf.com>
Date:   Fri Dec 20 09:56:54 2013 -0500

    fix wg_send_buffer to reconnect tcp sockets on failure
    
    Conflicts:
    	src/write_graphite.c

commit 8e9bdd5a63e67c6adb403c2aac4a25e0595ea147
Author: Sebastian Harl <sh at tokkee.org>
Date:   Sun Dec 22 13:59:44 2013 +0100

    curl plugin: Fixed a segfault when using <Match> without an Instance.
    
    Thanks to Alexander Golovko for reporting this in
    http://bugs.debian.org/732701

commit 147690b3baf04341851757c9424596ceb37c45ba
Author: Rainer Müller <raimue at codingfarm.de>
Date:   Wed Feb 27 19:46:41 2013 +0100

    collection3: Fix data source names
    
    Data sources were renamed in 6c1415d, but the data source names for some
    of these entries still referenced the old data sources.

commit 30aaad03b66ff22d8cc50de2116b2d93a9d445f2
Author: Rainer Müller <raimue at codingfarm.de>
Date:   Sun Nov 10 03:51:40 2013 +0100

    Link to IOKit using -framework
    
    The libIOKit.dylib symlink no longer exists in OS X 10.9 Mavericks, we
    now have to link using -framework. This should also work in all previous
    versions of OS X.
    
    Signed-off-by: Florian Forster <octo at collectd.org>

commit 8f85126d19f0444d79ec6d5aea12b6ef52130549
Author: Florian Forster <octo at collectd.org>
Date:   Wed Nov 13 19:59:27 2013 +0100

    src/types.db: Remove maximum value on "cache_size".
    
    Fixes #466. Thanks to @dlacko for pointing this out!

commit 0c4da4eb1348f032d6845e192d71e7a3908126c1
Merge: 6dcd94c 5fea70d
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Mon Oct 14 06:47:05 2013 -0700

    Merge pull request #393 from mfournier/prevent-building-with-old-libpcap
    
    Prevent building with old libpcap

commit 6dcd94cf362b78541cfd1c5b7c80a04c415beb88
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Mon Oct 7 23:11:44 2013 +0200

    fix error message in target_{replace,set}
    
    Remove erroneous hint that "Type" can be altered. Also correct a small
    typo. Thanks to @mjulian for pointing that out !
    
    Fixes GH#448

commit 0ebd7011d139760eab8c96d0b4ec4584c4fcd9f5
Author: Fabien Wernli <github at faxm0dem.org>
Date:   Fri Sep 27 09:42:46 2013 +0200

    Update collectd.conf.pod
    
    spotted by lukas227 in IRC:
    23:43 < lukas227> Hi, I think I found a mistake in the threshold.conf(5) man page: the example
                      THRESHOLD CONFIGURATION is within <Threshold></Threshold> tags, but should
                      probably be within <Plugin "threshold"></Plugin> tags (doesn work with
                      <Threshold> for me)
    Day changed to 27 Sep 2013
    
    Signed-off-by: Florian Forster <octo at collectd.org>

commit 0b6adfd256599f1bb944246435488eeddb7dc617
Author: Tim Laszlo <Tim.Laszlo at magnetar.com>
Date:   Tue Sep 24 13:20:29 2013 -0500

    Avoid using first person in the error message
    
    Signed-off-by: Florian Forster <octo at collectd.org>

commit 9f37f0c4e2b5957e96351a9064f7b2304a5b3924
Author: Tim Laszlo <Tim.Laszlo at magnetar.com>
Date:   Tue Sep 24 10:35:22 2013 -0500

    Replace you with your in error message
    
    Signed-off-by: Florian Forster <octo at collectd.org>

commit 510108ba3eb7ef594ec35c4d4cf1d816522a86fd
Author: Florian Forster <octo at collectd.org>
Date:   Mon Aug 19 17:04:11 2013 +0200

    zfs_arc plugin: Collect "allocated" and "stolen" on FreeBSD only.
    
    The appropriate log messages have been demoted to WARNING.
    
    Github: #305

commit 2aefd2f1927ab78258d8ad218eb5a351d668d412
Author: Jim Radford <radford at galvanix.com>
Date:   Sat Aug 10 09:14:27 2013 -0700

    curl_json plugin: avoid accessing off the end of the avl_tree_s
    
    It's not written this way, but really we have a union { *key; *tree; }
    which is differentiated by checking for the presence a magic field
    which only exists in key.  This leads to accesses off the end of the
    tree.  Putting the magic at start of the key avoids this.
    
    Signed-off-by: Florian Forster <octo at collectd.org>

commit d130204df3256c39e104aa9a4346d116458c745e
Author: Jim Radford <radford at galvanix.com>
Date:   Sat Aug 10 09:10:56 2013 -0700

    curl_json plugin: avoid unlikely overrun
    
    Signed-off-by: Florian Forster <octo at collectd.org>

commit 5fea70dbfa292536761c95ee7021a61ef925b73e
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Fri Aug 9 14:53:24 2013 +0200

    check if libpcap has PCAP_ERROR_IFACE_NOT_UP
    
    This should prevent DNS plugin from being built on systems with libpcap
    older than 1.0.0.
    
    GitHub issue #373




More information about the collectd-changes mailing list