Code

collectd.git
11 years agowrite_graphite: Use the complain mechanism to report connection errors.
Florian Forster [Thu, 17 Jan 2013 08:51:56 +0000 (09:51 +0100)]
write_graphite: Use the complain mechanism to report connection errors.

Fixes Github issue #236. Thanks to @pyr for reporting it!

11 years agoMerge branch 'collectd-4.10' into collectd-5.1
Florian Forster [Mon, 14 Jan 2013 09:53:13 +0000 (10:53 +0100)]
Merge branch 'collectd-4.10' into collectd-5.1

11 years agodbi plugin: Replace cdbi_config_set_string() with cf_util_get_string().
Florian Forster [Mon, 14 Jan 2013 09:48:03 +0000 (10:48 +0100)]
dbi plugin: Replace cdbi_config_set_string() with cf_util_get_string().

11 years agoFixed a small typo in the ethstat plugin
Jeff Schroeder [Mon, 31 Dec 2012 17:48:25 +0000 (11:48 -0600)]
Fixed a small typo in the ethstat plugin

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agoethstat plugin: Fix the map lookup.
Florian Forster [Fri, 11 Jan 2013 18:45:43 +0000 (19:45 +0100)]
ethstat plugin: Fix the map lookup.

Previously, a pointer into the configuration structure was used to look
up the mappings. Because the configuration structure is freed or
otherwise modified, this does not work as intended (and may actually
lead to a segmentation fault when unlucky).

For completeness sake, a shutdown callback was added to free the used
memory on exit.

Fixes Github issue 224.

11 years agosrc/types.db: Remove the maximum value from "timeleft".
Florian Forster [Thu, 13 Dec 2012 08:55:04 +0000 (09:55 +0100)]
src/types.db: Remove the maximum value from "timeleft".

11 years agozfs_arc plugin: Fix the type used for mutex misses.
Florian Forster [Thu, 29 Nov 2012 06:58:25 +0000 (07:58 +0100)]
zfs_arc plugin: Fix the type used for mutex misses.

Thanks to Yves Mettier for pointing this out!

11 years agoUpdating data source for collectd v5, see https://collectd.org/wiki/index.php/V4_to_v...
Zuhaib M Siddique [Tue, 13 Nov 2012 03:15:48 +0000 (19:15 -0800)]
Updating data source for collectd v5, see https://collectd.org/wiki/index.php/V4_to_v5_migration_guide

Signed-off-by: Florian Forster <octo@collectd.org>
11 years agovarnish plugin: Make sure the argument passed to VSM_n_Arg() is not NULL.
Florian Forster [Wed, 28 Nov 2012 07:15:29 +0000 (08:15 +0100)]
varnish plugin: Make sure the argument passed to VSM_n_Arg() is not NULL.

Fixes Github issue 202.

11 years agoMerge branch 'collectd-5.0' into collectd-5.1
Florian Forster [Sat, 17 Nov 2012 11:41:09 +0000 (12:41 +0100)]
Merge branch 'collectd-5.0' into collectd-5.1

11 years agoMerge branch 'collectd-4.10' into collectd-5.0
Florian Forster [Sat, 17 Nov 2012 11:41:00 +0000 (12:41 +0100)]
Merge branch 'collectd-4.10' into collectd-5.0

11 years agosrc/network.c: Fix the build on FreeBSD.
Ed Schouten [Fri, 16 Nov 2012 20:58:46 +0000 (21:58 +0100)]
src/network.c: Fix the build on FreeBSD.

<gcrypt.h> accepts a definition called GCRYPT_NO_DEPRECATED to disable
deprecated functionality. Unfortunately, this definition is not
sufficient to suppress all warnings. However, FreeBSD's version of
libgcrypt has been fixed to properly remove all deprecated features.

Signed-off-by: Florian Forster <octo@collectd.org>
12 years agoBump version to 5.1.1; Update ChangeLog. collectd-5.1.1
Florian Forster [Sun, 11 Nov 2012 11:56:53 +0000 (12:56 +0100)]
Bump version to 5.1.1; Update ChangeLog.

12 years agoMerge branch 'collectd-5.0' into collectd-5.1
Florian Forster [Sun, 11 Nov 2012 11:43:52 +0000 (12:43 +0100)]
Merge branch 'collectd-5.0' into collectd-5.1

Conflicts:
ChangeLog
version-gen.sh

12 years agoBump version to 5.0.5; Update ChangeLog. collectd-5.0.5
Florian Forster [Sun, 11 Nov 2012 11:30:56 +0000 (12:30 +0100)]
Bump version to 5.0.5; Update ChangeLog.

12 years agoMerge branch 'collectd-4.10' into collectd-5.0
Florian Forster [Sun, 11 Nov 2012 11:05:17 +0000 (12:05 +0100)]
Merge branch 'collectd-4.10' into collectd-5.0

Conflicts:
ChangeLog
src/pyvalues.c
version-gen.sh

12 years agoUpdate version-gen.sh. collectd-4.10.8
Florian Forster [Sun, 11 Nov 2012 10:39:43 +0000 (11:39 +0100)]
Update version-gen.sh.

12 years agoBump version to 4.10.8; Update ChangeLog.
Florian Forster [Sun, 11 Nov 2012 10:32:55 +0000 (11:32 +0100)]
Bump version to 4.10.8; Update ChangeLog.

12 years agoping plugin: Don't abort the "ping_thread" when ping_send() fails.
Florian Forster [Sun, 11 Nov 2012 09:57:55 +0000 (10:57 +0100)]
ping plugin: Don't abort the "ping_thread" when ping_send() fails.

This may happen when the network is down. If the thread fails, the read
callback will indicate an error and the exponential back-off will start.
This is not optimal for this scenario, since you usually want to have
ping stats from right when the network is back up.

Fixes Github issue #171.

12 years agoping plugin: Refactor "ping_thread": Move iteration over hosts into a function.
Florian Forster [Sun, 11 Nov 2012 09:56:00 +0000 (10:56 +0100)]
ping plugin: Refactor "ping_thread": Move iteration over hosts into a function.

12 years ago1) Cleans up one configure.ac error AC_LINK_IFELSE requires AC_LANG_PROGRAM (or somet...
Brian Aker [Fri, 26 Oct 2012 06:02:15 +0000 (02:02 -0400)]
1) Cleans up one configure.ac error AC_LINK_IFELSE requires AC_LANG_PROGRAM (or something similar) to get the setup right.
2) Fix for maintaier-clean so that you can run the autoreconf build script multiple times.
3) Clean up the generated man pages when running cleanup.

Signed-off-by: Florian Forster <octo@collectd.org>
12 years agocollectd-python.conf(5): fix register_* argument description
Idan Kamara [Wed, 24 Oct 2012 09:31:48 +0000 (11:31 +0200)]
collectd-python.conf(5): fix register_* argument description

Signed-off-by: Florian Forster <octo@collectd.org>
12 years agocollectd-python.conf(5): change phrasing of function descriptions
Idan Kamara [Wed, 24 Oct 2012 09:30:28 +0000 (11:30 +0200)]
collectd-python.conf(5): change phrasing of function descriptions

Signed-off-by: Florian Forster <octo@collectd.org>
12 years agocollectd-python.conf(5): change phrasing of minimum required version
Idan Kamara [Wed, 24 Oct 2012 09:29:03 +0000 (11:29 +0200)]
collectd-python.conf(5): change phrasing of minimum required version

Signed-off-by: Florian Forster <octo@collectd.org>
12 years agocollectd-python.conf(5): fix trivial spelling mistakes
Idan Kamara [Wed, 24 Oct 2012 08:53:58 +0000 (10:53 +0200)]
collectd-python.conf(5): fix trivial spelling mistakes

Signed-off-by: Florian Forster <octo@collectd.org>
12 years agocollectd-python.conf(5): capitalize Python
Idan Kamara [Wed, 24 Oct 2012 08:49:17 +0000 (10:49 +0200)]
collectd-python.conf(5): capitalize Python

Signed-off-by: Florian Forster <octo@collectd.org>
12 years agocollection3: Remove duplicate definition of contains_invalid_chars().
Florian Forster [Sat, 10 Nov 2012 07:58:00 +0000 (08:58 +0100)]
collection3: Remove duplicate definition of contains_invalid_chars().

Thanks to Jonathan Amiez for pointing this out!

Fixes Github issue #160.

12 years agonetwork.c: call gcry_check_version() as required by library.
Chris Lundquist [Fri, 12 Oct 2012 10:15:13 +0000 (03:15 -0700)]
network.c: call gcry_check_version() as required by library.

Signed-off-by: Florian Forster <octo@collectd.org>
12 years agoMerge remote-tracking branch 'trenkel/collectd-4.10' into collectd-4.10
Florian Forster [Sat, 20 Oct 2012 06:57:02 +0000 (08:57 +0200)]
Merge remote-tracking branch 'trenkel/collectd-4.10' into collectd-4.10

12 years agoChange the libnetlink function used to query link statistics to match iproute2's...
KIvosak [Sat, 13 Oct 2012 10:50:40 +0000 (12:50 +0200)]
Change the libnetlink function used to query link statistics to match iproute2's behavior and thus not trip on the kernel's new parsing of optional attributes for RTM_GETLINK.

Signed-off-by: Florian Forster <octo@collectd.org>
12 years agoMerge branch 'collectd-5.0' into collectd-5.1
Florian Forster [Thu, 18 Oct 2012 10:49:39 +0000 (12:49 +0200)]
Merge branch 'collectd-5.0' into collectd-5.1

12 years agoMerge branch 'collectd-4.10' into collectd-5.0
Florian Forster [Thu, 18 Oct 2012 10:43:30 +0000 (12:43 +0200)]
Merge branch 'collectd-4.10' into collectd-5.0

Conflicts:
src/utils_db_query.c
src/utils_db_query.h

12 years agodisk plugin: Multiply the average read/write latency with the interval.
Florian Forster [Wed, 17 Oct 2012 14:08:07 +0000 (16:08 +0200)]
disk plugin: Multiply the average read/write latency with the interval.

The counter/derive will later be divided by the interval, resulting in too
small rates (for interval > 1.0).

Should fix issue #150. Thanks to Manuel Sanmartin for identifying this problem!

12 years agopython: Fix memory leaks.
Sven Trenkel [Sun, 14 Oct 2012 15:12:45 +0000 (15:12 +0000)]
python: Fix memory leaks.

12 years agonetwork.c: workaround for broken OSX compilers issuing false warnings
Chris Lundquist [Thu, 11 Oct 2012 00:04:26 +0000 (17:04 -0700)]
network.c: workaround for broken OSX compilers issuing false warnings

Signed-off-by: Florian Forster <octo@collectd.org>
12 years agoMerge remote-tracking branch 'origin/collectd-5.1' into collectd-5.1
Florian Forster [Thu, 11 Oct 2012 20:03:51 +0000 (22:03 +0200)]
Merge remote-tracking branch 'origin/collectd-5.1' into collectd-5.1

12 years agosrc/utils_db_query.[ch]: Remove duplicate "const" modifier.
Florian Forster [Thu, 11 Oct 2012 19:52:36 +0000 (21:52 +0200)]
src/utils_db_query.[ch]: Remove duplicate "const" modifier.

12 years agoMerge branch 'collectd-5.0' into collectd-5.1
Florian Forster [Thu, 11 Oct 2012 08:22:53 +0000 (10:22 +0200)]
Merge branch 'collectd-5.0' into collectd-5.1

Conflicts:
src/snmp.c

12 years agoMerge branch 'collectd-4.10' into collectd-5.0
Florian Forster [Thu, 11 Oct 2012 08:07:41 +0000 (10:07 +0200)]
Merge branch 'collectd-4.10' into collectd-5.0

Conflicts:
src/snmp.c

12 years agoMerge branch 'ff/snmp' into collectd-4.10
Florian Forster [Thu, 11 Oct 2012 08:01:44 +0000 (10:01 +0200)]
Merge branch 'ff/snmp' into collectd-4.10

12 years agosrc/utils_avltree.c: Fix an off-by-one error in c_avl_insert().
Florian Forster [Mon, 8 Oct 2012 14:20:34 +0000 (16:20 +0200)]
src/utils_avltree.c: Fix an off-by-one error in c_avl_insert().

When inserting the first node in the tree, the size is not incremented.
This causes c_avl_size() to return one element too little.

Thanks to Yves Mettier for debugging this!

12 years agosnmp plugin: Fix incorrect comparison in csnmp_oid_compare().
Florian Forster [Thu, 4 Oct 2012 05:57:25 +0000 (07:57 +0200)]
snmp plugin: Fix incorrect comparison in csnmp_oid_compare().

12 years agosnmp plugin: Check the return value of csnmp_oid_suffix().
Florian Forster [Wed, 3 Oct 2012 06:32:20 +0000 (08:32 +0200)]
snmp plugin: Check the return value of csnmp_oid_suffix().

Also fix an issue where the complete OID is compared with only the suffix.

Thanks to Mark Juric to test the changes and point out these problems.

Issue: #131

12 years agoThe commit 3bda88e8b425f43644e303e6957e38ae59c1bc83 change the shell from sh to bash.
Manuel Luis Sanmartin Rozada [Sat, 29 Sep 2012 19:45:33 +0000 (21:45 +0200)]
The commit 3bda88e8b425f43644e303e6957e38ae59c1bc83 change the shell from sh to bash.
To fix the configure script generation error: remove the echo whith \c used in sh.

Note: bash is not installed in AIX by default.
Signed-off-by: Florian Forster <octo@collectd.org>
12 years agosnmp plugin: Fix iterating over tables without an instance configuration.
Florian Forster [Tue, 2 Oct 2012 07:28:32 +0000 (09:28 +0200)]
snmp plugin: Fix iterating over tables without an instance configuration.

Also should fix incorrect handling of instance values; the first one would
be skipped.

12 years agoconfigure: Only set the Perl interpreter if the argument is a file.
Florian Forster [Tue, 25 Sep 2012 10:32:50 +0000 (12:32 +0200)]
configure: Only set the Perl interpreter if the argument is a file.

This fixes Github issue #137.

12 years agoFixed bugs that prevented to "make distcheck"
Yves Mettier [Mon, 17 Sep 2012 13:46:24 +0000 (15:46 +0200)]
Fixed bugs that prevented to "make distcheck"

Fixes Github issue #132.

Signed-off-by: Florian Forster <octo@collectd.org>
12 years agoMerge branch 'collectd-5.0' into collectd-5.1
Florian Forster [Sun, 23 Sep 2012 10:22:27 +0000 (12:22 +0200)]
Merge branch 'collectd-5.0' into collectd-5.1

12 years agoMerge branch 'collectd-4.10' into collectd-5.0
Florian Forster [Sun, 23 Sep 2012 10:20:49 +0000 (12:20 +0200)]
Merge branch 'collectd-4.10' into collectd-5.0

Conflicts:
src/utils_db_query.c
src/zfs_arc.c

12 years agoFix for Solaris when setting ip-opt multicast-loop (must be a char, not int).
hume-github [Tue, 18 Sep 2012 18:19:39 +0000 (15:19 -0300)]
Fix for Solaris when setting ip-opt multicast-loop (must be a char, not int).
General logging additions for tracking down the problem.

Signed-off-by: Florian Forster <octo@collectd.org>
12 years agoMultithreading fix: localize unneeded global variable
hume-github [Tue, 18 Sep 2012 18:12:25 +0000 (15:12 -0300)]
Multithreading fix: localize unneeded global variable

12 years agoethstat plugin: Initialize realloc'ated memory.
Florian Forster [Sun, 23 Sep 2012 10:00:43 +0000 (12:00 +0200)]
ethstat plugin: Initialize realloc'ated memory.

The last element in "interfaces" is not guaranteed to be zeroed, resulting in a
segfault when cf_util_get_string() tries to free the "pointer".

Thanks to Mark T. Voelker for reporting and analyzing this bug!
This should fix Github issue #133.

12 years agoethstat plugin: Fix off-by-one error.
Florian Forster [Sun, 23 Sep 2012 09:56:58 +0000 (11:56 +0200)]
ethstat plugin: Fix off-by-one error.

This hopefully fixes Github issue #135.

12 years agosnmp plugin: Improve subtree matching.
Florian Forster [Sun, 23 Sep 2012 09:50:57 +0000 (11:50 +0200)]
snmp plugin: Improve subtree matching.

Some MIBs use subtrees with an unusual OID naming schema. For example,
some network hardware encodes the MAC address in the last six parts of
the OID. Previously, the code only checked the last part of the OID
("sub-id") and assumed this was increasing. This assumption is not true
in such naming schemas and is not required by SNMP. This patch fixes
this behavior by comparing the entire "OID suffix".

This hopefully fixes Github issue #131.

12 years agosnmp plugin: Expand tabs.
Florian Forster [Sun, 23 Sep 2012 09:44:39 +0000 (11:44 +0200)]
snmp plugin: Expand tabs.

12 years agosnmp plugin: Rename a couple of confusing variables.
Florian Forster [Tue, 18 Sep 2012 06:40:00 +0000 (08:40 +0200)]
snmp plugin: Rename a couple of confusing variables.

"head" and "tail" are way better names, I hope.

12 years agosnmp plugin: Improve some comments.
Florian Forster [Tue, 18 Sep 2012 06:29:26 +0000 (08:29 +0200)]
snmp plugin: Improve some comments.

12 years agolibs varnish & varnishcompat are NOT needed. "pkg-config --libs varnishapi" output...
JonathanHuot [Thu, 13 Sep 2012 16:27:57 +0000 (18:27 +0200)]
libs varnish & varnishcompat are NOT needed. "pkg-config --libs varnishapi" output only libvarnishapi as well

Signed-off-by: Florian Forster <octo@collectd.org>
12 years agobindings/Makefile: perl: Use INSTALL_BASE rather than PREFIX.
Sebastian Harl [Wed, 13 Jun 2012 12:33:05 +0000 (14:33 +0200)]
bindings/Makefile: perl: Use INSTALL_BASE rather than PREFIX.

Some versions of Perl / ExtUtils::MakeMaker will else abort with an error
message explaining INSTALL_BASE and PREFIX may not be used both. However, I
don't know where the other definition comes from.

Signed-off-by: Florian Forster <octo@collectd.org>
12 years agoconfigure: Don't add -liptc to the global LIBS setting.
Sebastian Harl [Wed, 13 Jun 2012 12:31:00 +0000 (14:31 +0200)]
configure: Don't add -liptc to the global LIBS setting.

AC_SEARCH_LIBS() would do that, so save and restore LIBS when calling that
macro.

Signed-off-by: Florian Forster <octo@collectd.org>
12 years agoconfigure: Use AC_INCLUDES_DEFAULT when checking any libkvm stuff.
Sebastian Harl [Fri, 18 May 2012 20:31:13 +0000 (22:31 +0200)]
configure: Use AC_INCLUDES_DEFAULT when checking any libkvm stuff.

kvm.h requires sys/types.h to be included. Using AC_INCLUDES_DEFAULT will
hopefully make sure that we're save for a bit ;-)

Signed-off-by: Florian Forster <octo@collectd.org>
12 years agocurl_xml plugin: Mark read-only strings as const.
Florian Forster [Thu, 13 Sep 2012 08:53:19 +0000 (10:53 +0200)]
curl_xml plugin: Mark read-only strings as const.

12 years agofix Host config being ignored
Fabien Wernli [Mon, 28 Nov 2011 09:46:18 +0000 (10:46 +0100)]
fix Host config being ignored

Change-Id: I8a109818d8a821e2f3e0660fbb6ba1843279fcc2
Signed-off-by: Florian Forster <octo@collectd.org>
12 years agoapcups plugin: Retry sending the "status" command.
Florian Forster [Thu, 13 Sep 2012 08:18:14 +0000 (10:18 +0200)]
apcups plugin: Retry sending the "status" command.

If that fails more than twice in the first 10 iterations, gracefully shut
down the socket in all future iterations.

This should fix Github issue #15.

12 years agoapcups plugin: Add function net_shutdown().
Florian Forster [Thu, 13 Sep 2012 08:05:35 +0000 (10:05 +0200)]
apcups plugin: Add function net_shutdown().

12 years agoapcups plugin: Make sure the socket is closed on errors.
Florian Forster [Thu, 13 Sep 2012 08:04:26 +0000 (10:04 +0200)]
apcups plugin: Make sure the socket is closed on errors.

12 years agosrc/utils_db_query.c: Use the right field when checking for size.
Florian Forster [Wed, 12 Sep 2012 20:51:58 +0000 (22:51 +0200)]
src/utils_db_query.c: Use the right field when checking for size.

12 years agoRevert "swap plugin: Add the "ReportBytes" option."
Florian Forster [Wed, 12 Sep 2012 19:31:41 +0000 (21:31 +0200)]
Revert "swap plugin: Add the "ReportBytes" option."

This reverts commit 25fd1667c186eb871a4b66f9866d6446e41f1bc2.

12 years agoswap plugin: Add the "ReportBytes" option.
Florian Forster [Wed, 12 Sep 2012 16:55:08 +0000 (18:55 +0200)]
swap plugin: Add the "ReportBytes" option.

When enabled, swap I/O is reported in bytes, not pages. Only valid for Linux.

This should fix Github issue #10.

12 years agoexec plugin: Really remove STDERR from the select() set.
Florian Forster [Wed, 12 Sep 2012 16:25:20 +0000 (18:25 +0200)]
exec plugin: Really remove STDERR from the select() set.

select(2) is actually using a variable called "copy", which we didn't set in
this case.

Fixes Github issue #12. Thanks to Tetsuya Kawaguchi for reporting this problem.

12 years agoconfigure.in: Make sure sa_familiy_t is defined when checking rtnl_dump_filter().
Florian Forster [Tue, 11 Sep 2012 07:54:32 +0000 (09:54 +0200)]
configure.in: Make sure sa_familiy_t is defined when checking rtnl_dump_filter().

12 years agonetlink plugin: Check for the number of arguments to 'rtnl_dump_filter'.
Sebastian Harl [Sat, 19 May 2012 10:31:52 +0000 (12:31 +0200)]
netlink plugin: Check for the number of arguments to 'rtnl_dump_filter'.

In recent versions of iproute2, 'rtnl_dump_filter' expects three rather than
five arguments.

This should fix Github issue #7.

Signed-off-by: Florian Forster <octo@collectd.org>
12 years agoFixed collectd's unixsock read interrupted by SIGCHLD's.
Gerrie Roos [Tue, 17 Apr 2012 13:22:36 +0000 (15:22 +0200)]
Fixed collectd's unixsock read interrupted by SIGCHLD's.

Signed-off-by: Florian Forster <octo@collectd.org>
12 years agoFixed various collectd memory leaks.
Gerrie Roos [Fri, 25 May 2012 03:38:47 +0000 (05:38 +0200)]
Fixed various collectd memory leaks.

Once I understood what's going on I tried to keep the changes to a minimum.

Signed-off-by: Florian Forster <octo@collectd.org>
12 years agoMerge branch 'ff/kstat' into collectd-4.10
Florian Forster [Mon, 10 Sep 2012 19:10:45 +0000 (21:10 +0200)]
Merge branch 'ff/kstat' into collectd-4.10

12 years agoSet license info line to ”GPLv2 or newer”
Adrian Perez [Fri, 7 Sep 2012 13:59:32 +0000 (16:59 +0300)]
Set license info line to ”GPLv2 or newer”

Recently I had a request to change the licensing of this file to
use it in a GPLv3 application. This change would make it easier,
while retaining GPLv2 to make the license still match the one in
collectd.

Signed-off-by: Florian Forster <octo@collectd.org>
12 years agoMerge branch 'collectd-5.0' into collectd-5.1
Florian Forster [Fri, 7 Sep 2012 09:15:24 +0000 (11:15 +0200)]
Merge branch 'collectd-5.0' into collectd-5.1

Conflicts:
src/swap.c

12 years agoMerge branch 'collectd-4.10' into collectd-5.0
Florian Forster [Fri, 7 Sep 2012 09:05:48 +0000 (11:05 +0200)]
Merge branch 'collectd-4.10' into collectd-5.0

12 years agocorrected high-resolution time conversions after code review
m4rienf [Thu, 6 Sep 2012 19:25:22 +0000 (21:25 +0200)]
corrected high-resolution time conversions after code review

Signed-off-by: Florian Forster <octo@collectd.org>
12 years agoUpdated Adrian Perez' 2009 Python network proto classes
m4rienf [Tue, 4 Sep 2012 18:23:43 +0000 (20:23 +0200)]
Updated Adrian Perez' 2009 Python network proto classes

Signed-off-by: Florian Forster <octo@collectd.org>
12 years agosnmp plugin: Fix error message printed by the "Shift" option.
Dan Thomson [Fri, 7 Sep 2012 02:00:11 +0000 (19:00 -0700)]
snmp plugin: Fix error message printed by the "Shift" option.

I noticed a small error in snmp.c in collectd-5.1.0 (might be
elsewhere). The warning message in csnmp_config_add_data_shift says
"Scale config option" instead of "Shift" config option:
[…]

Signed-off-by: Florian Forster <octo@collectd.org>
12 years agodf plugin: when checking / do it just once
Bruno Prémont [Wed, 21 Mar 2012 20:34:00 +0000 (21:34 +0100)]
df plugin: when checking / do it just once

Newer system symlink /etc/mtab to /proc/mounts which makes root
filesystem seem mounted twice, once as type rootfs and once for the
real device.

When / is selected for df plugin, skip the rootfs mount-point as
real root is usually mounted right on top of it.

Not skipping it causes rrdtool to complain about two updates for the
same timestamp, the first entry for rootfs passes but rrdtool complains
when stats for the second occurrence for real filesystem is being
considered.

Signed-off-by: Bruno Prémont <bonbons@linux-vserver.org>
Signed-off-by: Florian Forster <octo@collectd.org>
12 years agosnmp plugin: Check for SNMP_ENDOFMIBVIEW.
Florian Forster [Fri, 7 Sep 2012 08:11:42 +0000 (10:11 +0200)]
snmp plugin: Check for SNMP_ENDOFMIBVIEW.

Some implementations of SNMP will send a special "variable" when you're
leaving the requested subtree with type "endOfMibView" aka.
"SNMP_ENDOFMIBVIEW". Examples of such implementations are Citrix
Netscalers and IBM's General Parallel File System (GPFS). Reading past
this special variable will result in weird values being returned.

This adds an appropriate check to csnmp_check_res_left_subtree().

Thanks to "Mark" for reporting this issue and clarifying.

12 years agosrc/common.c: Add missing semicolon.
Florian Forster [Thu, 6 Sep 2012 15:29:59 +0000 (17:29 +0200)]
src/common.c: Add missing semicolon.

12 years agosrc/common.c: get_kstat_value: Check the arguments and return error codes.
Florian Forster [Thu, 6 Sep 2012 14:12:53 +0000 (16:12 +0200)]
src/common.c: get_kstat_value: Check the arguments and return error codes.

Rather than asserting that an argument is not NULL, check this condition
and return an error code.

This should fix Github issue #71.

12 years agosrc/Makefile.am: Unconditionally link collectd with libm.
Florian Forster [Wed, 5 Sep 2012 06:43:18 +0000 (08:43 +0200)]
src/Makefile.am: Unconditionally link collectd with libm.

Under FreeBSD, running src/utils_format_json.c fails because isfinite()
cannot be resolved. The GNU manpages for isnan() and isfinite() also
advise users to link with libm and AIX has had the library being linked
in for a while. Since it's such a basic library it seems easier to just
link with it unconditionally.

Fixes Github issue #122.

12 years agoMerge pull request #124 from tokkee/bj/build
Florian Forster [Tue, 4 Sep 2012 10:45:44 +0000 (03:45 -0700)]
Merge pull request #124 from tokkee/bj/build

Fix some build issues on AIX using automake <= 1.9 and gcc 4.7.1.

12 years agoAdd missing return statements
Benjamin Jacobs [Sun, 2 Sep 2012 21:54:35 +0000 (23:54 +0200)]
Add missing return statements

Fix gcc warn/error: no return statement in function returning non-void [-Werror=return-type]

Signed-off-by: Sebastian Harl <sh@tokkee.org>
12 years agoAutomake 1.9 compatibility: don't use $(builddir)
Benjamin Jacobs [Sun, 2 Sep 2012 21:53:24 +0000 (23:53 +0200)]
Automake 1.9 compatibility: don't use $(builddir)

Automake <= 1.9 don't define $(builddir) which is always defined to
'.' anyway.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
12 years agoMerge branch 'sh/collectd-5.1' into collectd-5.1
Florian Forster [Mon, 27 Aug 2012 08:12:11 +0000 (10:12 +0200)]
Merge branch 'sh/collectd-5.1' into collectd-5.1

12 years agoAdded the instance name to varnish API
Jonathan Huot [Thu, 2 Aug 2012 15:56:05 +0000 (18:56 +0300)]
Added the instance name to varnish API

Fixed issue collectd#110

Signed-off-by: Florian Forster <octo@collectd.org>
12 years agoMerge pull request #109 from tokkee/sh/collectd-5.0
Florian Forster [Fri, 10 Aug 2012 07:16:37 +0000 (00:16 -0700)]
Merge pull request #109 from tokkee/sh/collectd-5.0

configure: Define _REENTRANT when compiling on Solaris.

LGTM

12 years agoFix to make write_mongodb work with any version of mongo-c-driver
Chris Lundquist [Fri, 13 Jul 2012 01:06:15 +0000 (01:06 +0000)]
Fix to make write_mongodb work with any version of mongo-c-driver

12 years agoconfigure: Define _REENTRANT when compiling on Solaris.
Mathijs Möhlmann [Tue, 22 Mar 2011 13:26:47 +0000 (14:26 +0100)]
configure: Define _REENTRANT when compiling on Solaris.

On Wed, Mar 16, 2011 at 10:35:07AM +0100, Mathijs Möhlmann wrote:
> I'm using collectd 4.10.2 on Solaris 10 (gcc 3.4.6). Sometimes when I
> start with a clean rrd directory or add a host the .rrd file (rrdtools
> plugin) don't get created and I get the following message:
>
> collectd[2996]: [ID 702911 daemon.error] stat(/usr/local/var/lib/collectd/rrd/asterix/load/load.rrd) failed: Bad file number

This patch fixes this.

Signed-off-by: Sebastian Harl <sh@teamix.net>
12 years agoconfigure, utils_dns: Check for and use netinet/ip_compat.h.
Sebastian Harl [Thu, 2 Aug 2012 10:16:38 +0000 (12:16 +0200)]
configure, utils_dns: Check for and use netinet/ip_compat.h.

This is required on Solaris in order to get the ip6_ext struct.

12 years agomysql plugin: Use the database instance name for identifying read callbacks.
Sebastian Harl [Wed, 1 Aug 2012 07:16:34 +0000 (09:16 +0200)]
mysql plugin: Use the database instance name for identifying read callbacks.

The database instance is specified as argument to the <Database> block.
Without this fix, we cannot specify two database blocks without the
(optional!) 'Database' option as this would result in registering two read
callbacks with the name 'mysql'.

Thanks to Johan Bergström for reporting this on IRC!

12 years agocontrib/migrate-4-5.px: Added missing end quotes in a call to rrd_filter.px.
Sebastian Harl [Sun, 15 Jul 2012 11:04:09 +0000 (13:04 +0200)]
contrib/migrate-4-5.px: Added missing end quotes in a call to rrd_filter.px.

12 years agoFix bad definition of UDP src port in DNS plugin.
Daniel Sutto [Wed, 11 Jul 2012 17:32:16 +0000 (19:32 +0200)]
Fix bad definition of UDP src port in DNS plugin.

12 years agoCorrect compilation on FreeBSD, set HOST_NAME_MAX to _POSIX_HOST_NAME_MAX if isn...
biancalana [Fri, 6 Jul 2012 01:07:15 +0000 (22:07 -0300)]
Correct compilation on FreeBSD, set HOST_NAME_MAX to _POSIX_HOST_NAME_MAX if isn't defined

12 years agocontrib/migrate-4-5.px: Break up "df" RRD files into multiple files.
Florian Forster [Thu, 5 Jul 2012 13:48:29 +0000 (15:48 +0200)]
contrib/migrate-4-5.px: Break up "df" RRD files into multiple files.