[collectd-changes] collectd, the system statistics collection daemon: Changes to 'master'
Florian Forster
octo at verplant.org
Mon Aug 18 09:52:37 CEST 2014
ChangeLog | 24 +++++++
configure.ac | 113 +++++++++++++++++++++++--------
contrib/collection3/etc/collection.conf | 10 +--
contrib/redhat/collectd.spec | 21 ++++++
src/Makefile.am | 4 +-
src/aggregation.c | 3 +-
src/amqp.c | 52 +++++++++++++-
src/apache.c | 9 +++
src/collectd-unixsock.pod | 1 +
src/collectd.conf.in | 2 +-
src/collectd.conf.pod | 38 ++++++++++-
src/common.c | 2 +-
src/configfile.c | 9 ++-
src/curl.c | 1 +
src/curl_json.c | 14 +++-
src/curl_xml.c | 11 ++-
src/exec.c | 4 +-
src/lvm.c | 4 ++
src/network.c | 9 ++-
src/processes.c | 2 +-
src/pyvalues.c | 2 +-
src/snmp.c | 4 ++
src/tcpconns.c | 13 ++++
src/utils_vl_lookup.c | 11 ++-
src/write_http.c | 9 +++
src/write_riemann.c | 74 ++++++++++----------
version-gen.sh | 2 +-
27 files changed, 355 insertions(+), 93 deletions(-)
New commits:
commit 103f05e098865196fc5f28df51e99b64fd6b5202
Merge: d4547a2 fd7673e
Author: Florian Forster <octo at collectd.org>
Date: Mon Aug 18 09:50:34 2014 +0200
Merge branch 'collectd-5.4'
Conflicts:
configure.ac
src/curl_json.c
src/lvm.c
src/write_riemann.c
commit fd7673e5e9ad074624fc23cda5d2ec4549d43659
Merge: 3c424eb 96e0f23
Author: Florian Forster <octo at collectd.org>
Date: Mon Aug 18 09:35:04 2014 +0200
Merge branch 'collectd-5.3' into collectd-5.4
Conflicts:
contrib/redhat/collectd.spec
commit 96e0f2341bace029acefe0a88bab96ae326c0ff5
Merge: c6a4337 0afea60
Author: Florian Forster <octo at collectd.org>
Date: Mon Aug 18 09:33:29 2014 +0200
Merge branch 'collectd-4.10' into collectd-5.3
commit 0afea60611f115a28b8ec331aba610e3038c1ef2
Author: Arthur Marble <arthur at info9.net>
Date: Sun Aug 17 17:34:04 2014 -0500
curl_xml plugin: Fixed tautological pointer comparison error.
Fixes: http://bugs.debian.org/758481
Signed-off-by: Florian Forster <octo at collectd.org>
commit c6a433718fa3bc3b6192153fee23558ddf011838
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Wed Aug 13 09:09:14 2014 +0200
collectd.conf(5): add detail & example about multi-instance filterchain targets
commit 0da910fb1bf2bd4982ca6541458c795ec296f398
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Fri Aug 8 15:55:10 2014 +0200
snmp: free snmp_pdu struct allocated by snmp_pdu_create()
This should fix the leak reported in issue #610.
commit 3c424eba3b919af518e4078bd5856f95d3a6ef47
Merge: 520f074 5bdc5d3
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Thu Aug 7 15:42:22 2014 +0200
Merge pull request #540 from tokkee/configure
configure: Fixed check for libsigrok and AM_PATH_GLIB_2_0.
commit 37a82b6340ad2748e667a96b5af5c617edb3c72d
Merge: a781eb2 0bd8392
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Thu Aug 7 14:32:47 2014 +0200
Merge pull request #689 from ymettier/ym/cd53_fix_tcpconns_inet_diag
Fix for 'linux/inet_diag.h: No such file or directory'
commit a781eb2c59a9b65c30cbbe0880ea6aab90e65c0e
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Wed Aug 6 16:59:21 2014 +0200
RedHat RPM spec: add modbus plugin
... now that EPEL6 provides libmodbus
commit 0bd83922cc17a79de74067b29fa83a1c306015a4
Author: Yves Mettier <ymettier at free.fr>
Date: Mon Aug 4 14:01:01 2014 +0200
Fix for 'linux/inet_diag.h: No such file or directory'
commit 524b85687dbbd4cc2bbb650caf300162dcd16e96
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Mon Aug 4 13:37:09 2014 +0200
fix: use DOUBLE_TO_CDTIME_T() to match input type
... as strtod() returns a double not a time_t.
Follow-up to 7d1d59fb to match what ada80db25 does (currently in
master) and avoid a merge conflict.
commit b9ab99cc37687a111c4bbdd25c5924fa74a0c056
Author: KOMEDA Shinji <komeda.shinji at gmail.com>
Date: Wed Jul 30 17:56:07 2014 +0900
mistake, SAVE_LIBS="$LIBS" is correct.
commit ee49a2a68fe12b972b32e2d4d61aed91d6052cdc
Author: KOMEDA Shinji <komeda.shinji at gmail.com>
Date: Wed Jun 25 22:34:15 2014 +0900
patch required to build oracle plugin, collectd-5.4.0 (#653)
commit 7ae0eb4b33b50a9da921221264fbcc69e85eb27a
Merge: 9f6f901 81836d0
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Mon Jul 28 22:48:17 2014 +0200
Merge pull request #579 from mfournier/libiptc-ldflags
link iptables plugin against flags from pkg-config
commit 520f0743b108c58cf6b5c3c87f69f839bbf33c8a
Merge: d026829 7771a19
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Mon Jul 28 17:07:17 2014 +0200
Merge pull request #677 from collectd/revert-630-F-METRICS-383-tsdb-writer-5.4
Revert "write_tsdb plugin"
commit 7771a19a0bee247b8e1da848ab47671bd884c5b9
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Mon Jul 28 17:07:07 2014 +0200
Revert "write_tsdb plugin"
commit d0268299fc6a628f27667c22666f571cac839857
Merge: 1164a4c 276590a
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Mon Jul 28 17:07:02 2014 +0200
Merge pull request #630 from llnw/F-METRICS-383-tsdb-writer-5.4
write_tsdb plugin
commit 9f6f901889d4c9f594b5ae1fd0f449fcdd2d8fe3
Author: Sebastian Harl <sh at tokkee.org>
Date: Sun Jul 27 14:15:23 2014 +0200
utils_vl_lookup: Fixed a race when creating user objects.
This could cause multiple aggregation instances to be created in the
aggregation plugin when first writing data to the plugin. This, in turn, led
to "value too old" warnings because subsequently all data was submitted twice.
Thanks to @faxm0dem for reporting this in GH #535.
commit 07e4683f7f985668641d79137b64d148bc18ba8a
Author: Manuel Luis SanmartÃn Rozada <manuel.luis at gmail.com>
Date: Thu Jun 19 16:37:15 2014 +0200
Plugin exec: change notification time to integer.
Acording to collectd-exec.5 NOTIFICATION DATA FORMAT: time is epoch, i. e. as seconds since 1970-01-01 00:00:00 UTC.
commit 7d1d59fb064f2a9adfba50d3ea5c39ebc6bebd3c
Author: Manuel Luis SanmartÃn Rozada <manuel.luis at gmail.com>
Date: Thu Jun 19 19:14:53 2014 +0200
cmd PUTNOTIF time option: handle double values.
Conflicts:
src/utils_cmd_putnotif.c
commit f5c294b7355cee34df44b1c5b8ac3ef7b85664cd
Author: Manuel Luis SanmartÃn Rozada <manuel.luis at gmail.com>
Date: Thu Jun 19 15:14:02 2014 +0200
Plugin java: fix notification time conversion to cdtime_t.
commit ac78faa99d4b34c78a7bca741430c06c56e6f32c
Author: Manuel Luis SanmartÃn Rozada <manuel.luis at gmail.com>
Date: Thu Jun 19 16:50:48 2014 +0200
Plugin threshold: time is not set in missing notifications.
commit 1164a4cf351023ead8ae0d876d65e17900981251
Merge: 1a82248 e616449
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Sat Jul 26 09:40:11 2014 +0200
Merge pull request #592 from mfournier/bug-582
curl_json: also allow long callback names.
commit 71e39e8ef345daf2bd109749ae4f58bd7b4c659e
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Tue Jun 24 17:09:08 2014 +0200
manpage: document 2 missing options to amqp plugin section
commit 497f5785e8b385f03b5fb5b15bdff8ba39e4699e
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Mon Jun 23 18:00:01 2014 +0200
add missing backticks which broke the build
commit 51f6fa49cdac0e7702fef71baea85f69a39da82f
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Mon Jun 23 16:47:20 2014 +0200
write_riemann: coding style consistency
Make the style in line with 50d1b34d6 (from master) and avoid later
merge conflict.
commit c2ca2a46e617878dcff69de0b8940ea91d3401cc
Author: Lauri Tirkkonen <lotheac at iki.fi>
Date: Thu May 22 14:05:40 2014 +0300
don't assume pkg-config is in PATH
commit 6207fce91a0933e852ec76fc31ca81ec00ffa04b
Author: Wilfried Goesgens <dothebart at citadel.org>
Date: Thu Jun 5 20:04:13 2014 +0200
Configparser: when we alocate an empty list, we also need to reset the counter; else we will trip over this later.
This fixes https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=750440
commit 276590a0c2affb5c65798e6446a796b359770142
Author: Kevin Bowling <kbowling at llnw.com>
Date: Wed Jun 11 01:44:02 2014 -0700
[METRICS-390] Make sure HostTags is initialized if not configured
commit 7d2294322c1e6239ede5cfa3edb8783fb1e7fcd3
Author: Kevin Bowling <kbowling at llnw.com>
Date: Mon Jun 2 21:11:27 2014 -0700
[METRICS-390] Fix string handling for TSDB prefix and tags
commit bc348a3336bebb27d92977b39fdd4b3c8518da46
Author: Kevin Bowling <kbowling at llnw.com>
Date: Fri May 30 19:42:14 2014 -0700
[METRICS-390] Add tag writing from metadata using TSDB target_set patches
commit 75d231f48a06f39847da51b633f7215cb5a5c9b2
Author: Kevin Bowling <kbowling at llnw.com>
Date: Thu May 29 19:58:51 2014 -0700
[METRICS-383] Add HostTags which adds tags for all metrics from this writer
commit 0ff29956489a624846ac14ca02e46217d393e9ee
Author: Kevin Bowling <kbowling at llnw.com>
Date: Thu May 29 18:15:21 2014 -0700
Uncrustify write_tsdb
commit 067a28c5312fdb5ca10c706feef769afc7d1cab7
Author: txaj <txaj at ovh.fr>
Date: Mon Apr 28 11:28:41 2014 -0500
Add DeleteSocket option in synopsis of manpage
Signed-off-by: Florian Forster <octo at collectd.org>
commit 6df4f0f3cb7f99509e93254791260f2a181e250e
Author: Kevin Bowling <kbowling at llnw.com>
Date: Mon Apr 21 20:53:25 2014 -0700
[METRICS-383] write_tsdb plugin
commit 109cc80a5f4ee63ffbababe8e5e9edc1e3f3fc15
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Wed Apr 2 00:22:34 2014 +0200
add brackets to the list of characters graphite chokes on
commit fd4bdc17fc1560ed0775e54d01f564345ecea92e
Author: Pierre-Yves Ritschard <pyr at spootnik.org>
Date: Fri Jan 24 16:49:22 2014 +0100
Graphite deals poorly with metric names containing quotes.
Sanitize graphite metrics with our own escaping function,
better suited for this use-case than the one in `utils_parse_option`
commit e616449c23b1320b1f18f37a8a6f4b0e0b9c458d
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Tue Apr 1 01:10:47 2014 +0200
curl_json: also allow long callback names.
This is basically the same as 2f392819, which got applied to the
curl_xml plugin a few months ago.
Fixes #582.
commit 1a822486f40287f552890a553181fd620c662ada
Author: Manuel Luis Sanmartin Rozada <manuel.luis at gmail.com>
Date: Mon Mar 31 21:08:05 2014 +0200
Fix check for htonll in configure.ac
commit 43fcfd6a48b506b03114dd9637caf8fc211b47db
Author: Adrian Miron <adrian.miron.v2 at gmail.com>
Date: Sat Mar 8 18:56:11 2014 +0200
fix for #477: Notification time gone wrong
Sub-second time handling was added in collectd 5.0.0. This adds support
for this to the target_notification plugin, which got missed out at the
time.
commit 7fb11d646d9b4080e996d2645c8c911e843db9a6
Author: Manuel Luis SanmartÃn Rozada <manuel.luis at gmail.com>
Date: Wed Mar 12 15:04:39 2014 +0100
Fix getargs declaration to compile in AIX7
commit b0d364776a000846f5deb8c650d678834c537735
Author: Manuel Luis SanmartÃn Rozada <manuel.luis at gmail.com>
Date: Tue Mar 4 18:27:54 2014 +0100
AIX doesn't have MSG_DONTWAIT, define as MSG_NONBLOCK
commit 2d118ccc9dc78524b4b436dc14906ff433eefb42
Author: Joel Uckelman <uckelman at nomic.net>
Date: Tue Mar 4 12:07:04 2014 +0100
Updated Color to match DataSources and DSName for single-series graphs.
commit d571f4645593c16a26a98aa635b1952286089266
Author: Justin Burnham <jburnham at mediatemple.net>
Date: Wed Mar 5 22:36:21 2014 -0800
Fix missed change from int to double for interval
commit 6bd48f2346c5072dc22da58c7b7cd8e8ceb83fc5
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Sat Mar 29 13:37:36 2014 +0100
indent wh_init() to be consistent with the rest of the file
commit 66b400ab01b8133e450bb002e175117a1ab6f9ae
Author: Jeremy Katz <jeremy at katzbox.net>
Date: Sun Jan 26 20:43:19 2014 -0500
Call curl_global_init() in _init of plugins using curl
Need to call curl_global_init() or curl_easy_init() during init
for plugins when we're still running single threaded. This
updates the remaining ones
commit 81836d02839d13350aa8225396f9d44403e44f84
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Mon Mar 10 21:28:36 2014 +0100
link iptables plugin against flags from pkg-config
This solves issue #326 for ubuntu versions >= 13.10
commit e5d3760160c8fdadc81115e4f81dbb91569a8e7d
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 25d7de930baa8a25b232a6276e123ca692c1e710
Author: Jan Kundrát <jan.kundrat at cesnet.cz>
Date: Thu Feb 20 02:13:20 2014 +0100
lvm: Do not segfault when there are no VGs
commit 5bdc5d3ede2e1fad94dd7ebf6f76103201c39c3c
Author: Sebastian Harl <sh at tokkee.org>
Date: Sat Feb 8 12:14:10 2014 +0100
configure: Fixed check for libsigrok and AM_PATH_GLIB_2_0.
commit b21ab82a9ffe2a74a29c1dd606cb2ca7db6cd985
Author: Matthias Urlichs <matthias at urlichs.de>
Date: Wed Feb 5 10:49:24 2014 +0100
Please free strings *after* printing them ;-)
Signed-off-by: Florian Forster <octo at collectd.org>
commit c517ec54a78456b528249e87ac3d9f14f0d5ab81
Author: Florian Forster <octo at collectd.org>
Date: Sun Jan 26 08:52:52 2014 +0100
Bump version to 5.4.1; Update ChangeLog.
commit 19a89bf824f1a984fbdbd42a68ce113faadb04ea
Merge: 62b6bde 7a76219
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Thu Jan 23 14:19:20 2014 +0100
Merge branch 'collectd-5.3' into collectd-5.4
commit 7a762196fa7a4024c19ceac9b0c6918a5d8f62d5
Merge: d2e9e78 793c204
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Thu Jan 23 14:18:08 2014 +0100
Merge remote-tracking branch 'origin/collectd-4.10' into collectd-5.3
commit d2e9e78adec531d4c90460c9a39ccf6ed388cd69
Merge: affac33 1c04baf
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Thu Jan 23 14:17:25 2014 +0100
Merge remote-tracking branch 'origin/pr/490' into collectd-5.3
commit 1c04bafe27990a337df6b9a8582669fe110eb2ae
Author: Sebastian Harl <sh at tokkee.org>
Date: Wed Jan 22 13:34:30 2014 +0100
configure: Fixed linker options when checking for amqp_tcp_socket_new.
This fixes the check when using GCC's --as-needed which fails when options are
not specified in the right order. Libraries (-l options) have to be specified
after any source files. autoconf does the right thing when using $LIBS for
that case rather than $LDFLAGS.
commit 65ce17c396d1421807429f153d8d5302ad5d2a92
Author: Sebastian Harl <sh at tokkee.org>
Date: Wed Jan 22 13:29:53 2014 +0100
amqp plugin: Don't use C++ style comments.
commit 45c3dab26b4de8e49c301afa52d7c9e4f2b1500b
Merge: 3496d68 8d2726b
Author: Sebastian Harl <tokkee at debian.org>
Date: Wed Jan 22 04:27:30 2014 -0800
Merge pull request #2 from mfournier/amqp-symbol_lookup
amqp: fix symbol lookup error with librabbitmq >= 0.4.0
commit 8d2726baaa71d65bc70e76adeb2aa33bcd4f1421
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Tue Jan 21 10:24:53 2014 +0100
amqp: fix symbol lookup error with librabbitmq >= 0.4.0
amqp_socket_close() which we were using isn't exported anymore.
See https://github.com/alanxz/rabbitmq-c/commit/bdda7ab
amqp_destroy_connection() implicitly closes the socket, so we don't need
to bother about this if using librabbitmq >= 0.4.0
credits to @tokkee for figuring that out !
commit 793c2046de1ac04689d541a5e83513fe8e62578c
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Thu Jan 16 00:30:42 2014 +0100
network: comment libgcrypt initalization process
commit 5f2f969335757f31f42cd8bb7e38eb8c5fe5e56e
Author: Florian Forster <octo at collectd.org>
Date: Wed Jan 15 23:47:33 2014 +0100
apache plugin: Call curl_global_init() from the init function.
This is a shot in the dark in trying to address #513. By calling this
from an init() callback, I hope to be initializing the curl and gcrypt
libraries before collectd becomes multi-threaded, avoiding the problems
described in the issue.
commit ddffda7a150cd3abdb6ec392b514a250e91e0c19
Author: Chris Lundquist <chris.lundquist at github.com>
Date: Tue Jan 14 18:33:13 2014 -0800
[network] set_thread_cbs so we initialize the right threading mode in gcry_check_version
Signed-off-by: Florian Forster <octo at collectd.org>
commit 62b6bdead97c3e966eb4ebb55dcbea6d2010a691
Author: Marc Fournier <marc.fournier at camptocamp.com>
Date: Mon Jan 13 17:56:48 2014 +0100
fix cgroups plugin name in example config
commit 3496d684b96cb1bb87f67dfc7f2c7035042878f8
Author: Sebastian Harl <sh at tokkee.org>
Date: Mon Jan 13 15:46:43 2014 +0100
amqp plugin: Fixed compilation when using rabbitmq-c < 0.4.
Thanks to Marc Fournier for noticing!
commit 1a477ecb462094ad9e13320a9234716ead038b9c
Author: Sebastian Harl <sh at tokkee.org>
Date: Sat Nov 23 15:54:26 2013 +0100
amqp plugin: Added support for rabbitmq-c 0.4.x.
Upstream introduced a new socket interface and deprecated the old one. This
leads to compiler errors when using GCC and -Werror.
More information about the collectd-changes
mailing list