Marc Fournier [Wed, 17 Jun 2015 13:03:18 +0000 (15:03 +0200)]
Merge branch 'collectd-5.5'
Marek Becka [Tue, 16 Jun 2015 14:59:20 +0000 (10:59 -0400)]
fix openldap segfatult when ldapi is used v2
Marek Becka [Thu, 11 Jun 2015 17:52:41 +0000 (13:52 -0400)]
fix openldap segfatult when ldapi is used
Florian Forster [Wed, 17 Jun 2015 12:53:11 +0000 (14:53 +0200)]
Merge remote-tracking branch 'github/pr/1087'
Florian Forster [Wed, 17 Jun 2015 12:52:31 +0000 (14:52 +0200)]
Merge branch 'collectd-5.5'
Florian Forster [Wed, 17 Jun 2015 12:52:22 +0000 (14:52 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5
Florian Forster [Wed, 17 Jun 2015 09:41:55 +0000 (11:41 +0200)]
network plugin: Avoid "status may be used uninitialized" warning.
Florian Forster [Wed, 17 Jun 2015 08:48:27 +0000 (10:48 +0200)]
liboconfig: Declare yylex().
Florian Forster [Wed, 17 Jun 2015 08:37:31 +0000 (10:37 +0200)]
email plugin: Fix freeing linked lists.
The previous code essentially did:
for (…; …; ptr = ptr->next)
free (ptr);
The "ptr->next" is a use-after-free.
Florian Forster [Wed, 17 Jun 2015 08:26:21 +0000 (10:26 +0200)]
network plugin: Make sure all memory is freed when the receive thread fails.
Not all that useful (your receive thread just died …) but hopefully
makes the static analysis happy.
Florian Forster [Wed, 17 Jun 2015 07:12:38 +0000 (09:12 +0200)]
Merge branch 'collectd-5.5'
Florian Forster [Wed, 17 Jun 2015 07:12:26 +0000 (09:12 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5
Florian Forster [Wed, 17 Jun 2015 07:12:08 +0000 (09:12 +0200)]
Merge remote-tracking branch 'github/pr/1088' into collectd-5.4
Florian Forster [Wed, 17 Jun 2015 07:09:17 +0000 (09:09 +0200)]
src/utils_llist.c: Handle unlikely corner case.
This handles the following (unlikely) case:
(l->head == NULL) && (e == NULL)
In this case, the following code will dereference a NULL pointer:
if (l->head == e)
l->head = e->next;
Florian Forster [Wed, 17 Jun 2015 06:55:42 +0000 (08:55 +0200)]
src/utils_avltree.c: Rewrite checks in c_avl_pick().
The previous code made the (correct) assumption that "height" is always
greater than zero. This tripped up clang's "scan-build".
This confuses the static analysis in two more places in this file, which
are not as easy to fix :(
Florian Forster [Wed, 17 Jun 2015 06:38:27 +0000 (08:38 +0200)]
ceph plugin: Fix allocation size.
Florian Forster [Wed, 17 Jun 2015 06:35:22 +0000 (08:35 +0200)]
barometer plugin: Fix allocation size.
Florian Forster [Wed, 17 Jun 2015 05:50:46 +0000 (07:50 +0200)]
network plugin: Explicitly initialize "fd_num" to zero.
I have the feeling that initialization via memset() and unions in the sockent
structure confuse clang's scan-build.
Florian Forster [Wed, 17 Jun 2015 05:34:57 +0000 (07:34 +0200)]
notification target: Pass void** to tn_destroy().
The previous call was bad, resulting in errors in free().
Florian Forster [Wed, 17 Jun 2015 05:26:39 +0000 (07:26 +0200)]
perl plugin: Fix invalid free().
notification_meta_t.name is a char[], which we must not free.
Florian Forster [Tue, 16 Jun 2015 21:07:34 +0000 (23:07 +0200)]
liboconfig: Disable some clang warnings.
Hopefully fixes:
scanner.c:4128:17: error: unused function 'yyunput' [-Werror,-Wunused-function]
static void yyunput (int c, register char * yy_bp )
^
scanner.c:4173:16: error: function 'input' is not needed and will not be emitted [-Werror,-Wunneeded-internal-declaration]
static int input (void)
^
2 errors generated.
Florian Forster [Tue, 16 Jun 2015 21:06:56 +0000 (23:06 +0200)]
liboconfig: Declare yyparse().
Should hopefully fix:
oconfig.c:68:12: error: implicit declaration of function 'yyparse' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
status = yyparse ();
^
Florian Forster [Tue, 16 Jun 2015 20:46:25 +0000 (22:46 +0200)]
Merge branch 'collectd-5.5'
Florian Forster [Tue, 16 Jun 2015 20:46:06 +0000 (22:46 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5
Marek Becka [Tue, 16 Jun 2015 20:30:12 +0000 (16:30 -0400)]
add support for simple authentication
Manuel Luis Sanmartín Rozada [Wed, 20 May 2015 15:10:41 +0000 (17:10 +0200)]
In rrd synchronous file creation use lock_file
to prevent the creation of the same file at the same time multiple times
and obtain a corrupt rrd file.
Florian Forster [Tue, 16 Jun 2015 18:59:14 +0000 (20:59 +0200)]
network plugin: Simplify config handling.
Remove network_config_set_{boolean,string} and replace them with
cf_util_get_{boolean,string}. The other, more specialized, config handling
functions were also simplified.
Manuel Luis Sanmartín Rozada [Wed, 20 May 2015 20:06:18 +0000 (22:06 +0200)]
Allow empty Plugin blocks.
Manuel Luis Sanmartín Rozada [Wed, 20 May 2015 20:06:18 +0000 (22:06 +0200)]
Allow empty Plugin blocks.
Marek Becka [Tue, 16 Jun 2015 16:38:37 +0000 (12:38 -0400)]
use counter type for Innodb_buffer_pool_pages_flushed
Florian Forster [Tue, 16 Jun 2015 18:38:38 +0000 (20:38 +0200)]
Merge remote-tracking branch 'github/pr/1085'
Dagobert Michelsen [Mon, 15 Jun 2015 16:49:46 +0000 (18:49 +0200)]
Fix 64 bit check issue, running the preprocessor does not honour CFLAGS which holds the relevant -m64
Marek Becka [Tue, 16 Jun 2015 16:38:37 +0000 (12:38 -0400)]
use counter type for Innodb_buffer_pool_pages_flushed
Marc Fournier [Tue, 16 Jun 2015 07:18:25 +0000 (09:18 +0200)]
Merge branch 'collectd-5.5'
Kelly Thomas Kline [Mon, 15 Jun 2015 21:05:51 +0000 (14:05 -0700)]
Corrected text in README
Marc Fournier [Mon, 15 Jun 2015 19:18:04 +0000 (21:18 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5
Conflicts:
src/write_redis.c
Marc Fournier [Mon, 15 Jun 2015 14:09:50 +0000 (16:09 +0200)]
Revert "contrib/redhat/collectd.spec: added bison and flex"
This reverts commit
38203b1c8d8a8e5e567d7f6783dd8b88a2487070.
A misunderstanding about which tarball to use with the RPM specfile led
us here. See #1079 for the whole conversation.
Marc Fournier [Mon, 15 Jun 2015 09:01:42 +0000 (11:01 +0200)]
configure: turbostat: check for MSR_PKG_C10_RESIDENCY symbol
Older versions of `asm/msr-index.h` don't have all the symbol needed to
build the turbostat plugin. Checking for MSR_PKG_C10_RESIDENCY seems to
guarantee we have a recent enough `asm/msr-index.h`.
Fixes #1075
Marc Fournier [Mon, 15 Jun 2015 06:50:04 +0000 (08:50 +0200)]
collectd.conf.pod: update libyajl URL
Fixes #1081
Thanks to @msalmonse for pointing this out!
Ruben Kerkhof [Fri, 6 Mar 2015 15:11:18 +0000 (16:11 +0100)]
Fix a libtool warning
libtool: warning: '-version-info/-version-number' is ignored for
convenience libraries
Florian Forster [Thu, 11 Jun 2015 16:35:13 +0000 (17:35 +0100)]
Merge remote-tracking branch 'github/pr/1065' into collectd-5.5
Florian Forster [Thu, 11 Jun 2015 16:33:17 +0000 (17:33 +0100)]
Merge branch 'collectd-5.5'
Tagir Bakirov [Thu, 11 Jun 2015 10:26:51 +0000 (12:26 +0200)]
contrib/redhat/collectd.spec: added bison and flex
Current .spec does not work due to missing bison and flex dependencies.
This fix lets install bison and flex into the build environment as well as
define YACC and YFLAGS environment variables.
Florian Forster [Thu, 11 Jun 2015 15:48:55 +0000 (16:48 +0100)]
write_redis plugin: Check the return value of format_values().
brianpkelly (no email) [Thu, 11 Jun 2015 14:52:22 +0000 (09:52 -0500)]
write_redis: Increase parsability by using format_values from common.h
brianpkelly (no email) [Tue, 9 Jun 2015 18:52:54 +0000 (13:52 -0500)]
write_redis: Increase parsability of multi-valued keys by insterting delimiting characters
Florian Forster [Thu, 11 Jun 2015 15:32:07 +0000 (16:32 +0100)]
configure.ac: Move all checks for "struct ip6_ext" into one place.
Fixes: #348
Dagobert Michelsen [Thu, 11 Jun 2015 09:26:23 +0000 (11:26 +0200)]
Automatically add -DSOLARIS2=8 if required for ip6_ext
Fixes: #348
Florian Forster [Thu, 11 Jun 2015 13:48:02 +0000 (14:48 +0100)]
processes plugin: Initialize the cswitch_{in,}vol fields.
Florian Forster [Thu, 11 Jun 2015 13:39:16 +0000 (14:39 +0100)]
Merge branch 'collectd-5.5'
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
Florian Forster [Thu, 11 Jun 2015 13:34:01 +0000 (14:34 +0100)]
configure.ac: Ask users to build 64-bit Solaris binaries.
By default, the compilers will build 32-bit binaries on Solaris. This is
sub-optimal for us, for example reading /proc entries for 64-bit
processes doesn't work when collectd is 32-bit.
Fixes: #1077
Florian Forster [Thu, 11 Jun 2015 09:36:12 +0000 (10:36 +0100)]
zone plugin: Fix strerror -> sstrerror.
Florian Forster [Thu, 11 Jun 2015 09:17:27 +0000 (10:17 +0100)]
zone plugin: Minor code cleanups.
Florian Forster [Thu, 11 Jun 2015 09:14:04 +0000 (10:14 +0100)]
zone plugin: Undefine _FILE_OFFSET_BITS when building on 32bit hosts.
Fixes: #1077
Marek Becka [Tue, 9 Jun 2015 20:56:55 +0000 (16:56 -0400)]
swap plugin: Report swap sizes in bytes.
Regression from
43aa1c5cc9ab69004d0fe6de480c78815224111b.
Florian Forster [Thu, 11 Jun 2015 06:50:27 +0000 (07:50 +0100)]
Merge branch 'collectd-5.5'
Florian Forster [Thu, 11 Jun 2015 06:50:12 +0000 (07:50 +0100)]
Merge branch 'collectd-5.4' into collectd-5.5
Florian Forster [Thu, 11 Jun 2015 06:46:54 +0000 (07:46 +0100)]
dns plugin: Check for "struct ip6_ext".
Solaris appears to declare the struct, but only when The Right defines
are specified at compile time. As a quick and dirty fix, only build with
IPv6 support when the struct is usable.
Fixes: #348
Pierre-Yves Ritschard [Wed, 10 Jun 2015 13:54:58 +0000 (15:54 +0200)]
smart: KNF
Florian Schüller [Wed, 10 Jun 2015 13:29:31 +0000 (15:29 +0200)]
Update smart.c
Are you sure this doesn't memory-leak?
(I didn't have time to run valgrind but is it possible that this command is missing?)
Pierre-Yves Ritschard [Wed, 10 Jun 2015 13:54:58 +0000 (15:54 +0200)]
smart: KNF
Pierre-Yves Ritschard [Wed, 10 Jun 2015 13:51:53 +0000 (15:51 +0200)]
Merge pull request #1076 from schuellerf/master
Update smart.c
Florian Schüller [Wed, 10 Jun 2015 13:29:31 +0000 (15:29 +0200)]
Update smart.c
Are you sure this doesn't memory-leak?
(I didn't have time to run valgrind but is it possible that this command is missing?)
Marek Becka [Tue, 9 Jun 2015 21:13:29 +0000 (17:13 -0400)]
vmem plugin: fix types for nr_dirtied and nr_written
Florian Forster [Wed, 10 Jun 2015 07:39:24 +0000 (08:39 +0100)]
tcpconns plugin: Fix memory leak.
"prev" was set to NULL and never updated, leading to "port_list_head" to
be set to an entry later in the list. This leaks memory because earlier
entries in the list are now unreachable.
Fixes: #1074
Marek Becka [Wed, 10 Jun 2015 01:33:36 +0000 (21:33 -0400)]
tail plugin: initialize user_data_t
Florian Forster [Wed, 10 Jun 2015 06:55:02 +0000 (07:55 +0100)]
src/configfile.c: Set a plugin context when autoloading plugins.
Fixes: #1069
Florian Forster [Tue, 9 Jun 2015 17:21:13 +0000 (18:21 +0100)]
src/daemon/configfile.c: Remove unnecessary "continue" statements.
Florian Forster [Tue, 9 Jun 2015 17:10:55 +0000 (18:10 +0100)]
Merge remote-tracking branch 'github/pr/1067'
Manuel Luis Sanmartín Rozada [Mon, 8 Jun 2015 19:36:05 +0000 (21:36 +0200)]
plugin: not return -1 if plugin_flush_callback_name fails
Manuel Luis Sanmartín Rozada [Mon, 8 Jun 2015 19:31:38 +0000 (21:31 +0200)]
Do not call plugin_unregister if the read registration fails.
Manuel Luis Sanmartín Rozada [Mon, 8 Jun 2015 19:25:15 +0000 (21:25 +0200)]
plugin: fix white space.
Manuel Luis Sanmartín Rozada [Mon, 8 Jun 2015 19:21:44 +0000 (21:21 +0200)]
plugin: remove cast type information from malloc.
Manuel Luis Sanmartín Rozada [Mon, 8 Jun 2015 19:12:52 +0000 (21:12 +0200)]
plugin: move the code to create flush/name to plugin_flush_callback_name
Florian Forster [Mon, 8 Jun 2015 10:36:04 +0000 (12:36 +0200)]
apcups plugin: Implement the "PersistentConnection" option.
If set to false, close the connection after each interval. This lets
users chose this method if persistent connections pose a problem.
Fixes: #617
Florian Forster [Mon, 8 Jun 2015 10:34:41 +0000 (12:34 +0200)]
apcups plugin: Handle "END APC" lines correctly and stop reading.
Fixes: #617
Florian Forster [Mon, 8 Jun 2015 10:33:49 +0000 (12:33 +0200)]
apcups plugin: Fight code rot.
* Use the cleaner "complex" config and the cf_util_* functions.
* Rename "host" and "port" to "node" and "service".
Use cf_util_get_service() so users may specify services as string.
* Remove unused defines.
Manuel Luis Sanmartín Rozada [Sun, 7 Jun 2015 22:49:20 +0000 (00:49 +0200)]
Support for call the flush callback at regular intervals using
the read plugin callback.
Marc Fournier [Sun, 7 Jun 2015 14:21:37 +0000 (16:21 +0200)]
varnish: update plugin_register_complex_read() to new default value
... just a follow up to
cce136946b, in which one of the two
plugin_register_complex_read() calls got missed out.
Arthur Gautier [Sat, 6 Jun 2015 21:06:25 +0000 (21:06 +0000)]
processes: revert re-introduction of ps_read_tasks
This commit partially revert
30eeeee996124de666f907877f8196e5580101ed
which solved incorrectly the merge conflict
Signed-off-by: Arthur Gautier <baloo@gandi.net>
Florian Forster [Sat, 6 Jun 2015 20:33:34 +0000 (22:33 +0200)]
src/daemon/plugin.[ch]: Use cdtime_t for the interval argument of "register complex read".
All plugins converted to "struct timespec", just so that
plugin_register_complex_read() would convert back to cdtime_t again. This patch
removed this crazyness; the new "determine automatically" value is zero (used
to be NULL).
Florian Forster [Sat, 6 Jun 2015 19:43:28 +0000 (21:43 +0200)]
Merge remote-tracking branch 'github/pr/1036'
Conflicts:
src/processes.c
Florian Forster [Sat, 6 Jun 2015 19:39:16 +0000 (21:39 +0200)]
Merge branch 'pr/1033'
Florian Forster [Sat, 6 Jun 2015 19:37:00 +0000 (21:37 +0200)]
processes plugin: Read number of threads from /proc/$pid/stat as a fallback.
Should reading the number of threads from /prod/$pid/status fail, use the
number provided by /prod/$pid/stat as a fallback. If that fails, too, use 1.
As discussed with @manuelluis in #1033.
Florian Forster [Sat, 6 Jun 2015 19:22:25 +0000 (21:22 +0200)]
statsd plugin: Dispatch NaN when no timer event was recorded.
This makes timing events appear faster when writing to RRD files.
Fixes: #1038, #1049
Nathan Berkley [Fri, 5 Jun 2015 20:46:46 +0000 (16:46 -0400)]
Fix VERSION->PACKAGE_VERSION and PACKAGE->PACKAGE_NAME so they're always defined
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.
Robert Viduya [Wed, 3 Jun 2015 12:34:37 +0000 (08:34 -0400)]
disk plugin: Coding style changes.
I also reorganized the code to try to keep the CFReleases and
IOObjectReleases a little more manageable.
Signed-off-by: Florian Forster <octo@collectd.org>
Robert Viduya [Wed, 3 Jun 2015 12:34:37 +0000 (08:34 -0400)]
disk plugin: Fix compatibility for Mac OS X 10.10.
Here’s a fixed version of the disk plugin that makes it work under Mac
OSX 10.10, and hopefully previous releases. The original version was
looking for the disk name in one dictionary, but it was actually in
another. I suspect at some point, Apple moved the disk name property,
but I don’t have any previous releases to check.
I changed the code to look for the disk name in both dictionaries, so
hopefully it’s backward compatible.
Signed-off-by: Florian Forster <octo@collectd.org>
Chris Mayo [Sat, 6 Jun 2015 16:35:02 +0000 (17:35 +0100)]
Remove old systemd unit
collectd.service superseded by systemd.collectd.service
Florian Forster [Mon, 1 Jun 2015 17:15:58 +0000 (19:15 +0200)]
Merge remote-tracking branch 'github/pr/1056'
Florian Forster [Sun, 31 May 2015 20:54:47 +0000 (22:54 +0200)]
tail_csv plugin: Print warning and continue when metric is not found.
Previously, when multiple metrics were specified on one "Collect" line and one
didn't exist, all *following* metrics would be ignored. This patch changes this
to continue in this case and configure as many metrics as possible.
Manuel Luis Sanmartín Rozada [Sun, 31 May 2015 20:46:11 +0000 (22:46 +0200)]
Plugin network: add support for the timeout argument in the flush callback
Manuel Luis Sanmartín Rozada [Wed, 20 May 2015 18:52:58 +0000 (20:52 +0200)]
Plugin tail_csv: the manual says that you can use multiple times the
Collect option but the code expecs t"Collect n1 n2 n3 n4", fix
to allow to put the option Collect multiple times.
Manuel Luis Sanmartín Rozada [Wed, 20 May 2015 18:37:16 +0000 (20:37 +0200)]
Plugin tail_csv: if TimeFrom is not specified in config file
the default value for time_from is -1 and the type of fileds_num
is size_t, so the comparsion of signed and unsigned not work as espected
Manuel Luis Sanmartín Rozada [Sun, 31 May 2015 19:19:16 +0000 (21:19 +0200)]
processes: change type to contextswitch and types to derive_t
Manuel Luis Sanmartín Rozada [Sun, 31 May 2015 18:56:49 +0000 (20:56 +0200)]
processes: use cf_util_get_boolean for get "CollectContextSwitch"
Manuel Luis Sanmartín Rozada [Sun, 31 May 2015 18:49:58 +0000 (20:49 +0200)]
processes: delete added white spaces
Manuel Luis Sanmartín Rozada [Sun, 31 May 2015 18:48:27 +0000 (20:48 +0200)]
processes: rename ps_ctx_switch to report_ctx_switch