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

Florian Forster octo at verplant.org
Wed Jul 8 13:09:32 CEST 2015


 .gitignore                      |    1 +
 contrib/collectd2html.pl        |    2 +-
 src/Makefile.am                 |    3 +-
 src/bind.c                      |    2 +-
 src/collectd-nagios.c           |    4 +-
 src/collectd-tg.c               |   37 +++++------
 src/collectd.conf.in            |    6 +-
 src/collectdctl.c               |   16 ++---
 src/cpu.c                       |   10 +--
 src/daemon/Makefile.am          |   10 ++-
 src/daemon/collectd.c           |   82 ++++++++++++++++---------
 src/daemon/common.c             |   87 +++++++++++---------------
 src/daemon/common.h             |    4 +-
 src/daemon/common_test.c        |   92 ++++++++++++++++++++++++++++
 src/daemon/utils_cache.c        |   22 +------
 src/daemon/utils_cache_mock.c   |    3 +-
 src/daemon/utils_subst.c        |   75 ++++++++++++++---------
 src/daemon/utils_subst_test.c   |  129 +++++++++++++++++++++++++++++++++++++++
 src/df.c                        |    2 +-
 src/libcollectdclient/client.c  |    2 +-
 src/libcollectdclient/network.c |    8 +--
 src/liboconfig/oconfig.c        |   29 ++++-----
 src/network.c                   |    2 +-
 src/serial.c                    |   39 ++++++------
 src/target_replace.c            |    2 +-
 src/target_scale.c              |   23 ++-----
 src/tcpconns.c                  |    8 ++-
 src/testing.h                   |    9 +++
 src/utils_ignorelist.c          |   93 ++++++++++------------------
 src/write_redis.c               |    9 ++-
 src/write_riemann.c             |    4 +-
 31 files changed, 517 insertions(+), 298 deletions(-)

New commits:
commit d8afb11fb4cc4b515617782dcade95891c989b40
Author: Florian Forster <octo at collectd.org>
Date:   Wed Jul 8 12:41:04 2015 +0200

    network plugin: Fix function name in error output.

commit 73fb5c9c5c4c65b45c637f85884ec402964df561
Author: Florian Forster <octo at collectd.org>
Date:   Wed Jul 8 12:40:48 2015 +0200

    daemon: Fix -Wunused-parameter warnings.

commit 21b0365e24e1e7bd56ec27c5b539e9b5779d19b5
Author: Florian Forster <octo at collectd.org>
Date:   Wed Jul 8 12:39:56 2015 +0200

    oconfig: Fix -Wshadow and -Wsign-compare warnings.
    
    Also re-indent oconfig_clone().

commit aef50716bb84482979124ba1120546ada9ca6705
Author: Florian Forster <octo at collectd.org>
Date:   Wed Jul 8 12:39:03 2015 +0200

    Fix -Wshorten-64-to-32 warnings.

commit 4cafc1402997b570a66ed17400e8be4da6de4224
Author: Florian Forster <octo at collectd.org>
Date:   Wed Jul 8 12:36:35 2015 +0200

    Fix -Wsign-conversion warnings.

commit 03ed251b015e8bb4bcdf84f5f330ba2edcdd117a
Author: Florian Forster <octo at collectd.org>
Date:   Wed Jul 8 11:57:35 2015 +0200

    daemon: Clean up the Upstart and Systemd notification code.
    
    Document the use of "Linux abstract namespace sockets" and use sendto(2)
    instead of sendmsg(2) to avoid having to initialize struct msghdr
    and struct iovec. Removes the non-portable bzero() calls.

commit 872126c9a7e0a8f8ae2b28217c12c27c35af5237
Merge: 9bd400b 24c2f24
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Wed Jul 8 00:35:27 2015 +0200

    Merge branch 'collectd-5.5'

commit 24c2f247f6dc5c17b26d715346a380efababb08f
Merge: 780e6a7 18159ad
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Wed Jul 8 00:29:58 2015 +0200

    Merge branch 'collectd-5.4' into collectd-5.5

commit 780e6a76021a240e95007a04b723d827120afa95
Author: Gustavo Zacarias <gustavo at zacarias.com.ar>
Date:   Mon Jul 6 09:59:30 2015 -0300

    build: add libavltree, libcommon & libheap dependencies
    
    Otherwise it can break on very parallel builds since collectd link time
    arrives before one or more of these were built.
    
    Signed-off-by: Gustavo Zacarias <gustavo at zacarias.com.ar>

commit e174ee164d43cce350d0fd398c3d458cb15714ed
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date:   Sat Jul 4 13:25:23 2015 +0200

    Add test-suite logs to .gitignore

commit b7384b550300878b9a3566c64c8afc3ac92f31da
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date:   Sat Jul 4 19:52:52 2015 +0200

    collectd.conf: order plugins alphabetically again

commit 18159adcefb255db5a5234a8476e703deb6cc09f
Author: Ruud van Melick <ruud at vanmelick.com>
Date:   Tue Jun 30 16:08:49 2015 +0000

    Fix Perl errors
    
    "my" variable $cmd masks earlier declaration in same scope at /tmp/contrib_collectd2html.pl line 223.
    syntax error at /tmp/contrib_collectd2html.pl line 219, near "$span qw(1hour 1day 1week 1month)"
    Global symbol "$span" requires explicit package name at /tmp/contrib_collectd2html.pl line 221.
    Global symbol "$span" requires explicit package name at /tmp/contrib_collectd2html.pl line 224.
    Global symbol "$span" requires explicit package name at /tmp/contrib_collectd2html.pl line 225.
    Global symbol "$span" requires explicit package name at /tmp/contrib_collectd2html.pl line 232.
    Global symbol "$span" requires explicit package name at /tmp/contrib_collectd2html.pl line 237.
    syntax error at /tmp/contrib_collectd2html.pl line 245, near "}"

commit 9424954ff108699e798e677e9e78428ca74d04b8
Author: Michal Humpula <michal.humpula at hudrydum.cz>
Date:   Mon Jul 6 13:43:43 2015 +0200

    bind: fix zone count check

commit 9bd400b6073c7ad4e3ba4b6f568fd7f608a4b02f
Author: Florian Forster <octo at collectd.org>
Date:   Fri Jul 3 15:15:09 2015 +0200

    serial plugin: Fix -Wshorten-64-to-32 warning.
    
    serial.c:87:28: error: implicit conversion loses integer precision: 'unsigned long' to 'int' [-Werror,-Wshorten-64-to-32]
                    len = strlen (fields[0]) - 1;
                        ~ ~~~~~~~~~~~~~~~~~~~^~~
    serial.c:96:10: error: implicit conversion loses integer precision: 'unsigned long' to 'int' [-Werror,-Wshorten-64-to-32]
                            len = strlen (fields[i]);
                                ~ ^~~~~~~~~~~~~~~~~~

commit 710586ae652d56ddeaafd530621e129a580fb780
Author: Florian Forster <octo at collectd.org>
Date:   Fri Jul 3 15:06:28 2015 +0200

    src/utils_ignorelist.c: Reimplement ignorelist_append_regex().
    
    There's a signed / unsigned conversion in that function ...
    ... aaaaand it's fully rewritten. Oops.

commit 3f3b285aaed61ad7cebca07a8b55068f0c3c9e32
Author: Florian Forster <octo at collectd.org>
Date:   Fri Jul 3 13:55:24 2015 +0200

    collectd-tg: Remove use of NAN.
    
    This broke the build under Solaris, once again *sigh*.
    
    collectd-tg.c: In function ‘dtime’:
    collectd-tg.c:108:12: error: ‘NAN’ undeclared (first use in this function)
         return NAN;
                ^

commit 0824460029db8e584f71295c5ecc89e785598878
Author: Dagobert Michelsen <dam at opencsw.org>
Date:   Thu Jun 18 15:28:36 2015 +0200

    Take out explicit definitions as they are already checked via enable_standards in configure.ac.
    
    Fixes: #978

commit c26f465ba20ad1d5b9a7b77dac0e6117db9377b6
Author: Florian Forster <octo at collectd.org>
Date:   Fri Jul 3 12:31:32 2015 +0200

    collectd-tg: Move _POSIX_C_SOURCE and friends to the Makefile.
    
    Apparently defining this in the source files confuses Solaris' libc.
    Thanks to @dago for looking into this.
    
    Hopefully fixes: #978

commit d1e2c6d468c82c58e24b53a6af18b5d6b599f55d
Author: Florian Forster <octo at collectd.org>
Date:   Fri Jul 3 11:52:50 2015 +0200

    collectdctl: Fix -Wsign-conversion warnings.
    
    Also fixes a shadowed local variable warning.

commit 1e34eeecc5939118e644be5337612a0326781f8e
Author: Florian Forster <octo at collectd.org>
Date:   Fri Jul 3 11:49:07 2015 +0200

    collectd-nagios: Fix -Wsign-conversion warnings.

commit ca299374303452480544ac19e2028b63db362164
Author: Florian Forster <octo at collectd.org>
Date:   Fri Jul 3 11:44:28 2015 +0200

    collectd-tg: Fix unintentional cast from double to time_t.
    
    This fix is likely incomplete: the printf() line is probably executed way
    too often now.

commit 881d288ab29676f19afd886730ab550c7d15c8fc
Author: Florian Forster <octo at collectd.org>
Date:   Fri Jul 3 08:23:29 2015 +0200

    utils_cache.c, scale target: Don't re-implement counter wrap-around logic.

commit 9a8d9ab6a8c2e4d20a2b946bdfc2035bb92bccb6
Author: Florian Forster <octo at collectd.org>
Date:   Mon Jun 29 17:56:37 2015 +0200

    src/daemon/utils_subst_test.c: Actually add unit test.
    
    D'oh!

commit e1b93f596067106e7c29c263b8bb4d0b51718d9d
Author: Florian Forster <octo at collectd.org>
Date:   Mon Jun 29 17:32:44 2015 +0200

    src/daemon/utils_subst.c: Sanitize buffer offsets better.
    
    The previous implementation broke when off1 / off2 were outside of "string"
    but within "buflen". It also had problems if the replacement string was
    too long. This new implementation truncates the buffer as expected and
    is properly tested.

commit cf8bb3fbdadcdd4ed021377a01da8fb6459b7e7e
Author: Florian Forster <octo at collectd.org>
Date:   Mon Jun 29 12:52:03 2015 +0200

    write_riemann plugin: Ensure that "statuses" is always initialized.
    
    Hopefully fixes "Uninitialized argument value" warning.

commit e41add16b3f19e89cd746a76c66cd28670037d7d
Author: Florian Forster <octo at collectd.org>
Date:   Mon Jun 29 12:50:51 2015 +0200

    src/daemon/common.[ch]: Improve signature of value_to_rate().
    
    Passing in "value" as a derive_t and returning the rate as a value_t is
    just inconvenient and wrong. Instead, pass "value" as a value_t and return
    the rate in a gauge_t. While at it, move the state pointer to the end of
    the argument list.

commit 130316f078cadab03f6bbbbd6a8cd5cee77dc558
Author: Florian Forster <octo at collectd.org>
Date:   Mon Jun 29 09:51:12 2015 +0200

    src/daemon/common_test.c: Fix "decimal constant is unsigned only in ISO C90" warning.

commit b720b5a6214ab1b9c058c7bd1fb4aad2f90e7889
Merge: 9461848 79593ed
Author: Florian Forster <octo at collectd.org>
Date:   Sun Jun 28 15:05:45 2015 +0200

    Merge branch 'collectd-5.5'

commit 79593ed5e0a3def8e91be5b1de15a536af2d4a92
Merge: ba5d000 6966c22
Author: Florian Forster <octo at collectd.org>
Date:   Sun Jun 28 15:05:36 2015 +0200

    Merge branch 'collectd-5.4' into collectd-5.5

commit 9461848421c468d9117bf6c57335b344db0a420e
Author: Florian Forster <octo at collectd.org>
Date:   Sun Jun 28 15:00:49 2015 +0200

    src/daemon/common.c: Fix handling of counter_t in value_to_rate().
    
    Also fixes an off-by-one error in counter_diff() and adds a unit test for
    the function.

commit 6966c22daad028359bac6747d709416a64779d6a
Author: Florian Forster <octo at collectd.org>
Date:   Sun Jun 28 14:05:05 2015 +0200

    src/daemon/common.c: Fix off-by-one error in escape_slashes().
    
    Partial cherry-pick of 0cba91923be9326224f8434e4aae7691f7b6dad1.

commit 233ef890d210e7f231ebbc474894e90032ba49b1
Author: Florian Forster <octo at collectd.org>
Date:   Sun Jun 28 14:08:02 2015 +0200

    src/daemon/common.c: Add unit test for escape_string().

commit 0cba91923be9326224f8434e4aae7691f7b6dad1
Author: Florian Forster <octo at collectd.org>
Date:   Sun Jun 28 14:05:05 2015 +0200

    src/daemon/common.c: Fix off-by-one error in escape_slashes().
    
    This also adds a unit test for this issue.

commit 3b227016c5e2126d5064c19d29ab79f13a187b39
Merge: 88f22ff ba5d000
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Fri Jun 26 08:09:47 2015 +0200

    Merge branch 'collectd-5.5'
    
    Conflicts:
    	src/write_redis.c

commit 924c9af78d535f4920d73a2cd8e5090747479f0f
Author: Landry Breuil <landry at rhaalovely.net>
Date:   Wed Jun 24 06:48:16 2015 +0200

    properly handle error cases when kvm_read fails (#1094)

commit 305fccf949726b6dcaea65919c9adcbd342919f6
Author: Marek Becka <marek.becka at superhosting.cz>
Date:   Wed Jun 24 11:39:55 2015 -0400

    don't report inodes if fs doesn't provide f_files and f_ffree

commit ba5d00054e24261b3b8cbbef56dc6e6ae54f61bc
Author: Florian Forster <octo at collectd.org>
Date:   Thu Jun 25 22:18:27 2015 +0200

    write_redis plugin: Call freeReplyObject() for each redisReply.




More information about the collectd-changes mailing list