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

Florian Forster octo at verplant.org
Sat Sep 6 11:33:50 CEST 2014


 .../collectd/java/GenericJMXConfConnection.java    |    2 -
 contrib/redhat/collectd.spec                       |   11 +-
 src/collectd.conf.in                               |    2 +-
 src/collectd.conf.pod                              |   24 +-
 src/curl.c                                         |    1 +
 src/java.c                                         |   64 ++--
 src/memcachec.c                                    |    1 +
 src/meta_data.c                                    |    8 +-
 src/network.c                                      |  336 ++++++++++++--------
 src/pyvalues.c                                     |    8 +-
 src/utils_format_json.c                            |   13 +-
 src/utils_match.c                                  |   14 +-
 src/utils_match.h                                  |   13 +-
 src/utils_rrdcreate.c                              |    1 +
 14 files changed, 302 insertions(+), 196 deletions(-)

New commits:
commit 061c3c091d725d58dfe1e7525a8d72a1ea389a8a
Merge: 678fa2e 21077b0
Author: Florian Forster <octo at collectd.org>
Date:   Sat Sep 6 11:30:20 2014 +0200

    Merge branch 'collectd-5.4'

commit 21077b074c468a41dbd60baad691ebc7f2991d43
Merge: 1894607 61adba6
Author: Florian Forster <octo at collectd.org>
Date:   Sat Sep 6 11:27:56 2014 +0200

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

commit 61adba6f19b8f6ec08b996f4b2ddc9d6fa5d7fc7
Author: Florian Forster <octo at collectd.org>
Date:   Sat Sep 6 10:58:45 2014 +0200

    network plugin: Improve client connecting behavior.
    
    This moves the socket creation logic so it's called from
    networt_send_buffer_plain(). This allows us to recover after network
    failures or when collectd was started before the network was available.
    
    Fixes: #627

commit 0f877a368c1c339386add57c573094855457eefe
Author: Florian Forster <octo at collectd.org>
Date:   Wed Sep 3 09:10:00 2014 +0200

    src/utils_match.[ch]: Implement match_value_reset().
    
    This is called from the curl and memcachec plugins. Previously, gauge
    average, minimum and maximum values were calculated since the start of
    the daemon, rather than per-interval. This is not the documented
    functionality.
    
    Fixes: #663

commit 981a488d5cfbdc80a40d82d160f27e69c66a62d0
Author: Florian Forster <octo at collectd.org>
Date:   Wed Sep 3 07:39:27 2014 +0200

    curl plugin: Use the utility functions for config handling.

commit eb342c120baa5d015d71ae8ec8fba490df88ee64
Merge: 670dd12 dfb341b
Author: Florian Forster <octo at collectd.org>
Date:   Tue Sep 2 19:51:37 2014 +0200

    Merge remote-tracking branch 'github/collectd-5.3' into collectd-5.3

commit 670dd12b750843cf83ac3cf052b4c2d8b635c212
Author: Florian Forster <octo at collectd.org>
Date:   Tue Sep 2 19:50:47 2014 +0200

    src/meta_data.c: If the meta_data_t is empty, avoid calling malloc(0).

commit 7acb8df1c0fa0065f267d7f5af2abe260340900e
Author: Florian Forster <octo at collectd.org>
Date:   Tue Sep 2 19:49:11 2014 +0200

    src/utils_format_json.c: Handle empty meta_data_t gracefully.
    
    Previously, `meta != NULL` and `keys_num == 0` was possible and would
    result in "{}", which is not valid JSON.
    
    Fixes: 716

commit 0f4dc42a2a786763134d9661273608cfb2f52821
Author: Florian Forster <octo at collectd.org>
Date:   Tue Sep 2 19:48:10 2014 +0200

    python plugin: Don't create empty meta_data_t objects.
    
    Fixes: #716

commit dfb341bca520dbe01e2f7b551548dea6aad6310c
Author: Florian Forster <octo at google.com>
Date:   Tue Sep 2 16:54:07 2014 +0200

    src/utils_rrdcreate.c: Free "args".
    
    Thanks to Yves Mettier for pointing this out!
    
    Fixes: #661

commit 1894607dc4c03ce20db7c5256c97890aa70bcaa5
Merge: 7de87be 1c4c70a
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Fri Aug 29 17:26:41 2014 +0200

    Merge branch 'collectd-5.3' into collectd-5.4
    
    Conflicts:
    	contrib/redhat/collectd.spec

commit 1c4c70a4d273bde66f744b969fe02e87b149e92e
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Fri Aug 29 17:20:57 2014 +0200

    RPM specfile: update changelog without incrementing release number

commit e2f2a97fd838047ae4d9d4e331f11d104761bbdf
Author: Florian Forster <octo at google.com>
Date:   Thu Aug 28 20:55:45 2014 +0200

    GenericJMXConfConnection: Remove unused imports.

commit 513a5cafb5c18c375d1f7206adeee7cb5cb6251c
Author: Florian Forster <octo at google.com>
Date:   Thu Aug 28 20:41:25 2014 +0200

    java plugin: Make sure cjni_thread_detach() is called on all paths.
    
    Each call to cjni_thread_attach() much be accompanied by
    a call to cjni_thread_detach(). Some error handling cases were missing
    the call, potentially locking the plugin up.

commit 7de87be6f679d23cc311250559813e3b2db64795
Author: Florian Forster <octo at collectd.org>
Date:   Fri Aug 29 07:00:33 2014 +0200

    collectd.conf(5): Improve AutoLoadPlugin documentation.
    
    Make it clear that plugins without a <Plugin /> block will still need a
    LoadPlugin line.
    
    References: #715

commit d0ffa86f72a7138fe0a0c05a16c18cda84cdb3b1
Author: Florian Forster <octo at collectd.org>
Date:   Wed Aug 27 13:04:59 2014 +0200

    collectd.conf(5): Improve documentation of LoadPlugin.
    
    Mention AutoLoadPlugin in the relevant places. Add a <Plugin /> block
    for the "df" plugin to make it easier to spot that it is preceded by a
    <LoadPlugin /> *block*.
    
    Fixes: #715

commit b14c25da066052f9f8001880c8fd57f14539ec5e
Author: Kevin Bowling <kevin.bowling at kev009.com>
Date:   Thu Aug 14 02:30:45 2014 -0700

    EL <6 provide perl-ExtUtils-Embed with base perl
    
    Conflicts:
    	contrib/redhat/collectd.spec

commit 78a2746febb51f55dc6df7f0a0748dce2aed448b
Author: John Leach <john at johnleach.co.uk>
Date:   Mon Aug 18 21:36:35 2014 +0100

    Statsd: support samplerate field in timing metric types
    
    Fixes "Unable to parse line" bug, often seen receiving stats from
    OpenStack Swift. Should fix GH issue #461

commit 1401d6563b0030422128c3ef84be639e38ce8f9e
Author: Florian Forster <octo at collectd.org>
Date:   Mon Aug 18 09:58:34 2014 +0200

    collectd.conf: Fix default packet size of the network plugin.
    
    Fixes: #710




More information about the collectd-changes mailing list