Code

collectd.git
9 years agoopenldap: make connection to server persistent
Marc Fournier [Wed, 14 Oct 2015 15:44:04 +0000 (17:44 +0200)]
openldap: make connection to server persistent

Removes the overhead of connection setup/teardown at each read interval.

9 years agoMerge branch 'collectd-5.5'
Marc Fournier [Wed, 14 Oct 2015 07:10:50 +0000 (09:10 +0200)]
Merge branch 'collectd-5.5'

9 years agoMerge branch 'collectd-5.4' into collectd-5.5
Marc Fournier [Wed, 14 Oct 2015 07:10:38 +0000 (09:10 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5

9 years agoprocesses: correctly count processes on FreeBSD
Herve COMMOWICK [Wed, 14 Oct 2015 06:57:05 +0000 (08:57 +0200)]
processes: correctly count processes on FreeBSD

because actually we count threads instead of processes

(partial backport of 85c31a6d66 for collectd-5.4 /mf)

9 years agoFix 'Modification of a read-only value attempted' error
Ciaran Mac An Iomaire [Wed, 7 Oct 2015 15:20:20 +0000 (08:20 -0700)]
Fix 'Modification of a read-only value attempted' error

9 years agoprocesses: correctly count processes on {free,open}BSD
Herve COMMOWICK [Thu, 8 Oct 2015 09:41:45 +0000 (11:41 +0200)]
processes: correctly count processes on {free,open}BSD

because actually we count threads instead of processes

9 years agosystemd.collectd.service: backport changes from master branch
Marc Fournier [Wed, 14 Oct 2015 06:50:28 +0000 (08:50 +0200)]
systemd.collectd.service: backport changes from master branch

9 years agoMerge remote-tracking branch 'origin/pr/1264'
Marc Fournier [Wed, 14 Oct 2015 06:47:39 +0000 (08:47 +0200)]
Merge remote-tracking branch 'origin/pr/1264'

9 years agopython: Fix double-free bug.
Sven Trenkel [Sun, 4 Oct 2015 00:05:24 +0000 (00:05 +0000)]
python: Fix double-free bug.

9 years agoMerge pull request #1289 from trenkel/master
trenkel [Wed, 7 Oct 2015 14:51:29 +0000 (16:51 +0200)]
Merge pull request #1289 from trenkel/master

python: Fix double-free bug.

9 years agopython: Fix double-free bug.
Sven Trenkel [Sun, 4 Oct 2015 00:05:24 +0000 (00:05 +0000)]
python: Fix double-free bug.

9 years agosystemd: drop all capabilities by default
Ruben Kerkhof [Wed, 9 Sep 2015 16:52:26 +0000 (18:52 +0200)]
systemd: drop all capabilities by default

dns and ping need CAP_NET_RAW, iptables needs CAP_NET_ADMIN
so leave those commented out in the .service file.

9 years agoMake /home, /root and /run/user inaccessible
Ruben Kerkhof [Wed, 9 Sep 2015 15:52:53 +0000 (17:52 +0200)]
Make /home, /root and /run/user inaccessible

9 years agoMount /usr, /boot and /etc readonly
Ruben Kerkhof [Wed, 9 Sep 2015 15:51:17 +0000 (17:51 +0200)]
Mount /usr, /boot and /etc readonly

9 years agoNo need to wait 10 seconds before restarting
Ruben Kerkhof [Wed, 9 Sep 2015 15:49:49 +0000 (17:49 +0200)]
No need to wait 10 seconds before restarting

Systemd makes sure the process is gone before starting a new one

9 years agoOnly restart collectd on failure
Ruben Kerkhof [Wed, 9 Sep 2015 15:49:10 +0000 (17:49 +0200)]
Only restart collectd on failure

Do what the comment says ;)

9 years agoNotifyAccess is the default
Ruben Kerkhof [Wed, 9 Sep 2015 15:47:01 +0000 (17:47 +0200)]
NotifyAccess is the default

9 years agoLet systemd handle logging
Ruben Kerkhof [Wed, 9 Sep 2015 15:46:32 +0000 (17:46 +0200)]
Let systemd handle logging

9 years agonotify_systemd: unset NOTIFY_SOCKET later
Ruben Kerkhof [Tue, 8 Sep 2015 14:46:27 +0000 (16:46 +0200)]
notify_systemd: unset NOTIFY_SOCKET later

getenv returns a pointer, possibly to a static buffer.
If I understand the specs correctly, unsetenv is basically free
to do what it wants with this, so don't keep using the pointer
after we do unsetenv.

9 years agonotify_systemd: remove dead code
Ruben Kerkhof [Tue, 8 Sep 2015 14:13:47 +0000 (16:13 +0200)]
notify_systemd: remove dead code

The whole function is already wrapped in #ifdef KERNEL_LINUX

9 years agonotify_systemd: use close-on-exit on socket
Ruben Kerkhof [Tue, 8 Sep 2015 14:11:56 +0000 (16:11 +0200)]
notify_systemd: use close-on-exit on socket

9 years agoMerge branch 'collectd-5.5'
Marc Fournier [Mon, 14 Sep 2015 08:58:22 +0000 (10:58 +0200)]
Merge branch 'collectd-5.5'

9 years agoMerge branch 'collectd-5.4' into collectd-5.5
Marc Fournier [Mon, 14 Sep 2015 08:57:37 +0000 (10:57 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5

9 years agogmond: fix linking against libganglia at build time
Marc Fournier [Sun, 13 Sep 2015 22:03:44 +0000 (00:03 +0200)]
gmond: fix linking against libganglia at build time

Current versions of libganglia don't ship the ganglia-config utility
anymore. Change the configure script to not expect it to be in $PATH and
provide sensible defaults instead.

Fix #1129

9 years agolog_logstash: fix timestamp field to respect ISO 8601 format
Marc Fournier [Fri, 11 Sep 2015 21:59:10 +0000 (23:59 +0200)]
log_logstash: fix timestamp field to respect ISO 8601 format

Fixes #1132

9 years agovirt: Add PluginInstanceFormat none, as default
Ruben Kerkhof [Tue, 30 Jun 2015 13:04:11 +0000 (15:04 +0200)]
virt: Add PluginInstanceFormat none, as default

Fixes #1100

9 years agoMerge branch 'collectd-5.5'
Marc Fournier [Fri, 11 Sep 2015 21:29:08 +0000 (23:29 +0200)]
Merge branch 'collectd-5.5'

9 years agoMerge branch 'collectd-5.4' into collectd-5.5
Marc Fournier [Fri, 11 Sep 2015 21:21:49 +0000 (23:21 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5

9 years agoPluginInterfaceFormat supports multiple fields
Ruben Kerkhof [Tue, 30 Jun 2015 12:41:41 +0000 (14:41 +0200)]
PluginInterfaceFormat supports multiple fields

Document this.

9 years agoDon't access freed memory
Ruben Kerkhof [Tue, 30 Jun 2015 12:13:24 +0000 (14:13 +0200)]
Don't access freed memory

The fields array contains pointers into the value_copy string.

9 years agoFix error message
Ruben Kerkhof [Tue, 30 Jun 2015 11:03:13 +0000 (13:03 +0200)]
Fix error message

9 years agoMerge remote-tracking branch 'origin/pr/1135'
Marc Fournier [Fri, 11 Sep 2015 20:41:55 +0000 (22:41 +0200)]
Merge remote-tracking branch 'origin/pr/1135'

9 years agoMerge remote-tracking branch 'origin/pr/1260'
Marc Fournier [Fri, 11 Sep 2015 20:34:18 +0000 (22:34 +0200)]
Merge remote-tracking branch 'origin/pr/1260'

9 years agoMerge remote-tracking branch 'origin/pr/1205'
Marc Fournier [Fri, 11 Sep 2015 20:30:28 +0000 (22:30 +0200)]
Merge remote-tracking branch 'origin/pr/1205'

9 years agomysql: use mysql_config --include for include path
Ruben Kerkhof [Sat, 1 Aug 2015 17:03:34 +0000 (19:03 +0200)]
mysql: use mysql_config --include for include path

According to the mysql_config manpage, --cflags shows the
compiler flags the library was compiled with. We certainly don't
want to use those.

9 years agomysql: just search for mysql_get_server_version
Ruben Kerkhof [Sat, 1 Aug 2015 17:02:15 +0000 (19:02 +0200)]
mysql: just search for mysql_get_server_version

If we found that symbol, assume we also found mysql_init.

9 years agomysql: respect mysql_libs when searching for symbol
Ruben Kerkhof [Sat, 1 Aug 2015 16:59:53 +0000 (18:59 +0200)]
mysql: respect mysql_libs when searching for symbol

We always looked in libmysqlclient, but this doesn't
work for compatible databases such as Percona.

Respect the list return by mysql_config --libs_r instead.

Fixes #1098

9 years agoadded ZFS ARC cache to memory, treating it like Linux cached memory
Brian ONeill [Thu, 6 Aug 2015 20:11:23 +0000 (16:11 -0400)]
added ZFS ARC cache to memory, treating it like Linux cached memory

9 years agoMerge remote-tracking branch 'origin/pr/1229'
Marc Fournier [Fri, 11 Sep 2015 20:17:44 +0000 (22:17 +0200)]
Merge remote-tracking branch 'origin/pr/1229'

9 years agoMerge remote-tracking branch 'origin/pr/1254'
Marc Fournier [Fri, 11 Sep 2015 20:17:20 +0000 (22:17 +0200)]
Merge remote-tracking branch 'origin/pr/1254'

9 years agoLog http error codes other than 200. New config option LogHttpError [true/false].
vzubko [Fri, 28 Aug 2015 18:23:21 +0000 (11:23 -0700)]
Log http error codes other than 200. New config option LogHttpError [true/false].

9 years agoFix copy-paste error in debug message in snmp plugin
Denys Berkovskyy [Tue, 8 Sep 2015 10:38:18 +0000 (11:38 +0100)]
Fix copy-paste error in debug message in snmp plugin

9 years agomqtt plugin: Initialize locks on startup.
Florian Forster [Fri, 11 Sep 2015 05:23:56 +0000 (07:23 +0200)]
mqtt plugin: Initialize locks on startup.

D'oh!

Issue: #1262

9 years agoconfigure: print out build flags and options in summary
Marc Fournier [Tue, 8 Sep 2015 07:06:11 +0000 (09:06 +0200)]
configure: print out build flags and options in summary

9 years agoconfigure: move werror flag to features
Marc Fournier [Tue, 8 Sep 2015 07:03:24 +0000 (09:03 +0200)]
configure: move werror flag to features

9 years agoMake building with -Werror optional.
Ruben Kerkhof [Fri, 14 Aug 2015 22:15:59 +0000 (00:15 +0200)]
Make building with -Werror optional.

I noticed various downstream distros patch out -Werror
for one reason or another. This adds an option to make that
easier. It is still on by default.

9 years agoplugin.c: emit log message when plugin loading succeeds
Marc Fournier [Thu, 3 Sep 2015 17:24:19 +0000 (19:24 +0200)]
plugin.c: emit log message when plugin loading succeeds

9 years agoMerge pull request #1253 from rubenk/fix-osx-build
Marc Fournier [Thu, 3 Sep 2015 17:06:24 +0000 (19:06 +0200)]
Merge pull request #1253 from rubenk/fix-osx-build

gettimeofday() needs <sys/time.h>

9 years agodbi plugin interval documentation
Michal Bebjak [Thu, 3 Sep 2015 10:21:21 +0000 (12:21 +0200)]
dbi plugin interval documentation

9 years agoFix compilation for master
Michal Bebjak [Thu, 3 Sep 2015 10:21:05 +0000 (12:21 +0200)]
Fix compilation for master

9 years agogettimeofday() needs <sys/time.h>
Ruben Kerkhof [Thu, 3 Sep 2015 09:49:11 +0000 (11:49 +0200)]
gettimeofday() needs <sys/time.h>

Fixes #1247

9 years agocollectd-tg: Fall back to gettimeofday(3) if clock_gettime(3) is not available.
Florian Forster [Tue, 1 Sep 2015 20:16:11 +0000 (22:16 +0200)]
collectd-tg: Fall back to gettimeofday(3) if clock_gettime(3) is not available.

Sometimes Mac OS/X is stupid. clock_gettime() was introduced in 1997, just
sayin'.

Fixes: #1247
9 years agoMerge branch 'collectd-5.5'
Marc Fournier [Wed, 26 Aug 2015 22:44:23 +0000 (00:44 +0200)]
Merge branch 'collectd-5.5'

9 years agosrc/daemon/utils_time_test.c: add ULL suffix to large literals
Marc Fournier [Wed, 26 Aug 2015 22:20:12 +0000 (00:20 +0200)]
src/daemon/utils_time_test.c: add ULL suffix to large literals

This should prevent some 32bit compilers from complaining about:
`integer constant is too large for 'long' type`

9 years agoMerge branch 'collectd-5.4' into collectd-5.5
Marc Fournier [Wed, 26 Aug 2015 21:40:18 +0000 (23:40 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5

9 years agoFix harmless build warnings with newer binutils
Ruben Kerkhof [Fri, 14 Aug 2015 20:25:20 +0000 (22:25 +0200)]
Fix harmless build warnings with newer binutils

I see a lot of those on Rawhide:
ar: `u' modifier ignored since `D' is the default (see `U')

It's going to take a while to get this fixed upstream.
Meanwhile, silence the warnings.

Macro copied from libvirt.

9 years agoliboconfig: Fix implicit declaration warning
Ruben Kerkhof [Sun, 16 Aug 2015 10:28:43 +0000 (12:28 +0200)]
liboconfig: Fix implicit declaration warning

strlen declaration is in string.h

9 years agoDon't unlock lock twice
Ruben Kerkhof [Sun, 16 Aug 2015 11:47:24 +0000 (13:47 +0200)]
Don't unlock lock twice

Fixes make check on OpenBSD

9 years agopf: fix compilation on OpenBSD
Ruben Kerkhof [Sun, 16 Aug 2015 12:39:23 +0000 (14:39 +0200)]
pf: fix compilation on OpenBSD

9 years agodns: fix compilation on OpenBSD
Ruben Kerkhof [Sun, 16 Aug 2015 13:07:03 +0000 (15:07 +0200)]
dns: fix compilation on OpenBSD

OpenBSD doesn't have pcap-bpf.h

pcap.h has been including pcap/bpf.h since 2006.
Since we require a pcap which has PCAP_ERROR_IFACE_NOT_UP, introduced in 2008
this shouldn't break anything.

9 years agocoding style fixes over 94e5622
Marc Fournier [Wed, 26 Aug 2015 21:28:50 +0000 (23:28 +0200)]
coding style fixes over 94e5622

9 years agoFix pipe leak in exec plugin
Gautam BT [Mon, 9 Feb 2015 11:01:24 +0000 (16:31 +0530)]
Fix pipe leak in exec plugin

Fixes #762

9 years agosrc/testing.h: Rename the EXPECT_EQ_{DOUBLE,INT,STR} macros.
Florian Forster [Fri, 21 Aug 2015 11:55:42 +0000 (13:55 +0200)]
src/testing.h: Rename the EXPECT_EQ_{DOUBLE,INT,STR} macros.

Let all equality macros follow a common naming and logging schema.

9 years agosrc/testing.h: Rewrite the EXPECT_EQ_UINT64() macro.
Florian Forster [Fri, 21 Aug 2015 11:37:30 +0000 (13:37 +0200)]
src/testing.h: Rewrite the EXPECT_EQ_UINT64() macro.

Cast the input to uint64_t, so we don't need to do this when calling the
macro. This results in cleaner log messages and prevents macros to be
expanded in the log output.

9 years agosrc/daemon/utils_time_test.c: Test ms conversion.
Florian Forster [Fri, 21 Aug 2015 11:34:49 +0000 (13:34 +0200)]
src/daemon/utils_time_test.c: Test ms conversion.

The CDTIME_T_TO_MS() macro is used by all plugins using the cURL library,
so we should properly test this macro, too.

9 years agosrc/daemon/utils_time.h: Don't cast input to time_t.
Florian Forster [Fri, 21 Aug 2015 10:49:04 +0000 (12:49 +0200)]
src/daemon/utils_time.h: Don't cast input to time_t.

The CDTIME_T_TO_TIME_T() macro used to cast its input to time_t, which is
a 32bit type on (some?) 32bit architectures.

This is a regression introduced in db1391aaa66b8b8fad82219494f61f3452441f62
and not found in any released version of collectd. Phew!

9 years agosrc/daemon/utils_time.h: Treat nanoseconds as 64bit integer.
Florian Forster [Fri, 21 Aug 2015 09:56:57 +0000 (11:56 +0200)]
src/daemon/utils_time.h: Treat nanoseconds as 64bit integer.

The assumed type was "long", because that is what struct timespec is
using. However, struct timespec only stores the fraction of a second in
the approrpiate field and therefore only cares about values up to 10^9.
We, on the other hand, assume a UNIX epoch in ns precision, so we
require the entire 64bits.

This patch changes the [MUN]S_TO_CDTIME_T() macros to assume a uint64_t
input and moves the casting to the appropriate data type for struct
time{val,spec} to the CDTIME_T_TO_TIME{VAL,SPEC}() macros. Appropriate
casts are added to the cURL based plugins which need to pass a "long" to
cURL when specifying timeouts.

It also fixes the unit test, which assigned large (> 32 bit) literals to
a "long" field, which breaks on 32 bit architectures.

9 years agosrc/daemon/utils_time.h: Improve precision of conversion macros.
Florian Forster [Wed, 19 Aug 2015 12:26:24 +0000 (14:26 +0200)]
src/daemon/utils_time.h: Improve precision of conversion macros.

This patch also adds test cases for most conversions. It is inspired by
collectd/go-collectd#5 and uses some of the same test cases.

9 years agoAllow to specify per database interval for fetching stats
Michal Bebjak [Mon, 17 Aug 2015 11:07:23 +0000 (13:07 +0200)]
Allow to specify per database interval for fetching stats

9 years agoltdl: only compile included libltdl when needed
Ruben Kerkhof [Sun, 9 Aug 2015 17:46:08 +0000 (19:46 +0200)]
ltdl: only compile included libltdl when needed

If configure finds an external libltdl, it's going to
use it, so there's no use in compiling the shipped libltdl.

9 years agoMerge remote-tracking branch 'origin/pr/1216'
Marc Fournier [Thu, 13 Aug 2015 21:36:19 +0000 (23:36 +0200)]
Merge remote-tracking branch 'origin/pr/1216'

9 years agoMerge remote-tracking branch 'origin/pr/1188'
Marc Fournier [Thu, 13 Aug 2015 21:35:57 +0000 (23:35 +0200)]
Merge remote-tracking branch 'origin/pr/1188'

9 years agoUse the devstat struct directly instead of using devstat_compute_statistics().
Brad Davis [Tue, 11 Aug 2015 13:49:04 +0000 (07:49 -0600)]
Use the devstat struct directly instead of using devstat_compute_statistics().

9 years agopowerdns: update recursor stats to 3.7.3
Ruben Kerkhof [Mon, 10 Aug 2015 20:29:07 +0000 (22:29 +0200)]
powerdns: update recursor stats to 3.7.3

Fixes #555

9 years agoMerge branch 'collectd-5.5'
Marc Fournier [Fri, 7 Aug 2015 08:14:59 +0000 (10:14 +0200)]
Merge branch 'collectd-5.5'

9 years agoMerge branch 'collectd-5.4' into collectd-5.5
Marc Fournier [Fri, 7 Aug 2015 08:14:17 +0000 (10:14 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5

9 years agoChanged the max value of cache_size in types.db to handle boxes with large amounts...
Brian ONeill [Thu, 6 Aug 2015 20:15:50 +0000 (16:15 -0400)]
Changed the max value of cache_size in types.db to handle boxes with large amounts of memory

9 years agoAdded more data to ZFS stats, c, c_min, and c_max for bettering monitoring arc usage
Brian ONeill [Thu, 6 Aug 2015 20:12:33 +0000 (16:12 -0400)]
Added more data to ZFS stats, c, c_min, and c_max for bettering monitoring arc usage

9 years agorouteros: fix a small build error pointed out by clang
Marc Fournier [Wed, 5 Aug 2015 16:05:02 +0000 (18:05 +0200)]
routeros: fix a small build error pointed out by clang

routeros.c:334:35: error: 'memset' call operates on objects of type 'cr_data_t' (aka 'struct cr_data_s') while the size is based on a different type 'cr_data_t *' (aka 'struct cr_data_s *') [-Werror,-Wsizeof-pointer-memaccess]
  memset (router_data, 0, sizeof (router_data));
          ~~~~~~~~~~~             ^~~~~~~~~~~
routeros.c:334:35: note: did you mean to dereference the argument to 'sizeof' (and multiply it by the number of elements)?
  memset (router_data, 0, sizeof (router_data));
                                  ^~~~~~~~~~~

9 years agoMerge pull request #1153 from mbethke/fix-unixsock
Pierre-Yves Ritschard [Wed, 5 Aug 2015 09:08:22 +0000 (11:08 +0200)]
Merge pull request #1153 from mbethke/fix-unixsock

Fix Unixsock.pm

9 years agoMerge pull request #1178 from rubenk/fix-libmodbus-compilation-on-freebsd
Pierre-Yves Ritschard [Wed, 5 Aug 2015 09:07:27 +0000 (11:07 +0200)]
Merge pull request #1178 from rubenk/fix-libmodbus-compilation-on-freebsd

core: include <sys/socket.h> in collectd.h

9 years agoipc: enable _GNU_SOURCE to fix build with musl libc
Natanael Copa [Wed, 5 Aug 2015 06:48:08 +0000 (08:48 +0200)]
ipc: enable _GNU_SOURCE to fix build with musl libc

This fixes compile the compile error:

> ipc.c:154:49: error: 'struct shm_info' has no member named 'used_ids'
>    ipc_submit_g("shm", "segments", NULL, shm_info.used_ids);
>                                                   ^

Fixes #1147

9 years agoRevert "amqp: look for librabbitmq in /usr/local as well"
Marc Fournier [Tue, 4 Aug 2015 16:39:33 +0000 (18:39 +0200)]
Revert "amqp: look for librabbitmq in /usr/local as well"

This reverts commit c1c5087fd5d9e66427cee8c98c523519d578bee6.

... as a follow-up to the discussion which took place in #1201

9 years agofhcount: this plugin only works on Linux
Ruben Kerkhof [Tue, 4 Aug 2015 09:21:19 +0000 (11:21 +0200)]
fhcount: this plugin only works on Linux

9 years agoMerge pull request #1196 from rubenk/travis
Pierre-Yves Ritschard [Tue, 4 Aug 2015 10:39:45 +0000 (12:39 +0200)]
Merge pull request #1196 from rubenk/travis

Travis

9 years agoTravis: add some whitelisted packages
Ruben Kerkhof [Tue, 4 Aug 2015 08:33:39 +0000 (10:33 +0200)]
Travis: add some whitelisted packages

The list is at https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise

9 years agoTravis: test with both gcc and clang
Ruben Kerkhof [Tue, 4 Aug 2015 08:20:50 +0000 (10:20 +0200)]
Travis: test with both gcc and clang

Travis does this in parallel so the build doesn't become
twice as long.

9 years agoTravis: run make distcheck
Ruben Kerkhof [Tue, 4 Aug 2015 08:18:36 +0000 (10:18 +0200)]
Travis: run make distcheck

This way we test if we can successfully build from tarball,
and we didn't leave out any files or forgot to clean something up.

9 years agodisk: no need to link with kvm, bsdxml, sbuf
Ruben Kerkhof [Sun, 2 Aug 2015 12:05:17 +0000 (14:05 +0200)]
disk: no need to link with kvm, bsdxml, sbuf

9 years agodisk: rename snap_present to snap
Ruben Kerkhof [Sun, 2 Aug 2015 11:57:05 +0000 (13:57 +0200)]
disk: rename snap_present to snap

There's only one of them now

9 years agodisk: gather statistics since boot on FreeBSD
Ruben Kerkhof [Sun, 2 Aug 2015 11:47:18 +0000 (13:47 +0200)]
disk: gather statistics since boot on FreeBSD

disk_octets and disk_ops are derives, so we don't want rates
but absolute values.

I tested this with fio with a constant IO rate and confirmed
that the values are correct for disk_octets and disk_ops.

disk_time is a different matter and I need some help with that.
devstat_compute_statistics returns a long double and it didn't
seem to increase much on my system, but that might be because I
tested this with a fast SSD.

9 years agoMake disk plugin compatible with FreeBSD.
Xin Li [Tue, 4 Jun 2013 21:44:34 +0000 (14:44 -0700)]
Make disk plugin compatible with FreeBSD.

9 years agoMerge branch 'collectd-5.5'
Marc Fournier [Mon, 3 Aug 2015 21:29:16 +0000 (23:29 +0200)]
Merge branch 'collectd-5.5'

9 years agosystemd.collectd.service: take debian/ubuntu's env file in account too
Marc Fournier [Mon, 3 Aug 2015 21:28:39 +0000 (23:28 +0200)]
systemd.collectd.service: take debian/ubuntu's env file in account too

9 years agoMerge remote-tracking branch 'origin/pr/1191'
Marc Fournier [Mon, 3 Aug 2015 21:27:10 +0000 (23:27 +0200)]
Merge remote-tracking branch 'origin/pr/1191'

9 years agoMerge remote-tracking branch 'origin/pr/1181'
Marc Fournier [Mon, 3 Aug 2015 21:26:55 +0000 (23:26 +0200)]
Merge remote-tracking branch 'origin/pr/1181'

9 years agoMerge remote-tracking branch 'origin/pr/1175'
Marc Fournier [Mon, 3 Aug 2015 21:26:21 +0000 (23:26 +0200)]
Merge remote-tracking branch 'origin/pr/1175'

9 years agoMerge remote-tracking branch 'origin/pr/1164'
Marc Fournier [Mon, 3 Aug 2015 21:26:05 +0000 (23:26 +0200)]
Merge remote-tracking branch 'origin/pr/1164'

9 years agoMerge branch 'collectd-5.4' into collectd-5.5
Marc Fournier [Mon, 3 Aug 2015 21:23:37 +0000 (23:23 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5

9 years agologstash: initialize conf struct to 0
Vincent Bernat [Mon, 3 Aug 2015 08:06:30 +0000 (10:06 +0200)]
logstash: initialize conf struct to 0

With YAJL 1 (at least on Ubuntu Precise), if `conf.indentString` is not
initialized correctly, we would get a segfault even when `conf.beautify`
is set to 0. We avoid this case by initializing the whole structure to
0. `conf.beautify = 0` is kept for explicitness.