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

[Florian Forster]

 src/amqp.c            |   22 +++++++++++++++++++
 src/apache.c          |    9 ++++++--
 src/ascent.c          |    8 +++++--
 src/ceph.c            |    1 +
 src/collectd.conf.in  |    1 +
 src/collectd.conf.pod |    9 ++++++++
 src/nginx.c           |    8 +++++--
 src/powerdns.c        |   19 +++++++++++++++--
 src/write_http.c      |    6 ++++++
 src/write_tsdb.c      |   57 +++++++++++++++++++++++++++++--------------------
 10 files changed, 109 insertions(+), 31 deletions(-)

New commits:
commit 2039fa29a1247727e81a6f60c47410250165b4e3
Merge: 47c9674 38e15f5
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Wed Mar 11 22:42:11 2015 +0100

    Merge pull request #947 from mfournier/avoid_using_curlopt_userpwd
    
    avoid using CURLOPT_USERPWD when possible

commit 47c9674d2516a03a15a5eea36f3a6f2f067b5085
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Wed Mar 11 22:15:13 2015 +0100

    amqp: add documentation bits for ConnectionRetryDelay feature

commit 4fc052c0ab3545bca9c8cfbf3247ff22f6fe58f9
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Wed Mar 11 22:12:16 2015 +0100

    amqp: disable reconnection delaying feature by default

commit 1affe76577741c3ce45ffb052891b5d43ab3b000
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Wed Mar 11 22:11:15 2015 +0100

    amqp: coding-style consistency

commit 5acbb982f1c16b1abb0f088698d7165327718fd4
Author: Yoga Ramalingam <yramalingam1 at bloomberg.net>
Date:   Fri Oct 31 16:03:31 2014 -0400

    AMQP connection failure leads collectd to use 100%CPU
    
    Summary:
    Issue : https://ipm.bloomberg.com/jira/browse/SS-103
    Solution : When amqp connection fails, it retries for every message, added a fix to retry only after a delay. A new configuration "ConnectionRetryDelay"  has been introduced with default value as 60 seconds.
    
    Test Plan:
    1. Tested without the new configuration
    2. Tested with the new configuration
    
    In both the cases, verified connection is retried only after the delay and made sure collectd is not taking 100% cpu.
    
    Reviewers: skhajamo
    
    Reviewed By: skhajamo
    
    CC: arcyd
    
    Differential Revision: https://all.phab.dev.bloomberg.com/D149956
    
    Conflicts:
    	src/amqp.c

commit d80e639b0ac36e3aa87382c6da93ddc8c4b34170
Merge: e1e5931 b93947b
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Tue Mar 10 21:10:19 2015 +0100

    Merge pull request #965 from rubenk/powerdns-update-auth-stats
    
    powerdns: update plugin with stats for pdns 3.4.3

commit e1e5931a3e2e24c6c1b769ae3d4818d0ffdb49b5
Merge: 68b76e9 60124c7
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Tue Mar 10 19:43:23 2015 +0100

    Merge pull request #959 from rubenk/fix-ceph-plugin
    
    Ceph: do not define _BSD_SOURCE

commit 68b76e9e32d172936e7f01d6ac0cd5e4d49f8d46
Author: Florian Forster <octo at collectd.org>
Date:   Tue Mar 10 15:34:10 2015 +0100

    write_tsdb plugin: Fix name generation even more.
    
    There were more cases in which "type" or "type_instance" were omitted.
    
    Fixes: #945

commit 42e4d6cd43374ac5e954a02408e7e79734c90f90
Author: Dallin Young <dallin.young at gmail.com>
Date:   Fri Feb 20 19:33:00 2015 +0100

    write_tsdb plugin: Add type and type_instance to the metric name in any case.
    
    Previously, the generated names were wrong, especially when no
    plugin instance was used for a metric.
    
    Fixes: #945
    Signed-off-by: Florian Forster <octo at collectd.org>

commit b93947b198b239879fb04ea55db526096b211420
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date:   Mon Mar 9 22:31:52 2015 +0100

    powerdns: update plugin with stats for pdns 3.4.3

commit 60124c7da3a9fccdc610d804755a5f27398d0951
Author: Ruben Kerkhof <ruben at rubenkerkhof.com>
Date:   Wed Mar 4 15:38:06 2015 +0100

    Ceph: define _DEFAULT_SOURCE next to _BSD_SOURCE
    
    Fixes:
    make[3]: Entering directory '/home/ruben/src/collectd/src'
      CC       ceph_la-ceph.lo
    In file included from /usr/include/stdio.h:27:0,
                     from ./daemon/collectd.h:34,
                     from ceph.c:26:
    /usr/include/features.h:148:3: error: #warning "_BSD_SOURCE and
    _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Werror=cpp]
     # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use
     # _DEFAULT_SOURCE"
       ^
    cc1: all warnings being treated as errors
    Makefile:4120: recipe for target 'ceph_la-ceph.lo' failed
    make[3]: *** [ceph_la-ceph.lo] Error 1
    make[3]: Leaving directory '/home/ruben/src/collectd/src'
    Makefile:5096: recipe for target 'all-recursive' failed
    make[2]: *** [all-recursive] Error 1
    make[2]: Leaving directory '/home/ruben/src/collectd/src'
    Makefile:3142: recipe for target 'all' failed
    make[1]: *** [all] Error 2
    make[1]: Leaving directory '/home/ruben/src/collectd/src'
    Makefile:551: recipe for target 'all-recursive' failed
    make: *** [all-recursive] Error 1

commit 38e15f5809846c009792ef9aeee800efbf3aa21e
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date:   Tue Feb 24 21:46:53 2015 +0100

    avoid using CURLOPT_USERPWD when possible
    
    CURLOPT_USERPWD chokes on colons inside usernames or passwords, so use
    CURLOPT_USERNAME and CURLOPT_PASSWORD if curl 7.19.1 or newer is found.
    
    Follow-up to 0af75dc13 for the rest of the plugins based on libcurl.