Ruben Kerkhof [Thu, 11 Aug 2016 15:45:48 +0000 (17:45 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Thu, 11 Aug 2016 15:44:42 +0000 (17:44 +0200)]
md: fix deprecation warning with latest glibc
md.c: In function ‘md_process’:
md.c:120:3: warning: ‘__makedev_from_sys_types’ is deprecated:
In the GNU C Library, `makedev' is defined by <sys/sysmacros.h>.
For historical compatibility, it is currently defined by
<sys/types.h> as well, but we plan to remove this soon.
To use `makedev', include <sys/sysmacros.h> directly.
If you did not intend to use a system-defined macro `makedev',
you should #undef it after including <sys/types.h>.
[-Wdeprecated-declarations]
if (st.st_rdev != makedev (MD_MAJOR, minor))
^~
In file included from /usr/include/features.h:397:0,
from /usr/include/bits/libc-header-start.h:33,
from /usr/include/stdio.h:28,
from ./daemon/collectd.h:34,
from md.c:22:
David Gibson [Wed, 10 Aug 2016 10:07:14 +0000 (20:07 +1000)]
Fix conceptual buglet in default_callback
The 'DERIVE' path in default_callback() increments the 'counter' field of
value instead of the 'derive' field. Since those fields have the same
type and offset within the value union this will still work fine, but
AFAICT it's conceptually incorrect. This corrects it.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Sat, 6 Aug 2016 19:21:56 +0000 (21:21 +0200)]
src/utils_db_query.c: Correctly handle return value of strjoin().
It returns the number of bytes, not zero, on success. This fixes a
bug introduced in
496ca2b758344bc6372ab0adf98ad8050f69b25a.
Florian Forster [Sat, 6 Aug 2016 18:33:54 +0000 (20:33 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5
Florian Forster [Sat, 6 Aug 2016 18:15:51 +0000 (20:15 +0200)]
src/utils_db_query.c: Check return status of strjoin().
Fixes: #4
Florian Forster [Sat, 6 Aug 2016 18:00:34 +0000 (20:00 +0200)]
libcollectdclient: Don't print anything to STDOUT by default.
Even with --enable-debug. This behavior is now controlled by the
"COLLECTD_TRACE" environment variable.
Fixes: #105
Florian Forster [Sat, 6 Aug 2016 16:22:56 +0000 (18:22 +0200)]
ping plugin: Let start_thread() return gracefully when thread is already running.
Signaling an error caused the init function to signal an error, causing
the read callback to be unregistered on systems where init is called
more than once.
Fixes: #869
Ruben Kerkhof [Fri, 5 Aug 2016 11:12:03 +0000 (13:12 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5
trenkel [Thu, 4 Aug 2016 20:57:55 +0000 (22:57 +0200)]
Merge pull request #1846 from tokkee/collectd-5.4
python plugin: Fix conversion of value-lists from Python to C.
Sebastian Harl [Thu, 4 Aug 2016 20:15:34 +0000 (22:15 +0200)]
python plugin: Fix conversion of value-lists from Python to C.
This affects data-sets with more than one data-source of different types.
Previously, the type of the first data-source would have been used to convert
all values.
Florian Forster [Wed, 3 Aug 2016 20:27:26 +0000 (22:27 +0200)]
src/plugin.c: Stop write threads before calling shutdown callbacks.
Issue: #1110
Sebastian Harl [Wed, 27 Jul 2016 07:45:48 +0000 (09:45 +0200)]
network plugin: Don't abort() if gcrypt initialization failed.
Instead, report an error and let plugin initialization fail.
Ruben Kerkhof [Tue, 26 Jul 2016 10:50:07 +0000 (12:50 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5
Conflicts:
ChangeLog
contrib/redhat/collectd.spec
version-gen.sh
Aurelien ROUGEMONT [Tue, 26 Jul 2016 10:29:49 +0000 (12:29 +0200)]
metadata: add comment about metadata functions use and threads safety
Signed-off-by: Florian Forster <octo@collectd.org>
Ruben Kerkhof [Tue, 26 Jul 2016 10:26:24 +0000 (12:26 +0200)]
Bump spec file to 5.4.3
Ruben Kerkhof [Tue, 26 Jul 2016 10:20:40 +0000 (12:20 +0200)]
Update spec file to 5.5.2
(cherry picked from commit
34add34b27c6d85ed992efc951fc08994e5f86d6)
Florian Forster [Tue, 26 Jul 2016 07:21:19 +0000 (09:21 +0200)]
Bump version to 5.4.3; Update ChangeLog.
Florian Forster [Tue, 26 Jul 2016 06:54:42 +0000 (08:54 +0200)]
network plugin: Fix error message for GCRYCTL_INIT_SECMEM failure.
Florian Forster [Tue, 26 Jul 2016 05:50:55 +0000 (07:50 +0200)]
ChangeLog: Add note about #1665.
Florian Forster [Mon, 25 Jul 2016 11:13:56 +0000 (13:13 +0200)]
Bump version to 5.5.2; Update ChangeLog.
Florian Forster [Mon, 25 Jul 2016 11:52:16 +0000 (13:52 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5
Florian Forster [Mon, 25 Jul 2016 11:39:37 +0000 (13:39 +0200)]
network plugin, libcollectdclient: Check return value of gcry_control().
Fixes: #1665
Florian Forster [Thu, 21 Jul 2016 05:49:25 +0000 (07:49 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5
Florian Forster [Tue, 19 Jul 2016 08:00:37 +0000 (10:00 +0200)]
network plugin: Fix heap overflow in parse_packet().
Emilien Gaspar has identified a heap overflow in parse_packet(), the
function used by the network plugin to parse incoming network packets.
This is a vulnerability in collectd, though the scope is not clear at
this point. At the very least specially crafted network packets can be
used to crash the daemon. We can't rule out a potential remote code
execution though.
Fixes: CVE-2016-6254
Marc Fournier [Tue, 14 Jun 2016 05:44:35 +0000 (07:44 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5
Marc Fournier [Tue, 14 Jun 2016 05:38:30 +0000 (07:38 +0200)]
src/*.pod: fix minor warnings spotted by podchecker
Marc Fournier [Tue, 14 Jun 2016 05:17:48 +0000 (07:17 +0200)]
collectd.conf.pod: fix minor typos in ntpd plugin section
Ruben Kerkhof [Fri, 10 Jun 2016 07:47:53 +0000 (09:47 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5
Thomas Guthmann [Wed, 8 Jun 2016 03:03:47 +0000 (13:03 +1000)]
Bug#1059 : Remove any white spaces in ethstats stat names (affects VMXNet3 interface)
Ruben Kerkhof [Fri, 3 Jun 2016 10:51:59 +0000 (12:51 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5
Sebastian Harl [Mon, 30 May 2016 20:09:07 +0000 (22:09 +0200)]
Merged branch 'collectd-4.10' into collectd-5.4.
Sebastian Harl [Mon, 30 May 2016 19:59:46 +0000 (21:59 +0200)]
perl plugin: Be more consistent about capitalization.
Pavel Rochnyack [Mon, 30 May 2016 06:00:38 +0000 (12:00 +0600)]
perl plugin: Removed commented code
Pavel Rochnyack [Mon, 30 May 2016 05:52:21 +0000 (11:52 +0600)]
perl plugin: Added call_pv_locked() wrapper to handle thread locking flags.
Pavel Rochnyack [Mon, 30 May 2016 05:31:44 +0000 (11:31 +0600)]
perl plugin: Switched to PTHREAD_MUTEX_RECURSIVE locking
Pavel Rochnyack [Fri, 13 May 2016 13:20:22 +0000 (19:20 +0600)]
perl plugin: Fixes for #1706
* Fix coredump due to destroying interpreter on threads running perl.
* Fix deadlock when perl_log() is called from perl_init()
Pavel Rochnyack [Fri, 13 May 2016 08:50:31 +0000 (14:50 +0600)]
perl plugin: lock base thread interpreter in perl_init() too.
Avoid race conditions with c_ithread_create() called from threads of already-initialized plugins.
Fix for https://github.com/collectd/collectd/issues/1706.
Florian Forster [Tue, 14 Jul 2015 06:22:18 +0000 (08:22 +0200)]
plugin_mock.c: Declare "kc".
This hopefully fixes "make check" on Solaris, which currently fails
with:
CC common_test.o
CCLD test_common
Undefined first referenced
symbol in file
kc ./.libs/libcommon.a(common.o)
ld: fatal: symbol referencing errors. No output written to test_common
collect2: error: ld returned 1 exit status
(cherry picked from commit
4fb43017b4b585256627b9503ce0a5cf08ecdefe)
Florian Forster [Thu, 11 Jun 2015 13:35:43 +0000 (14:35 +0100)]
Makefile.am: Link tests with required libraries, too.
"make check" fails on Solaris because libraries are missing:
CCLD test_common
Undefined first referenced
symbol in file
kc ./.libs/libcommon.a(common.o)
kstat_data_lookup ./.libs/libcommon.a(common.o)
kstat_lookup ./.libs/libcommon.a(common.o)
kstat_read ./.libs/libcommon.a(common.o)
getaddrinfo ./.libs/libcommon.a(common.o)
freeaddrinfo ./.libs/libcommon.a(common.o)
gai_strerror ./.libs/libcommon.a(common.o)
ld: fatal: symbol referencing errors. No output written to test_common
collect2: error: ld returned 1 exit status
(cherry picked from commit
6213557b1d5c79a60e9c4322263836ca6066aa0e)
Gustavo Zacarias [Mon, 6 Jul 2015 12:59:30 +0000 (09:59 -0300)]
build: add libavltree, libcommon & libheap dependencies
Otherwise it can break on very parallel builds since collectd link time
arrives before one or more of these were built.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
(cherry picked from commit
780e6a76021a240e95007a04b723d827120afa95)
Ruben Kerkhof [Wed, 25 May 2016 15:26:13 +0000 (17:26 +0200)]
Fix a typo that snuck in with
0c8d275
Always test before committing...
Pointy hat to: me
Florian Forster [Tue, 14 Jul 2015 07:00:49 +0000 (09:00 +0200)]
Link libcommon.la with $(COMMON_LIBS).
This hopefully fixes link errors on Solaris:
CCLD test_utils_vl_lookup
Undefined first referenced
symbol in file
kstat_data_lookup daemon/.libs/libcommon.a(common.o)
kstat_lookup daemon/.libs/libcommon.a(common.o)
kstat_read daemon/.libs/libcommon.a(common.o)
getaddrinfo daemon/.libs/libcommon.a(common.o)
freeaddrinfo daemon/.libs/libcommon.a(common.o)
gai_strerror daemon/.libs/libcommon.a(common.o)
ld: fatal: symbol referencing errors. No output written to test_utils_vl_lookup
collect2: error: ld returned 1 exit status
(cherry picked from commit
fe2eee98f4b1cf8c5a5df6ed6cd03d8487c695be)
Conflicts:
src/daemon/Makefile.am
Ruben Kerkhof [Wed, 25 May 2016 14:53:06 +0000 (16:53 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Wed, 25 May 2016 14:52:34 +0000 (16:52 +0200)]
Merge pull request #1726 from rubenk/udev
Udev
Marc Fournier [Wed, 25 May 2016 14:28:01 +0000 (16:28 +0200)]
processes: re-add <sys/user.h> inclusion
cf #1725
Ruben Kerkhof [Wed, 25 May 2016 14:15:32 +0000 (16:15 +0200)]
Stop hardcoding libudev
Ruben Kerkhof [Wed, 25 May 2016 14:13:55 +0000 (16:13 +0200)]
Add missing udev flags to Makefile.am
Marc Fournier [Wed, 25 May 2016 14:13:10 +0000 (16:13 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Wed, 25 May 2016 14:00:51 +0000 (16:00 +0200)]
processes: MAXCOMLEN is not exposed on Solaris
MAXCOMLEN in <sys/user.h> is only exposed to kernel
code. I think it's safe to assume that it isn't going
to change, so just hardcode it.
Ruben Kerkhof [Wed, 25 May 2016 13:47:59 +0000 (15:47 +0200)]
Merge pull request #1724 from rpv-tomsk/smart-plugin-udev-dep
Fix for #1688 The SMART plugin does not build/load, v.5.5.0
Pavel Rochnyack [Wed, 25 May 2016 13:01:46 +0000 (19:01 +0600)]
smart plugin: Check for libudev presence
Marc Fournier [Fri, 20 May 2016 20:30:54 +0000 (22:30 +0200)]
collectd.conf.in: remove extraneous pound sign
Ruben Kerkhof [Fri, 20 May 2016 10:50:02 +0000 (12:50 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5
Birger Schmidt [Mon, 16 May 2016 06:39:38 +0000 (08:39 +0200)]
utils_cache.c: fix FORMAT_VL failed ERROR messages
ciomaire [Tue, 3 May 2016 11:41:14 +0000 (13:41 +0200)]
kill correct pid on fdopen failure
Ruben Kerkhof [Tue, 10 May 2016 09:52:36 +0000 (11:52 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5
Conflicts:
src/Makefile.am
Ruben Kerkhof [Sat, 23 Apr 2016 15:35:39 +0000 (17:35 +0200)]
rrdtool plugin: fix thread-safety detection
librrd 1.6.0 is now threadsafe and librrd_th is gone.
Since there doesn't seem to be a way to detect that librrd
is threadsafe, use pkg-config to check for 1.6.0 or newer instead.
The logic is now as follows:
Check for librrd >= 1.6.0 with pkg-config
If not found, look for rrd_update_r in librrd_th.
If not found, look for rrd_update in librrd and assume librrd is not
thread safe.
(cherry picked from commit
ef43260cd901847220c2a9de400579ff903ca13e)
Conflicts:
src/Makefile.am
Ruben Kerkhof [Sat, 23 Apr 2016 13:06:03 +0000 (15:06 +0200)]
rrdtool check: stop linking in libm
(cherry picked from commit
32c0ce39f786c56e9d13f3615253a7ae55b578e6)
Ruben Kerkhof [Sat, 23 Apr 2016 13:03:03 +0000 (15:03 +0200)]
rrdtool check: no need to save CPPFLAGS
There's no need to save CPPFLAGS when we're just
checking a library.
(cherry picked from commit
f7e09269879b74e61324de9178503221b2df9136)
Ruben Kerkhof [Sat, 23 Apr 2016 13:00:26 +0000 (15:00 +0200)]
rrdtool check: no need to save LDFLAGS
There's no need to save LDFLAGS when we're just
checking a header.
(cherry picked from commit
38068ecc7922ace29bb6af3f8ee5568c3fe96c08)
Pavel Rochnyack [Mon, 9 May 2016 09:15:26 +0000 (15:15 +0600)]
statsd plugin: Fix deadlock on plugin shutdown (Issue #1703)
Dagobert Michelsen [Mon, 13 Jul 2015 10:12:07 +0000 (12:12 +0200)]
More missing kstat usages
Dagobert Michelsen [Mon, 13 Jul 2015 10:00:10 +0000 (12:00 +0200)]
Add missing kstat definitions
Dagobert Michelsen [Thu, 18 Jun 2015 13:28:36 +0000 (15:28 +0200)]
Take out explicit definitions as they are already checked via enable_standards in configure.ac.
Fixes: #978
Florian Forster [Fri, 3 Jul 2015 10:31:32 +0000 (12:31 +0200)]
collectd-tg: Move _POSIX_C_SOURCE and friends to the Makefile.
Apparently defining this in the source files confuses Solaris' libc.
Thanks to @dago for looking into this.
Hopefully fixes: #978
Marc Fournier [Mon, 2 May 2016 14:07:47 +0000 (16:07 +0200)]
processes: remove initialisation of unexisting variables
Partial revert of
1f0156c, which broke the build on Solaris and OpenBSD.
The context-switch reporting code is only part of master at the moment.
Fixes: #1674
Ruben Kerkhof [Sun, 24 Apr 2016 11:25:21 +0000 (13:25 +0200)]
Merge pull request #1546 from mfournier/processname_length_1284
processes: warn about process names above OS limit
Brandon Arp [Fri, 15 Apr 2016 18:37:44 +0000 (11:37 -0700)]
fix potential curl plugin curl_slist_append memory leak
make sure that we dont leak memory if curl_slist_append returns null
Ruben Kerkhof [Fri, 15 Apr 2016 09:32:22 +0000 (11:32 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5
Jim Quinn [Mon, 21 Mar 2016 16:40:24 +0000 (12:40 -0400)]
Fix process plugin memory leak [solaris]
Marc Fournier [Wed, 6 Apr 2016 19:40:37 +0000 (21:40 +0200)]
Merge pull request #1627 from rubenk/remove-old-filter-syntax-from-manpage
Remove broken filter syntax from collectd.conf(5)
Pmoranga [Wed, 23 Mar 2016 14:43:26 +0000 (15:43 +0100)]
Bump version to latest 5.5.1 #1536
(cherry picked from commit
238419ac27bcd991cebd021d25706b78d7edd182)
Ruben Kerkhof [Sat, 26 Mar 2016 18:31:34 +0000 (19:31 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Sat, 26 Mar 2016 18:28:27 +0000 (19:28 +0100)]
configure.ac: break long line and sort
This will make future merges easier.
Ruben Kerkhof [Sat, 26 Mar 2016 18:11:32 +0000 (19:11 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Sat, 26 Mar 2016 17:18:44 +0000 (18:18 +0100)]
Fix building with xfsprogs 4.5.0
xfsprogs 4.5.0 started to use off64_t in its headers,
which is hidden behind _GNU_SOURCE
Fixes #1637
Ruben Kerkhof [Sat, 26 Mar 2016 12:59:26 +0000 (13:59 +0100)]
mysql plugin: remove unused declaration
This was left behind after commit
c17582c
Ruben Kerkhof [Mon, 21 Mar 2016 17:29:49 +0000 (18:29 +0100)]
Remove broken filter syntax from collectd.conf(5)
fb67910d documented the new syntax.
The old syntax does no longer work, remove it.
Ruben Kerkhof [Sun, 20 Mar 2016 11:22:21 +0000 (12:22 +0100)]
Fix conflict markers
Ruben Kerkhof [Sun, 20 Mar 2016 11:04:20 +0000 (12:04 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Sun, 20 Mar 2016 10:53:13 +0000 (11:53 +0100)]
Fix indentation in previous commit
Ruben Kerkhof [Sun, 20 Mar 2016 10:29:28 +0000 (11:29 +0100)]
Merge pull request #1620 from skinowski/write_http_mem_leak_II
write_http: in cleanup handler free http headers
Tolga Ceylan [Sun, 20 Mar 2016 02:03:31 +0000 (19:03 -0700)]
write_http: in cleanup handler free http headers
slist of http headers require cleanup to avoid
memory leak. See libcurl example:
https://curl.haxx.se/libcurl/c/httpcustomheader.html
Ruben Kerkhof [Sat, 19 Mar 2016 15:47:33 +0000 (16:47 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Fri, 18 Mar 2016 12:22:58 +0000 (13:22 +0100)]
Fix build on Solaris 10 i386 part 2
utils_latency.c needs the same fix as applied in
a41f312
(cherry picked from commit
e7f7ecc1cac73841cdebd7e0462af4989532a107)
Ruben Kerkhof [Fri, 18 Mar 2016 11:59:03 +0000 (12:59 +0100)]
Fix build on Solaris 10 i386
AC_SYS_LARGEFILE defines _FILE_OFFSET_BITS in src/config.h,
so we need this header first before including system headers.
Thanks to @dago for the report.
Fixes:
CC collectd-utils_random.o
In file included from collectd.h:31:0,
from utils_random.c:29:
../../src/config.h:1646:0: error: "_FILE_OFFSET_BITS" redefined
[-Werror]
#define _FILE_OFFSET_BITS 64
^
In file included from
/opt/csw/lib/gcc/i386-pc-solaris2.10/5.2.0/include-fixed/pthread.h:20:0,
from utils_random.c:27:
/opt/csw/lib/gcc/i386-pc-solaris2.10/5.2.0/include-fixed/sys/feature_tests.h:196:0:
note: this is the location of the previous definition
#define _FILE_OFFSET_BITS 32
^
cc1: all warnings being treated as errors
(cherry picked from commit
a41f312a8d48a989dfba00a8b43532c60f67caba)
Marc Fournier [Sat, 19 Mar 2016 15:44:05 +0000 (16:44 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Marc Fournier [Sat, 19 Mar 2016 07:24:43 +0000 (08:24 +0100)]
RPM specfile: fix xmms plugin build condition
Marc Fournier [Fri, 18 Mar 2016 22:44:17 +0000 (23:44 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Marc Fournier [Fri, 18 Mar 2016 22:07:02 +0000 (23:07 +0100)]
RPM specfile: update changelog
Marc Fournier [Fri, 18 Mar 2016 21:53:59 +0000 (22:53 +0100)]
RPM specfile: enable xmms plugin on EL7
Ruben Kerkhof [Fri, 18 Mar 2016 12:03:37 +0000 (13:03 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Marc Fournier [Fri, 18 Mar 2016 09:16:34 +0000 (10:16 +0100)]
RPM specfile: re-enable memcachec plugin on EL7
cf https://bugzilla.redhat.com/show_bug.cgi?id=
1116949
Marc Fournier [Fri, 18 Mar 2016 09:13:48 +0000 (10:13 +0100)]
RPM specfile: enable modbus plugin on EL7
Ruben Kerkhof [Thu, 17 Mar 2016 19:22:15 +0000 (20:22 +0100)]
Merge pull request #1617 from michaelsalmon/putval-time-exec-pod
added definition of N to collectd-exec
Michael Salmon [Thu, 17 Mar 2016 13:18:04 +0000 (14:18 +0100)]
added definition of N to collectd-exec
Ruben Kerkhof [Sun, 6 Mar 2016 11:08:59 +0000 (12:08 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Sun, 6 Mar 2016 10:49:07 +0000 (11:49 +0100)]
Merge pull request #1575 from rubenk/dragonflybsd-utils-mount
Fix build on DragonFlyBSD
Ruben Kerkhof [Sun, 6 Mar 2016 10:20:42 +0000 (11:20 +0100)]
Merge pull request #1580 from rubenk/freebsd-zfs-arc
zfs_arc: 'stolen' was removed after FreeBSD 10.2