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
Ruben Kerkhof [Fri, 4 Mar 2016 11:19:15 +0000 (12:19 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Fri, 4 Mar 2016 11:15:49 +0000 (12:15 +0100)]
Merge pull request #1597 from rubenk/turbostat-fix-prototypes
Turbostat: fix a few old-style prototypes
Ruben Kerkhof [Fri, 4 Mar 2016 11:15:31 +0000 (12:15 +0100)]
Merge pull request #1595 from rubenk/turbostat-fix-shadowing-issue
Turbostat: fix shadowing issue
Ruben Kerkhof [Fri, 4 Mar 2016 11:15:13 +0000 (12:15 +0100)]
Merge pull request #1594 from rubenk/ceph-fix-shadowing-issue
Ceph: fix shadowing issue
Ruben Kerkhof [Fri, 4 Mar 2016 11:14:55 +0000 (12:14 +0100)]
Merge pull request #1596 from rubenk/fix-a-few-more-prototypes
Fix a few more prototypes
Ruben Kerkhof [Thu, 3 Mar 2016 22:02:03 +0000 (23:02 +0100)]
Turbostat: fix a few old-style prototypes
Ruben Kerkhof [Thu, 3 Mar 2016 21:35:43 +0000 (22:35 +0100)]
Fix a few more prototypes
Found with -Wstrict-prototypes and -Wold-style-definition
Ruben Kerkhof [Thu, 3 Mar 2016 21:16:10 +0000 (22:16 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Thu, 3 Mar 2016 21:14:45 +0000 (22:14 +0100)]
Turbostat: fix shadowing issue
turbostat.c: In function ‘delta_thread’:
turbostat.c:460:26: error: declaration of ‘core_delta’ shadows a global
declaration [-Werror=shadow]
const struct core_data *core_delta)
^~~~~~~~~~
turbostat.c:163:4: note: shadowed declaration is here
} *core_delta, *core_even, *core_odd;
^~~~~~~~~~
Ruben Kerkhof [Thu, 3 Mar 2016 21:13:37 +0000 (22:13 +0100)]
Ceph: fix shadowing issue
Ruben Kerkhof [Thu, 3 Mar 2016 20:40:22 +0000 (21:40 +0100)]
Merge pull request #1584 from rubenk/fix-wrong-logical-op
utils_avltree.c: fix compiler warning
Ruben Kerkhof [Thu, 3 Mar 2016 20:32:38 +0000 (21:32 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Thu, 3 Mar 2016 20:29:16 +0000 (21:29 +0100)]
Merge branch 'Wshadow' into collectd-5.4
Pierre-Yves Ritschard [Fri, 7 Nov 2014 16:34:32 +0000 (17:34 +0100)]
Define _DEFAULT_SOURCE in addition to _BSD_SOURCE
This enables forward compatibility with the ongoing
deprecation of _BSD_SOURCE.
(cherry picked from commit
3bc1a46bebfa53ec0f0e12d6406ca126a3ad6bf3)
Andrés J. Díaz [Wed, 2 Mar 2016 18:21:56 +0000 (19:21 +0100)]
Fix memory leak in redis.c
Ruben Kerkhof [Tue, 1 Mar 2016 18:57:21 +0000 (19:57 +0100)]
Fix a few issues found by -Wshadow
Ruben Kerkhof [Tue, 1 Mar 2016 17:36:52 +0000 (18:36 +0100)]
utils_avltree.c: fix compiler warning
make[3]: Entering directory '/home/ruben/src/collectd/src/daemon'
CC utils_avltree.lo
utils_avltree.c: In function ‘rebalance’:
utils_avltree.c:248:20: warning: logical ‘or’ of collectively exhaustive
tests is always true [-Wlogical-op]
assert ((b_bottom >= -1) || (b_bottom <= 1));
^~
utils_avltree.c:258:20: warning: logical ‘or’ of collectively exhaustive
tests is always true [-Wlogical-op]
assert ((b_bottom >= -1) || (b_bottom <= 1));
^~
Ruben Kerkhof [Tue, 1 Mar 2016 15:54:06 +0000 (16:54 +0100)]
write_sensu: define _GNU_SOURCE for asprintf
On Linux, asprintf and vasprintf are only available when _GNU_SOURCE is defined.
Ruben Kerkhof [Tue, 1 Mar 2016 13:02:33 +0000 (14:02 +0100)]
write_sensu: remove custom asprintf implementation
This was guarded by HAVE_ASPRINTF, but we never had a configure check
for asprintf (or vasprintf).
This only turned up when I made the function static, since they now
clash with the prototypes in stdio.h on FreeBSD.
As far as I know all the platforms we build on have these functions.
If this turns out to be not the case, we can always add compat functions
to our utilies later.
For now, this fixes the build on FreeBSD.
Ruben Kerkhof [Tue, 1 Mar 2016 12:08:06 +0000 (13:08 +0100)]
write_riemann: add new header to Makefile.am
Fixes 'make distcheck'
Ruben Kerkhof [Tue, 1 Mar 2016 11:11:16 +0000 (12:11 +0100)]
write_sensu: mark asprintf as static
Commit straigh to 5.5. This plugin didn't exist in 5.4.
Ruben Kerkhof [Tue, 1 Mar 2016 11:10:40 +0000 (12:10 +0100)]
write_sensu: mark vasprintf as static
Commit straight to 5.5. This plugin didn't exist in 5.4
Ruben Kerkhof [Tue, 1 Mar 2016 11:09:40 +0000 (12:09 +0100)]
write_riemann: move prototype to header file
Ruben Kerkhof [Tue, 1 Mar 2016 10:58:18 +0000 (11:58 +0100)]
redis: mark redis_handle_query as static
Commit straight to 5.5. This plugin didn't exist in 5.4.
Ruben Kerkhof [Tue, 1 Mar 2016 10:57:39 +0000 (11:57 +0100)]
redis: mark redis_handle_info as static
Commit straight to 5.5. This plugin didn't exist in 5.4.
Ruben Kerkhof [Tue, 1 Mar 2016 10:56:40 +0000 (11:56 +0100)]
barometer: mark Detect_sensor_type as static
Make function start with lowercase 'd' while we're at it.
Commit straight to 5.5.
Ruben Kerkhof [Tue, 1 Mar 2016 10:53:19 +0000 (11:53 +0100)]
collectd.c: mark notify_systemd as static
Commit straight to 5.5. This function didn't exist in 5.4.
Ruben Kerkhof [Tue, 1 Mar 2016 10:52:47 +0000 (11:52 +0100)]
collectd.c: mark notify_upstart as static
Commit straight to 5.5. This function didn't exist in 5.4.
Ruben Kerkhof [Tue, 1 Mar 2016 10:46:54 +0000 (11:46 +0100)]
sensu: mark replace_str as static
Commit straight to 5.5. This plugin doesn't exist in 5.4
Ruben Kerkhof [Tue, 1 Mar 2016 10:45:41 +0000 (11:45 +0100)]
sensu: mark sensu_format_name2 as static
Commit straight to 5.5, this plugin doesn't exist in 5.4
Ruben Kerkhof [Tue, 1 Mar 2016 10:43:13 +0000 (11:43 +0100)]
Fix prototype of uc_get_size
Commit straight to 5.5, this function doesn't exist in 5.4.
Ruben Kerkhof [Tue, 1 Mar 2016 10:41:43 +0000 (11:41 +0100)]
Fix prototype of plugin_log_available_writers
Commit straight to 5.5, this function doesn't exist in 5.4
Ruben Kerkhof [Tue, 1 Mar 2016 10:26:25 +0000 (11:26 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Ruben Kerkhof [Tue, 1 Mar 2016 10:18:21 +0000 (11:18 +0100)]
Merge pull request #1582 from rubenk/missing-prototypes
Missing prototypes
Ruben Kerkhof [Mon, 29 Feb 2016 22:43:28 +0000 (23:43 +0100)]
xmms: mark cxmms_read as static
Ruben Kerkhof [Mon, 29 Feb 2016 22:42:17 +0000 (23:42 +0100)]
sensors: mark sensors_free_features as static
Ruben Kerkhof [Mon, 29 Feb 2016 22:41:07 +0000 (23:41 +0100)]
processes: mark ps_read_process as static
Ruben Kerkhof [Mon, 29 Feb 2016 22:37:41 +0000 (23:37 +0100)]
utils_db_query.c: make udb_query_free_one static
Ruben Kerkhof [Mon, 29 Feb 2016 22:37:04 +0000 (23:37 +0100)]
battery: mark dict_get_double as static
Ruben Kerkhof [Mon, 29 Feb 2016 22:32:51 +0000 (23:32 +0100)]
types_list.c: add header for prototypes
Ruben Kerkhof [Mon, 29 Feb 2016 22:31:55 +0000 (23:31 +0100)]
utils_subst.c: add header for prototypes
Ruben Kerkhof [Mon, 29 Feb 2016 22:30:55 +0000 (23:30 +0100)]
utils_random.c: add header for prototypes
Ruben Kerkhof [Mon, 29 Feb 2016 22:29:05 +0000 (23:29 +0100)]
utils_cmd_getval.c: add header for prototypes
Ruben Kerkhof [Mon, 29 Feb 2016 22:28:25 +0000 (23:28 +0100)]
utils_cmd_flush.c: add header for prototypes
Ruben Kerkhof [Mon, 29 Feb 2016 22:27:36 +0000 (23:27 +0100)]
threshold.c: mark ut_config as static
Ruben Kerkhof [Mon, 29 Feb 2016 22:26:00 +0000 (23:26 +0100)]
latency_counter_create: fix signature
Ruben Kerkhof [Mon, 29 Feb 2016 22:23:47 +0000 (23:23 +0100)]
utils_latency.c: mark change_bin_width as static
Ruben Kerkhof [Mon, 29 Feb 2016 22:22:47 +0000 (23:22 +0100)]
utils_cmd_putval.c: include header for prototypes
Ruben Kerkhof [Mon, 29 Feb 2016 22:21:35 +0000 (23:21 +0100)]
Include header for prototype of handle_putnotif
Ruben Kerkhof [Mon, 29 Feb 2016 22:20:00 +0000 (23:20 +0100)]
Add prototype for module_register
Ruben Kerkhof [Mon, 29 Feb 2016 22:17:44 +0000 (23:17 +0100)]
liboconfig: mark oconfig_free_all as static
Ruben Kerkhof [Mon, 29 Feb 2016 21:16:49 +0000 (22:16 +0100)]
zfs_arc: 'stolen' was removed after FreeBSD 10.2
Patch taken from FreeBSD port
Ruben Kerkhof [Sun, 28 Feb 2016 17:29:41 +0000 (18:29 +0100)]
Fix build on DragonFlyBSD
DragonFlyBSD has both vfsstat and fsstat apis.
It lacks ST_NOWAIT however.
The easiest fix is to swap the checks and use getfsstat first.
Marc Fournier [Sun, 28 Feb 2016 07:33:10 +0000 (08:33 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Marc Fournier [Sun, 28 Feb 2016 07:32:00 +0000 (08:32 +0100)]
processes: fix pid format string
Follow up to
7c495a5.
Marc Fournier [Sun, 28 Feb 2016 00:12:42 +0000 (01:12 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5