Code

collectd.git
9 years agoMerge remote-tracking branch 'github/pr/1093'
Florian Forster [Thu, 25 Jun 2015 20:34:26 +0000 (22:34 +0200)]
Merge remote-tracking branch 'github/pr/1093'

9 years agowrite_redis plugin: Use the prefix for the "values" set, too.
Florian Forster [Thu, 25 Jun 2015 20:11:17 +0000 (22:11 +0200)]
write_redis plugin: Use the prefix for the "values" set, too.

Make the code match the documentation and use the prefix for the set of all
metrics, too. Also add documentation for the "Prefix" option and let the
default prefix be set at compile time.

9 years agoMerge remote-tracking branch 'github/pr/1082'
Florian Forster [Thu, 25 Jun 2015 19:40:27 +0000 (21:40 +0200)]
Merge remote-tracking branch 'github/pr/1082'

9 years agosrc/Makefile.am: Move tests towards the libraries tested.
Florian Forster [Tue, 23 Jun 2015 12:26:55 +0000 (14:26 +0200)]
src/Makefile.am: Move tests towards the libraries tested.

9 years agoremoved separator between prefix and the rest of the key
Sebastian Pfahl [Mon, 15 Jun 2015 14:07:57 +0000 (14:07 +0000)]
removed separator between prefix and the rest of the key

9 years agoRemove unmaintained Fedora contrib files
Ruben Kerkhof [Mon, 22 Jun 2015 19:24:09 +0000 (21:24 +0200)]
Remove unmaintained Fedora contrib files

9 years agoMerge branch 'collectd-5.5'
Florian Forster [Fri, 19 Jun 2015 18:08:24 +0000 (20:08 +0200)]
Merge branch 'collectd-5.5'

9 years agobarometer plugin: Fix "Allocator sizeof operand mismatch" warning.
Florian Forster [Fri, 19 Jun 2015 18:03:08 +0000 (20:03 +0200)]
barometer plugin: Fix "Allocator sizeof operand mismatch" warning.

9 years agowrite_sensu plugin: Fix debug message.
Florian Forster [Fri, 19 Jun 2015 17:27:27 +0000 (19:27 +0200)]
write_sensu plugin: Fix debug message.

It still referenced the variables, which have been removed in
1c4008c3216edbc9c7cbeffd1c597c9b32e8f64d.

9 years agoMerge branch 'collectd-5.5'
Florian Forster [Fri, 19 Jun 2015 14:28:01 +0000 (16:28 +0200)]
Merge branch 'collectd-5.5'

9 years agowrite_sensu plugin: Fix memory leak.
Florian Forster [Fri, 19 Jun 2015 14:27:26 +0000 (16:27 +0200)]
write_sensu plugin: Fix memory leak.

9 years agoturbostat plugin: Fix "Undefined allocation of 0 bytes (CERT MEM04-C; CWE-131)" warning.
Florian Forster [Fri, 19 Jun 2015 14:26:53 +0000 (16:26 +0200)]
turbostat plugin: Fix "Undefined allocation of 0 bytes (CERT MEM04-C; CWE-131)" warning.

9 years agoopenvpn plugin: Fix "Dead assignment" warning.
Florian Forster [Fri, 19 Jun 2015 14:26:12 +0000 (16:26 +0200)]
openvpn plugin: Fix "Dead assignment" warning.

9 years agoMerge branch 'collectd-5.4' into collectd-5.5
Florian Forster [Fri, 19 Jun 2015 13:11:39 +0000 (15:11 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5

9 years agosrc/utils_cmd_flush.c: Fix memory leak.
Florian Forster [Fri, 19 Jun 2015 11:06:34 +0000 (13:06 +0200)]
src/utils_cmd_flush.c: Fix memory leak.

9 years agosrc/utils_rrdcreate.c: Fix memory leak.
Florian Forster [Fri, 19 Jun 2015 08:54:02 +0000 (10:54 +0200)]
src/utils_rrdcreate.c: Fix memory leak.

9 years agosrc/utils_ignorelist.c: Fix memory leak.
Florian Forster [Fri, 19 Jun 2015 08:54:02 +0000 (10:54 +0200)]
src/utils_ignorelist.c: Fix memory leak.

Turns out, regfree(3) cleans up the memory allocated by regcomp(3), but
not the pointer itself.

9 years agosrc/utils_cmd_putval.c: Fix memory leak.
Florian Forster [Fri, 19 Jun 2015 08:54:02 +0000 (10:54 +0200)]
src/utils_cmd_putval.c: Fix memory leak.

9 years agoutils_cache plugin: Fix memory leak.
Florian Forster [Fri, 19 Jun 2015 08:54:02 +0000 (10:54 +0200)]
utils_cache plugin: Fix memory leak.

9 years agorrdtool plugin: Add assertion.
Florian Forster [Fri, 19 Jun 2015 08:54:02 +0000 (10:54 +0200)]
rrdtool plugin: Add assertion.

This helps the static code analysis to figure out that memory is not
leaking after all.

9 years agopowerdns plugin: Fix memory leak.
Florian Forster [Fri, 19 Jun 2015 08:54:02 +0000 (10:54 +0200)]
powerdns plugin: Fix memory leak.

While at it, replace the powerdns_config_add_string() function.

9 years agomemcachec plugin: Fix memory leak.
Florian Forster [Fri, 19 Jun 2015 08:54:02 +0000 (10:54 +0200)]
memcachec plugin: Fix memory leak.

9 years agojava plugin: Fix memory leak.
Florian Forster [Fri, 19 Jun 2015 08:54:02 +0000 (10:54 +0200)]
java plugin: Fix memory leak.

9 years agoipvs plugin: Fix memory leak.
Florian Forster [Fri, 19 Jun 2015 08:54:02 +0000 (10:54 +0200)]
ipvs plugin: Fix memory leak.

9 years agogmond plugin: Fix memory leak.
Florian Forster [Fri, 19 Jun 2015 08:54:02 +0000 (10:54 +0200)]
gmond plugin: Fix memory leak.

9 years agocurl_xml plugin: Fix memory leak.
Florian Forster [Fri, 19 Jun 2015 08:54:02 +0000 (10:54 +0200)]
curl_xml plugin: Fix memory leak.

9 years agocurl_json plugin: Fix memory leak.
Florian Forster [Fri, 19 Jun 2015 08:54:02 +0000 (10:54 +0200)]
curl_json plugin: Fix memory leak.

9 years agocurl plugin: Fix memory leak.
Florian Forster [Fri, 19 Jun 2015 08:54:02 +0000 (10:54 +0200)]
curl plugin: Fix memory leak.

9 years agocollectdmon: Fix memory leak.
Florian Forster [Fri, 19 Jun 2015 08:54:02 +0000 (10:54 +0200)]
collectdmon: Fix memory leak.

9 years agoapache plugin: Fix memory leak.
Florian Forster [Fri, 19 Jun 2015 08:54:02 +0000 (10:54 +0200)]
apache plugin: Fix memory leak.

9 years agosrc/utils_cache.c: Fix two memory leaks.
Florian Forster [Fri, 19 Jun 2015 05:05:22 +0000 (07:05 +0200)]
src/utils_cache.c: Fix two memory leaks.

* Free "times" pointer if it is not returned to the user.
* Free (re)alloc'ed pointers when strdup() fails.

9 years agosnmp plugin: Fix "Assigned value is garbage or undefined" warning.
Florian Forster [Thu, 18 Jun 2015 15:46:03 +0000 (17:46 +0200)]
snmp plugin: Fix "Assigned value is garbage or undefined" warning.

9 years agosrc/utils_latency.c: Fix "Assigned value is garbage or undefined" warning.
Florian Forster [Thu, 18 Jun 2015 15:45:52 +0000 (17:45 +0200)]
src/utils_latency.c: Fix "Assigned value is garbage or undefined" warning.

9 years agothreshold plugin: Fix "Dead assignment" warnings.
Florian Forster [Thu, 18 Jun 2015 15:31:03 +0000 (17:31 +0200)]
threshold plugin: Fix "Dead assignment" warnings.

9 years agoMerge branch 'collectd-5.5'
Florian Forster [Thu, 18 Jun 2015 14:55:53 +0000 (16:55 +0200)]
Merge branch 'collectd-5.5'

9 years agoMerge branch 'collectd-5.4' into collectd-5.5
Florian Forster [Thu, 18 Jun 2015 14:52:09 +0000 (16:52 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5

9 years agomodbus plugin: Make sure variable is initialized.
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).

9 years agostats plugin: Link with libm (-lm).
Florian Forster [Thu, 18 Jun 2015 14:09:10 +0000 (16:09 +0200)]
stats plugin: Link with libm (-lm).

Fixes a bug reported by @Tenzer:

    symbol lookup error: /usr/lib/collectd/statsd.so: undefined symbol: log

9 years agotail plugin: Make sure variable is initialized.
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).

9 years agoFix "Undefined allocation of 0 bytes (CERT MEM04-C; CWE-131)" warnings.
Florian Forster [Thu, 18 Jun 2015 13:27:54 +0000 (15:27 +0200)]
Fix "Undefined allocation of 0 bytes (CERT MEM04-C; CWE-131)" warnings.

9 years agothreshold plugin: Fix "Dead increment" warnings.
Florian Forster [Thu, 18 Jun 2015 12:45:02 +0000 (14:45 +0200)]
threshold plugin: Fix "Dead increment" warnings.

9 years agoFix "Argument with 'nonnull' attribute passed null" warnings.
Florian Forster [Thu, 18 Jun 2015 11:36:02 +0000 (13:36 +0200)]
Fix "Argument with 'nonnull' attribute passed null" warnings.

9 years agoMerge branch 'collectd-5.5'
Florian Forster [Thu, 18 Jun 2015 11:05:23 +0000 (13:05 +0200)]
Merge branch 'collectd-5.5'

9 years agoMerge branch 'collectd-5.4' into collectd-5.5
Florian Forster [Thu, 18 Jun 2015 11:05:14 +0000 (13:05 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5

9 years agothreshold plugin: Fix "Dead assignment" warning.
Florian Forster [Thu, 18 Jun 2015 07:16:18 +0000 (09:16 +0200)]
threshold plugin: Fix "Dead assignment" warning.

9 years agoted plugin: Fix "Dead assignment" warning.
Florian Forster [Thu, 18 Jun 2015 07:16:18 +0000 (09:16 +0200)]
ted plugin: Fix "Dead assignment" warning.

9 years agotail_csv plugin: Fix "Dead assignment" warning.
Florian Forster [Thu, 18 Jun 2015 07:16:18 +0000 (09:16 +0200)]
tail_csv plugin: Fix "Dead assignment" warning.

9 years agotail plugin: Fix "Dead assignment" warning.
Florian Forster [Thu, 18 Jun 2015 08:27:42 +0000 (10:27 +0200)]
tail plugin: Fix "Dead assignment" warning.

9 years agosnmp plugin: Fix "Dead assignment" warning.
Florian Forster [Thu, 18 Jun 2015 07:16:18 +0000 (09:16 +0200)]
snmp plugin: Fix "Dead assignment" warning.

9 years agopowerdns plugin: Fix "Dead assignment" warning.
Florian Forster [Thu, 18 Jun 2015 07:16:18 +0000 (09:16 +0200)]
powerdns plugin: Fix "Dead assignment" warning.

9 years agoping plugin: Fix "Dead assignment" warning.
Florian Forster [Thu, 18 Jun 2015 07:16:18 +0000 (09:16 +0200)]
ping plugin: Fix "Dead assignment" warning.

9 years agoonewire plugin: Fix "Dead assignment" warning.
Florian Forster [Thu, 18 Jun 2015 08:25:41 +0000 (10:25 +0200)]
onewire plugin: Fix "Dead assignment" warning.

9 years agoopenvpn plugin: Fix "Dead assignment" warning.
Florian Forster [Thu, 18 Jun 2015 07:16:18 +0000 (09:16 +0200)]
openvpn plugin: Fix "Dead assignment" warning.

9 years agontpd plugin: Fix "Dead assignment" warning.
Florian Forster [Thu, 18 Jun 2015 07:16:18 +0000 (09:16 +0200)]
ntpd plugin: Fix "Dead assignment" warning.

9 years agonetwork plugin: Fix "Dead assignment" warning.
Florian Forster [Thu, 18 Jun 2015 07:16:18 +0000 (09:16 +0200)]
network plugin: Fix "Dead assignment" warning.

9 years agomodbus plugin: Fix "Dead assignment" warning.
Florian Forster [Thu, 18 Jun 2015 07:16:18 +0000 (09:16 +0200)]
modbus plugin: Fix "Dead assignment" warning.

9 years agoonewire plugin: Fix "Dead assignment" warning.
Florian Forster [Thu, 18 Jun 2015 07:16:18 +0000 (09:16 +0200)]
onewire plugin: Fix "Dead assignment" warning.

9 years agonfs plugin: Fix handling of servers with 42 or 44 fields.
Florian Forster [Thu, 18 Jun 2015 07:16:18 +0000 (09:16 +0200)]
nfs plugin: Fix handling of servers with 42 or 44 fields.

9 years agobattery plugin: Fix file descriptor leak.
Florian Forster [Thu, 18 Jun 2015 07:16:18 +0000 (09:16 +0200)]
battery plugin: Fix file descriptor leak.

9 years agosrc/libcollectdclient/client.c: Fix "Dead assignment" warning.
Florian Forster [Thu, 18 Jun 2015 07:16:18 +0000 (09:16 +0200)]
src/libcollectdclient/client.c: Fix "Dead assignment" warning.

9 years agogmond plugin: Fix handling of COUNTER and ABSOLUTE data sources.
Florian Forster [Thu, 18 Jun 2015 07:16:18 +0000 (09:16 +0200)]
gmond plugin: Fix handling of COUNTER and ABSOLUTE data sources.

9 years agoemail plugin: Fix "Dead assignment" warning.
Florian Forster [Thu, 18 Jun 2015 07:16:18 +0000 (09:16 +0200)]
email plugin: Fix "Dead assignment" warning.

9 years agosrc/daemon/filter_chain.c: Fix "Dead assignment" warning.
Florian Forster [Thu, 18 Jun 2015 07:16:18 +0000 (09:16 +0200)]
src/daemon/filter_chain.c: Fix "Dead assignment" warning.

9 years agocurl_json plugin: Fix "Dead assignment" warning.
Florian Forster [Thu, 18 Jun 2015 07:16:18 +0000 (09:16 +0200)]
curl_json plugin: Fix "Dead assignment" warning.

9 years agoamqp plugin: Fix "Dead assignment" warning.
Florian Forster [Thu, 18 Jun 2015 07:16:18 +0000 (09:16 +0200)]
amqp plugin: Fix "Dead assignment" warning.

9 years agosrc/utils_avltree.c: Add assertions to rotate_{left,right}().
Florian Forster [Wed, 17 Jun 2015 20:08:19 +0000 (22:08 +0200)]
src/utils_avltree.c: Add assertions to rotate_{left,right}().

clang's static code analysis thought that x->right / x->left could be NULL,
reporting false positives. Let's see if this fixes it.

9 years agosnmp plugin: Fix off-by-one array access.
Florian Forster [Wed, 17 Jun 2015 17:12:45 +0000 (19:12 +0200)]
snmp plugin: Fix off-by-one array access.

9 years agoexec plugin: Don't assign variable that is never read.
Florian Forster [Wed, 17 Jun 2015 15:38:41 +0000 (17:38 +0200)]
exec plugin: Don't assign variable that is never read.

9 years agoMerge branch 'collectd-5.5'
Florian Forster [Wed, 17 Jun 2015 15:29:48 +0000 (17:29 +0200)]
Merge branch 'collectd-5.5'

9 years agoMerge branch 'collectd-5.4' into collectd-5.5
Florian Forster [Wed, 17 Jun 2015 15:29:38 +0000 (17:29 +0200)]
Merge branch 'collectd-5.4' into collectd-5.5

9 years agosrc/utils_db_query.c: Fix use-after-free.
Florian Forster [Wed, 17 Jun 2015 15:28:39 +0000 (17:28 +0200)]
src/utils_db_query.c: Fix use-after-free.

"r_area->next" was evaluated after "r_area" was freed.

9 years agobarometer plugin: Initialize output arrays.
Florian Forster [Wed, 17 Jun 2015 15:19:01 +0000 (17:19 +0200)]
barometer plugin: Initialize output arrays.

9 years agosrc/daemon/common.c: Implement strjoin() with memcpy().
Florian Forster [Wed, 17 Jun 2015 14:19:25 +0000 (16:19 +0200)]
src/daemon/common.c: Implement strjoin() with memcpy().

The previous implementation used strncat() which has the unfortunate and
unintuitive behavior of copying n+1 bytes to the buffer.

9 years agosrc/utils_cache.c: Remove incorrect free.
Florian Forster [Wed, 17 Jun 2015 13:20:41 +0000 (15:20 +0200)]
src/utils_cache.c: Remove incorrect free.

"ce" is not updated / used in this loop, so it would be theoretically
possible for "ce" to be freed twice.

9 years agoMerge branch 'collectd-5.5'
Marc Fournier [Wed, 17 Jun 2015 13:03:18 +0000 (15:03 +0200)]
Merge branch 'collectd-5.5'

9 years agofix openldap segfatult when ldapi is used v2
Marek Becka [Tue, 16 Jun 2015 14:59:20 +0000 (10:59 -0400)]
fix openldap segfatult when ldapi is used  v2

9 years agofix openldap segfatult when ldapi is used
Marek Becka [Thu, 11 Jun 2015 17:52:41 +0000 (13:52 -0400)]
fix openldap segfatult when ldapi is used

9 years agoMerge remote-tracking branch 'github/pr/1087'
Florian Forster [Wed, 17 Jun 2015 12:53:11 +0000 (14:53 +0200)]
Merge remote-tracking branch 'github/pr/1087'

9 years agoMerge branch 'collectd-5.5'
Florian Forster [Wed, 17 Jun 2015 12:52:31 +0000 (14:52 +0200)]
Merge branch 'collectd-5.5'

9 years agoMerge branch 'collectd-5.4' into 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

9 years agonetwork plugin: Avoid "status may be used uninitialized" warning.
Florian Forster [Wed, 17 Jun 2015 09:41:55 +0000 (11:41 +0200)]
network plugin: Avoid "status may be used uninitialized" warning.

9 years agoliboconfig: Declare yylex().
Florian Forster [Wed, 17 Jun 2015 08:48:27 +0000 (10:48 +0200)]
liboconfig: Declare yylex().

9 years agoemail plugin: Fix freeing linked lists.
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.

9 years agonetwork plugin: Make sure all memory is freed when the receive thread fails.
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.

9 years agoMerge branch 'collectd-5.5'
Florian Forster [Wed, 17 Jun 2015 07:12:38 +0000 (09:12 +0200)]
Merge branch 'collectd-5.5'

9 years agoMerge branch 'collectd-5.4' into 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

9 years agoMerge remote-tracking branch 'github/pr/1088' into collectd-5.4
Florian Forster [Wed, 17 Jun 2015 07:12:08 +0000 (09:12 +0200)]
Merge remote-tracking branch 'github/pr/1088' into collectd-5.4

9 years agosrc/utils_llist.c: Handle unlikely corner case.
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;

9 years agosrc/utils_avltree.c: Rewrite checks in c_avl_pick().
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 :(

9 years agoceph plugin: Fix allocation size.
Florian Forster [Wed, 17 Jun 2015 06:38:27 +0000 (08:38 +0200)]
ceph plugin: Fix allocation size.

9 years agobarometer plugin: Fix allocation size.
Florian Forster [Wed, 17 Jun 2015 06:35:22 +0000 (08:35 +0200)]
barometer plugin: Fix allocation size.

9 years agonetwork plugin: Explicitly initialize "fd_num" to zero.
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.

9 years agonotification target: Pass void** to tn_destroy().
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().

9 years agoperl plugin: Fix invalid 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.

9 years agoliboconfig: Disable some clang warnings.
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.

9 years agoliboconfig: Declare yyparse().
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 ();
           ^

9 years agoMerge branch 'collectd-5.5'
Florian Forster [Tue, 16 Jun 2015 20:46:25 +0000 (22:46 +0200)]
Merge branch 'collectd-5.5'

9 years agoMerge branch 'collectd-5.4' into 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

9 years agoadd support for simple authentication
Marek Becka [Tue, 16 Jun 2015 20:30:12 +0000 (16:30 -0400)]
add support for simple authentication

9 years agoIn rrd synchronous file creation use lock_file
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.