Max Henkel [Thu, 8 Apr 2010 10:06:29 +0000 (12:06 +0200)]
collectd2html.pl: Produce XHTML output.
… as requested in Debian bug #575029.
Signed-off-by: Sebastian Harl <tokkee@debian.org>
Yuri D'Elia [Fri, 18 Dec 2009 11:33:31 +0000 (12:33 +0100)]
collectd2html: Fixed recursive mode.
Also, improved default settings to match the collectd4 series.
Signed-off-by: Sebastian Harl <tokkee@debian.org>
Luke Heberling [Sun, 30 Aug 2009 19:41:13 +0000 (12:41 -0700)]
powerdns plugin: Fixed communication when talking to pdns 2.9.22.
powerdns version 2.9.22 (and above) require a newline at the end of
commands sent to the server.
Signed-off-by: Sebastian Harl <tokkee@debian.org>
Aurelien Reynaud [Wed, 12 May 2010 09:55:05 +0000 (11:55 +0200)]
snmp.c: compilation fixes for AIX
The C and C++ standards allows the character type char to be signed or
unsigned, depending on the platform and compiler. Most systems,
including x86 GNU/Linux and Microsoft Windows, use signed char, but
those based on PowerPC and ARM processors typically use unsigned char.
This patch fixes a "comparison is always true" warning on AIX (powerpc)
which leads the compilation to abort because of the -Werror flag.
Being unsigned by default, a char is always >0.
Signed-off-by: Aurelien Reynaud <collectd@wattapower.net>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Aurelien Reynaud [Wed, 12 May 2010 09:55:04 +0000 (11:55 +0200)]
processes.c: fix uninitialized variables warnings
Signed-off-by: Aurelien Reynaud <collectd@wattapower.net>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Johan Van den Brande [Wed, 19 May 2010 10:23:23 +0000 (12:23 +0200)]
Bugfix for libcollectdclient lcc_putval.
Hello,
I'm using collectd to monitor system and process parameters of our code under
test running on a cluster. The test processes communicate to collectd via the
unixsock plugin, but there was a small error in the client library which I had
to fix first.
The wire format of the putval command is missing a space behind the closing
double quote of the identifier. As I said, it is a small fix, but nevertheless
I attached the patch for client.c. The bug is present in 4.6 (that is the
version I'm using in production), but I fixed it against 4.10.0.
Cheers,
Johan
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Wed, 19 May 2010 10:14:46 +0000 (12:14 +0200)]
snmp plugin: csnmp_value_list_to_value: Include the OID in the log message.
Florian Forster [Wed, 19 May 2010 09:47:45 +0000 (11:47 +0200)]
snmp plugin: Don't print a warning if the ASN type is "ASN_NULL".
Thanks to "Flyinvap" for pointing this out.
Florian Forster [Wed, 19 May 2010 08:47:58 +0000 (10:47 +0200)]
Merge remote branch 'origin/collectd-4.9' into collectd-4.9
Max Henkel [Tue, 4 May 2010 21:39:18 +0000 (23:39 +0200)]
configure.in: htonll check depends on linker
Fixing a cross-compile issue by depending only on a linker check.
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sven Trenkel [Sat, 15 May 2010 20:36:25 +0000 (22:36 +0200)]
python: Fixed some memory leaks in the write and notification callbacks.
Thanks to Volkmar Uhlig for the hint.
Sven Trenkel [Mon, 3 May 2010 13:01:56 +0000 (15:01 +0200)]
python: Fixed a crash if the plugin was loaded but not configured.
Florian Forster [Sat, 1 May 2010 09:00:22 +0000 (11:00 +0200)]
Merge branch 'collectd-4.8' into collectd-4.9
Thorsten von Eicken [Sat, 1 May 2010 08:03:15 +0000 (10:03 +0200)]
rrdcached.c needs to include rrd.h
Florian Forster [Sat, 1 May 2010 07:53:12 +0000 (09:53 +0200)]
Build system: Check for "strtok_r" availability with "-Wall -Werror" when using GCC.
Previously, the check was done without "-Werror" which resulted in a
warning and success. When the daemon was later built with "-Werror" set,
that warning would result in an error and abort the build.
Thanks to Aurélien Reynaud for reporting the problem.
Florian Forster [Sat, 1 May 2010 07:35:01 +0000 (09:35 +0200)]
Merge branch 'collectd-4.8' into collectd-4.9
Florian Forster [Thu, 29 Apr 2010 07:57:18 +0000 (09:57 +0200)]
configure.in: Put conditionals around <inttypes.h>, too, for consistency's sake.
Aurélien Reynaud [Thu, 29 Apr 2010 07:39:48 +0000 (09:39 +0200)]
Solaris 8 fixes: Check for <stdint.h> before inclusion.
Aurélien Reynaud [Thu, 29 Apr 2010 07:37:57 +0000 (09:37 +0200)]
Solaris 8 fixes: Fall back to putenv(3).
Florian Forster [Sun, 25 Apr 2010 13:32:50 +0000 (15:32 +0200)]
collectd-nagios.c: Output performance data with the "%f" format string.
Apparently the parser used by nagios is dumb as bread. Thanks to Lao Wai
for pointing this out. For more information, see:
<http://nagiosplug.sourceforge.net/developer-guidelines.html#AEN201>
Florian Forster [Thu, 22 Apr 2010 09:28:19 +0000 (11:28 +0200)]
Bumped version to 4.9.2; Updated ChangeLog.
Florian Forster [Thu, 22 Apr 2010 09:14:25 +0000 (11:14 +0200)]
Merge branch 'collectd-4.8' into collectd-4.9
Conflicts:
ChangeLog
Florian Forster [Thu, 22 Apr 2010 09:06:16 +0000 (11:06 +0200)]
Bumped version to 4.8.5; Updated ChangeLog.
Florian Forster [Wed, 21 Apr 2010 17:04:01 +0000 (19:04 +0200)]
Merge branch 'collectd-4.8' into collectd-4.9
Conflicts:
ChangeLog
Florian Forster [Wed, 21 Apr 2010 14:23:46 +0000 (16:23 +0200)]
src/plugin.c: plugin_log: Append newline to message …
… even when no log-plugin was loaded.
Florian Forster [Wed, 21 Apr 2010 14:19:53 +0000 (16:19 +0200)]
network plugin: Don't access values in an already freed array.
Florian Forster [Mon, 19 Apr 2010 11:05:15 +0000 (13:05 +0200)]
contrib/exec-nagios.px: Whitespace and POD fixes.
Florian Forster [Wed, 7 Apr 2010 10:55:03 +0000 (12:55 +0200)]
Bumped version to 4.8.2; Updated ChangeLog.
Florian Forster [Wed, 7 Apr 2010 09:55:15 +0000 (11:55 +0200)]
Merge branch 'collectd-4.8' into collectd-4.9
Florian Forster [Wed, 7 Apr 2010 09:53:32 +0000 (11:53 +0200)]
network plugin: Fix a severe memory leak.
A couple of bytes were leaked with every encrypted packet received.
Florian Forster [Wed, 7 Apr 2010 09:41:41 +0000 (11:41 +0200)]
rrdtool plugin: Correctly free the cache when shutting down.
Florian Forster [Mon, 5 Apr 2010 14:32:45 +0000 (16:32 +0200)]
network plugin: Be more strict when checking the return value of "setsockopt".
Florian Forster [Mon, 5 Apr 2010 12:09:39 +0000 (14:09 +0200)]
README: Fix a typo.
Florian Forster [Wed, 31 Mar 2010 13:16:32 +0000 (15:16 +0200)]
Merge commit 'tokkee/sh/collectd-4.8' into collectd-4.8
Florian Forster [Wed, 31 Mar 2010 07:06:13 +0000 (09:06 +0200)]
collectd.conf.in: Change the basename of the Perl plugin to "Collectd::Plugins".
Florian Forster [Wed, 31 Mar 2010 07:01:05 +0000 (09:01 +0200)]
collectd-perl(5): Fix the synopsis.
I think this is a left-over from a switch from "Collectd::Plugin" to
"Collectd::Plugins". Thanks to Denis Yagofarov for reporting the bug and
Michael Shigorin for relaying it to me.
Sebastian Harl [Fri, 26 Mar 2010 12:11:50 +0000 (13:11 +0100)]
configure, src/Makefile: Check for nanosleep() in libposix4 as well.
On, e.g., Solaris 2.6, nanosleep() is only available from that library.
Thanks to Vincent McIntyre for reporting this and providing an initial patch.
Florian Forster [Thu, 25 Mar 2010 07:09:57 +0000 (08:09 +0100)]
README: Fix typo.
Florian Forster [Thu, 25 Mar 2010 06:57:58 +0000 (07:57 +0100)]
README: Fix typo.
Florian Forster [Wed, 24 Mar 2010 15:37:53 +0000 (16:37 +0100)]
snmp plugin: Fix a format string.
Florian Forster [Mon, 22 Mar 2010 18:22:02 +0000 (19:22 +0100)]
openvpn plugin: Fix a copy'n'paste error in the "new naming schema".
Florian Forster [Mon, 22 Mar 2010 18:20:25 +0000 (19:20 +0100)]
collectd.conf(5): Document the "ImprovedNamingSchema" option of the OpenVPN plugin.
Florian Forster [Wed, 17 Mar 2010 18:12:53 +0000 (19:12 +0100)]
netapp plugin: Fix a syntax error in an error message.
Thanks to facade from IRC for the hint.
Florian Forster [Mon, 15 Mar 2010 21:40:45 +0000 (22:40 +0100)]
Merge branch 'collectd-4.8' into collectd-4.9
Conflicts:
src/exec.c
Florian Forster [Mon, 15 Mar 2010 21:03:14 +0000 (22:03 +0100)]
Exec plugin: Update copyright header.
Florian Forster [Wed, 3 Mar 2010 14:44:11 +0000 (15:44 +0100)]
configfile: cf_read_dir: Don't abort reading a directory when reading one file fails.
Clément Stenac [Sat, 27 Feb 2010 20:22:47 +0000 (21:22 +0100)]
Processes plugin: Fix a minor typo.
Florian Forster [Tue, 9 Mar 2010 17:51:08 +0000 (18:51 +0100)]
Exec plugin: Add a missing folding marker.
Florian Forster [Tue, 9 Mar 2010 17:50:55 +0000 (18:50 +0100)]
Exec plugin: Set the "noreturn" attribute on the "exec_child" function.
Florian Forster [Tue, 9 Mar 2010 17:50:32 +0000 (18:50 +0100)]
Exec plugin: Reset the "PL_RUNNING" if "fork_child()" fails.
Jan Engelhardt [Tue, 16 Feb 2010 20:16:47 +0000 (21:16 +0100)]
libiptc: avoid strict-aliasing warnings
libiptc: avoid strict-aliasing warnings
In file included from libiptc/libip4tc.c:117:0:
libiptc/libiptc.c: In function ‘__iptcc_p_del_policy’:
libiptc/libiptc.c:826:4: warning: dereferencing type-punned pointer will break
strict-aliasing rules
libiptc/libiptc.c: In function ‘iptc_get_target’:
libiptc/libiptc.c:1650:4: warning: dereferencing type-punned pointer will break
strict-aliasing rules
libiptc/libip4tc.c: In function ‘dump_entry’:
libiptc/libip4tc.c:157:3: warning: dereferencing type-punned pointer will break
strict-aliasing rules
CC libiptc/libip6tc.lo
In file included from libiptc/libip6tc.c:112:0:
libiptc/libiptc.c: In function ‘__iptcc_p_del_policy’:
libiptc/libiptc.c:826:4: warning: dereferencing type-punned pointer will break
strict-aliasing rules
libiptc/libiptc.c: In function ‘ip6tc_get_target’:
libiptc/libiptc.c:1650:4: warning: dereferencing type-punned pointer will break
strict-aliasing rules
libiptc/libip6tc.c: In function ‘dump_entry’:
libiptc/libip6tc.c:188:3: warning: dereferencing type-punned pointer will break
strict-aliasing rules
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Rebased for collectd/src/owniptc: Alan Pevec <apevec@gmail.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Tue, 9 Mar 2010 15:55:20 +0000 (16:55 +0100)]
Merge remote branch 'origin/collectd-4.8' into collectd-4.8
Manuel Sanmartin (no email) [Tue, 9 Mar 2010 15:12:51 +0000 (16:12 +0100)]
configure.in: Check for "htonll".
The first patch adds support to check if the htonl and htonll functions
(which are used in AIX port) are available in configure. Until now the
AIX port used these functions without perform any existence test.
Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
Manuel Sanmartin (no email) [Tue, 9 Mar 2010 14:40:00 +0000 (15:40 +0100)]
memcached plugin: Add hack for AIX compatibility.
The second one port memcached plugin to AIX. Since AIX don't have
MSG_DONTWAIT flag support, we use MSG_NONBLOCK... and we hope to work
fine ever :)
Signed-off-by: Florian Forster <octo@leeloo.lan.home.verplant.org>
Florian Forster [Wed, 3 Mar 2010 13:01:30 +0000 (14:01 +0100)]
oracle plugin: Fix semantics of OCIAttrGet.
Apparently it returns success if it could fetch the parameter value and
doesn't interpret the value itself. So returning NULL when querying for
OCI_ATTR_SERVER_STATUS does not result in an error. Handle this as a
lost connection.
Thanks to Sven for pointing this out :)
Sebastian Harl [Thu, 25 Feb 2010 23:31:51 +0000 (00:31 +0100)]
.mailmap: Added Rodolphe Quiedeville <rquiedeville@bearstech.com>.
His name was mis-spelled in one commit as Rodolphe Quiedeville*l*.
Florian Forster [Thu, 25 Feb 2010 22:55:25 +0000 (23:55 +0100)]
Merge branch 'collectd-4.8' into collectd-4.9
Conflicts:
src/ping.c
Stu Hood [Thu, 25 Feb 2010 21:40:53 +0000 (22:40 +0100)]
contrib/redhat/collectd.spec: Updated for version 4.9.
I've attached a patch for the RPM specfile to allow it to build collectd 4.9.0,
including Java support.
Florian Forster [Thu, 11 Feb 2010 13:03:38 +0000 (14:03 +0100)]
debian/: Removed ancient Debian package files.
You might want to look at git://git.tokkee.org/pkg-collectd.git instead.
Florian Forster [Wed, 10 Feb 2010 14:24:23 +0000 (15:24 +0100)]
configure.in: Fix three small typos.
Amit Gupta [Wed, 10 Feb 2010 13:37:36 +0000 (14:37 +0100)]
Build system: Put Java class files into a .jar file.
Hi,
I was wondering why the java plugin api class files are published under
share/collectd/java. Ideally, a java-plugin.jar file containing all the class
files should get published rather than the individual class files.
Additionally, the jar files IMO should get published to the lib directory where
the so files are sitting rather than the share directory.
Same holds true for jmx class files as well (probably jmx.jar?).
I could work on this if everyone is okay with it.
Regards
Amit
Florian Forster [Wed, 10 Feb 2010 13:01:37 +0000 (14:01 +0100)]
src/utils_cmd_listval.c: Fix a memory leak.
Thanks to Peter Warasin for figuring this out. His "garbage collector" patch
may replace this solution in future versions of collectd.
Michael Stapelberg [Sat, 6 Feb 2010 15:10:33 +0000 (16:10 +0100)]
Bugfix: correctly handle spurious wakeups in pthread_cond_timedwait
This fixes problems storing data in rrd files on NetBSD 5.0 with more
than one CPU.
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Thu, 4 Feb 2010 12:07:43 +0000 (13:07 +0100)]
src/utils_format_json.c: Use "isfinite" rather than "isinf".
Makes it a bit easier to read.
Florian Forster [Thu, 4 Feb 2010 12:07:06 +0000 (13:07 +0100)]
src/collectd.h: Add fallback implementations of "isfinite" and "isinf".
Chris Buben [Thu, 4 Feb 2010 08:52:30 +0000 (00:52 -0800)]
utils_format_json: serialize nan and inf as null, as per JSON spec
I'm deserializing JSON output from the write_http plugin using ruby-yajl.
yajl was puking on the literal value nan encoded in the output.
[
{
"plugin": "memcached",
"interval": 10,
"host": "myhost",
"values": [
nan,
5
],
"time":
1265239180,
"plugin_instance": "",
"type_instance": "",
"type": "ps_count"
}
]
After some research, ECMA-262 15.12.3 says nan and infinite numbers
aren't representable in JSON and should be serialized as the string
null. I figure any strictly-compliant JSON parser will fail on parsing
JSON data containing nans as emitted by collectd's utils_format_json
routines.
This patch makes collectd's JSON output compliant in the case of
infinite or nan gauge values.
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Thu, 28 Jan 2010 22:29:25 +0000 (23:29 +0100)]
ping plugin: Improved some error messages.
Florian Forster [Tue, 26 Jan 2010 23:07:50 +0000 (00:07 +0100)]
contextswitch plugin: Handle large counter/derive values correctly.
Using "strtoul" for derive_t values fails for large counter values.
Thanks to Martin Merkel for reporting this :)
Sebastian Harl [Sun, 24 Jan 2010 14:32:25 +0000 (15:32 +0100)]
collectd{-python,.conf}(5): Fixed some typos.
Thanks to lintian(1) for catching those!
Sebastian Harl [Sun, 24 Jan 2010 12:20:43 +0000 (13:20 +0100)]
collectd{-perl,.conf}(5), {my,postgre}sql plugins: Fixed some typos.
Thanks to lintian(1) for catching (some of) those! :-)
Florian Forster [Sat, 23 Jan 2010 12:19:49 +0000 (13:19 +0100)]
apache plugin: Fix collection of the "apache_connections" value with Apache 2.*.
Thanks to Gary (bug tracker) for pointing this out :)
Pavel Piatruk [Fri, 22 Jan 2010 08:13:29 +0000 (09:13 +0100)]
contrib/collection.cgi: Added ability to hide specified types.
It is useful when you don't want to see many graphs. How to use the patch:
apply it to collection.cgi and add lines with keyword ,,dontshowtype'' to
/etc/collectd/collection.conf:
dontshowtype: "if_errors"
dontshowtype: "if_packets"
Then you will see only if_octets types in "interface" plugin page.
Via Debian bug #566199.
Florian Forster [Thu, 21 Jan 2010 10:36:30 +0000 (11:36 +0100)]
src/filter_chain.c: Make info-message more verbose.
Paul Sadauskas [Sun, 17 Jan 2010 19:54:06 +0000 (12:54 -0700)]
Use Curl AnyAuth (digest+basic) instead of just digest
Florian Forster [Wed, 20 Jan 2010 09:32:01 +0000 (10:32 +0100)]
Merge commit 'tokkee/sh/collectd-4.8' into collectd-4.8
Sebastian Harl [Fri, 15 Jan 2010 09:07:39 +0000 (10:07 +0100)]
exec plugin: Improved some error messages.
Florian Forster [Fri, 15 Jan 2010 09:16:18 +0000 (10:16 +0100)]
contrib/exec-munin.px: Add GPLv2 header.
Florian Forster [Thu, 14 Jan 2010 14:19:39 +0000 (15:19 +0100)]
Merge branch 'collectd-4.8' into collectd-4.9
Conflicts:
ChangeLog
Florian Forster [Thu, 14 Jan 2010 14:03:43 +0000 (15:03 +0100)]
ChangeLog: Added fix in the processes plugin.
Florian Forster [Thu, 14 Jan 2010 09:54:53 +0000 (10:54 +0100)]
processes plugin: Fix handling of the ps_disk_{octets,ops} types.
There values were stored in a `long', then `counter_t', then interpreted as
`derive_t'. Changed that to `derive_t' only. Hopefully this fixes a bug
reported by Mark Moseley.
Florian Forster [Wed, 13 Jan 2010 17:04:24 +0000 (18:04 +0100)]
ChangeLog: Updated for version 4.9.1.
Florian Forster [Wed, 13 Jan 2010 16:55:02 +0000 (17:55 +0100)]
ChangeLog: Updated for version 4.8.3.
Florian Forster [Wed, 13 Jan 2010 14:52:12 +0000 (15:52 +0100)]
Merge commit 'tokkee/sh/collectd-4.8' into collectd-4.8
Florian Forster [Wed, 13 Jan 2010 14:51:41 +0000 (15:51 +0100)]
collectd.conf(5): Rephrase a weird sentence in the cURL-JSON documentation.
Florian Forster [Wed, 13 Jan 2010 14:51:02 +0000 (15:51 +0100)]
collectd.conf(5): Remove trailing whitespace.
Sebastian Harl [Wed, 13 Jan 2010 12:21:47 +0000 (13:21 +0100)]
types.db(5): Mention the types "ABSOLUTE" and "DERIVE" as well.
Florian Forster [Wed, 13 Jan 2010 11:11:20 +0000 (12:11 +0100)]
Merge branch 'collectd-4.8' into collectd-4.9
Florian Forster [Wed, 13 Jan 2010 11:10:20 +0000 (12:10 +0100)]
Merge branch 'collectd-4.7' into collectd-4.8
Florian Forster [Mon, 11 Jan 2010 22:18:27 +0000 (23:18 +0100)]
bindings/perl/lib/Collectd.pm: Add forgotten "config" callback type.
Thanks to "ntenev" for reporting the issue.
Florian Forster [Tue, 5 Jan 2010 10:50:22 +0000 (11:50 +0100)]
Merge commit 'tokkee/sh/collectd-4.9' into collectd-4.9
Florian Forster [Tue, 5 Jan 2010 10:47:44 +0000 (11:47 +0100)]
Merge branch 'collectd-4.8' into collectd-4.9
Florian Forster [Mon, 4 Jan 2010 22:52:54 +0000 (23:52 +0100)]
rrdtool plugin: Correctly initialize the ->random_variation member.
This lead to huge negative values in that member, causing values to be only
written to upon exit. D'oh!
plazmus [Thu, 31 Dec 2009 09:00:25 +0000 (10:00 +0100)]
apache plugin: Fix a segmentation fault in the config handling of VerifyPeer / VerifyHost.
Hello,
Today I upgraded a machine from 4.5.2 to 4.9.0. Everything went fine, but
the new version segfaults immediately at startup. With some help from gdb
I tracked down the problem to the apache module. It will occur if one
tries to use the VerifyPeer/VerifyHost options (I guess few people use
these as I don't see complaints?)
When the plugin attempts to read the value of a boolean option, instead of
using the pre-parsed int value, it misdetects the type of the option
(seems a mechanical mistake) and tries to use the string pointer, which is
actually NULL.
I'm sending a patch, it's actually shorter than the description ;)
Thanks to all developers and maintainers of collectd for working on it.
Have a nice holidays.
Sebastian Harl [Sun, 27 Dec 2009 01:34:56 +0000 (02:34 +0100)]
Monitorus.pm: Put the plugin into the "Collectd::Plugins" namespace.
… rather than "Collectd::Plugin".
Sebastian Harl [Sun, 27 Dec 2009 01:34:10 +0000 (02:34 +0100)]
bindings/Makefile: Added Monitorus.pm to EXTRA_DIST.
Sebastian Harl [Sun, 27 Dec 2009 01:00:44 +0000 (02:00 +0100)]
src/collectd.conf: Added missing plugins and config options.
Sebastian Harl [Sun, 27 Dec 2009 00:14:29 +0000 (01:14 +0100)]
collectd.conf: Added "LoadPlugin Monitorus/OpenVZ" in the "perl" config.
Sebastian Harl [Sat, 26 Dec 2009 23:59:26 +0000 (00:59 +0100)]
README: Added missing plugins.
Florian Forster [Fri, 25 Dec 2009 22:53:11 +0000 (23:53 +0100)]
src/collectd.conf.in: Added an example config for the python plugin.
Florian Forster [Fri, 25 Dec 2009 22:52:56 +0000 (23:52 +0100)]
src/collectd.conf.in: Added an example config for the netapp plugin.