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

[Florian Forster]

 bindings/Makefile.am        |    2 +-
 configure.in                |   76 +++++++++++++++++++++++++++++-
 contrib/collectd_network.py |    2 +-
 src/apcups.c                |  107 ++++++++++++++++++++++++++++++++-----------
 src/collectd.c              |    1 +
 src/common.c                |   15 +++---
 src/curl_xml.c              |    8 ++--
 src/ethstat.c               |    3 +-
 src/exec.c                  |   15 ++++--
 src/meta_data.c             |    1 +
 src/netlink.c               |   12 +++++
 src/network.c               |   27 ++++++-----
 src/unixsock.c              |   15 ++++--
 src/utils_db_query.c        |    2 +-
 src/utils_fbhash.c          |    1 +
 src/zfs_arc.c               |    5 +-
 16 files changed, 229 insertions(+), 63 deletions(-)

New commits:
commit 5347744b510e0a94639905e0263689bf46d90de2
Merge: 5cf0dd2 80a66a5
Author: Florian Forster <octo at collectd.org>
Date:   Sun Sep 23 12:22:37 2012 +0200

    Merge branch 'collectd-5.1'

commit 80a66a53838bcf17e513f673f18a61fd1ac647c0
Merge: 427297d d19bcbf
Author: Florian Forster <octo at collectd.org>
Date:   Sun Sep 23 12:22:27 2012 +0200

    Merge branch 'collectd-5.0' into collectd-5.1

commit d19bcbf5c310f3656503e64ba26829256112ded4
Merge: 30f927c e4998db
Author: Florian Forster <octo at collectd.org>
Date:   Sun Sep 23 12:20:49 2012 +0200

    Merge branch 'collectd-4.10' into collectd-5.0
    
    Conflicts:
    	src/utils_db_query.c
    	src/zfs_arc.c

commit e4998db54e69d5ec37146a2ba50d97de14c419d4
Author: hume-github <hume-ml+github at bofh.ca>
Date:   Tue Sep 18 15:19:39 2012 -0300

    Fix for Solaris when setting ip-opt multicast-loop (must be a char, not int).
    General logging additions for tracking down the problem.
    
    Signed-off-by: Florian Forster <octo at collectd.org>

commit 4aef026a3cb088e937871f8de32ed5fbd472296a
Author: hume-github <hume-ml+github at bofh.ca>
Date:   Tue Sep 18 15:12:25 2012 -0300

    Multithreading fix: localize unneeded global variable

commit 427297d59bc5686f4ef7b95d689421c6eac9c833
Author: Florian Forster <octo at collectd.org>
Date:   Sun Sep 23 12:00:43 2012 +0200

    ethstat plugin: Initialize realloc'ated memory.
    
    The last element in "interfaces" is not guaranteed to be zeroed, resulting in a
    segfault when cf_util_get_string() tries to free the "pointer".
    
    Thanks to Mark T. Voelker for reporting and analyzing this bug!
    This should fix Github issue #133.

commit eb44b1e0a044f924c8cbcf28da320aab602d0aca
Author: Florian Forster <octo at collectd.org>
Date:   Sun Sep 23 11:56:58 2012 +0200

    ethstat plugin: Fix off-by-one error.
    
    This hopefully fixes Github issue #135.

commit 30f927c17e617e2357da273477585c96f7ffa408
Author: JonathanHuot <jonathan.huot at gmail.com>
Date:   Thu Sep 13 18:27:57 2012 +0200

    libs varnish & varnishcompat are NOT needed. "pkg-config --libs varnishapi" output only libvarnishapi as well
    
    Signed-off-by: Florian Forster <octo at collectd.org>

commit 97e8f346a88eccf4d1608c21d5cc6ee9620c1c41
Author: Sebastian Harl <sh at teamix.net>
Date:   Wed Jun 13 14:33:05 2012 +0200

    bindings/Makefile: perl: Use INSTALL_BASE rather than PREFIX.
    
    Some versions of Perl / ExtUtils::MakeMaker will else abort with an error
    message explaining INSTALL_BASE and PREFIX may not be used both. However, I
    don't know where the other definition comes from.
    
    Signed-off-by: Florian Forster <octo at collectd.org>

commit c43464c98c24cd886e839756076a4cded37cdaea
Author: Sebastian Harl <sh at teamix.net>
Date:   Wed Jun 13 14:31:00 2012 +0200

    configure: Don't add -liptc to the global LIBS setting.
    
    AC_SEARCH_LIBS() would do that, so save and restore LIBS when calling that
    macro.
    
    Signed-off-by: Florian Forster <octo at collectd.org>

commit 096f706caf5718c11b3e8a7ad9ecb84f05482c4d
Author: Sebastian Harl <sh at tokkee.org>
Date:   Fri May 18 22:31:13 2012 +0200

    configure: Use AC_INCLUDES_DEFAULT when checking any libkvm stuff.
    
    kvm.h requires sys/types.h to be included. Using AC_INCLUDES_DEFAULT will
    hopefully make sure that we're save for a bit ;-)
    
    Signed-off-by: Florian Forster <octo at collectd.org>

commit 39a8492cebd21e77317c51bf2d9caaf49e5cd2f7
Author: Florian Forster <octo at collectd.org>
Date:   Thu Sep 13 10:53:19 2012 +0200

    curl_xml plugin: Mark read-only strings as const.

commit 8e4720f3f09d21b7cf46acda5a5295101b2ece41
Author: Fabien Wernli <cpan at faxm0dem.org>
Date:   Mon Nov 28 10:46:18 2011 +0100

    fix Host config being ignored
    
    Change-Id: I8a109818d8a821e2f3e0660fbb6ba1843279fcc2
    Signed-off-by: Florian Forster <octo at collectd.org>

commit dce49231bf8af989aceb34e0e80546503d687b6d
Author: Florian Forster <octo at collectd.org>
Date:   Thu Sep 13 10:18:14 2012 +0200

    apcups plugin: Retry sending the "status" command.
    
    If that fails more than twice in the first 10 iterations, gracefully shut
    down the socket in all future iterations.
    
    This should fix Github issue #15.

commit 3855d8f3a6310d739d35ba9fa86c35d813abf859
Author: Florian Forster <octo at collectd.org>
Date:   Thu Sep 13 10:05:35 2012 +0200

    apcups plugin: Add function net_shutdown().

commit 31601e42bda74a7a5d62aac79461802416ffca91
Author: Florian Forster <octo at collectd.org>
Date:   Thu Sep 13 10:04:26 2012 +0200

    apcups plugin: Make sure the socket is closed on errors.

commit ba7e9af4584390be02144473bd432c5998ed4066
Author: Florian Forster <octo at collectd.org>
Date:   Wed Sep 12 22:51:58 2012 +0200

    src/utils_db_query.c: Use the right field when checking for size.

commit 9754d84492908f5e02cc16c45955a433028ee66b
Author: Florian Forster <octo at collectd.org>
Date:   Wed Sep 12 21:31:41 2012 +0200

    Revert "swap plugin: Add the "ReportBytes" option."
    
    This reverts commit 25fd1667c186eb871a4b66f9866d6446e41f1bc2.

commit 25fd1667c186eb871a4b66f9866d6446e41f1bc2
Author: Florian Forster <octo at collectd.org>
Date:   Wed Sep 12 18:55:08 2012 +0200

    swap plugin: Add the "ReportBytes" option.
    
    When enabled, swap I/O is reported in bytes, not pages. Only valid for Linux.
    
    This should fix Github issue #10.

commit dc0b5c71ffa2608bb63b1b2e63f52768681959c1
Author: Florian Forster <octo at collectd.org>
Date:   Wed Sep 12 18:25:20 2012 +0200

    exec plugin: Really remove STDERR from the select() set.
    
    select(2) is actually using a variable called "copy", which we didn't set in
    this case.
    
    Fixes Github issue #12. Thanks to Tetsuya Kawaguchi for reporting this problem.

commit f9917650c7f661c71c8010dac9e707f075d25039
Author: Florian Forster <octo at collectd.org>
Date:   Tue Sep 11 09:54:32 2012 +0200

    configure.in: Make sure sa_familiy_t is defined when checking rtnl_dump_filter().

commit 793d766ab645cdb01297889797faf780eb669d40
Author: Sebastian Harl <sh at tokkee.org>
Date:   Sat May 19 12:31:52 2012 +0200

    netlink plugin: Check for the number of arguments to 'rtnl_dump_filter'.
    
    In recent versions of iproute2, 'rtnl_dump_filter' expects three rather than
    five arguments.
    
    This should fix Github issue #7.
    
    Signed-off-by: Florian Forster <octo at collectd.org>

commit 932048e614c6602159cdfc0580f296f74af46227
Author: Gerrie Roos <groos at xiplink.com>
Date:   Tue Apr 17 15:22:36 2012 +0200

    Fixed collectd's unixsock read interrupted by SIGCHLD's.
    
    Signed-off-by: Florian Forster <octo at collectd.org>

commit 5abe911631a15dd312d83db92c9dd9da9f13c9df
Author: Gerrie Roos <groos at xiplink.com>
Date:   Fri May 25 05:38:47 2012 +0200

    Fixed various collectd memory leaks.
    
    Once I understood what's going on I tried to keep the changes to a minimum.
    
    Signed-off-by: Florian Forster <octo at collectd.org>

commit dd5fc7ca70168375863161967d6738914ea008b7
Merge: 77f03c9 a4872ad
Author: Florian Forster <octo at collectd.org>
Date:   Mon Sep 10 21:10:45 2012 +0200

    Merge branch 'ff/kstat' into collectd-4.10

commit 20756b3157f7241eee578fdb4c775a2e6f93c97d
Author: Adrian Perez <aperez at furi-ku.org>
Date:   Fri Sep 7 16:59:32 2012 +0300

    Set license info line to ”GPLv2 or newer”
    
    Recently I had a request to change the licensing of this file to
    use it in a GPLv3 application. This change would make it easier,
    while retaining GPLv2 to make the license still match the one in
    collectd.
    
    Signed-off-by: Florian Forster <octo at collectd.org>

commit a4872adedee43b05feaee42e13007b0fe0afc41c
Author: Florian Forster <octo at collectd.org>
Date:   Thu Sep 6 17:29:59 2012 +0200

    src/common.c: Add missing semicolon.

commit 619eaff863528b2f97dc79371dddf46a69c7115d
Author: Florian Forster <octo at collectd.org>
Date:   Thu Sep 6 16:12:53 2012 +0200

    src/common.c: get_kstat_value: Check the arguments and return error codes.
    
    Rather than asserting that an argument is not NULL, check this condition
    and return an error code.
    
    This should fix Github issue #71.