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

[Florian Forster]

 .gitignore                                         |    3 +
 .../collectd/java/GenericJMXConfConnection.java    |    1 +
 src/collectd.conf.in                               |    1 +
 src/collectd.conf.pod                              |    6 +
 src/dbi.c                                          |   46 +++---
 src/filter_chain.c                                 |   31 ++--
 src/mysql.c                                        |    1 +
 src/postgresql.c                                   |    1 +
 src/write_riemann.c                                |  158 +++++++++++++++++---
 9 files changed, 194 insertions(+), 54 deletions(-)

New commits:
commit 163fd735366af79a8c1422945e4665fe9ee735b9
Merge: a9e5429 7aaf833
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date:   Mon Oct 28 06:31:16 2013 -0700

    Merge pull request #459 from pyr/feature-riemann-attributes
    
    Add support for custom attributes.

commit a9e54292e518c37f457a1f239c5c7e52d18731cb
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date:   Mon Oct 28 14:23:33 2013 +0100

    Ignore more build artifacts
    
    This hides:
    
    - vl_utils_lookup_test
    - junk left behind by pod2man
    - the buildperl dir

commit 7aaf833b3182b21150da980551f58703f529ca56
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date:   Mon Oct 28 14:18:02 2013 +0100

    Add documentation bits for the new 'Attribute' directive

commit e3ef3021cd91577fed81db854a1c3593a2dce18a
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date:   Mon Oct 28 13:47:03 2013 +0100

    Add support for custom attributes.

commit d7c0080fdca2a6cdc45aba04e27fa7e23a627ca8
Merge: eb8f5b1 3402ebc
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date:   Tue Oct 15 06:49:22 2013 -0700

    Merge pull request #453 from vincentbernat/feature/parallel-dbi
    
    Handle several databases in parallel with dbi plugin

commit eb8f5b18c63b1a9dd534d5f1c42c9aac6c106657
Merge: e5e9f96 55b2b2d
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date:   Mon Oct 14 05:58:29 2013 -0700

    Merge pull request #441 from katzj/localhost-sql
    
    Fix handling of 127.0.0.1 instead of localhost for *sql plugins

commit e5e9f96a809912b3e9b5ec85e7d093a5f1137375
Merge: 0a161fc 9d0c6ed
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date:   Mon Oct 14 04:27:53 2013 -0700

    Merge pull request #452 from alexscott/master
    
    Add a JMXProvider Class Loader to be able to load Provider using

commit 3402ebca4425ea0dbb8ccb1c438d0b8d23735067
Author: Vincent Bernat <bernat at luffy.cx>
Date:   Sat Oct 12 22:38:57 2013 +0200

    dbi plugin: register one read callback for each database block
    
    By using a distinct read callback for each database block, collectd
    will be able to query several databases in parallel. This is useful if
    the plugin should handle many queries. This lets the user split them in
    chunks and speed up the retrieval.

commit 589383172bfa1728c96aa9d36be22d60d37e052b
Author: Vincent Bernat <bernat at luffy.cx>
Date:   Sat Oct 12 22:37:00 2013 +0200

    dbi plugin: fix a warning mentioning snmp plugin

commit 0a161fcfdfa7886f83f6e73cf7ccbe05ade4ae70
Merge: 104eeb9 4dc3912
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date:   Thu Oct 10 01:57:08 2013 -0700

    Merge pull request #444 from falzm/master
    
    Append rules/targets to existing chain.

commit 9d0c6edab10103c67aa9a4a11c5bc2f57ab0902a
Author: Alexandre Moutot <a.moutot at alphalink.fr>
Date:   Wed Oct 9 15:47:48 2013 +0200

    Add a JMXProvider Class Loader to be able to load Provider using
    getConnectorAsService from JMXConnectorFactory. The protocol remoting-jmx
    using by JBOSS > 7 need that to work.

commit 4dc3912afb15688cef0659cf8c1b858cce20394a
Author: Marc Falzon <marc at falzon.me>
Date:   Tue Oct 1 22:20:41 2013 +0200

    Rewritten condition more clearly.

commit cd62bd64fb0c1c55bbe418e5737b7b83ee042d43
Author: Marc Falzon <marc at falzon.me>
Date:   Tue Oct 1 18:53:39 2013 +0200

    Append rules/targets to existing chain.
    
    This patch allows appending rules/targets to an existing chain instead
    of overwriting it. This way, it is possible to split filter chains
    definition among several files.

commit 104eeb9961455ecf3feeb2d526ad089c2daddfeb
Merge: 2234328 28088a3
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date:   Mon Sep 30 01:58:42 2013 -0700

    Merge pull request #417 from udoprog/udoprog/riemann
    
    write_riemann: Add extra meta strings as attributes in notifications

commit 22343287f0bf38df1b8730443498560a21f4cd09
Merge: 23a9e65 78c0678
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date:   Mon Sep 30 01:56:56 2013 -0700

    Merge pull request #425 from spotify/master
    
    write_riemann plugin: Receive acknowledge message when using TCP.

commit 55b2b2d01f263a96763ad24b02f01865d5009fed
Author: Jeremy Katz <jeremy at katzbox.net>
Date:   Wed Sep 25 14:36:48 2013 -0400

    Fix handling of 127.0.0.1 instead of localhost for *sql plugins
    
    The mysql and postgresql plugins have special handling if you
    use localhost as your hostname.  Sometimes you need to use 127.0.0.1
    instead and want to not have that make changes to the hostname
    for the metrics.

commit 78c0678a23963a829e41f03b5540bcb3dc585b59
Author: John-John Tedro <udoprog at spotify.com>
Date:   Tue Sep 17 15:40:13 2013 +0200

    write_riemann plugin: Receive acknowledge message when using TCP.
    
    Not receiving an acknowledge message when communicating with riemann over TCP
    will cause the riemann instance to eventually hang for extended periods of time
    because of resource exhaustion.
    
    Took the time to reaorganize the riemann_send function to simplify locking.

commit 28088a38826a276541a6e729c1752d6cb9b538d0
Author: John-John Tedro <johnjohn.tedro at gmail.com>
Date:   Mon Sep 2 21:53:34 2013 +0000

    write_riemann: Add extra meta strings as attributes in notifications