Code

collectd.git
9 years agoMerge pull request #1023 from ciomaire/write_kafka_ldflags
Marc Fournier [Tue, 19 May 2015 10:01:18 +0000 (12:01 +0200)]
Merge pull request #1023 from ciomaire/write_kafka_ldflags

when --with-librdkafka arg is not a path searched by linker

9 years agoMerge remote-tracking branch 'github/pr/1027'
Florian Forster [Tue, 19 May 2015 08:45:57 +0000 (10:45 +0200)]
Merge remote-tracking branch 'github/pr/1027'

9 years agolibcollectdclient: Propagate errors when signing / encrypting network packets.
Florian Forster [Tue, 21 Apr 2015 08:00:23 +0000 (10:00 +0200)]
libcollectdclient: Propagate errors when signing / encrypting network packets.

9 years agooconfig: fix oconfig_free to free all elements
Marc Fournier [Tue, 12 May 2015 20:40:27 +0000 (22:40 +0200)]
oconfig: fix oconfig_free to free all elements

The recursive nature of this function made it difficult to free the root
node of the config tree. Splitting it in 2 allows to work around this
problem.

9 years agoMerge branch 'collectd-5.4'
Marc Fournier [Sat, 9 May 2015 22:14:18 +0000 (00:14 +0200)]
Merge branch 'collectd-5.4'

9 years agoMerge branch 'collectd-5.3' into collectd-5.4
Marc Fournier [Sat, 9 May 2015 22:13:19 +0000 (00:13 +0200)]
Merge branch 'collectd-5.3' into collectd-5.4

9 years ago/bin/sh on OSX doesn't understand -n
Ruben Kerkhof [Sat, 9 May 2015 18:34:52 +0000 (20:34 +0200)]
/bin/sh on OSX doesn't understand -n

This breaks PACKAGEVERSION since the -n is left verbatim in the string.
Use the more portable printf instead

9 years agoMerge pull request #1024 from rubenk/fix-version-gen-on-osx
Marc Fournier [Sat, 9 May 2015 22:10:36 +0000 (00:10 +0200)]
Merge pull request #1024 from rubenk/fix-version-gen-on-osx

/bin/sh on OSX doesn't understand -n

9 years agoMerge pull request #1016 from mfournier/write_sensu-format-string
Marc Fournier [Sat, 9 May 2015 22:06:42 +0000 (00:06 +0200)]
Merge pull request #1016 from mfournier/write_sensu-format-string

write_sensu: fix format-string portability problem

9 years ago/bin/sh on OSX doesn't understand -n
Ruben Kerkhof [Sat, 9 May 2015 18:34:52 +0000 (20:34 +0200)]
/bin/sh on OSX doesn't understand -n

This breaks PACKAGEVERSION since the -n is left verbatim in the string.
Use the more portable printf instead

9 years agowhen --with-librdkafka arg is not a path searched by linker
ciomaire [Fri, 8 May 2015 14:48:54 +0000 (07:48 -0700)]
when --with-librdkafka arg is not a path searched by linker

9 years agoMerge pull request #1002 from ciomaire/master
Pierre-Yves Ritschard [Thu, 7 May 2015 13:00:37 +0000 (15:00 +0200)]
Merge pull request #1002 from ciomaire/master

write_kafka plugin : Create kafka handles from kafka_write callback rather than the config callback

9 years agoMerge pull request #1014 from mfournier/fix-path-to-java
Marc Fournier [Tue, 5 May 2015 19:40:09 +0000 (21:40 +0200)]
Merge pull request #1014 from mfournier/fix-path-to-java

improve java detection/defaults in configure script

9 years agoRPM specfile: update summary to be consistent with .deb packages
Marc Fournier [Tue, 5 May 2015 16:18:26 +0000 (18:18 +0200)]
RPM specfile: update summary to be consistent with .deb packages

9 years agoRPM specfile: remove superfluous '--without-*' configure flags
Marc Fournier [Tue, 5 May 2015 16:17:27 +0000 (18:17 +0200)]
RPM specfile: remove superfluous '--without-*' configure flags

9 years ago- use _POSIX2_LINE_MAX for errbuf as stated by kvm(3).
ale@biancalanas.net [Tue, 5 May 2015 02:01:29 +0000 (02:01 +0000)]
- use _POSIX2_LINE_MAX for errbuf as stated by kvm(3).
- fix error msg on kvm_openfiles failure

9 years agofixes swap plugin on FreeBSD Jail
ale@biancalanas.net [Fri, 1 May 2015 16:48:30 +0000 (16:48 +0000)]
fixes swap plugin on FreeBSD Jail

9 years agofixes processes plugin on FreeBSD Jail
ale@biancalanas.net [Fri, 1 May 2015 16:48:28 +0000 (16:48 +0000)]
fixes processes plugin on FreeBSD Jail

9 years agoconfigure: add return() statements in 3 AC_LANG_PROGRAM() blocks
Marc Fournier [Sat, 2 May 2015 08:08:23 +0000 (10:08 +0200)]
configure: add return() statements in 3 AC_LANG_PROGRAM() blocks

This allows the dns and df plugins to get built also in the case the
configure script is run with `CC="gcc -Wall -Werror"`.

9 years agoRPM specfile: correct copy-paste error
Marc Fournier [Fri, 1 May 2015 10:10:17 +0000 (12:10 +0200)]
RPM specfile: correct copy-paste error

9 years agowrite_sensu: fix format-string portability problem
Marc Fournier [Wed, 29 Apr 2015 22:15:19 +0000 (00:15 +0200)]
write_sensu: fix format-string portability problem

Casting counters, derives and abolutes to int64_t was incorrect, as they
are respectively `unsigned long long`, `int64_t` and `uint64_t`.
Apart from potentially loosing precision, the `%ld` format-string made
clang choke on the 32bit architecture (follow-up to 78340212).

9 years agomake java components discovery follow symlinks
Marc Fournier [Tue, 28 Apr 2015 05:39:02 +0000 (07:39 +0200)]
make java components discovery follow symlinks

When `--with-java` points to a symlink, `find` should resolve it, making
the configure script work seamlessly with symlinks pointing to JDK
installations.

This fixes the confusing discrepancy between `--with-java=/path/to/java`
failing and `--with-java=/path/to/java/` working.

9 years agoFallback to /usr/lib/jvm if JAVA_HOME is not set
Ruben Kerkhof [Sun, 18 Nov 2012 10:38:24 +0000 (11:38 +0100)]
Fallback to /usr/lib/jvm if JAVA_HOME is not set

This makes the java plugin build out of the box
on systems with a JDK installed.
/usr/lib/jvm is the default location for the JDK
on at least Fedora, Red Hat and Debian.

9 years agocleanup test-related files
Marc Fournier [Wed, 22 Apr 2015 08:12:32 +0000 (10:12 +0200)]
cleanup test-related files

9 years agoupdate ignored test-related files
Marc Fournier [Wed, 22 Apr 2015 08:11:14 +0000 (10:11 +0200)]
update ignored test-related files

9 years agotests: include tests/macros.h in release tarballs
Marc Fournier [Wed, 22 Apr 2015 08:05:33 +0000 (10:05 +0200)]
tests: include tests/macros.h in release tarballs

This is needed to run the tests outside of the git repository.

9 years agoMerge branch 'collectd-4.10' into collectd-5.3
Marc Fournier [Wed, 22 Apr 2015 06:46:00 +0000 (08:46 +0200)]
Merge branch 'collectd-4.10' into collectd-5.3

9 years agoMerge pull request #1008 from remicollet/issue-librabbitmq-060
Marc Fournier [Wed, 22 Apr 2015 06:39:50 +0000 (08:39 +0200)]
Merge pull request #1008 from remicollet/issue-librabbitmq-060

fix build with librabbitmq 0.6.0

Also backported to the collectd-5.3 branch as bd60e5 and 7fd46078d.

9 years agocheck if AMQP_VERSION exists
Remi Collet [Tue, 21 Apr 2015 15:40:43 +0000 (17:40 +0200)]
check if AMQP_VERSION exists

9 years agocheck if AMQP_VERSION exists
Remi Collet [Tue, 21 Apr 2015 15:40:43 +0000 (17:40 +0200)]
check if AMQP_VERSION exists

9 years agofix build with librabbitmq 0.6.0
Remi Collet [Tue, 21 Apr 2015 07:33:20 +0000 (09:33 +0200)]
fix build with librabbitmq 0.6.0

9 years agofix build with librabbitmq 0.6.0
Remi Collet [Tue, 21 Apr 2015 07:33:20 +0000 (09:33 +0200)]
fix build with librabbitmq 0.6.0

9 years agoUpdate meta_data.c
hshopeful [Mon, 20 Apr 2015 12:35:40 +0000 (20:35 +0800)]
Update meta_data.c

In the function meta_data_get_string(), when the type mismatchs,the ERROR statement should be
ERROR ("meta_data_get_string: Type mismatch for key `%s'", e->key);
not
ERROR ("meta_data_get_signed_int: Type mismatch for key `%s'", e->key);

9 years agofix double free errors found by valgrind
ciomaire [Wed, 15 Apr 2015 13:19:27 +0000 (06:19 -0700)]
fix double free errors found by valgrind

9 years agoCreate kafka handles from within write callback
ciomaire [Wed, 15 Apr 2015 12:31:55 +0000 (05:31 -0700)]
Create kafka handles from within write callback

9 years agowrite_sensu: fix 2 format-related details
Marc Fournier [Tue, 14 Apr 2015 16:48:07 +0000 (18:48 +0200)]
write_sensu: fix 2 format-related details

The default CC on freebsd-10 (clang 3.4) spotted these issues:

write_sensu.c:494:38: error: format specifies type 'long long' but the argument has type 'int64_t' (aka 'long') [-Werror,-Wformat]
write_sensu.c:494:45: error: data argument not used by format string [-Werror,-Wformat-extra-args]

9 years agoMerge branch 'collectd-5.4'
Marc Fournier [Tue, 14 Apr 2015 07:27:00 +0000 (09:27 +0200)]
Merge branch 'collectd-5.4'

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

9 years agoMerge branch 'collectd-5.3' into collectd-5.4
Marc Fournier [Tue, 14 Apr 2015 07:25:02 +0000 (09:25 +0200)]
Merge branch 'collectd-5.3' into collectd-5.4

9 years agowrite_kafka: correct mistyped function name
Marc Fournier [Tue, 14 Apr 2015 06:33:14 +0000 (08:33 +0200)]
write_kafka: correct mistyped function name

9 years agowrite_kafka: fix typo preventing --with-librdkafka from working as expected
Marc Fournier [Tue, 14 Apr 2015 06:30:17 +0000 (08:30 +0200)]
write_kafka: fix typo preventing --with-librdkafka from working as expected

9 years agoMerge remote-tracking branch 'origin/pr/1001'
Marc Fournier [Tue, 14 Apr 2015 07:23:22 +0000 (09:23 +0200)]
Merge remote-tracking branch 'origin/pr/1001'

9 years agoMerge branch 'collectd-4.10' into collectd-5.3
Marc Fournier [Tue, 14 Apr 2015 07:17:27 +0000 (09:17 +0200)]
Merge branch 'collectd-4.10' into collectd-5.3

9 years agonotify_email: avoid linking against libdl
Marc Fournier [Tue, 14 Apr 2015 06:35:28 +0000 (08:35 +0200)]
notify_email: avoid linking against libdl

This flag seems to have been accidentally added in 451d75bae1 and
prevents building the plugin on platforms which don't have GNU libc.

Conflicts:
src/Makefile.am

9 years agonotify_email: avoid linking against libdl
Marc Fournier [Tue, 14 Apr 2015 06:35:28 +0000 (08:35 +0200)]
notify_email: avoid linking against libdl

This flag seems to have been accidentally added in 451d75bae1 and
prevents building the plugin on platforms which don't have GNU libc.

9 years agoMerge branch 'collectd-5.3' into collectd-5.4
Marc Fournier [Mon, 13 Apr 2015 22:24:46 +0000 (00:24 +0200)]
Merge branch 'collectd-5.3' into collectd-5.4

9 years agoRevert "version-gen.sh: Switch to bash due to bashisms."
Marc Fournier [Mon, 13 Apr 2015 22:21:57 +0000 (00:21 +0200)]
Revert "version-gen.sh: Switch to bash due to bashisms."

The last bashism was removed in 4d376681. Reverting to /bin/sh prevents
build errors on platforms without bash installed by default.

This reverts commit 3bda88e8b425f43644e303e6957e38ae59c1bc83.

9 years agowrite_sensu: pass literal string to ERROR() macro
Marc Fournier [Sun, 12 Apr 2015 20:01:39 +0000 (22:01 +0200)]
write_sensu: pass literal string to ERROR() macro

This allows building with gcc's `-Werror=format-security` flag, which is
enforced when building debian packages.

See https://wiki.debian.org/Hardening

9 years agoMerge remote-tracking branch 'origin/pr/998'
Marc Fournier [Sun, 12 Apr 2015 07:26:52 +0000 (09:26 +0200)]
Merge remote-tracking branch 'origin/pr/998'

9 years agonetwork: set ttl before opening server sockets
Tim Laszlo [Fri, 20 Jun 2014 14:00:43 +0000 (09:00 -0500)]
network: set ttl before opening server sockets

If TimeToLive is defined in collectd.conf after Server options, the
net_config_ttl value is updated after network_config_add_server and
the desired ttl is not used.

9 years agoWarn if ttl is out of bounds
Tim Laszlo [Fri, 20 Jun 2014 13:37:19 +0000 (08:37 -0500)]
Warn if ttl is out of bounds

9 years agoopenvpn plugin: Don't signal an error when no clients are connected.
Florian Forster [Sun, 14 Sep 2014 17:28:05 +0000 (19:28 +0200)]
openvpn plugin: Don't signal an error when no clients are connected.

In the multi1_read() function, an error (zero) was returned when no
clients were currently connected to the OpenVPN server, because the
"read" variable was initialized to zero and the while loop exited before
it was set to one. This is not the intended behavior.

Thanks to @srix for reporting this issue!

Fixes: #731
9 years agoMerge branch 'collectd-5.4'
Marc Fournier [Wed, 8 Apr 2015 23:14:40 +0000 (01:14 +0200)]
Merge branch 'collectd-5.4'

9 years agoREADME: ordering
Marc Fournier [Wed, 8 Apr 2015 23:09:33 +0000 (01:09 +0200)]
README: ordering

9 years agoRPM specfile: add write_sensu and ipc plugins
Marc Fournier [Wed, 8 Apr 2015 22:58:56 +0000 (00:58 +0200)]
RPM specfile: add write_sensu and ipc plugins

9 years agoMerge branch 'collectd-5.3' into collectd-5.4
Marc Fournier [Wed, 8 Apr 2015 22:53:49 +0000 (00:53 +0200)]
Merge branch 'collectd-5.3' into collectd-5.4

9 years agoipc: don't enable by default in example config file
Marc Fournier [Wed, 8 Apr 2015 22:51:16 +0000 (00:51 +0200)]
ipc: don't enable by default in example config file

9 years agoipc: build on AIX by default
Marc Fournier [Wed, 8 Apr 2015 22:50:44 +0000 (00:50 +0200)]
ipc: build on AIX by default

9 years agoipc: don't document plugin without any options
Marc Fournier [Wed, 8 Apr 2015 22:50:24 +0000 (00:50 +0200)]
ipc: don't document plugin without any options

9 years agoipc: remove extraneous call to sysconf()
Marc Fournier [Wed, 8 Apr 2015 22:49:28 +0000 (00:49 +0200)]
ipc: remove extraneous call to sysconf()

9 years agoMerge remote-tracking branch 'origin/pr/925'
Marc Fournier [Wed, 8 Apr 2015 22:32:50 +0000 (00:32 +0200)]
Merge remote-tracking branch 'origin/pr/925'

9 years agowrite_sensu: documentation wording, wrap long lines
Marc Fournier [Wed, 8 Apr 2015 22:27:13 +0000 (00:27 +0200)]
write_sensu: documentation wording, wrap long lines

Thanks to @jamtur01 for reviewing !

9 years agoMerge remote-tracking branch 'origin/pr/912'
Marc Fournier [Wed, 8 Apr 2015 22:16:37 +0000 (00:16 +0200)]
Merge remote-tracking branch 'origin/pr/912'

9 years agoMerge remote-tracking branch 'origin/pr/946'
Marc Fournier [Wed, 8 Apr 2015 22:14:37 +0000 (00:14 +0200)]
Merge remote-tracking branch 'origin/pr/946'

Conflicts:
src/collectd.conf.pod

9 years agocurl-based plugins: disable Timeout option if libcurl < 7.16.2
Marc Fournier [Wed, 8 Apr 2015 20:58:22 +0000 (22:58 +0200)]
curl-based plugins: disable Timeout option if libcurl < 7.16.2

This could be done better, but as it's a non-essential feature and
7.16.2 is 8 years old, I favor not over-complicating things.

9 years agoMerge remote-tracking branch 'origin/pr/993'
Marc Fournier [Wed, 8 Apr 2015 22:08:21 +0000 (00:08 +0200)]
Merge remote-tracking branch 'origin/pr/993'

9 years agoMerge remote-tracking branch 'origin/pr/985'
Marc Fournier [Wed, 8 Apr 2015 22:07:07 +0000 (00:07 +0200)]
Merge remote-tracking branch 'origin/pr/985'

9 years agoMerge remote-tracking branch 'origin/pr/693'
Marc Fournier [Wed, 8 Apr 2015 22:06:25 +0000 (00:06 +0200)]
Merge remote-tracking branch 'origin/pr/693'

Conflicts:
src/collectd.conf.pod

9 years agodbi plugin: fix a warning mentioning snmp plugin
Vincent Bernat [Sat, 12 Oct 2013 20:37:00 +0000 (22:37 +0200)]
dbi plugin: fix a warning mentioning snmp plugin

9 years agowrite_http: make sure CURLOPT_* only get longs
Marc Fournier [Sat, 4 Apr 2015 23:44:50 +0000 (01:44 +0200)]
write_http: make sure CURLOPT_* only get longs

... to avoid portability problems.

9 years agomake sure CURLOPT_TIMEOUT_MS only gets longs
Marc Fournier [Sat, 4 Apr 2015 23:16:13 +0000 (01:16 +0200)]
make sure CURLOPT_TIMEOUT_MS only gets longs

... to avoid portability problems.

9 years agobind: fix a memory leak
Marc Fournier [Sat, 4 Apr 2015 22:54:37 +0000 (00:54 +0200)]
bind: fix a memory leak

9 years agoBind plugin: Add support for per-zone stats in v3 XML
Bruno Prémont [Sat, 15 Nov 2014 21:21:21 +0000 (22:21 +0100)]
Bind plugin: Add support for per-zone stats in v3 XML

Contrary to Victor's saying in commit 78e89b2e0c205 (bind plugin: add
support for the new XML v3 API.), XML v3 API does support per-zone
statistics.

By default those statistics are limited to zone serial as if
  zone-statistics terse;
was listed in each zone definition block.

To obtain full statistics the above default must be overridden with:
  zone-statistics full;

Signed-off-by: Bruno Prémont <bonbons@linux-vserver.org>
9 years agocollectd.conf.pod: clarify possibly confusing statement
Marc Fournier [Sat, 4 Apr 2015 21:27:48 +0000 (23:27 +0200)]
collectd.conf.pod: clarify possibly confusing statement

9 years agocurl: correct typo in error message
Marc Fournier [Sat, 4 Apr 2015 20:35:55 +0000 (22:35 +0200)]
curl: correct typo in error message

9 years agodoc & comments: s/mili/milli/
Marc Fournier [Sat, 4 Apr 2015 20:34:41 +0000 (22:34 +0200)]
doc & comments: s/mili/milli/

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 agoMerge branch 'collectd-4.10' into collectd-5.3
Marc Fournier [Thu, 2 Apr 2015 21:05:23 +0000 (23:05 +0200)]
Merge branch 'collectd-4.10' into collectd-5.3

9 years agoFix type instance sanitization in bind plugin
Thomas Kho [Thu, 2 Apr 2015 17:14:24 +0000 (13:14 -0400)]
Fix type instance sanitization in bind plugin

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 agobattery: do not report sysfs ENODEV failure
Peter Wu [Tue, 31 Mar 2015 21:17:32 +0000 (23:17 +0200)]
battery: do not report sysfs ENODEV failure

Linux reports ENODEV if the reported battery values are equal to
ACPI_BATTERY_VALUE_UNKNOWN. This can be observed for an unpatched Clevo
B7130 laptop while reading the "Battery Present Charge" attribute.

Since this is a non-fatal, non-recoverable event, do not report such
errors. Also change the error message to report the filename triggering
this error to ease hunting down the error.

9 years agobattery: report current if known
Peter Wu [Mon, 30 Mar 2015 16:48:06 +0000 (18:48 +0200)]
battery: report current if known

The power field is not always available (take my Clevo B7130 laptop for
example). The current is reported though via "current_now".

According to the ACPI spec v5.0, sect. 10.2.2.6 _BST (Battery Status),
the reported field is "battery present rate" which is always positive
(its direction depends on the charging state).

Contents of /sys/class/power_supply/BAT0/uevent for my laptop:

    POWER_SUPPLY_NAME=BAT0
    POWER_SUPPLY_STATUS=Discharging
    POWER_SUPPLY_PRESENT=1
    POWER_SUPPLY_TECHNOLOGY=Li-ion
    POWER_SUPPLY_CYCLE_COUNT=0
    POWER_SUPPLY_VOLTAGE_MIN_DESIGN=11100000
    POWER_SUPPLY_VOLTAGE_NOW=11824000
    POWER_SUPPLY_CURRENT_NOW=1498000
    POWER_SUPPLY_CHARGE_FULL_DESIGN=5200000
    POWER_SUPPLY_CHARGE_FULL=5280000
    POWER_SUPPLY_CHARGE_NOW=4797000
    POWER_SUPPLY_CAPACITY=90
    POWER_SUPPLY_CAPACITY_LEVEL=Normal
    POWER_SUPPLY_MODEL_NAME=BAT
    POWER_SUPPLY_MANUFACTURER=NOTEBOOK
    POWER_SUPPLY_SERIAL_NUMBER=0001

Note for Clevo B7130 owners, the charging rate is not reported when
discharging but this can be [patched][1].

 [1]: https://github.com/Lekensteyn/acpi-stuff/blob/master/Clevo-B7130/BatteryFix.dsl

9 years agowrite_http: add 2 new options to example config
Marc Fournier [Thu, 26 Mar 2015 21:03:29 +0000 (22:03 +0100)]
write_http: add 2 new options to example config

9 years agowrite_http: control rate using only one parameter
Marc Fournier [Thu, 26 Mar 2015 20:52:39 +0000 (21:52 +0100)]
write_http: control rate using only one parameter

- do not enable the feature with an on/off switch. Enable it by setting
  a positive value to the parameter instead. Therefore drop the
  arbitrary default value used previously.

- rename LowLimitBytesPerSec to LowSpeedLimit.

- make LowSpeedLimit refer to bytes per second rather than bytes per
  Interval.

9 years agowrite_http: adapt the behaviour of Timeout option
Marc Fournier [Wed, 25 Mar 2015 23:01:54 +0000 (00:01 +0100)]
write_http: adapt the behaviour of Timeout option

- rename PostTimeoutSec parameter to Timeout

- change Timeout to take milliseconds rather than seconds, for the sake
  of consistency: collectd allow working at the sub-second scale if need
  be, so it's a shame to restrain this here.

- do *not* set the default timeout to the value of Interval. Rationale:
  what matters here is that each POST request completes before the send
  buffer fills up again. How fast the send buffer fills up completely
  depends on how much data is collected. Interval is unrelated to this,
  and unlike read plugins, I don't think it makes a good value to use as
  the default timeout.

9 years agofix functions indentation and statuses initialization.
Fabrice A. Marie [Tue, 24 Mar 2015 08:43:13 +0000 (16:43 +0800)]
fix functions indentation and statuses initialization.

9 years agowrite_sensu cannot be endpoint/proxy.
Fabrice A. Marie [Tue, 24 Mar 2015 08:42:40 +0000 (16:42 +0800)]
write_sensu cannot be endpoint/proxy.

9 years agoMerge remote-tracking branch 'origin/pr/752' into wh_low_speed_limit
Marc Fournier [Tue, 24 Mar 2015 06:37:18 +0000 (07:37 +0100)]
Merge remote-tracking branch 'origin/pr/752' into wh_low_speed_limit

Conflicts:
src/write_http.c

Also slipped in a couple of conding-style consistentcy related changes.

9 years agoUpgrade spec to 5.4.2
Poil [Mon, 23 Mar 2015 10:18:56 +0000 (11:18 +0100)]
Upgrade spec to 5.4.2

9 years agoMerge branch 'collectd-5.3' into collectd-5.4
Marc Fournier [Tue, 24 Mar 2015 06:00:35 +0000 (07:00 +0100)]
Merge branch 'collectd-5.3' into collectd-5.4

Conflicts:
contrib/redhat/collectd.spec
src/collectd.conf.pod

9 years agoRPM specfile: bump version number
Marc Fournier [Tue, 24 Mar 2015 05:51:40 +0000 (06:51 +0100)]
RPM specfile: bump version number

Thanks to @Poil for pointing that out !

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 agowrite_sensu plugin to write datapoints and notification to sensu client TCP socket...
Fabrice A. Marie [Mon, 26 Jan 2015 09:43:23 +0000 (17:43 +0800)]
write_sensu plugin to write datapoints and notification to sensu client TCP socket. Inspired from write_riemann.