Code

collectd.git
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.

9 years agonetwork plugin: Simplify config handling.
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.

9 years agoAllow empty Plugin blocks.
Manuel Luis Sanmartín Rozada [Wed, 20 May 2015 20:06:18 +0000 (22:06 +0200)]
Allow empty Plugin blocks.

9 years agoAllow empty Plugin blocks.
Manuel Luis Sanmartín Rozada [Wed, 20 May 2015 20:06:18 +0000 (22:06 +0200)]
Allow empty Plugin blocks.

9 years agouse counter type for Innodb_buffer_pool_pages_flushed
Marek Becka [Tue, 16 Jun 2015 16:38:37 +0000 (12:38 -0400)]
use counter type for Innodb_buffer_pool_pages_flushed

9 years agoMerge remote-tracking branch 'github/pr/1085'
Florian Forster [Tue, 16 Jun 2015 18:38:38 +0000 (20:38 +0200)]
Merge remote-tracking branch 'github/pr/1085'

9 years agoFix 64 bit check issue, running the preprocessor does not honour CFLAGS which holds...
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

9 years agouse counter type for Innodb_buffer_pool_pages_flushed
Marek Becka [Tue, 16 Jun 2015 16:38:37 +0000 (12:38 -0400)]
use counter type for Innodb_buffer_pool_pages_flushed

9 years agoMerge branch 'collectd-5.5'
Marc Fournier [Tue, 16 Jun 2015 07:18:25 +0000 (09:18 +0200)]
Merge branch 'collectd-5.5'

9 years agoCorrected text in README
Kelly Thomas Kline [Mon, 15 Jun 2015 21:05:51 +0000 (14:05 -0700)]
Corrected text in README

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

9 years agoRevert "contrib/redhat/collectd.spec: added bison and flex"
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.

9 years agoconfigure: turbostat: check for MSR_PKG_C10_RESIDENCY symbol
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

9 years agocollectd.conf.pod: update libyajl URL
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!

9 years agoFix a libtool warning
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

9 years agoMerge remote-tracking branch 'github/pr/1065' into collectd-5.5
Florian Forster [Thu, 11 Jun 2015 16:35:13 +0000 (17:35 +0100)]
Merge remote-tracking branch 'github/pr/1065' into collectd-5.5

9 years agoMerge branch 'collectd-5.5'
Florian Forster [Thu, 11 Jun 2015 16:33:17 +0000 (17:33 +0100)]
Merge branch 'collectd-5.5'

9 years agocontrib/redhat/collectd.spec: added bison and flex
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.

9 years agowrite_redis plugin: Check the return value of format_values().
Florian Forster [Thu, 11 Jun 2015 15:48:55 +0000 (16:48 +0100)]
write_redis plugin: Check the return value of format_values().

9 years agowrite_redis: Increase parsability by using format_values from common.h
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

9 years agowrite_redis: Increase parsability of multi-valued keys by insterting delimiting chara...
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

9 years agoconfigure.ac: Move all checks for "struct ip6_ext" into one place.
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
9 years agoAutomatically add -DSOLARIS2=8 if required for ip6_ext
Dagobert Michelsen [Thu, 11 Jun 2015 09:26:23 +0000 (11:26 +0200)]
Automatically add -DSOLARIS2=8 if required for ip6_ext

Fixes: #348
9 years agoprocesses plugin: Initialize the cswitch_{in,}vol fields.
Florian Forster [Thu, 11 Jun 2015 13:48:02 +0000 (14:48 +0100)]
processes plugin: Initialize the cswitch_{in,}vol fields.

9 years agoMerge branch 'collectd-5.5'
Florian Forster [Thu, 11 Jun 2015 13:39:16 +0000 (14:39 +0100)]
Merge branch 'collectd-5.5'

9 years agoMakefile.am: Link tests with required libraries, too.
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

9 years agoconfigure.ac: Ask users to build 64-bit Solaris binaries.
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
9 years agozone plugin: Fix strerror -> sstrerror.
Florian Forster [Thu, 11 Jun 2015 09:36:12 +0000 (10:36 +0100)]
zone plugin: Fix strerror -> sstrerror.

9 years agozone plugin: Minor code cleanups.
Florian Forster [Thu, 11 Jun 2015 09:17:27 +0000 (10:17 +0100)]
zone plugin: Minor code cleanups.

9 years agozone plugin: Undefine _FILE_OFFSET_BITS when building on 32bit hosts.
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
9 years agoswap plugin: Report swap sizes in bytes.
Marek Becka [Tue, 9 Jun 2015 20:56:55 +0000 (16:56 -0400)]
swap plugin: Report swap sizes in bytes.

Regression from 43aa1c5cc9ab69004d0fe6de480c78815224111b.

9 years agoMerge branch 'collectd-5.5'
Florian Forster [Thu, 11 Jun 2015 06:50:27 +0000 (07:50 +0100)]
Merge branch 'collectd-5.5'

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

9 years agodns plugin: Check for "struct ip6_ext".
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
9 years agosmart: KNF
Pierre-Yves Ritschard [Wed, 10 Jun 2015 13:54:58 +0000 (15:54 +0200)]
smart: KNF