collectd.git
9 years agoascent: Add support for specifying a connection timeout
Marc Fournier [Sat, 4 Apr 2015 20:29:22 +0000 (22:29 +0200)]
ascent: Add support for specifying a connection timeout

9 years agonginx: Add support for specifying a connection timeout
Marc Fournier [Sat, 4 Apr 2015 20:28:47 +0000 (22:28 +0200)]
nginx: Add support for specifying a connection timeout

9 years agobind: Add support for specifying a connection timeout
Marc Fournier [Sat, 4 Apr 2015 20:27:53 +0000 (22:27 +0200)]
bind: Add support for specifying a connection timeout

9 years agoapache: Add support for specifying a connection timeout
Marc Fournier [Sat, 4 Apr 2015 20:26:34 +0000 (22:26 +0200)]
apache: Add support for specifying a connection timeout

9 years agocurl_xml: Add support for specifying a connection timeout
Marc Fournier [Sat, 4 Apr 2015 20:20:07 +0000 (22:20 +0200)]
curl_xml: Add support for specifying a connection timeout

9 years agocurl: adapt Timeout doc bits to new behaviour
Marc Fournier [Thu, 2 Apr 2015 16:29:05 +0000 (18:29 +0200)]
curl: adapt Timeout doc bits to new behaviour

Also clarify the ins and outs of stalled network connections regarding
threads consumption and add warning about timeouts and
MeasureResponseTime.

9 years agocurl_json: allow Timeout to be set to 0
Marc Fournier [Thu, 2 Apr 2015 16:25:42 +0000 (18:25 +0200)]
curl_json: allow Timeout to be set to 0

also use the per-instance interval or plugin_get_interval() as the
default value, depending on which one is configured.

9 years agocurl: allow Timeout to be set to 0
Marc Fournier [Thu, 2 Apr 2015 16:21:52 +0000 (18:21 +0200)]
curl: allow Timeout to be set to 0

also use plugin_get_interval() rather than cf_get_default_interval() to
take per-plugin interval in account.

9 years agocurl_json: Add support for specifying a connection timeout
Jan Kundrát [Wed, 25 Mar 2015 17:06:50 +0000 (18:06 +0100)]
curl_json: Add support for specifying a connection timeout

There's apparently no need to init the config values in the `db` struct;
memset() is used earlier in the process. This patch doesn't change this
convention.

9 years agocurl: Add support for specifying a connection timeout
Jan Kundrát [Sat, 21 Feb 2015 15:12:27 +0000 (16:12 +0100)]
curl: Add support for specifying a connection timeout

9 years agolog_logstash: adapt JSON format to logstash 1.2+
Marc Fournier [Tue, 17 Mar 2015 17:27:05 +0000 (18:27 +0100)]
log_logstash: adapt JSON format to logstash 1.2+

Fixes #974

9 years agoMerge branch 'collectd-5.4'
Marc Fournier [Thu, 12 Mar 2015 09:07:27 +0000 (10:07 +0100)]
Merge branch 'collectd-5.4'

Conflicts:
configure.ac
src/dbi.c
src/utils_latency.c

9 years agoRevert "add a conditional for the new dbi reentrant driver interface"
Marc Fournier [Thu, 12 Mar 2015 08:58:28 +0000 (09:58 +0100)]
Revert "add a conditional for the new dbi reentrant driver interface"

This reverts commit f1907a6d0775bc2ed9f2de79bd82b05e06e3e214.

With @pyr's acknowledgement, thanks !

Fixes #962

9 years agoMerge pull request #947 from mfournier/avoid_using_curlopt_userpwd
Marc Fournier [Wed, 11 Mar 2015 21:42:11 +0000 (22:42 +0100)]
Merge pull request #947 from mfournier/avoid_using_curlopt_userpwd

avoid using CURLOPT_USERPWD when possible

9 years agoamqp: add documentation bits for ConnectionRetryDelay feature
Marc Fournier [Wed, 11 Mar 2015 21:15:13 +0000 (22:15 +0100)]
amqp: add documentation bits for ConnectionRetryDelay feature

9 years agoamqp: disable reconnection delaying feature by default
Marc Fournier [Wed, 11 Mar 2015 21:12:16 +0000 (22:12 +0100)]
amqp: disable reconnection delaying feature by default

9 years agoamqp: coding-style consistency
Marc Fournier [Wed, 11 Mar 2015 21:11:15 +0000 (22:11 +0100)]
amqp: coding-style consistency

9 years agoAMQP connection failure leads collectd to use 100%CPU
Yoga Ramalingam [Fri, 31 Oct 2014 20:03:31 +0000 (16:03 -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

9 years agoMerge pull request #965 from rubenk/powerdns-update-auth-stats
Marc Fournier [Tue, 10 Mar 2015 20:10:19 +0000 (21:10 +0100)]
Merge pull request #965 from rubenk/powerdns-update-auth-stats

powerdns: update plugin with stats for pdns 3.4.3

9 years agoMerge pull request #959 from rubenk/fix-ceph-plugin
Marc Fournier [Tue, 10 Mar 2015 18:43:23 +0000 (19:43 +0100)]
Merge pull request #959 from rubenk/fix-ceph-plugin

Ceph: do not define _BSD_SOURCE

9 years agowrite_tsdb plugin: Fix name generation even more.
Florian Forster [Tue, 10 Mar 2015 14:34:10 +0000 (15:34 +0100)]
write_tsdb plugin: Fix name generation even more.

There were more cases in which "type" or "type_instance" were omitted.

Fixes: #945

9 years agowrite_tsdb plugin: Add type and type_instance to the metric name in any case.
Dallin Young [Fri, 20 Feb 2015 18:33:00 +0000 (19:33 +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@collectd.org>
9 years agoMakefile.am: s/INCLUDES/AM_CPPFLAGS/
Florian Forster [Tue, 10 Mar 2015 14:13:59 +0000 (15:13 +0100)]
Makefile.am: s/INCLUDES/AM_CPPFLAGS/

Fixes the following warning:
  Makefile.am:5: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')

9 years agopowerdns: update plugin with stats for pdns 3.4.3
Ruben Kerkhof [Mon, 9 Mar 2015 21:31:52 +0000 (22:31 +0100)]
powerdns: update plugin with stats for pdns 3.4.3

9 years agowrite_mongodb plugin: Fix BSON memory handling even further.
Florian Forster [Mon, 9 Mar 2015 09:59:38 +0000 (10:59 +0100)]
write_mongodb plugin: Fix BSON memory handling even further.

According to the mongo-c-driver 0.8.1 documentation, each call to
bson_alloc() needs to be matched by a call to bson_dealloc() and each
call to bson_init() needs to be matched by a call to bson_destroy().

Additionally, this patch adds macros for mongo-c-driver < 0.8.0 to map
the new bson_alloc() and bson_deallow() names to the old bson_create()
and bson_dispose() symbol names.

Tested with mongo-c-driver 0.8.1 and 0.7.1.

Fixes: #331, #956

9 years agowrite_mongodb plugin: s/bson_dispose/bson_destroy/
Florian Forster [Mon, 9 Mar 2015 07:56:39 +0000 (08:56 +0100)]
write_mongodb plugin: s/bson_dispose/bson_destroy/

Thanks to @eremenko for providing the initial patch!

Fixes: #331, #956

9 years agoCeph: define _DEFAULT_SOURCE next to _BSD_SOURCE
Ruben Kerkhof [Wed, 4 Mar 2015 14:38:06 +0000 (15:38 +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

9 years agoStatsd: avoid doing a division by zero when calculating the percentile with an empty...
Wilfried Goesgens [Tue, 29 Jul 2014 11:58:23 +0000 (13:58 +0200)]
Statsd: avoid doing a division by zero when calculating the percentile with an empty histogram.

9 years agoStatsd: avoid doing a division by zero when calculating the average if we didn't...
Wilfried Goesgens [Sat, 21 Jun 2014 19:14:28 +0000 (21:14 +0200)]
Statsd: avoid doing a division by zero when calculating the average if we didn't get any values.

9 years agoutils_latency: use portable format string
Marc Fournier [Tue, 27 Jan 2015 13:46:02 +0000 (14:46 +0100)]
utils_latency: use portable format string

9 years agostatsd histogram to support more than 1 second
Yoga Ramalingam [Fri, 14 Nov 2014 14:23:13 +0000 (09:23 -0500)]
statsd histogram to support more than 1 second

Summary:
Problem: Collectd/Statsd supports configurable percentiles for timers but it limits the value to be 1 to 1000ms. If the timer value is more than 1000ms, it uses for min, max, average,... and drops it for percentile computation.

Solution: Added support for increasing bin width when the value is above histogram's range.

Test Plan: Tested by sending metrics within range and out-of-range (ie above 1000 ms)

Reviewers: skhajamo, shalstea

Reviewed By: skhajamo

CC: arcyd
Differential Revision: https://all.phab.dev.bloomberg.com/D156454

9 years agoMerge pull request #838 from yogeswaran/histogram
Pierre-Yves Ritschard [Fri, 6 Mar 2015 07:30:38 +0000 (08:30 +0100)]
Merge pull request #838 from yogeswaran/histogram

statsd histogram to support more than 1 second

9 years agoconfigure: add liblvm2app to summary output
Marc Fournier [Tue, 3 Mar 2015 23:41:42 +0000 (00:41 +0100)]
configure: add liblvm2app to summary output

9 years agoMerge branch 'collectd-5.3' into collectd-5.4
Marc Fournier [Tue, 3 Mar 2015 23:39:09 +0000 (00:39 +0100)]
Merge branch 'collectd-5.3' into collectd-5.4

Conflicts:
configure.ac

9 years agoconfigure: add missing entries in summary output
Marc Fournier [Tue, 3 Mar 2015 23:29:58 +0000 (00:29 +0100)]
configure: add missing entries in summary output

... and reorder alphabetically.

9 years agoMerge pull request #951 from tokkee/sh/debian-patches
Marc Fournier [Tue, 3 Mar 2015 23:08:37 +0000 (00:08 +0100)]
Merge pull request #951 from tokkee/sh/debian-patches

plugin: Use strcasecmp rather than strncasecmp to find a plugin.

9 years agoMerge pull request #953 from rubenk/powerdns-do-not-look-past-the-end-of-array
Marc Fournier [Tue, 3 Mar 2015 22:59:38 +0000 (23:59 +0100)]
Merge pull request #953 from rubenk/powerdns-do-not-look-past-the-end-of-array

Powerdns plugin: fix logging on failed lookup

9 years agoPowerdns plugin: fix logging on failed lookup
Ruben Kerkhof [Sat, 28 Feb 2015 19:05:14 +0000 (20:05 +0100)]
Powerdns plugin: fix logging on failed lookup

Don't look past the end of the array but check the boundary first.

9 years agoMerge pull request #954 from rubenk/remove-outdated-advice
Marc Fournier [Tue, 3 Mar 2015 22:55:28 +0000 (23:55 +0100)]
Merge pull request #954 from rubenk/remove-outdated-advice

Setting Globals to true is not needed anymore

9 years agoSetting Globals to true is not needed anymore
Ruben Kerkhof [Sun, 1 Mar 2015 14:04:55 +0000 (15:04 +0100)]
Setting Globals to true is not needed anymore

003c6e86b480 made this happen by default

9 years agoclean.sh: take new 'src/daemon' dir in account
Marc Fournier [Tue, 3 Mar 2015 22:41:57 +0000 (23:41 +0100)]
clean.sh: take new 'src/daemon' dir in account

9 years agosnmp plugin: add hostname to "csnmp_value_list_to_value" error message
Sergey [Tue, 3 Mar 2015 21:36:03 +0000 (22:36 +0100)]
snmp plugin: add hostname to "csnmp_value_list_to_value" error message

Fixes #952

9 years agoRPM specfile: add ceph plugin
Marc Fournier [Mon, 24 Nov 2014 09:41:14 +0000 (10:41 +0100)]
RPM specfile: add ceph plugin

9 years agoREADME/AUTHORS: mention ceph plugin
Marc Fournier [Tue, 3 Mar 2015 20:54:58 +0000 (21:54 +0100)]
README/AUTHORS: mention ceph plugin

9 years agoMerge remote-tracking branch 'origin/pr/598'
Marc Fournier [Tue, 3 Mar 2015 20:36:21 +0000 (21:36 +0100)]
Merge remote-tracking branch 'origin/pr/598'

Conflicts:
src/collectd.conf.in
src/types.db

9 years agoRemove superfluous debug statements
daryder [Mon, 2 Mar 2015 14:33:01 +0000 (09:33 -0500)]
Remove superfluous debug statements

9 years agoSetting Globals to true is not needed anymore
Ruben Kerkhof [Sun, 1 Mar 2015 14:04:55 +0000 (15:04 +0100)]
Setting Globals to true is not needed anymore

003c6e86b480 made this happen by default

9 years agoPowerdns plugin: fix logging on failed lookup
Ruben Kerkhof [Sat, 28 Feb 2015 19:05:14 +0000 (20:05 +0100)]
Powerdns plugin: fix logging on failed lookup

Don't look past the end of the array but check the boundary first.

9 years agoplugin: Use strcasecmp rather than strncasecmp to find a plugin.
Sebastian Harl [Fri, 27 Feb 2015 15:49:01 +0000 (16:49 +0100)]
plugin: Use strcasecmp rather than strncasecmp to find a plugin.

This makes collectd resistant against vulnerable copies of libltdl
(CVE-2009-3736). See <http://bugs.debian.org/559801#15> for further
details.

9 years agoBump version to 5.4.2; Update ChangeLog. collectd-5.4.2
Florian Forster [Thu, 26 Feb 2015 14:06:36 +0000 (15:06 +0100)]
Bump version to 5.4.2; Update ChangeLog.

9 years agoMerge branch 'collectd-5.3' into collectd-5.4
Florian Forster [Thu, 26 Feb 2015 11:49:58 +0000 (12:49 +0100)]
Merge branch 'collectd-5.3' into collectd-5.4

9 years agoChangeLog: Add libdbi fix. collectd-5.3.2
Florian Forster [Thu, 26 Feb 2015 11:19:39 +0000 (12:19 +0100)]
ChangeLog: Add libdbi fix.

9 years agodbi plugin: Switch to libdbi's thread-safe interface.
Florian Forster [Thu, 26 Feb 2015 11:16:00 +0000 (12:16 +0100)]
dbi plugin: Switch to libdbi's thread-safe interface.

Macros are in place to make buliding with libdbi <0.9.0 possible.

Fixes: #950

9 years agoBump version to 5.3.2; Update ChangeLog.
Florian Forster [Thu, 26 Feb 2015 10:31:03 +0000 (11:31 +0100)]
Bump version to 5.3.2; Update ChangeLog.

9 years agocollectd-exec(5): Clarify the format of the Time: header.
Florian Forster [Thu, 26 Feb 2015 08:11:02 +0000 (09:11 +0100)]
collectd-exec(5): Clarify the format of the Time: header.

9 years agoRevert "Plugin exec: change notification time to integer."
Florian Forster [Thu, 26 Feb 2015 08:04:37 +0000 (09:04 +0100)]
Revert "Plugin exec: change notification time to integer."

This was working as intended.

This reverts commit 07e4683f7f985668641d79137b64d148bc18ba8a.

9 years agosnmp plugin: add hostname to "csnmp_instance_list_add" error message
Sergey [Tue, 24 Feb 2015 21:13:00 +0000 (22:13 +0100)]
snmp plugin: add hostname to "csnmp_instance_list_add" error message

Fixes #939

9 years agoavoid using CURLOPT_USERPWD when possible
Marc Fournier [Tue, 24 Feb 2015 20:46:53 +0000 (21:46 +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.

9 years agoMerge branch 'collectd-5.4'
Marc Fournier [Tue, 24 Feb 2015 09:02:58 +0000 (10:02 +0100)]
Merge branch 'collectd-5.4'

Conflicts:
src/Makefile.am
src/write_http.c

9 years agoMerge branch 'collectd-5.3' into collectd-5.4
Marc Fournier [Tue, 24 Feb 2015 08:57:29 +0000 (09:57 +0100)]
Merge branch 'collectd-5.3' into collectd-5.4

9 years agoMerge branch 'collectd-4.10' into collectd-5.3
Marc Fournier [Tue, 24 Feb 2015 06:43:22 +0000 (07:43 +0100)]
Merge branch 'collectd-4.10' into collectd-5.3

Conflicts:
src/collectd.conf.pod

9 years agoMerge pull request #890 from trenkel/master
trenkel [Sun, 15 Feb 2015 15:34:09 +0000 (16:34 +0100)]
Merge pull request #890 from trenkel/master

Fix compiler warnings with Python3.

9 years agoperl plugin: plugins are linked with *_LIBADD and LIBS not *_LIBS and LIBS
Jim Radford [Tue, 17 Sep 2013 17:52:03 +0000 (17:52 +0000)]
perl plugin: plugins are linked with *_LIBADD and LIBS not *_LIBS and LIBS

Conflicts:
src/Makefile.am

9 years agolibperl's ldopts include libaries and therefore should go in LIBS not LDFLAGS
Jim Radford [Wed, 7 Aug 2013 20:21:08 +0000 (13:21 -0700)]
libperl's ldopts include libaries and therefore should go in LIBS not LDFLAGS

Without this configure fails compile its libperl test program because
-lperl comes before the test program on the compiler command line.

Conflicts:
src/Makefile.am

9 years agoMerge pull request #390 from radford/libperl-ldopts
Marc Fournier [Fri, 6 Feb 2015 15:31:26 +0000 (16:31 +0100)]
Merge pull request #390 from radford/libperl-ldopts

libperl's ldopts include libaries and therefore should go in LIBS not LDFLAGS

9 years agomodbus: rename register types once more
Eric Sandeen [Wed, 28 Jan 2015 04:36:05 +0000 (22:36 -0600)]
modbus: rename register types once more

As I was looking over my config files again, ModbusRegisterType
kind of stuck out like a sore thumb.

Modbus does talk about "read holding" and "read input" as "commands";
perhaps renaming it as this patch does is more intuitive, so that all
of the Modbus register configurations start with Register.

I'm not wedded to it, but if you like it & agree, here you go.

Thanks,
-Eric

9 years agoMerge pull request #908 from vincentbernat/fix/libstatgrab4
Marc Fournier [Mon, 2 Feb 2015 10:41:48 +0000 (11:41 +0100)]
Merge pull request #908 from vincentbernat/fix/libstatgrab4

libstatgrab: fix detection of libstatgrab >= 0.90

9 years agoMerge pull request #902 from mfournier/write_http-node-blocks
Marc Fournier [Mon, 2 Feb 2015 10:25:03 +0000 (11:25 +0100)]
Merge pull request #902 from mfournier/write_http-node-blocks

write_http: deprecate <URL> blocks in favor of <Node>

9 years agoMerge pull request #899 from mfournier/write_http-multiple-destionations
Marc Fournier [Mon, 2 Feb 2015 10:24:08 +0000 (11:24 +0100)]
Merge pull request #899 from mfournier/write_http-multiple-destionations

write_http: make callback names context-dependent

9 years agoRPM specfile: doc clarification
Marc Fournier [Wed, 28 Jan 2015 14:06:28 +0000 (15:06 +0100)]
RPM specfile: doc clarification

9 years agoipmi: use SIGIO instead of SIGUSR2 to avoid conflict with JVM
Vincent Bernat [Fri, 23 Jan 2015 17:55:04 +0000 (18:55 +0100)]
ipmi: use SIGIO instead of SIGUSR2 to avoid conflict with JVM

Java uses SIGUSR2 to suspend/resume threads. The OpenIPMI plugins also
need a signal to resume its event loop when setting a timer. They can't
both use the same signal. We ask OpenIPMI to use SIGIO instead.

This should fix #114.

9 years agowrite_kafka plugin: Topic property not being set
ciomaire [Mon, 26 Jan 2015 13:02:11 +0000 (14:02 +0100)]
write_kafka plugin: Topic property not being set

9 years agoMerge pull request #910 from vincentbernat/fix/ipmi-dont-use-sigusr2
Pierre-Yves Ritschard [Mon, 26 Jan 2015 12:56:29 +0000 (13:56 +0100)]
Merge pull request #910 from vincentbernat/fix/ipmi-dont-use-sigusr2

ipmi: use SIGIO instead of SIGUSR2 to avoid conflict with JVM

9 years agoipmi: use SIGIO instead of SIGUSR2 to avoid conflict with JVM
Vincent Bernat [Fri, 23 Jan 2015 17:55:04 +0000 (18:55 +0100)]
ipmi: use SIGIO instead of SIGUSR2 to avoid conflict with JVM

Java uses SIGUSR2 to suspend/resume threads. The OpenIPMI plugins also
need a signal to resume its event loop when setting a timer. They can't
both use the same signal. We ask OpenIPMI to use SIGIO instead.

This should fix #114.

9 years agoMerge pull request #906 from obazoud/patch-1
Marc Fournier [Fri, 23 Jan 2015 14:07:44 +0000 (15:07 +0100)]
Merge pull request #906 from obazoud/patch-1

Wording automake

9 years agoadded doc CollectStatistics to section rrdcached
Micha Krause [Fri, 23 Jan 2015 13:24:54 +0000 (14:24 +0100)]
added doc CollectStatistics to section rrdcached

Fixes #907

Conflicts:
src/collectd.conf.pod

9 years agomysql: document defaults to boolean config options
Marc Fournier [Fri, 23 Jan 2015 14:01:52 +0000 (15:01 +0100)]
mysql: document defaults to boolean config options

9 years agolibstatgrab: fix detection of libstatgrab >= 0.90
Vincent Bernat [Fri, 23 Jan 2015 10:57:03 +0000 (11:57 +0100)]
libstatgrab: fix detection of libstatgrab >= 0.90

Ensure linking is done after compilation of the test program, otherwise
symbols cannot be found. `LDFLAGS` and `CFLAGS` are placed before the
test program on gcc command line while `LIBS` is placed after. Even if
in our case, `LDFLAGS` also contain the lib, being put before the
program while the linking phase is done with the same command leads to
`sg_init()` never found which is misinterpreted as requiring an
argument.

9 years agoWording automake
Olivier Bazoud [Thu, 22 Jan 2015 15:57:35 +0000 (16:57 +0100)]
Wording automake

9 years agowrite_http: consistent multi-instance support
Marc Fournier [Tue, 20 Jan 2015 22:09:56 +0000 (23:09 +0100)]
write_http: consistent multi-instance support

This makes the plugin use `<Node>` blocks liks most other write plugins,
while maintaining backwards compatibility with `<URL>` blocks.

It's a follow up to #899, which was merely a fix for the release
branches.

9 years agowrite_http: make callback names context-dependent
Marc Fournier [Sat, 17 Jan 2015 15:10:46 +0000 (16:10 +0100)]
write_http: make callback names context-dependent

This allows multiple destinations to work again (fixes #821), using the
same logic as other write plugins.

The callback name would now be something like:
    `write_http/http://example.com/endpoint`
which is not very nice.

The next step would be to change this plugin to use `<Node>` blocks
like many others, and pass the URL as a parameter inside each instance
block. So I see this patch as the minimum required to let 5.3 and 5.4
users use this plugin with multiple destinations.

Conflicts:
src/write_http.c

9 years agowrite_http: make callback names context-dependent
Marc Fournier [Sat, 17 Jan 2015 15:10:46 +0000 (16:10 +0100)]
write_http: make callback names context-dependent

This allows multiple destinations to work again (fixes #821), using the
same logic as other write plugins.

The callback name would now be something like:
    `write_http/http://example.com/endpoint`
which is not very nice.

The next step would be to change this plugin to use `<Node>` blocks
like many others, and pass the URL as a parameter inside each instance
block. So I see this patch as the minimum required to let 5.3 and 5.4
users use this plugin with multiple destinations.

9 years agoensure all curl-based plugins follow HTTP redirects
Marc Fournier [Fri, 16 Jan 2015 22:45:26 +0000 (23:45 +0100)]
ensure all curl-based plugins follow HTTP redirects

For the sake of consistency.

9 years agoadd Modbus/RTU support to modbus plugin
Eric Sandeen [Wed, 10 Dec 2014 21:38:09 +0000 (15:38 -0600)]
add Modbus/RTU support to modbus plugin

This allows access to a local RS-485 serial port
via the modbus plugin by specifying i.e.

  Device "/dev/ttyUSB0"
  Baudrate 38400

in a <Host> block.

For now it assumes 8N1; adding another config option
to support other configurations could be done later.

Lightly tested on my local setup.

Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
9 years agoRPM specfile: misc improvements related to perl files
Marc Fournier [Fri, 16 Jan 2015 16:57:00 +0000 (17:57 +0100)]
RPM specfile: misc improvements related to perl files

Avoids installing some files in two different packages & locations. Also
avoid unnecessary dependencies on -perl and -contrib packages.

Supersedes #896.

Thanks to @faxm0dem for helping work things out !

9 years agowrite_riemann: defaults to use TCP and batching
Marc Fournier [Thu, 15 Jan 2015 08:06:24 +0000 (09:06 +0100)]
write_riemann: defaults to use TCP and batching

Fixes #891

9 years agoRPM specfile: install client tools to a dedicated package
Marc Fournier [Wed, 14 Jan 2015 22:40:06 +0000 (23:40 +0100)]
RPM specfile: install client tools to a dedicated package

Avoids the package containing the daemon to depend on libcollectdclient.

Fixes #879

9 years agoRPM specfile: handle new write_log plugin
Marc Fournier [Wed, 14 Jan 2015 22:30:26 +0000 (23:30 +0100)]
RPM specfile: handle new write_log plugin

9 years agoMerge remote-tracking branch 'origin/pr/835'
Marc Fournier [Wed, 14 Jan 2015 22:28:18 +0000 (23:28 +0100)]
Merge remote-tracking branch 'origin/pr/835'

9 years agoperl plugin: plugins are linked with *_LIBADD and LIBS not *_LIBS and LIBS
Jim Radford [Tue, 17 Sep 2013 17:52:03 +0000 (17:52 +0000)]
perl plugin: plugins are linked with *_LIBADD and LIBS not *_LIBS and LIBS

9 years agolibperl's ldopts include libaries and therefore should go in LIBS not LDFLAGS
Jim Radford [Wed, 7 Aug 2013 20:21:08 +0000 (13:21 -0700)]
libperl's ldopts include libaries and therefore should go in LIBS not LDFLAGS

Without this configure fails compile its libperl test program because
-lperl comes before the test program on the compiler command line.

9 years agoMerge pull request #886 from pyr/feature/write_log
Pierre-Yves Ritschard [Wed, 14 Jan 2015 08:25:25 +0000 (09:25 +0100)]
Merge pull request #886 from pyr/feature/write_log

Add a write_log output plugin which logs values.

9 years agoDo not mention plugins with no options.
Pierre-Yves Ritschard [Tue, 13 Jan 2015 10:06:37 +0000 (11:06 +0100)]
Do not mention plugins with no options.

9 years agomention write_log in the README
Pierre-Yves Ritschard [Tue, 13 Jan 2015 10:05:52 +0000 (11:05 +0100)]
mention write_log in the README

9 years agochange license
Pierre-Yves Ritschard [Tue, 13 Jan 2015 10:03:06 +0000 (11:03 +0100)]
change license

9 years agopython: Properly init the empty string with Python3.
Sven Trenkel [Mon, 12 Jan 2015 23:22:34 +0000 (23:22 +0000)]
python: Properly init the empty string with Python3.

9 years agoFix compiler warnings with Python3.
Sven Trenkel [Fri, 9 Jan 2015 21:28:24 +0000 (21:28 +0000)]
Fix compiler warnings with Python3.
https://github.com/collectd/collectd/issues/505

9 years agoAdd a write_log output plugin which logs values.
Pierre-Yves Ritschard [Thu, 8 Jan 2015 10:06:04 +0000 (11:06 +0100)]
Add a write_log output plugin which logs values.

I find this to be useful when developping new input plugins,
it allows creating a very simple configuration and combined
with `-f` can be used for a very simple workflow.

I'm proposing this, since I think it could be useful for
people wanting to debug their config on local agents as well.

9 years agoMerge pull request #870 from ifesdjeen/bugfix/absolute-in-multivalue-dispatch
Pierre-Yves Ritschard [Thu, 8 Jan 2015 09:14:48 +0000 (10:14 +0100)]
Merge pull request #870 from ifesdjeen/bugfix/absolute-in-multivalue-dispatch

Change "plugin_dispatch_multivalue" to accept any metric type.

9 years agoMerge branch 'collectd-5.4'
Marc Fournier [Wed, 7 Jan 2015 23:18:57 +0000 (00:18 +0100)]
Merge branch 'collectd-5.4'