Marc Fournier [Tue, 9 Feb 2016 22:27:29 +0000 (23:27 +0100)]
Merge branch 'collectd-5.5'
Marc Fournier [Tue, 9 Feb 2016 22:27:12 +0000 (23:27 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Marc Fournier [Tue, 9 Feb 2016 22:15:49 +0000 (23:15 +0100)]
Merge pull request #1521 from coreykosak/factor-out-common-code
Factor out some common functionality
Marc Fournier [Tue, 9 Feb 2016 22:13:15 +0000 (23:13 +0100)]
Merge pull request #1540 from mfournier/write_sensu_segfault_fix
write_sensu: avoid calling strlen() on variable set to NULL
Marc Fournier [Tue, 9 Feb 2016 22:12:38 +0000 (23:12 +0100)]
Merge pull request #1529 from jamtur01/patch-1
Fixed typo in CounterSum documentation
Marc Fournier [Mon, 8 Feb 2016 08:46:21 +0000 (09:46 +0100)]
RPM specfile: re-enable varnish plugin on EL7
... as the collectd-5.5 line now supports the varnish 4 API.
Marc Fournier [Fri, 5 Feb 2016 14:16:09 +0000 (15:16 +0100)]
write_sensu: avoid calling strlen() on variable set to NULL
This fixes a segfault when no `Tag` option is set.
Ruben Kerkhof [Sat, 30 Jan 2016 16:44:54 +0000 (17:44 +0100)]
Fix the addres of the Free Software Foundation
James Turnbull [Tue, 26 Jan 2016 16:39:50 +0000 (11:39 -0500)]
Fixed typo in CounterSum documentation
Marc Fournier [Tue, 26 Jan 2016 11:19:57 +0000 (12:19 +0100)]
Revert "Revert "openvpn plugin: Fix "Dead assignment" warning.""
This reverts commit
b40a0ef00b49cbc4d828ca2cd928c98dd27834c0.
Marc Fournier [Tue, 26 Jan 2016 11:18:26 +0000 (12:18 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Marc Fournier [Tue, 26 Jan 2016 06:21:57 +0000 (07:21 +0100)]
turbostat: fix whitespaces in log messages
Corey Kosak [Fri, 22 Jan 2016 21:56:37 +0000 (16:56 -0500)]
Don't divide by 0 when doing percentages (e.g. with the swap plugin).
Prior to this change, if all the values being sent sum to zero, then the
calculated percentage is a division by 0 which is either Inf or NaN
depending on the numerator.
This is not a theoretical concern: it can easily happen if all the input
gauges are 0.
This change forces the output to be zero if the denominator is zero.
Corey Kosak [Sat, 23 Jan 2016 00:10:21 +0000 (19:10 -0500)]
Provide a unified signature for ps_get_cmdline.
Prior to this change, ps_get_cmdline had different signatures for
KERNEL_LINUX vs. KERNEL_SOLARIS. This means that callers who want to
call this function would have to have an #if..#else that controlled which
variant of the function to call.
By giving them the same signature, callers don't have to worry about
that.
Corey Kosak [Fri, 22 Jan 2016 22:22:18 +0000 (17:22 -0500)]
The field 're' only exists if HAVE_REGEX_H is defined (see definition at
line 194). So, consistent with all other usages, this should be protected
with an #if guard.
Marc Fournier [Tue, 26 Jan 2016 05:50:15 +0000 (06:50 +0100)]
Revert "openvpn plugin: Fix "Dead assignment" warning."
I cherry-picked this patch, but overlooked the fact it relates to
another change (
c339d93f) only found in the collectd-5.5 branch.
Reverting, as it results in a compilation error.
This reverts commit
b7f9a3c02d885e0fbe8fb7aac5c9a51b5771a9d3.
Corey Kosak [Fri, 22 Jan 2016 23:49:30 +0000 (18:49 -0500)]
Factor out some common functionality in an effort to make
this code more readable.
Florian Forster [Fri, 22 Jan 2016 09:53:29 +0000 (10:53 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Marc Fournier [Wed, 20 Jan 2016 21:32:03 +0000 (22:32 +0100)]
drbd plugin: improve header lines identification
Recent DRBD versions display more detailed build information in
`/proc/drbd`, which caused the header identification to fail.
Comparing the first part of each line against all known header prefixes
will hopefully make this more robust.
Fixes #1514
Signed-off-by: Florian Forster <octo@collectd.org>
Marc Fournier [Mon, 18 Jan 2016 15:44:52 +0000 (16:44 +0100)]
df: remove legacy code skipping "rootfs" monitoring
3512bb1 added code to skip duplicate reporting of `rootfs` mounted on `/`.
f9c1c5b and
f0398d0 added generic code to skip any volume mounted twice.
Depending on the order of the entries in `/etc/mtab`, reporting for `/` was
entirely skipped.
This patch basically reverts the first, non-generic patch, as it's
superseded by the 2 others.
Fixes #1402
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Fri, 22 Jan 2016 09:33:17 +0000 (10:33 +0100)]
ChangeLog: Fix mangled entries.
Florian Forster [Fri, 22 Jan 2016 08:55:02 +0000 (09:55 +0100)]
Bump version to 5.5.1; Update ChangeLog.
Marc Fournier [Fri, 22 Jan 2016 08:47:43 +0000 (09:47 +0100)]
Merge pull request #1517 from mfournier/systemd-upstart-build-issue
systemd.collectd.service: improve systemd & capabilities explanations
Jakub Jankowski [Thu, 21 Jan 2016 20:43:26 +0000 (21:43 +0100)]
docs: Add info about mode7 requirement for ntpd
Since ntpd-4.2.7p230 "mode 7" requests are ignored by default, and
that's what ntpd plugin uses currently. The ntp daemon must be
explicitly configured to enable mode7 requests.
This patch adds short information about that to collectd.conf manpage.
Related to collectd/collectd#932
Signed-off-by: Jakub Jankowski <shasta@toxcorp.com>
Florian Forster [Fri, 22 Jan 2016 08:04:41 +0000 (09:04 +0100)]
collectdmon: Refactor the re-opening of STD{IN,OUT,ERR}.
Marc Fournier [Thu, 21 Jan 2016 20:29:18 +0000 (21:29 +0100)]
Merge branch 'collectd-5.5'
Marc Fournier [Thu, 21 Jan 2016 20:26:38 +0000 (21:26 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Jakub Jankowski [Thu, 21 Jan 2016 16:15:20 +0000 (17:15 +0100)]
docs: mention regexps for the interface plugin
It is very useful to collect data (or ignore) from a group of interfaces
that are similarly named - especially if the list is dynamic and it's
not feasible to update configuration each time an interface shows up or
disappears. It's possible to use regexps to specify interfaces to
collect data from (or ignore), but it's not clearly stated anywhere in
the documentation.
This is an attempt to improve documentation in this area.
Signed-off-by: Jakub Jankowski <shasta@toxcorp.com>
Marc Fournier [Thu, 21 Jan 2016 17:39:51 +0000 (18:39 +0100)]
systemd.collectd.service: improve systemd & capabilities explanations
Fixes #1444
Florian Forster [Tue, 1 Dec 2015 15:18:38 +0000 (16:18 +0100)]
exec plugin: Revert file mode to 0644.
This fixes a regression from
94e562250296b1435e3e48cd302055d89c4c702b.
Marc Fournier [Wed, 20 Jan 2016 08:47:31 +0000 (09:47 +0100)]
virt plugin: make indentation explicit
Fixes this warning raised by gcc-6's new "misleading-indentation"
option:
```
virt.c: In function 'lv_init':
virt.c:331:2: error: statement is indented as if it were guarded by... [-Werror=misleading-indentation]
return 0;
^~~~~~
virt.c:328:5: note: ...this 'if' clause, but it is not
if (virInitialize () != 0)
^~
```
Marc Fournier [Mon, 18 Jan 2016 16:49:24 +0000 (17:49 +0100)]
df: remove legacy references to ReportReserved
The ReportReserved option was removed in
fcb3cbf. This patch cleans up a
couple of references which got left behind.
Marc Fournier [Fri, 15 Jan 2016 16:19:41 +0000 (17:19 +0100)]
Merge branch 'collectd-5.5'
Marc Fournier [Fri, 15 Jan 2016 16:19:31 +0000 (17:19 +0100)]
Merge branch 'collectd-5.4'
Marc Fournier [Fri, 15 Jan 2016 16:00:30 +0000 (17:00 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Sat, 28 Nov 2015 17:37:15 +0000 (18:37 +0100)]
write_redis: don't return with lock held
Florian Forster [Tue, 14 Jul 2015 06:42:15 +0000 (08:42 +0200)]
src/utils_latency.c: Fix format string error.
Florian Forster [Tue, 14 Jul 2015 06:34:52 +0000 (08:34 +0200)]
src/utils_latency.c: Ensure that LLONG_MAX is defined.
EPEL5 doesn't have it in <limits.h> apparently.
Florian Forster [Mon, 13 Jul 2015 09:53:58 +0000 (11:53 +0200)]
src/utils_latency.c: Store "bin_width" as cdtime_t.
This solves the integer overflow when passing huge latency values to
latency_counter_add(). In addition to fixing the overflow the function
will now ignore values that are larger than LLONG_MAX, i.e. the longest
possible latency is 272 years. As a nice side-effect, the precission of
latency_counter_get_percentile() is improved.
Issue: #1131
Florian Forster [Sun, 12 Jul 2015 10:58:20 +0000 (12:58 +0200)]
src/utils_latency.c: Fix change_bin_width().
A missing cast when calculating "width_change_ratio" caused all metrics to
be moved to bucket #0.
Ruben Kerkhof [Sat, 4 Jul 2015 20:49:49 +0000 (22:49 +0200)]
varnish: fix leak on read
Since VSM_Close doesn't free the object we leak a few bytes
every interval
Florian Forster [Fri, 19 Jun 2015 14:26:12 +0000 (16:26 +0200)]
openvpn plugin: Fix "Dead assignment" warning.
Florian Forster [Thu, 18 Jun 2015 14:45:23 +0000 (16:45 +0200)]
modbus plugin: Make sure variable is initialized.
This was introduced by the merge
(
09c6a320f3cb36b5dbb2c2ce43858f33be7acf9b).
Florian Forster [Thu, 18 Jun 2015 13:31:11 +0000 (15:31 +0200)]
tail plugin: Make sure variable is initialized.
This was introduced by the merge
(
09c6a320f3cb36b5dbb2c2ce43858f33be7acf9b).
Dagobert Michelsen [Thu, 4 Jun 2015 11:25:48 +0000 (13:25 +0200)]
Fix header condition
The dependency is either UTMPX or UTMP or Statgrab. The inclusion above hasn't statgrab.h in the elif-chain, that means compilation fails when only libstatgrab is available. The line can safely be taken out as the same condition is checked in #L120.
Claudius Zingerli [Tue, 5 Jan 2016 17:22:22 +0000 (18:22 +0100)]
Fixed rrdtool sigsegv (datadir==NULL ptr dereferencing)
Marc Fournier [Wed, 13 Jan 2016 08:12:23 +0000 (09:12 +0100)]
processes: correct a typo
Marc Fournier [Tue, 12 Jan 2016 13:02:23 +0000 (14:02 +0100)]
Merge branch 'collectd-5.5'
Marc Fournier [Tue, 12 Jan 2016 08:03:09 +0000 (09:03 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Sat, 28 Nov 2015 17:37:15 +0000 (18:37 +0100)]
write_redis: don't return with lock held
Ruben Kerkhof [Sun, 29 Nov 2015 16:52:26 +0000 (17:52 +0100)]
redis plugin: make sure buffer is null-terminated
CID 37938
Ruben Kerkhof [Sun, 29 Nov 2015 17:06:33 +0000 (18:06 +0100)]
perl: unlock mutex on error
CID 37970
Ruben Kerkhof [Sun, 29 Nov 2015 17:27:56 +0000 (18:27 +0100)]
openvpn: free resource on error
Ruben Kerkhof [Sun, 29 Nov 2015 17:23:17 +0000 (18:23 +0100)]
openvpn: fix error message
Ruben Kerkhof [Sun, 29 Nov 2015 17:22:30 +0000 (18:22 +0100)]
openvpn: check return value of malloc
CID 37987
Ruben Kerkhof [Sat, 28 Nov 2015 19:27:22 +0000 (20:27 +0100)]
curl_json: remove dead code
CID 37963
Ruben Kerkhof [Fri, 4 Dec 2015 18:31:16 +0000 (19:31 +0100)]
snmp plugin: don't read from uninitialized pointer
if the first snmp_pdu_create inside the loop returns an error,
we exit the loop with res uninitialized and then call snmp_free_pdu on it.
CID #38037
Ruben Kerkhof [Fri, 4 Dec 2015 18:02:32 +0000 (19:02 +0100)]
libcollectdclient: don't close socket twice
CID #38039
Ruben Kerkhof [Sat, 12 Dec 2015 11:24:41 +0000 (12:24 +0100)]
email plugin: fix check for result of malloc
CID #38010
Claudius Zingerli [Tue, 5 Jan 2016 17:22:22 +0000 (18:22 +0100)]
Fixed rrdtool sigsegv (datadir==NULL ptr dereferencing)
Ruben Kerkhof [Fri, 25 Dec 2015 08:39:44 +0000 (09:39 +0100)]
openldap plugin: fix build on OSX El Capitan
OpenLDAP is deprecated in OSX El Capitan.
Apple would like us to use the OpenDirectory Framework instead.
Treat these deprecation warnings as warnings, not errors.
Marc Fournier [Tue, 12 Jan 2016 05:52:54 +0000 (06:52 +0100)]
collectd.conf.pod: mention IPv6 option to the iptables plugin
Thanks to @michaelsalmon for pointing this out !
Fix #1496
Laurent [Wed, 6 Jan 2016 09:52:31 +0000 (10:52 +0100)]
remove the addressof in the sizeof
quick fix for issue 1501?
the new warning for pointer access introduced in gcc 4.8 helped to find
this one.
Florian Forster [Fri, 18 Dec 2015 10:11:15 +0000 (11:11 +0100)]
disk plugin: Declare alt_name only when libudev is available.
Coverity whines about "output_name = alt_name" being dead code because
it sees alt_name as beeing NULL always.
CID: 48417
Florian Forster [Fri, 18 Dec 2015 08:26:14 +0000 (09:26 +0100)]
network plugin: Coding style fixes.
This fixes a number of sizeof() operations which did not follow our best
practice of using the variable rather than its type. It also removes
unnecessary (void *) casts.
Florian Forster [Fri, 18 Dec 2015 08:24:19 +0000 (09:24 +0100)]
network plugin: Check range of pkg_numval.
This is essentially the same as the check using exp_size a couple lines
earlier, but that appears to be too indirect for Coverity to understand.
This hopefully fixes the resulting "tainted_data_return" errors.
CID: 48420
Florian Forster [Thu, 17 Dec 2015 14:19:00 +0000 (15:19 +0100)]
Merge branch 'collectd-5.5'
Florian Forster [Thu, 17 Dec 2015 14:18:45 +0000 (15:18 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Florian Forster [Thu, 17 Dec 2015 14:13:39 +0000 (15:13 +0100)]
perl plugin: Check "return value" of PERL_GET_CONTEXT.
CID: 37985
Florian Forster [Thu, 17 Dec 2015 13:57:13 +0000 (14:57 +0100)]
email plugin: Don't call type_list_incr() with type == NULL.
CID: 37988
Florian Forster [Thu, 17 Dec 2015 13:43:31 +0000 (14:43 +0100)]
write_http plugin: Check return status of cf_util_get_*().
CID: 37949
Florian Forster [Thu, 17 Dec 2015 13:25:19 +0000 (14:25 +0100)]
gmond plugin: Inline the plugin_dispatch_values() call.
Since version 5.3, a write queue is used. This means that the
plugin_dispatch_values() call will create a copy of the value list and
return quickly. Creating yet another copy here is therefore not as useful
anymore.
CID: 38114
Florian Forster [Thu, 17 Dec 2015 13:18:59 +0000 (14:18 +0100)]
gmond plugin: Check return value of sendto(2).
CID: 38113
Florian Forster [Thu, 17 Dec 2015 13:21:27 +0000 (14:21 +0100)]
gmond plugin: Check return value of setsockopt(2).
CID: 38112
Florian Forster [Thu, 17 Dec 2015 12:32:29 +0000 (13:32 +0100)]
zfs_arc plugin: Rewrite Linux parsing logic.
CID: 38028
Florian Forster [Thu, 17 Dec 2015 12:41:46 +0000 (13:41 +0100)]
Merge branch 'collectd-5.5'
Florian Forster [Thu, 17 Dec 2015 12:41:18 +0000 (13:41 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Florian Forster [Thu, 17 Dec 2015 12:34:12 +0000 (13:34 +0100)]
zfs_arc plugin: Plug memory leak on Linux.
CID: 42796
Signed-off-by: Florian Forster <octo@collectd.org>
Ruben Kerkhof [Sat, 12 Dec 2015 15:43:55 +0000 (16:43 +0100)]
configure.ac: warn when pkg-config is not installed
It hasn't been optional for a while now.
Fixes:
checking for rrd.h... no
./configure: 25157: Syntax error: word unexpected (expecting ")")
Signed-off-by: Florian Forster <octo@collectd.org>
Ruben Kerkhof [Sun, 13 Dec 2015 12:07:05 +0000 (13:07 +0100)]
barometer plugin: cleanup whitespace
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Thu, 17 Dec 2015 09:26:02 +0000 (10:26 +0100)]
collectd.conf(5): Document all metrics created by CollectInternalStats.
Yves Mettier [Tue, 15 Dec 2015 09:55:17 +0000 (09:55 +0000)]
collectd.conf(5): Improve documentation of the CollectdInternalStats option.
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Thu, 17 Dec 2015 09:09:28 +0000 (10:09 +0100)]
Merge branch 'pr/1469'
Florian Forster [Thu, 17 Dec 2015 09:02:09 +0000 (10:02 +0100)]
Merge branch 'pr/1393'
Ruben Kerkhof [Sun, 13 Dec 2015 12:44:11 +0000 (13:44 +0100)]
drbd plugin: no need to link with libpthread
Ruben Kerkhof [Sun, 13 Dec 2015 11:37:17 +0000 (12:37 +0100)]
Merge pull request #1466 from rubenk/write_riemann-remove-unneeded-include
write_riemann: remove unneeded include
Ruben Kerkhof [Sun, 13 Dec 2015 11:36:53 +0000 (12:36 +0100)]
Merge pull request #1463 from rubenk/redis-fix-build-warning
redis plugin: fix build error on NetBSD
Ruben Kerkhof [Sat, 12 Dec 2015 17:15:15 +0000 (18:15 +0100)]
write_riemann: remove unneeded include
Fixes build on NetBSD:
Making all in daemon
CC write_riemann_threshold.lo
write_riemann_threshold.c:36:18: fatal error: ltdl.h: No such file or directory
#include <ltdl.h>
^
compilation terminated.
*** Error code 1
Stop.
make[3]: stopped in /home/ruben/src/collectd/src
*** Error code 1
Stop.
make[2]: stopped in /home/ruben/src/collectd/src
*** Error code 1
Stop.
make[1]: stopped in /home/ruben/src/collectd/src
*** Error code 1
Stop.
make: stopped in /home/ruben/src/collectd
Ruben Kerkhof [Sat, 12 Dec 2015 14:32:23 +0000 (15:32 +0100)]
redis plugin: fix build error on NetBSD
Making all in daemon
CC redis_la-redis.lo
redis.c: In function 'redis_handle_info':
redis.c:307:5: error: array subscript has type 'char' [-Werror=char-subscripts]
for(i=0;(*str && (isdigit(*str) || *str == '.'));i++,str++)
^
cc1: all warnings being treated as errors
*** Error code 1
Stop.
make[3]: stopped in /home/ruben/src/collectd/src
*** Error code 1
Stop.
make[2]: stopped in /home/ruben/src/collectd/src
*** Error code 1
Stop.
make[1]: stopped in /home/ruben/src/collectd/src
*** Error code 1
Stop.
make: stopped in /home/ruben/src/collectd
Ruben Kerkhof [Sat, 12 Dec 2015 13:44:52 +0000 (14:44 +0100)]
Merge pull request #1462 from rubenk/email-plugin-fix-malloc-check
email plugin: fix check for result of malloc
Ruben Kerkhof [Sat, 12 Dec 2015 11:24:41 +0000 (12:24 +0100)]
email plugin: fix check for result of malloc
CID #38010
Ruben Kerkhof [Sat, 12 Dec 2015 10:09:33 +0000 (11:09 +0100)]
Merge pull request #1461 from rubenk/fix-java-plugin-on-freebsd
java: link with libpthread on FreeBSD
Ruben Kerkhof [Fri, 11 Dec 2015 22:43:18 +0000 (23:43 +0100)]
java: link with libpthread on FreeBSD
Ruben Kerkhof [Fri, 11 Dec 2015 22:01:06 +0000 (23:01 +0100)]
Merge branch 'collectd-5.5'
Ruben Kerkhof [Fri, 11 Dec 2015 20:56:40 +0000 (21:56 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Fri, 11 Dec 2015 20:43:15 +0000 (21:43 +0100)]
Merge pull request #1460 from rubenk/mark-lvm2app-linux-only
lvm2 plugin: mark as Linux only
Ruben Kerkhof [Fri, 11 Dec 2015 20:38:58 +0000 (21:38 +0100)]
Merge pull request #1459 from rubenk/remove-unneccesary-check-for-ip-compat-h
Remove check for ip_compat.h
Ruben Kerkhof [Fri, 11 Dec 2015 20:38:32 +0000 (21:38 +0100)]
Merge pull request #1458 from rubenk/pthread-detection
Pthread detection
Ruben Kerkhof [Fri, 11 Dec 2015 20:38:06 +0000 (21:38 +0100)]
Merge pull request #1457 from rubenk/java-plugin-fixups
Java plugin fixups
Ruben Kerkhof [Fri, 11 Dec 2015 20:37:41 +0000 (21:37 +0100)]
Merge pull request #1455 from rubenk/configure-ac-remove-dead-code
configure.ac: remove commented out check