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

Florian Forster octo at verplant.org
Mon Jan 21 11:17:05 CET 2013


 configure.in          |    6 +-
 src/Makefile.am       |   16 +-
 src/collectd.conf.in  |   22 +-
 src/collectd.conf.pod |   57 +++++
 src/common.c          |   32 +++
 src/common.h          |    3 +
 src/riemann.proto     |   39 +++
 src/write_riemann.c   |  672 +++++++++++++++++++++++++++++++++++++++++++++++++
 8 files changed, 838 insertions(+), 9 deletions(-)

New commits:
commit 8a9ac11ae8f0f9999f75508b4413fe5c95bfe497
Merge: d37b132 b4da854
Author: Florian Forster <octo at collectd.org>
Date:   Mon Jan 21 11:10:55 2013 +0100

    Merge branch 'pyr/riemann'
    
    Resolves Github issue #221.

commit b4da854362a1e649b5767d79361dc08d6f41c4e1
Author: Florian Forster <octo at collectd.org>
Date:   Fri Jan 18 11:55:53 2013 +0100

    write_riemann plugin: Remove the "Delay" option.

commit f97a020e7c41cefab74fb32bd2c9bf90fc47f034
Author: Florian Forster <octo at collectd.org>
Date:   Fri Jan 18 11:37:34 2013 +0100

    write_riemann plugin: Remove unused defines.

commit 04ada059cbc1299293485abf35c04fc74e1f5bca
Author: Florian Forster <octo at collectd.org>
Date:   Thu Jan 17 14:07:12 2013 +0100

    collectd.conf(5): Add documentation for the write_riemann plugin.

commit 7d87419725ee6e7cd30d53b8f3498f4ce61c8eb3
Author: Florian Forster <octo at collectd.org>
Date:   Thu Jan 17 13:37:09 2013 +0100

    write_riemann plugin: Unify the plugin's configuration semantic.
    
    The "write_mongodb" and "write_redis" plugins follow the same general
    config schema, i.e. <Node /> blocks with "Host" and "Port" options.
    Adapt the same style for "write_riemann".

commit 955af7c84d853cdba98534f1f88d3acf311de450
Author: Florian Forster <octo at collectd.org>
Date:   Thu Jan 17 09:46:20 2013 +0100

    src/collectd.conf.in: Rename "riemann" to "write_riemann".

commit f1eed3f69e512d9ecd67c674150f193a520ff2c9
Author: Florian Forster <octo at collectd.org>
Date:   Thu Jan 17 09:28:24 2013 +0100

    write_riemann plugin: Ensure a unified logging prefix.

commit 0a116775f091004f4c7e7736f1c908dcc7851099
Author: Florian Forster <octo at collectd.org>
Date:   Wed Jan 16 22:00:11 2013 +0100

    write_riemann plugin: Rename the "riemann" plugin.

commit 07e8a566706af31c544fd5b34706f222e415e2c6
Author: Florian Forster <octo at collectd.org>
Date:   Wed Jan 16 21:50:37 2013 +0100

    riemann plugin: Clean up the riemann_connect() function.
    
    Don't warn when connecting to some address fails. The system could, for
    example, not have any IPv6 connectivity but the address record also
    includes an IPv6 address. In this case a connect(2) call will fail but
    this is not a problem.
    
    Due to the new locking one of the concurrency checks was made redundant.

commit 917c18f7783c176e0df13a017f1ca1213724910c
Merge: e90b75d 97b298a
Author: Florian Forster <octo at collectd.org>
Date:   Mon Jan 14 09:49:17 2013 +0100

    Merge remote-tracking branch 'github-octo/pyr/riemann' into pyr/riemann

commit 97b298aeecb1a86e05a03a605277d9a5e1a4a48b
Author: Florian Forster <octo at collectd.org>
Date:   Sun Jan 13 23:14:13 2013 +0100

    riemann plugin: Implement the "StoreRates" option.

commit e90b75d7c8e883190487930b242114b7c5e06687
Author: Florian Forster <octo at collectd.org>
Date:   Fri Jan 11 13:43:59 2013 +0100

    riemann plugin: Use the new strarray interface to allow indefinite number of tags.

commit aaabdb7dcc46df1597930f9bf7fbfa464aa64d5d
Author: Florian Forster <octo at collectd.org>
Date:   Fri Jan 11 14:56:35 2013 +0100

    src/common.[ch]: Implement strarray_{add,free}.

commit 8da1109ec9a262c3417fcc6aa55d8b888d375c9d
Author: Florian Forster <octo at collectd.org>
Date:   Fri Jan 11 11:52:14 2013 +0100

    riemann plugin: Fix two minor bugs.

commit 3c48e21e94c3d37f18796c8f9fc3ecb5e4b10ccd
Author: Florian Forster <octo at collectd.org>
Date:   Fri Jan 11 11:30:14 2013 +0100

    riemann plugin: Fix a double-free issue with the shared structure.
    
    The reference to the riemann_host structure is shared between the write
    and the notification callback. Upon exit, riemann_free() is called twice,
    via the user_data_t structure passed to the register functions. Previously
    this would have caused a double-free, which is unacceptable.
    
    This patch introduces a reference counter and will only free the structure
    (and close the socket) when the last reference is freed.
    
    The locking has been moved out of the riemann_connect() function and into
    the riemann_send() function. It is unlikely, but not impossible that two
    threads interfere with each other when writing to the socket.

commit e0528dcc89bfc6fdb467f3add447c1778ad069d9
Author: Florian Forster <octo at collectd.org>
Date:   Fri Jan 11 10:33:36 2013 +0100

    riemann plugin: Add support for service names.
    
    I.e. you can not define a "riemann" service in /etc/services and then use
    «Port "riemann"» in the configuration. Also add support for arbitrarily
    long host names.

commit 75bdbf9fb2d0679a2adc2fac964a052fa1f6cd1c
Author: Florian Forster <octo at collectd.org>
Date:   Thu Jan 10 11:40:58 2013 +0100

    riemann plugin: Move the creation of protobufs into their own function.
    
    This also adds a couple more tags, e.g. "type:..." and so on. The "host"
    field is now correctly populated from the vl->host or n->host field.

commit 3a8981f7a7346fd5657e783b9c7dc75804f73352
Author: Florian Forster <octo at collectd.org>
Date:   Wed Jan 9 11:19:57 2013 +0100

    riemann plugin: Make all private funcitons and module-global variables "static".

commit 325bcefac8cd442e685d3ac3f17b179fa2cdf970
Author: Florian Forster <octo at collectd.org>
Date:   Wed Jan 9 11:18:34 2013 +0100

    riemann plugin: Remove trailing white-space.

commit 4df77626505fc8275417bfa08cc12b4e5907299e
Author: Florian Forster <octo at collectd.org>
Date:   Wed Jan 9 11:18:05 2013 +0100

    riemann plugin: Improve the riemann_send() function.
    
    Make the passed in "Msg*" const, use swrite() to make sure the entire
    buffer is sent and break out the disconnect logic into an own function.

commit b53792f620f86bdf1cd707d04d16352adf2dec49
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date:   Wed Jan 9 10:02:50 2013 +0100

    take into account PR comments from @octo
    
    Signed-off-by: Florian Forster <octo at collectd.org>

commit 6dfcd49cbfc90eb987f1b351e1187f34819f3e85
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date:   Fri Dec 28 21:51:12 2012 +0100

    add support for notifications as well
    
    Signed-off-by: Florian Forster <octo at collectd.org>

commit 4f8eb9713e492396242e17de4c73a31ce94486d6
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date:   Fri Dec 21 22:26:02 2012 +0100

    Riemann UDP write plugin
    
    First implementation of a riemann plugin.
    This is basic for now and only support
    sending to a UDP target, later work will
    include notification support and service
    rewriting.
    
    Signed-off-by: Florian Forster <octo at collectd.org>




More information about the collectd-changes mailing list