Code

collectd.git
10 years agoRevert "Let snmp_synch_response deal with PDU freeing"
Marc Fournier [Wed, 19 Nov 2014 16:59:30 +0000 (17:59 +0100)]
Revert "Let snmp_synch_response deal with PDU freeing"

This reverts commit 9d6f72e5054cfbb183585991fefcf119259d71c4.

The proper fix to this issue is in the collectd-4.10 branch. See also
79e90bba.

10 years agoLet snmp_synch_response deal with PDU freeing
Pierre-Yves Ritschard [Wed, 19 Nov 2014 15:00:54 +0000 (16:00 +0100)]
Let snmp_synch_response deal with PDU freeing

When reading from tables, upon errors the PDUs sent are already
freed by snmp_synch_response since they are right after
snmp_send is called.

This commit syncs collectd's approach with other occurences of
snmp_synch_response calls.

There might be a few corner cases where we leak PDUs, but it
is unclear how to check for those since we would need to
have an indication that snmp_send was never called, which
as far as I can tell is not possible.

The potential for failure in snmp_send is rather low and will
be easily spotted though, since when crafting invalid PDUs
snmp send will constantly fail and since valid configurations
can never leak memory.

This fixes #804

10 years agoredhat initscript: add timeout when stopping the daemon
Marc Fournier [Fri, 7 Nov 2014 16:37:40 +0000 (17:37 +0100)]
redhat initscript: add timeout when stopping the daemon

This mitigates the risk of having 2 daemons running simultaneously
during a short period, on restart.

The debian package's initscript does the same thing, using the same
timeout value.

10 years agocurl_json: fix the array access implemented in f1e1e37e
Wilfried Goesgens [Thu, 30 Oct 2014 20:32:17 +0000 (21:32 +0100)]
curl_json: fix the array access implemented in f1e1e37e

In the avl-tree we store two different structs, cj_key_t for the value
we search, c_avl_tree_t for sub-nodes.
The old version does assume when it will find a key, and when a tree,
which doesn't have to be right in all cases.
Therefore we utilize the magic to revalidate this cast.
Being able to tell tree from key, we now can also implement array access
on the right most node of the tree-path.

10 years agostatsd: clarify/simplify documentation & example
Marc Fournier [Thu, 25 Sep 2014 16:54:56 +0000 (18:54 +0200)]
statsd: clarify/simplify documentation & example

10 years agoAdded documentation for StatsD module per added functionality in issue #403.
Denis Boulas [Tue, 23 Sep 2014 08:08:25 +0000 (11:08 +0300)]
Added documentation for StatsD module per added functionality in issue #403.

10 years agoMerge branch 'collectd-5.3' into collectd-5.4
Florian Forster [Wed, 10 Sep 2014 15:15:24 +0000 (17:15 +0200)]
Merge branch 'collectd-5.3' into collectd-5.4

10 years agosrc/common.c: Fix strstripnewline().
Florian Forster [Wed, 10 Sep 2014 14:54:26 +0000 (16:54 +0200)]
src/common.c: Fix strstripnewline().

Because the length of the string was decremented too late, the function
would actually overwrite the trailing null byte instead of the newline.

10 years agoRPM specfile: enable lvm plugin on RHEL7
Marc Fournier [Mon, 8 Sep 2014 15:29:14 +0000 (17:29 +0200)]
RPM specfile: enable lvm plugin on RHEL7

10 years agoMerge branch 'collectd-5.3' into collectd-5.4
Marc Fournier [Mon, 8 Sep 2014 15:21:38 +0000 (17:21 +0200)]
Merge branch 'collectd-5.3' into collectd-5.4

Conflicts:
contrib/redhat/collectd.spec

10 years agoRPM specfile: enable netlink plugin on RHEL > 5
Marc Fournier [Mon, 8 Sep 2014 14:59:30 +0000 (16:59 +0200)]
RPM specfile: enable netlink plugin on RHEL > 5

10 years agoRPM specfile: fix bogus dates
Marc Fournier [Mon, 8 Sep 2014 14:42:14 +0000 (16:42 +0200)]
RPM specfile: fix bogus dates

modern rpmbuild versions appear to be more strict on this point.

10 years agoRPM specfile: support for RHEL7
Marc Fournier [Mon, 8 Sep 2014 14:41:21 +0000 (16:41 +0200)]
RPM specfile: support for RHEL7

10 years agoRPM specfile: add missing %files section for modbus plugin
Marc Fournier [Mon, 8 Sep 2014 12:12:51 +0000 (14:12 +0200)]
RPM specfile: add missing %files section for modbus plugin

complement to a781eb2c5

10 years agoRPM specfile: remove define accidentally re-added when handling merge conflict
Marc Fournier [Mon, 8 Sep 2014 10:49:49 +0000 (12:49 +0200)]
RPM specfile: remove define accidentally re-added when handling merge conflict

10 years agoRPM specfile: remove macro accidentally re-added when handling merge conflict
Marc Fournier [Mon, 8 Sep 2014 10:38:53 +0000 (12:38 +0200)]
RPM specfile: remove macro accidentally re-added when handling merge conflict

10 years agoRPM specfile: remove duplicate modbus block
Marc Fournier [Mon, 8 Sep 2014 10:26:55 +0000 (12:26 +0200)]
RPM specfile: remove duplicate modbus block

10 years agoMerge branch 'collectd-5.3' into collectd-5.4
Florian Forster [Sat, 6 Sep 2014 09:27:56 +0000 (11:27 +0200)]
Merge branch 'collectd-5.3' into collectd-5.4

Conflicts:
src/curl.c

10 years agonetwork plugin: Improve client connecting behavior.
Florian Forster [Sat, 6 Sep 2014 08:58:45 +0000 (10:58 +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
10 years agosrc/utils_match.[ch]: Implement match_value_reset().
Florian Forster [Wed, 3 Sep 2014 07:10:00 +0000 (09:10 +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
10 years agocurl plugin: Use the utility functions for config handling.
Florian Forster [Wed, 3 Sep 2014 05:39:27 +0000 (07:39 +0200)]
curl plugin: Use the utility functions for config handling.

10 years agoMerge remote-tracking branch 'github/collectd-5.3' into collectd-5.3
Florian Forster [Tue, 2 Sep 2014 17:51:37 +0000 (19:51 +0200)]
Merge remote-tracking branch 'github/collectd-5.3' into collectd-5.3

10 years agosrc/meta_data.c: If the meta_data_t is empty, avoid calling malloc(0).
Florian Forster [Tue, 2 Sep 2014 17:50:47 +0000 (19:50 +0200)]
src/meta_data.c: If the meta_data_t is empty, avoid calling malloc(0).

10 years agosrc/utils_format_json.c: Handle empty meta_data_t gracefully.
Florian Forster [Tue, 2 Sep 2014 17:49:11 +0000 (19:49 +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
10 years agopython plugin: Don't create empty meta_data_t objects.
Florian Forster [Tue, 2 Sep 2014 17:48:10 +0000 (19:48 +0200)]
python plugin: Don't create empty meta_data_t objects.

Fixes: #716
10 years agosrc/utils_rrdcreate.c: Free "args".
Florian Forster [Tue, 2 Sep 2014 14:54:07 +0000 (16:54 +0200)]
src/utils_rrdcreate.c: Free "args".

Thanks to Yves Mettier for pointing this out!

Fixes: #661
10 years agoMerge branch 'collectd-5.3' into collectd-5.4
Marc Fournier [Fri, 29 Aug 2014 15:26:41 +0000 (17:26 +0200)]
Merge branch 'collectd-5.3' into collectd-5.4

Conflicts:
contrib/redhat/collectd.spec

10 years agoRPM specfile: update changelog without incrementing release number
Marc Fournier [Fri, 29 Aug 2014 15:20:57 +0000 (17:20 +0200)]
RPM specfile: update changelog without incrementing release number

10 years agoGenericJMXConfConnection: Remove unused imports.
Florian Forster [Thu, 28 Aug 2014 18:55:45 +0000 (20:55 +0200)]
GenericJMXConfConnection: Remove unused imports.

10 years agojava plugin: Make sure cjni_thread_detach() is called on all paths.
Florian Forster [Thu, 28 Aug 2014 18:41:25 +0000 (20:41 +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.

10 years agocollectd.conf(5): Improve AutoLoadPlugin documentation.
Florian Forster [Fri, 29 Aug 2014 05:00:33 +0000 (07:00 +0200)]
collectd.conf(5): Improve AutoLoadPlugin documentation.

Make it clear that plugins without a <Plugin /> block will still need a
LoadPlugin line.

References: #715

10 years agocollectd.conf(5): Improve documentation of LoadPlugin.
Florian Forster [Wed, 27 Aug 2014 11:04:59 +0000 (13:04 +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
10 years agoEL <6 provide perl-ExtUtils-Embed with base perl
Kevin Bowling [Thu, 14 Aug 2014 09:30:45 +0000 (02:30 -0700)]
EL <6 provide perl-ExtUtils-Embed with base perl

Conflicts:
contrib/redhat/collectd.spec

10 years agoStatsd: support samplerate field in timing metric types
John Leach [Mon, 18 Aug 2014 20:36:35 +0000 (21:36 +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

10 years agocollectd.conf: Fix default packet size of the network plugin.
Florian Forster [Mon, 18 Aug 2014 07:58:34 +0000 (09:58 +0200)]
collectd.conf: Fix default packet size of the network plugin.

Fixes: #710
10 years agoMerge branch 'collectd-5.3' into collectd-5.4
Florian Forster [Mon, 18 Aug 2014 07:35:04 +0000 (09:35 +0200)]
Merge branch 'collectd-5.3' into collectd-5.4

Conflicts:
contrib/redhat/collectd.spec

10 years agoMerge branch 'collectd-4.10' into collectd-5.3
Florian Forster [Mon, 18 Aug 2014 07:33:29 +0000 (09:33 +0200)]
Merge branch 'collectd-4.10' into collectd-5.3

10 years agocurl_xml plugin: Fixed tautological pointer comparison error.
Arthur Marble [Sun, 17 Aug 2014 22:34:04 +0000 (17:34 -0500)]
curl_xml plugin: Fixed tautological pointer comparison error.

Fixes: http://bugs.debian.org/758481
Signed-off-by: Florian Forster <octo@collectd.org>
10 years agocollectd.conf(5): add detail & example about multi-instance filterchain targets
Marc Fournier [Wed, 13 Aug 2014 07:09:14 +0000 (09:09 +0200)]
collectd.conf(5): add detail & example about multi-instance filterchain targets

10 years agosnmp: free snmp_pdu struct allocated by snmp_pdu_create()
Marc Fournier [Fri, 8 Aug 2014 13:55:10 +0000 (15:55 +0200)]
snmp: free snmp_pdu struct allocated by snmp_pdu_create()

This should fix the leak reported in issue #610.

10 years agoMerge pull request #540 from tokkee/configure
Marc Fournier [Thu, 7 Aug 2014 13:42:22 +0000 (15:42 +0200)]
Merge pull request #540 from tokkee/configure

configure: Fixed check for libsigrok and AM_PATH_GLIB_2_0.

10 years agoMerge pull request #689 from ymettier/ym/cd53_fix_tcpconns_inet_diag
Marc Fournier [Thu, 7 Aug 2014 12:32:47 +0000 (14:32 +0200)]
Merge pull request #689 from ymettier/ym/cd53_fix_tcpconns_inet_diag

Fix for 'linux/inet_diag.h: No such file or directory'

10 years agoRedHat RPM spec: add modbus plugin
Marc Fournier [Wed, 6 Aug 2014 14:59:21 +0000 (16:59 +0200)]
RedHat RPM spec: add modbus plugin

...  now that EPEL6 provides libmodbus

10 years agoFix for 'linux/inet_diag.h: No such file or directory'
Yves Mettier [Mon, 4 Aug 2014 12:01:01 +0000 (14:01 +0200)]
Fix for 'linux/inet_diag.h: No such file or directory'

10 years agofix: use DOUBLE_TO_CDTIME_T() to match input type
Marc Fournier [Mon, 4 Aug 2014 11:37:09 +0000 (13:37 +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.

10 years agomistake, SAVE_LIBS="$LIBS" is correct.
KOMEDA Shinji [Wed, 30 Jul 2014 08:56:07 +0000 (17:56 +0900)]
mistake, SAVE_LIBS="$LIBS" is correct.

10 years agopatch required to build oracle plugin, collectd-5.4.0 (#653)
KOMEDA Shinji [Wed, 25 Jun 2014 13:34:15 +0000 (22:34 +0900)]
patch required to build oracle plugin, collectd-5.4.0 (#653)

10 years agoMerge pull request #579 from mfournier/libiptc-ldflags
Pierre-Yves Ritschard [Mon, 28 Jul 2014 20:48:17 +0000 (22:48 +0200)]
Merge pull request #579 from mfournier/libiptc-ldflags

link iptables plugin against flags from pkg-config

10 years agoMerge pull request #677 from collectd/revert-630-F-METRICS-383-tsdb-writer-5.4
Pierre-Yves Ritschard [Mon, 28 Jul 2014 15:07:17 +0000 (17:07 +0200)]
Merge pull request #677 from collectd/revert-630-F-METRICS-383-tsdb-writer-5.4

Revert "write_tsdb plugin"

10 years agoRevert "write_tsdb plugin"
Pierre-Yves Ritschard [Mon, 28 Jul 2014 15:07:07 +0000 (17:07 +0200)]
Revert "write_tsdb plugin"

10 years agoMerge pull request #630 from llnw/F-METRICS-383-tsdb-writer-5.4
Pierre-Yves Ritschard [Mon, 28 Jul 2014 15:07:02 +0000 (17:07 +0200)]
Merge pull request #630 from llnw/F-METRICS-383-tsdb-writer-5.4

write_tsdb plugin

10 years agoutils_vl_lookup: Fixed a race when creating user objects.
Sebastian Harl [Sun, 27 Jul 2014 12:15:23 +0000 (14:15 +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.

10 years agoPlugin exec: change notification time to integer.
Manuel Luis Sanmartín Rozada [Thu, 19 Jun 2014 14:37:15 +0000 (16:37 +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.

10 years agocmd PUTNOTIF time option: handle double values.
Manuel Luis Sanmartín Rozada [Thu, 19 Jun 2014 17:14:53 +0000 (19:14 +0200)]
cmd PUTNOTIF time option: handle double values.

Conflicts:
src/utils_cmd_putnotif.c

10 years agoPlugin java: fix notification time conversion to cdtime_t.
Manuel Luis Sanmartín Rozada [Thu, 19 Jun 2014 13:14:02 +0000 (15:14 +0200)]
Plugin java: fix notification time conversion to cdtime_t.

10 years agoPlugin threshold: time is not set in missing notifications.
Manuel Luis Sanmartín Rozada [Thu, 19 Jun 2014 14:50:48 +0000 (16:50 +0200)]
Plugin threshold: time is not set in missing notifications.

10 years agoMerge pull request #592 from mfournier/bug-582
Pierre-Yves Ritschard [Sat, 26 Jul 2014 07:40:11 +0000 (09:40 +0200)]
Merge pull request #592 from mfournier/bug-582

curl_json: also allow long callback names.

10 years agomanpage: document 2 missing options to amqp plugin section
Marc Fournier [Tue, 24 Jun 2014 15:09:08 +0000 (17:09 +0200)]
manpage: document 2 missing options to amqp plugin section

10 years agoadd missing backticks which broke the build
Marc Fournier [Mon, 23 Jun 2014 16:00:01 +0000 (18:00 +0200)]
add missing backticks which broke the build

10 years agowrite_riemann: coding style consistency
Marc Fournier [Mon, 23 Jun 2014 14:47:20 +0000 (16:47 +0200)]
write_riemann: coding style consistency

Make the style in line with 50d1b34d6 (from master) and avoid later
merge conflict.

10 years agodon't assume pkg-config is in PATH
Lauri Tirkkonen [Thu, 22 May 2014 11:05:40 +0000 (14:05 +0300)]
don't assume pkg-config is in PATH

10 years agoConfigparser: when we alocate an empty list, we also need to reset the counter; else...
Wilfried Goesgens [Thu, 5 Jun 2014 18:04:13 +0000 (20:04 +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

10 years ago[METRICS-390] Make sure HostTags is initialized if not configured
Kevin Bowling [Wed, 11 Jun 2014 08:44:02 +0000 (01:44 -0700)]
[METRICS-390] Make sure HostTags is initialized if not configured

10 years ago[METRICS-390] Fix string handling for TSDB prefix and tags
Kevin Bowling [Tue, 3 Jun 2014 04:11:27 +0000 (21:11 -0700)]
[METRICS-390] Fix string handling for TSDB prefix and tags

10 years ago[METRICS-390] Add tag writing from metadata using TSDB target_set patches
Kevin Bowling [Sat, 31 May 2014 02:42:14 +0000 (19:42 -0700)]
[METRICS-390] Add tag writing from metadata using TSDB target_set patches

10 years ago[METRICS-383] Add HostTags which adds tags for all metrics from this writer
Kevin Bowling [Fri, 30 May 2014 02:58:51 +0000 (19:58 -0700)]
[METRICS-383] Add HostTags which adds tags for all metrics from this writer

10 years agoUncrustify write_tsdb
Kevin Bowling [Fri, 30 May 2014 01:15:21 +0000 (18:15 -0700)]
Uncrustify write_tsdb

10 years agoAdd DeleteSocket option in synopsis of manpage
txaj [Mon, 28 Apr 2014 16:28:41 +0000 (11:28 -0500)]
Add DeleteSocket option in synopsis of manpage

Signed-off-by: Florian Forster <octo@collectd.org>
10 years ago[METRICS-383] write_tsdb plugin
Kevin Bowling [Tue, 22 Apr 2014 03:53:25 +0000 (20:53 -0700)]
[METRICS-383] write_tsdb plugin

10 years agoadd brackets to the list of characters graphite chokes on
Marc Fournier [Tue, 1 Apr 2014 22:22:34 +0000 (00:22 +0200)]
add brackets to the list of characters graphite chokes on

10 years agoGraphite deals poorly with metric names containing quotes.
Pierre-Yves Ritschard [Fri, 24 Jan 2014 15:49:22 +0000 (16:49 +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`

10 years agocurl_json: also allow long callback names.
Marc Fournier [Mon, 31 Mar 2014 23:10:47 +0000 (01:10 +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.

10 years agoFix check for htonll in configure.ac
Manuel Luis Sanmartin Rozada [Mon, 31 Mar 2014 19:08:05 +0000 (21:08 +0200)]
Fix check for htonll in configure.ac

10 years agofix for #477: Notification time gone wrong
Adrian Miron [Sat, 8 Mar 2014 16:56:11 +0000 (18:56 +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.

10 years agoFix getargs declaration to compile in AIX7
Manuel Luis Sanmartín Rozada [Wed, 12 Mar 2014 14:04:39 +0000 (15:04 +0100)]
Fix getargs declaration to compile in AIX7

10 years agoAIX doesn't have MSG_DONTWAIT, define as MSG_NONBLOCK
Manuel Luis Sanmartín Rozada [Tue, 4 Mar 2014 17:27:54 +0000 (18:27 +0100)]
AIX doesn't have MSG_DONTWAIT, define as MSG_NONBLOCK

10 years agoUpdated Color to match DataSources and DSName for single-series graphs.
Joel Uckelman [Tue, 4 Mar 2014 11:07:04 +0000 (12:07 +0100)]
Updated Color to match DataSources and DSName for single-series graphs.

10 years agoFix missed change from int to double for interval
Justin Burnham [Thu, 6 Mar 2014 06:36:21 +0000 (22:36 -0800)]
Fix missed change from int to double for interval

10 years agoindent wh_init() to be consistent with the rest of the file
Marc Fournier [Sat, 29 Mar 2014 12:37:36 +0000 (13:37 +0100)]
indent wh_init() to be consistent with the rest of the file

10 years agoCall curl_global_init() in _init of plugins using curl
Jeremy Katz [Mon, 27 Jan 2014 01:43:19 +0000 (20:43 -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

10 years agolink iptables plugin against flags from pkg-config
Marc Fournier [Mon, 10 Mar 2014 20:28:36 +0000 (21:28 +0100)]
link iptables plugin against flags from pkg-config

This solves issue #326 for ubuntu versions >= 13.10

10 years agowrite_riemann plugin: Receive acknowledge message when using TCP.
John-John Tedro [Tue, 17 Sep 2013 13:40:13 +0000 (15:40 +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.

10 years agolvm: Do not segfault when there are no VGs
Jan Kundrát [Thu, 20 Feb 2014 01:13:20 +0000 (02:13 +0100)]
lvm: Do not segfault when there are no VGs

10 years agoconfigure: Fixed check for libsigrok and AM_PATH_GLIB_2_0.
Sebastian Harl [Sat, 8 Feb 2014 11:14:10 +0000 (12:14 +0100)]
configure: Fixed check for libsigrok and AM_PATH_GLIB_2_0.

10 years agoPlease free strings *after* printing them ;-)
Matthias Urlichs [Wed, 5 Feb 2014 09:49:24 +0000 (10:49 +0100)]
Please free strings *after* printing them ;-)

Signed-off-by: Florian Forster <octo@collectd.org>
10 years agoBump version to 5.4.1; Update ChangeLog. collectd-5.4.1
Florian Forster [Sun, 26 Jan 2014 07:52:52 +0000 (08:52 +0100)]
Bump version to 5.4.1; Update ChangeLog.

10 years agoMerge branch 'collectd-5.3' into collectd-5.4
Marc Fournier [Thu, 23 Jan 2014 13:19:20 +0000 (14:19 +0100)]
Merge branch 'collectd-5.3' into collectd-5.4

10 years agoMerge remote-tracking branch 'origin/collectd-4.10' into collectd-5.3
Marc Fournier [Thu, 23 Jan 2014 13:18:08 +0000 (14:18 +0100)]
Merge remote-tracking branch 'origin/collectd-4.10' into collectd-5.3

10 years agoMerge remote-tracking branch 'origin/pr/490' into collectd-5.3
Marc Fournier [Thu, 23 Jan 2014 13:17:25 +0000 (14:17 +0100)]
Merge remote-tracking branch 'origin/pr/490' into collectd-5.3

10 years agoconfigure: Fixed linker options when checking for amqp_tcp_socket_new. sh/collectd-5.3
Sebastian Harl [Wed, 22 Jan 2014 12:34:30 +0000 (13:34 +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.

10 years agoamqp plugin: Don't use C++ style comments.
Sebastian Harl [Wed, 22 Jan 2014 12:29:53 +0000 (13:29 +0100)]
amqp plugin: Don't use C++ style comments.

10 years agoMerge pull request #2 from mfournier/amqp-symbol_lookup
Sebastian Harl [Wed, 22 Jan 2014 12:27:30 +0000 (04:27 -0800)]
Merge pull request #2 from mfournier/amqp-symbol_lookup

amqp: fix symbol lookup error with librabbitmq >= 0.4.0

10 years agoamqp: fix symbol lookup error with librabbitmq >= 0.4.0
Marc Fournier [Tue, 21 Jan 2014 09:24:53 +0000 (10:24 +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 !

10 years agonetwork: comment libgcrypt initalization process
Marc Fournier [Wed, 15 Jan 2014 23:30:42 +0000 (00:30 +0100)]
network: comment libgcrypt initalization process

10 years agoapache plugin: Call curl_global_init() from the init function.
Florian Forster [Wed, 15 Jan 2014 22:47:33 +0000 (23:47 +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.

10 years ago[network] set_thread_cbs so we initialize the right threading mode in gcry_check_version
Chris Lundquist [Wed, 15 Jan 2014 02:33:13 +0000 (18:33 -0800)]
[network] set_thread_cbs so we initialize the right threading mode in gcry_check_version

Signed-off-by: Florian Forster <octo@collectd.org>
10 years agofix cgroups plugin name in example config
Marc Fournier [Mon, 13 Jan 2014 16:56:48 +0000 (17:56 +0100)]
fix cgroups plugin name in example config

10 years agoamqp plugin: Fixed compilation when using rabbitmq-c < 0.4.
Sebastian Harl [Mon, 13 Jan 2014 14:46:43 +0000 (15:46 +0100)]
amqp plugin: Fixed compilation when using rabbitmq-c < 0.4.

Thanks to Marc Fournier for noticing!

10 years agoMerge branch 'collectd-5.3' into collectd-5.4
Marc Fournier [Wed, 8 Jan 2014 17:28:07 +0000 (18:28 +0100)]
Merge branch 'collectd-5.3' into collectd-5.4

Conflicts:
src/zfs_arc.c

10 years agoMerge branch 'collectd-4.10' into collectd-5.3
Marc Fournier [Wed, 8 Jan 2014 17:24:27 +0000 (18:24 +0100)]
Merge branch 'collectd-4.10' into collectd-5.3