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
Ruben Kerkhof [Fri, 11 Dec 2015 20:37:22 +0000 (21:37 +0100)]
Merge pull request #1454 from rubenk/libi2c-dev-mark-as-linux-only
libi2c only exists on Linux
Ruben Kerkhof [Fri, 11 Dec 2015 20:36:53 +0000 (21:36 +0100)]
Merge pull request #1453 from rubenk/configure-dont-output-pkgconfig-errors
libnotify: Don't output multiple lines of errors
Ruben Kerkhof [Fri, 11 Dec 2015 20:36:31 +0000 (21:36 +0100)]
Merge pull request #1452 from rubenk/configure-silence-configure-check
configure.ac: send output of check to /dev/null
Ruben Kerkhof [Fri, 11 Dec 2015 20:35:38 +0000 (21:35 +0100)]
Merge pull request #1442 from rubenk/omnios-fix-make-check
Fix make check on OmniOS
Ruben Kerkhof [Fri, 11 Dec 2015 18:53:33 +0000 (19:53 +0100)]
lvm2 plugin: mark as Linux only
Ruben Kerkhof [Fri, 11 Dec 2015 18:33:40 +0000 (19:33 +0100)]
Merge pull request #1456 from rubenk/onewire-fixup-flag-handling
onewire plugin: fixup flag handling
Ruben Kerkhof [Fri, 11 Dec 2015 18:26:38 +0000 (19:26 +0100)]
Remove check for ip_compat.h
Solaris needed this at one point but since
a621ced we check for ip6_ext without including this
header and that seems to succeed to.
Ruben Kerkhof [Fri, 11 Dec 2015 18:19:31 +0000 (19:19 +0100)]
Clarify error message
Ruben Kerkhof [Fri, 11 Dec 2015 18:18:29 +0000 (19:18 +0100)]
Stop hardcoding -lpthread
Ruben Kerkhof [Fri, 11 Dec 2015 18:08:59 +0000 (19:08 +0100)]
Move check for libpthread up
So we can use the result in plugins later on.
Ruben Kerkhof [Fri, 11 Dec 2015 17:48:13 +0000 (18:48 +0100)]
Java plugin: allow setting JAVA_LIBS as well
Ruben Kerkhof [Fri, 11 Dec 2015 17:32:48 +0000 (18:32 +0100)]
Java plugin: remove unused variables
Ruben Kerkhof [Fri, 11 Dec 2015 17:31:08 +0000 (18:31 +0100)]
Java plugin: clarify error message
It is possible that we've found libjvm, but it doesn't have
the right function.
Ruben Kerkhof [Fri, 11 Dec 2015 16:59:21 +0000 (17:59 +0100)]
onewire plugin: fixup flag handling
Split flags in _LDFLAGS and _LIBS
Allows the plugin to be detected and to be build on FreeBSD
Ruben Kerkhof [Fri, 11 Dec 2015 16:42:37 +0000 (17:42 +0100)]
configure.ac: remove commented out check
Ruben Kerkhof [Fri, 11 Dec 2015 16:25:08 +0000 (17:25 +0100)]
libi2c only exists on Linux
Ruben Kerkhof [Fri, 11 Dec 2015 16:08:44 +0000 (17:08 +0100)]
libnotify: Don't output multiple lines of errors
The errors pkg-config returns are not very helpful and they
break our nicely formatted list of found and absent libraries.
Just say that the package can't be found, like we do for the rest
of the packages we need.
Ruben Kerkhof [Fri, 11 Dec 2015 16:03:58 +0000 (17:03 +0100)]
configure.ac: send output of check to /dev/null
The output is quite a long line:
kern.cp_times: 10336 0 9848 499639
7613098 18834 0 11963 115
8101970 16444 0 14368 1672
8100398 17584 0 14149 1358
8099791
And we have no use for the result, we just want to know if the sysctl exists.
Florian Forster [Fri, 11 Dec 2015 08:18:27 +0000 (09:18 +0100)]
src/utils_ignorelist.c: Refactoring / code style fixes.
One of the goals was to remove uses of smalloc().
Ruben Kerkhof [Thu, 10 Dec 2015 18:38:04 +0000 (19:38 +0100)]
swap plugin: don't exit when malloc fails
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Thu, 10 Dec 2015 09:45:11 +0000 (10:45 +0100)]
src/daemon/utils_time.c: Rewrite format_zone() using strftime().
The "extern long timezone", while specified by X/Open, is not available
on FreeBSD. There, timezone() is a function.
Florian Forster [Wed, 9 Dec 2015 10:57:43 +0000 (11:57 +0100)]
.gitignore: Ignore all files starting with "test_".
Florian Forster [Wed, 9 Dec 2015 08:54:09 +0000 (09:54 +0100)]
Merge branch 'collectd-5.5'
Florian Forster [Wed, 9 Dec 2015 08:49:55 +0000 (09:49 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Florian Forster [Wed, 9 Dec 2015 08:44:24 +0000 (09:44 +0100)]
curl_json plugin: Rewrite logic to add a path to db->tree.
CID: 37991
Florian Forster [Tue, 8 Dec 2015 15:56:52 +0000 (16:56 +0100)]
curl_xml plugin: Correctly free xpath object.
CID: 37993
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Tue, 8 Dec 2015 13:42:07 +0000 (14:42 +0100)]
Merge branch 'collectd-5.5'
Florian Forster [Tue, 8 Dec 2015 13:39:07 +0000 (14:39 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Florian Forster [Tue, 8 Dec 2015 13:38:05 +0000 (14:38 +0100)]
ping plugin: Protect access to ping_thread_error.
This is primarily to make Coverity happy.
CID: 37976
Florian Forster [Tue, 8 Dec 2015 13:31:33 +0000 (14:31 +0100)]
ping plugin: Remove "static" from local variable.
This caused Coverity to see concurrency issues where there are none.
CID: 37934
Florian Forster [Tue, 8 Dec 2015 13:22:54 +0000 (14:22 +0100)]
rrdtool plugin: Improve handling of the "DataDir" option.
CID: 37977
Florian Forster [Tue, 8 Dec 2015 12:54:17 +0000 (13:54 +0100)]
python plugin: Check return value of cpy_unicode_or_bytes_to_string().
CID: 37984
Florian Forster [Tue, 8 Dec 2015 12:44:28 +0000 (13:44 +0100)]
python plugin: Check return value of malloc().
CID: 37981, 37982, 37983
Florian Forster [Tue, 8 Dec 2015 12:41:35 +0000 (13:41 +0100)]
python plugin: Fix memory leak.
The regiser_read / register_write functions assume a user_data_t*
pointing to static memory and will not store / free the pointer.
CID: 38002
Florian Forster [Tue, 8 Dec 2015 12:14:47 +0000 (13:14 +0100)]
tail plugin: Fix memory leak.
CID: 38013
Florian Forster [Tue, 8 Dec 2015 12:07:26 +0000 (13:07 +0100)]
postgresql plugin: Register a new user data pointer with udb_query_set_user_data() unconditionally.
CID: 38019
Florian Forster [Tue, 8 Dec 2015 11:51:29 +0000 (12:51 +0100)]
email plugin: Refactor the accept() loop.
This removes the assumption that accept() returning a socket (success)
implies that errno is not equal to EINTR. This is probably a reasonable
assumption, but trips up Coverity may be a bit hard to read.
CID: 38009
Florian Forster [Tue, 8 Dec 2015 10:56:09 +0000 (11:56 +0100)]
email plugin: Free "connection" in error handling.
CID: 38010
Florian Forster [Tue, 8 Dec 2015 10:49:56 +0000 (11:49 +0100)]
postgresql plugin: Remove invalid free().
CID: 37936
Florian Forster [Tue, 8 Dec 2015 10:46:09 +0000 (11:46 +0100)]
src/collectd-tg.c: Explicitly null-terminate string.
CID: 37937
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Tue, 8 Dec 2015 10:30:38 +0000 (11:30 +0100)]
src/utils_format_json.c: Check return value of json_escape_string().
CID: 37946
Florian Forster [Tue, 8 Dec 2015 10:33:46 +0000 (11:33 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Florian Forster [Tue, 8 Dec 2015 10:30:13 +0000 (11:30 +0100)]
src/utils_format_json.c: Make sure "keys" is freed in all error paths.
CID: 38008
Florian Forster [Tue, 8 Dec 2015 10:14:28 +0000 (11:14 +0100)]
collectd, collectdmon: Store return value of open() and dup().
This is to make Coverity happy.
CID: 38011, 38012
Florian Forster [Tue, 8 Dec 2015 09:44:13 +0000 (10:44 +0100)]
Merge remote-tracking branch 'github/pr/1437'
Florian Forster [Tue, 8 Dec 2015 09:33:17 +0000 (10:33 +0100)]
src/daemon/utils_time.h: Avoid incorrect rounding in CDTIME_T_TO_TIME{VAL,SPEC}.
This change also partially expands CDTIME_T_TO_{US,NS} to avoid dead
code warnings in Coverity.
Fixes: #1446
CID: 37950, 37951, 37952, 37953, 37954, 41722
Florian Forster [Tue, 8 Dec 2015 09:32:40 +0000 (10:32 +0100)]
src/daemon/utils_time_test.c: Check the "tv_sec" field of struct time{val,spec}.
Also fixes an incorrect "expected" test value.
Issue: #1446
Florian Forster [Tue, 8 Dec 2015 09:00:30 +0000 (10:00 +0100)]
Merge remote-tracking branch 'github/pr/1440'
Ruben Kerkhof [Sun, 6 Dec 2015 11:09:20 +0000 (12:09 +0100)]
sigrok plugin: don't pass status to strerror
CID #38120
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Tue, 8 Dec 2015 08:24:22 +0000 (09:24 +0100)]
Merge remote-tracking branch 'github/pr/1438'
Yoga Ramalingam [Mon, 7 Dec 2015 20:59:39 +0000 (15:59 -0500)]
interface plugin: Fix review comments.
Issue: #1416
Yoga Ramalingam [Mon, 7 Dec 2015 15:09:08 +0000 (10:09 -0500)]
interface plugin: Add UniqueName config property.
Issue: #1416
Yoga Ramalingam [Fri, 4 Dec 2015 21:08:54 +0000 (16:08 -0500)]
interface plugin: Fix duplicate interface metrics for Solaris.
Issue: #1416
Ruben Kerkhof [Sun, 6 Dec 2015 15:43:11 +0000 (16:43 +0100)]
Merge branch 'collectd-5.5'
Ruben Kerkhof [Sun, 6 Dec 2015 15:40:36 +0000 (16:40 +0100)]
Merge remote-tracking branch 'collectd/collectd-5.4' into collectd-5.5
Ruben Kerkhof [Sun, 6 Dec 2015 14:36:57 +0000 (15:36 +0100)]
Merge pull request #1441 from chicha/fix-gitignore
.gitignore: ignore test_plugin_ceph
Ruben Kerkhof [Sun, 6 Dec 2015 14:24:16 +0000 (15:24 +0100)]
Fix make check on OmniOS
We need the defines from config.h before
we include <testing.h>, or we get the following error on OmniOS:
make test_common test_meta_data test_utils_avltree test_utils_heap test_utils_time test_utils_subst
gcc -DHAVE_CONFIG_H -I. -I../../src -I../../src -DPREFIX='"/opt/collectd"' -DCONFIGFILE='"/opt/collectd/etc/collectd.conf"' -DLOCALSTATEDIR='"/opt/collectd/var"' -DPKGLOCALSTATEDIR='"/opt/collectd/var/lib/collectd"' -DPIDFILE='"/opt/collectd/var/run/collectd.pid"' -DPLUGINDIR='"/opt/collectd/lib/collectd"' -DPKGDATADIR='"/opt/collectd/share/collectd"' -Wall -Werror -g -O2 -c -o common_test.o common_test.c
In file included from collectd.h:31:0,
from common.h:31,
from common_test.c:28:
../../src/config.h:1631:0: error: "_FILE_OFFSET_BITS" redefined [-Werror]
#define _FILE_OFFSET_BITS 64
^
In file included from /usr/include/inttypes.h:41:0,
from ../../src/testing.h:30,
from common_test.c:27:
/opt/gcc-5.1.0/lib/gcc/i386-pc-solaris2.11/5.1.0/include-fixed/sys/feature_tests.h:231:0: note: this is the location of the previous definition
#define _FILE_OFFSET_BITS 32
^
cc1: all warnings being treated as errors
*** Error code 1
make: Fatal error: Command failed for target `common_test.o'
Charles-Henri d'Adhémar [Sun, 6 Dec 2015 14:19:44 +0000 (15:19 +0100)]
.gitignore: ignore test_plugin_ceph
Ruben Kerkhof [Sun, 6 Dec 2015 11:21:45 +0000 (12:21 +0100)]
write_kafka: fix two leaks on error
CID #38124
Ruben Kerkhof [Sun, 6 Dec 2015 09:12:03 +0000 (10:12 +0100)]
iptables plugin: indent consistently
Ruben Kerkhof [Sun, 6 Dec 2015 08:57:33 +0000 (09:57 +0100)]
iptables plugin: move comment to right place
Florian Forster [Sat, 5 Dec 2015 22:37:16 +0000 (23:37 +0100)]
multimeter plugin: Initizliaze "struct termios".
CID: 38036
Ruben Kerkhof [Sat, 5 Dec 2015 21:17:43 +0000 (22:17 +0100)]
configure.ac: fix previous change to detect libjvm
This worked on OSX but failed on Linux.
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Sat, 5 Dec 2015 22:08:22 +0000 (23:08 +0100)]
Merge branch 'collectd-5.5'
Florian Forster [Sat, 5 Dec 2015 22:07:14 +0000 (23:07 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Sat, 5 Dec 2015 13:20:29 +0000 (14:20 +0100)]
meta_data.c: check return value of md_entry_alloc
CID #37986
Signed-off-by: Florian Forster <octo@collectd.org>
Ruben Kerkhof [Sat, 5 Dec 2015 14:07:40 +0000 (15:07 +0100)]
iptables plugin: remove dead code
ip version is either IPv4 or IPv6
CID #37962
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Sat, 5 Dec 2015 21:49:05 +0000 (22:49 +0100)]
src/filter_chain.c: Refactor fc_process_chain() a wee bit.
Florian Forster [Sat, 5 Dec 2015 21:48:18 +0000 (22:48 +0100)]
src/filter_chain.c: Delete dead code.
CID: 37961
Florian Forster [Sat, 5 Dec 2015 21:30:39 +0000 (22:30 +0100)]
src/common.c: Check arguments of parse_values().
CID: 37965
Florian Forster [Sat, 5 Dec 2015 21:23:05 +0000 (22:23 +0100)]
libcollectdclient: Check return value of setsockopt().
Coverity CID 37944.
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Sat, 5 Dec 2015 21:06:46 +0000 (22:06 +0100)]
Merge branch 'collectd-5.5'
Florian Forster [Sat, 5 Dec 2015 21:06:35 +0000 (22:06 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Sat, 5 Dec 2015 14:50:46 +0000 (15:50 +0100)]
configure.ac: fix libjvm detection on OSX
Shared libraries have the extension .dylib instead of .so
Ideally we look at shrext_cmds from libtool to find the shared library
extension but this works too.
Signed-off-by: Florian Forster <octo@collectd.org>
Ruben Kerkhof [Sat, 5 Dec 2015 14:16:36 +0000 (15:16 +0100)]
unixsock: check return value of chmod
CID #37948
Signed-off-by: Florian Forster <octo@collectd.org>
Ruben Kerkhof [Sat, 5 Dec 2015 14:02:43 +0000 (15:02 +0100)]
zookeeper plugin: remove dead code
status cannot be 0 inside the loop
CID #37964
Signed-off-by: Florian Forster <octo@collectd.org>
Ruben Kerkhof [Sat, 5 Dec 2015 13:28:23 +0000 (14:28 +0100)]
write_tsdb plugin: don't close a closed socket
CID #37979 and #37980
Signed-off-by: Florian Forster <octo@collectd.org>
Ruben Kerkhof [Sat, 5 Dec 2015 13:14:54 +0000 (14:14 +0100)]
zfs-arc plugin: check return value of malloc
CID #37989
Signed-off-by: Florian Forster <octo@collectd.org>
Ruben Kerkhof [Sat, 5 Dec 2015 13:09:12 +0000 (14:09 +0100)]
bind plugin: plug small leak
CID #37992
Signed-off-by: Florian Forster <octo@collectd.org>
Ruben Kerkhof [Sat, 5 Dec 2015 13:03:58 +0000 (14:03 +0100)]
curl_xml plugin: plug a few leaks on error
CID #37993
Signed-off-by: Florian Forster <octo@collectd.org>
Ruben Kerkhof [Sat, 5 Dec 2015 12:42:33 +0000 (13:42 +0100)]
stats plugin: close fd on error
CID #37995
Signed-off-by: Florian Forster <octo@collectd.org>
Ruben Kerkhof [Sat, 5 Dec 2015 12:39:03 +0000 (13:39 +0100)]
utils_cache.c: plug leak on error
CID #38000
Signed-off-by: Florian Forster <octo@collectd.org>
Ruben Kerkhof [Sat, 5 Dec 2015 12:33:54 +0000 (13:33 +0100)]
Aggregration plugin: plug leak on error
CID #38005
Signed-off-by: Florian Forster <octo@collectd.org>
Ruben Kerkhof [Sat, 5 Dec 2015 12:21:25 +0000 (13:21 +0100)]
varnish plugin: fix two resource leaks on error
CID #42774
Signed-off-by: Florian Forster <octo@collectd.org>
Ruben Kerkhof [Sat, 5 Dec 2015 11:11:26 +0000 (12:11 +0100)]
write_riemann plugin: plug leak on error
CID #37996
Signed-off-by: Florian Forster <octo@collectd.org>