Mike Flisher [Sun, 22 May 2011 15:39:29 +0000 (17:39 +0200)]
Various plugins: Set the cURL option "CURLOPT_NOSIGNAL".
This fixes problems with version 7.21.2 (and later) of libcurl that are due to
collectd being a multi-threaded program.
Signed-off-by: Florian Forster <octo@collectd.org>
Rafal Lesniak [Fri, 13 May 2011 15:15:54 +0000 (17:15 +0200)]
src/meta_data.c: Free a leaking mutex.
This problem primarily manifested on FreeBSD but may well effect other
systems as well.
Thanks to Tomas Krasnican for reporting this problem.
Signed-off-by: Florian Forster <octo@collectd.org>
Florian Forster [Mon, 9 May 2011 21:36:17 +0000 (23:36 +0200)]
df plugin: Improve error message.
Samuli Suominen [Mon, 28 Mar 2011 00:16:33 +0000 (02:16 +0200)]
notify_desktop plugin: Add compatibility code for libnotify 0.7.
The current code in src/notify_desktop.c is not compatible with the new
libnotify 0.7 API
This:
notification = notify_notification_new (summary, n->message, NULL, NULL);
Should now be:
notification = notify_notification_new (summary, n->message, NULL;
As in, one argument less for notify_notification_new.
But we can't just remove it or it'll break compability with libnotify
0.4.x and 0.5.x.
This piece of code sets dummy NOTIFY_CHECK_VERSION for libnotify-0.4.x,
because NOTIFY_CHECK_VERSION was added only in 0.5.x:
#ifndef NOTIFY_CHECK_VERSION
#define NOTIFY_CHECK_VERSION(x,y,z) 0
#endif
Then we can freely use NOTIFY_CHECK_VERSION, and it will work with all
of 0.4, 0.5 and 0.7 series:
#if NOTIFY_CHECK_VERSION (0, 7, 0)
do something cool
#endif
I'm attaching the working patch. It's been tested with all of the
mentioned versions, as well as it's in active use at Gentoo Linux.
Thanks, Samuli
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Sat, 26 Mar 2011 16:00:17 +0000 (09:00 -0700)]
Bump version to 4.10.3; Update ChangeLog.
Florian Forster [Sat, 26 Mar 2011 15:53:22 +0000 (08:53 -0700)]
Merge branch 'collectd-4.9' into collectd-4.10
Conflicts:
ChangeLog
version-gen.sh
Florian Forster [Fri, 25 Mar 2011 15:39:17 +0000 (08:39 -0700)]
Bump version to 4.9.5; Update ChangeLog.
Florian Forster [Sat, 19 Mar 2011 14:43:41 +0000 (15:43 +0100)]
libvirt plugin: Correctly check the status code of virDomainGetVcpus().
The status code is less than zero on failure and the number of vCPUs
otherwise. Thanks to "JLPC" for pointing this problem out.
Bruno Prémont [Fri, 18 Mar 2011 07:24:40 +0000 (08:24 +0100)]
Fix compilation error with plugin_register_shutdown
Compiling collectd-4.10.2 on an OpenSuSE 11.3 system causes the
following error:
snmp.c: In function ‘module_register’:
snmp.c:1620:3: error: passing argument 1 of ‘plugin_register_shutdown’ discards qualifiers from pointer target type
plugin.h:275:5: note: expected ‘char *’ but argument is of type ‘const char *’
Convert plugin_register_shutdown's name argument from 'char *' to
'const char *' in order to match the other plugin_register_*
functions.
Signed-off-by: Bruno Prémont <bonbons@linux-vserver.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Mon, 14 Mar 2011 19:06:53 +0000 (20:06 +0100)]
Merge branch 'collectd-4.9' into collectd-4.10
Gregory Szorc [Sat, 5 Mar 2011 06:25:45 +0000 (22:25 -0800)]
dispatch proper values in Python write plugin
Fixes the Python write callback so the appropriate value is dispatched to
Python. Previously, the code only looked at the first element of a data set
to determine which value type (GAUGE, COUNTER, etc) to dispatch. If your data
set consisted of multiple values of different types, then the Python write
plugin was receiving bad values for the elements at position n > 0 whose type
was not the same as that at position 0.
Florian Forster [Tue, 8 Mar 2011 08:36:13 +0000 (09:36 +0100)]
processes plugin: Call kvm_close() after kvm_geterr().
Sebastian Harl [Tue, 22 Feb 2011 09:17:46 +0000 (10:17 +0100)]
collectd.conf(5): Mention MySQL privileges required for repl stats.
Sebastian Harl [Tue, 7 Sep 2010 20:03:54 +0000 (22:03 +0200)]
collectd.conf(5): Be more verbose about how to access a notification daemon.
Sebastian Harl [Tue, 7 Sep 2010 19:45:44 +0000 (21:45 +0200)]
filter_chain: Use a complaint to report plugin_write()'s ENOENT error.
In most cases this is a permanent error, so using the complain mechanism
avoids spamming the logs.
Florian Forster [Wed, 9 Feb 2011 06:28:03 +0000 (07:28 +0100)]
src/plugin.c: Print a more verbose error message if lt_dlopen() fails.
Since the Debian package doesn't depend on the libraries used by the
collectd plugins, some plugins may fail to load. ltdl reports this with
the very confusing error message "file not found". Since the plugin is
in fact available, many users don't realize a dependency is missing and
assume collectd is looking in the wrong directory -- and they are hardly
to blame for this.
This commit introduces a lengthy error message which hopefully points
users into the right direction.
Florian Forster [Mon, 7 Feb 2011 07:47:18 +0000 (08:47 +0100)]
Merge branch 'collectd-4.9' into collectd-4.10
Florian Forster [Mon, 7 Feb 2011 07:31:37 +0000 (08:31 +0100)]
exec plugin: Remove useless preprocessor stuff.
Florian Forster [Fri, 28 Jan 2011 08:18:16 +0000 (09:18 +0100)]
ntpd plugin: Report failures of "ntpd_do_query" as *errors*, not debug messages.
Florian Forster [Thu, 13 Jan 2011 07:57:24 +0000 (08:57 +0100)]
src/utils_threshold.c: Fix creation of percentage notifications.
Joey Hess has reported a problem when creating notifications from
percentage thresholds. Because the (percentage) minimum value is
compared to the (raw) DS value, the following message is possible:
Message: Host XXX, plugin df type df (instance root): Data source
"free" is currently
1773072384.000000. That is above the warning
threshold of nan%.
A new section will handle this case correctly. In the inverted case, the
problem should not exist.
Florian Forster [Tue, 4 Jan 2011 11:41:51 +0000 (12:41 +0100)]
Merge branch 'collectd-4.9' into collectd-4.10
Florian Forster [Tue, 4 Jan 2011 11:39:22 +0000 (12:39 +0100)]
dns plugin: Include <pcap-bpf.h> if available.
Florian Forster [Thu, 30 Dec 2010 07:10:15 +0000 (08:10 +0100)]
java plugin: Improve an error message.
Florian Forster [Thu, 16 Dec 2010 00:26:50 +0000 (01:26 +0100)]
README: Document the version of libmodbus used and update URL.
Florian Forster [Wed, 15 Dec 2010 14:56:14 +0000 (15:56 +0100)]
modbus plugin: Restore compatibility to libmodbus 2.0.3.
This is the current "stable" version.
Florian Forster [Mon, 13 Dec 2010 08:45:44 +0000 (09:45 +0100)]
curl_json plugin: Fix handling of arrays.
Florian Forster [Mon, 6 Dec 2010 08:31:15 +0000 (09:31 +0100)]
Merge branch 'collectd-4.9' into collectd-4.10
Florian Forster [Sun, 5 Dec 2010 11:05:18 +0000 (12:05 +0100)]
src/common.c: parse_value: Fix assignment of derive and absolute values.
Florian Forster [Sat, 4 Dec 2010 08:30:47 +0000 (09:30 +0100)]
configure.in: Fix a typo in an AC_ARG_WITH description.
Florian Forster [Sun, 28 Nov 2010 07:36:39 +0000 (08:36 +0100)]
ChangeLog: Add missing line (copynpaste error).
Florian Forster [Sat, 27 Nov 2010 10:03:34 +0000 (11:03 +0100)]
Bump version to 4.10.2; Update ChangeLog.
Florian Forster [Sat, 27 Nov 2010 10:00:29 +0000 (11:00 +0100)]
Merge branch 'collectd-4.9' into collectd-4.10
Conflicts:
ChangeLog
src/collectd.conf.pod
version-gen.sh
Florian Forster [Sat, 27 Nov 2010 09:55:47 +0000 (10:55 +0100)]
Bump version to 4.9.4; Update ChangeLog.
Florian Forster [Thu, 25 Nov 2010 10:51:17 +0000 (11:51 +0100)]
Merge remote branch 'trenkel/collectd-4.9' into collectd-4.9
Sven Trenkel [Thu, 25 Nov 2010 09:56:30 +0000 (10:56 +0100)]
netapp: Fixed incompatible changes between NetApp Release 7.2 and 7.3 that prevented collecting SIS data
Florian Forster [Tue, 23 Nov 2010 17:45:49 +0000 (18:45 +0100)]
swap plugin: Fix a bug collecting swap I/O.
Florian Forster [Tue, 16 Nov 2010 11:20:18 +0000 (12:20 +0100)]
Merge remote branch 'trenkel/collectd-4.9' into collectd-4.9
Sven Trenkel [Tue, 16 Nov 2010 11:11:45 +0000 (12:11 +0100)]
Fixed RedHat init script to shut down collectd on reboot/halt.
Florian Forster [Sun, 14 Nov 2010 09:52:13 +0000 (10:52 +0100)]
collectd.conf(5): Document the dangers of messing with the interval setting.
Florian Forster [Fri, 12 Nov 2010 07:13:42 +0000 (08:13 +0100)]
processes plugin: Don't complain about a failed open(/proc/$PID/cmdline)
... if the error is ENOENT. This merely means we were too slow and that
we can safely ignore the process.
Florian Forster [Thu, 11 Nov 2010 13:20:58 +0000 (14:20 +0100)]
src/utils_rrdcreate.c: Remove a too strict assertion.
We don't actually check anywhere that vl->time is greater than 10, so we
cannot assure this.
Florian Forster [Sat, 6 Nov 2010 11:08:20 +0000 (12:08 +0100)]
Merge branch 'collectd-4.9' into collectd-4.10
Conflicts:
src/collectd.conf.in
src/python.c
Florian Forster [Sat, 6 Nov 2010 08:58:57 +0000 (09:58 +0100)]
README: Add libperfstat as an optional dependency.
Sven Trenkel [Mon, 11 Oct 2010 11:35:39 +0000 (13:35 +0200)]
netapp plugin: Fixed a bug that prevented the configured interval to be passed on to the dispatch function.
Florian Forster [Wed, 6 Oct 2010 08:11:10 +0000 (10:11 +0200)]
Merge remote branch 'trenkel/collectd-4.10' into collectd-4.10
Sven Trenkel [Mon, 4 Oct 2010 23:26:22 +0000 (01:26 +0200)]
Fixed epic documentation fail. Python3 and meta-data support was added with 4.10 but is still listed as missing.
Sven Trenkel [Fri, 1 Oct 2010 00:41:38 +0000 (02:41 +0200)]
Add sys.argv. Not too many programs consider the possibility that it might not exist resulting in unhandled exceptions.
Sven Trenkel [Thu, 30 Sep 2010 10:59:21 +0000 (12:59 +0200)]
Fixed possible memory leak in case of broken match_value configs.
Florian Forster [Thu, 30 Sep 2010 07:23:22 +0000 (09:23 +0200)]
src/types.db: Remove unused type "pinba_view".
Florian Forster [Wed, 29 Sep 2010 15:56:58 +0000 (17:56 +0200)]
src/utils_cache.c: Replace a left-over hard-coded default of "2" with "timeout_g".
Florian Forster [Fri, 24 Sep 2010 09:52:52 +0000 (11:52 +0200)]
curl_json plugin: Restore struct when handling error.
Florian Forster [Wed, 15 Sep 2010 15:21:40 +0000 (17:21 +0200)]
src/collectd.h: Do not include <sensors/sensors.h> here.
Aurelien Reynaud [Sat, 19 Jun 2010 18:03:52 +0000 (20:03 +0200)]
Fix errno thread-safety under AIX
Unlike Linux or Solaris, errno under AIX is not thread-safe by
default.
This patch sets _THREAD_SAFE_ERRNO when AIX is detected in order to
force the thread-safe implementation of errno. Without this, calls
like stat() in the rrdtool plugin fail with errno incorrectly set,
leading to the inability to create previously absent rrd files.
Maybe _THREAD_SAFE should be set instead, to prevent other possible
threads-related problems, but this is enough to scratch my current
itch...
Here is the relevant part of /usr/include/errno.h on AIX:
#if defined(_THREAD_SAFE) || defined(_THREAD_SAFE_ERRNO)
/*
* Per thread errno is provided by the threads provider. Both the extern
* int
* and the per thread value must be maintained by the threads library.
*/
extern int *_Errno( void );
#define errno (*_Errno())
#else
extern int errno;
#endif /* _THREAD_SAFE || _THREAD_SAFE_ERRNO */
Signed-off-by: Aurelien Reynaud <collectd@wattapower.net>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Sun, 5 Sep 2010 08:12:02 +0000 (10:12 +0200)]
collection3: Add graph for "ps_disk_octets".
Florian Forster [Sun, 5 Sep 2010 07:42:40 +0000 (09:42 +0200)]
notify_email plugin: Check for "session == NULL" and return gracefully.
I don't know how libesmtp handles NULL pointers and I don't want to take
my chances.
Florian Forster [Sun, 5 Sep 2010 07:36:55 +0000 (09:36 +0200)]
notify_email plugin: Serialize all accesses to libesmtp using a mutex.
Jerome Oufella [Wed, 1 Sep 2010 18:35:58 +0000 (14:35 -0400)]
collection3: fix multiple hosts selection issue
When selecting multiple hosts in collection3's hosts list, and with some
plugins only (the ones that use a specific resource name such as memory
or tcpconns), the resulting graph list will be limited to one single
graph (instead of one per host).
This patch addresses this issue by modifying the name of the hash key
in the group_files_by_plugin_instance function, making it less prone
to name collisions by prefixing it by the host name.
Comments and enhancements will be welcome.
Signed-off-by: Jerome Oufella <jerome.oufella@savoirfairelinux.com>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Wed, 1 Sep 2010 18:36:40 +0000 (20:36 +0200)]
network plugin: Use the complain mechanism to inform the user about ignored signatures.
Sebastian Harl [Mon, 23 Aug 2010 17:02:06 +0000 (19:02 +0200)]
src/utils_tail: Remove newline characters at the end of a line.
The tool is supposed to work line-based, so a) the newline character is
implicit and b) imho, does not belong to the string which is then further
processed.
Also, this allows '$' to match the end of a line when applying a regex to the
line, no matter if the REG_NEWLINE flag has been used when compiling the regex
or not.
Sebastian Harl [Mon, 23 Aug 2010 16:56:02 +0000 (18:56 +0200)]
utils_match: Let '^' and '$' affect lines rather than the full string.
The regcomp() flag REG_NEWLINE is required for that, even though regex(7)
might make people think otherwise.
Florian Forster [Fri, 20 Aug 2010 06:22:00 +0000 (08:22 +0200)]
src/collectd.conf.in: Move "TimeToLive" before the "Server" and "Listen" statements.
Thanks to Renaud Chaput for pointing this out!
Florian Forster [Thu, 19 Aug 2010 13:02:41 +0000 (15:02 +0200)]
Merge branch 'collectd-4.9' into collectd-4.10
Florian Forster [Thu, 19 Aug 2010 13:00:26 +0000 (15:00 +0200)]
src/utils_heap.c: Fix calculation of the parent's index.
This resulted in the "upwards" reheap function to return prematurely,
leaving the heap condition violated.
Florian Forster [Tue, 17 Aug 2010 16:53:29 +0000 (18:53 +0200)]
Merge branch 'collectd-4.9' into collectd-4.10
Florian Forster [Tue, 17 Aug 2010 16:52:36 +0000 (18:52 +0200)]
src/plugin.c: Improve an info message.
Based on a patch by Sebastian, which didn't use the handy "FORMAT_VL"
macro.
Florian Forster [Tue, 17 Aug 2010 06:07:35 +0000 (08:07 +0200)]
collectd.conf(5): Document he "Derive*" and "AbsoluteSet" DSTypes of the tail plugin.
Florian Forster [Tue, 17 Aug 2010 06:05:38 +0000 (08:05 +0200)]
src/utils_match.c: Use strtoull(3) for counter and absolute data sources.
Florian Forster [Mon, 16 Aug 2010 08:32:27 +0000 (10:32 +0200)]
src/utils_match.h: Fix a bug preventing derive values from being handled correctly.
Due to the bit-wise check, the value for derive (0x30) matches the check
for gauge (0x10), too. This commit fixes the behavior by assigning other
numeric values to the defines.
Florian Forster [Fri, 13 Aug 2010 21:15:48 +0000 (23:15 +0200)]
src/configfile.c: Continue parsing config files if stat'ing one file fails.
Florian Forster [Sun, 8 Aug 2010 08:59:15 +0000 (10:59 +0200)]
curl json: Fix checking the response code.
Garret Heaton [Tue, 20 Jul 2010 01:56:31 +0000 (18:56 -0700)]
Fix incorrect error logging.
Was calling sys.stderror instead of sys.stderr.
Florian Forster [Wed, 4 Aug 2010 12:40:04 +0000 (14:40 +0200)]
curl_json plugin: Use a more descriptive define as return value.
Sebastian Harl [Wed, 28 Jul 2010 20:42:48 +0000 (22:42 +0200)]
collectd-perl(5): Mention that "Globals" should be enabled.
Sebastian Harl [Wed, 28 Jul 2010 20:42:23 +0000 (22:42 +0200)]
collectd.conf(5): Documents LoadPlugin's "Globals" option.
Florian Forster [Tue, 13 Jul 2010 11:58:34 +0000 (13:58 +0200)]
curl_json plugin: Use the "number" callback of libyajl.
The "integer" callback only works with "long"s, which are 32bit on
x86 and other 32bit architectures. The "number" callback gets the raw
string for us to parse ourselves – honoring the data source type in the
process.
The "integer" and "double" callbacks have been removed, since they are not
used if the "number" callback is present.
Florian Forster [Fri, 9 Jul 2010 10:01:28 +0000 (12:01 +0200)]
Bumped version to 4.10.1; Updated ChangeLog.
Florian Forster [Fri, 9 Jul 2010 09:58:28 +0000 (11:58 +0200)]
swap plugin: Multiply swap sizes by 1024.
This fixes a regression introduced in
6a3935d.
Florian Forster [Fri, 9 Jul 2010 09:49:31 +0000 (11:49 +0200)]
Merge branch 'collectd-4.9' into collectd-4.10
Conflicts:
ChangeLog
version-gen.sh
Florian Forster [Fri, 9 Jul 2010 09:47:07 +0000 (11:47 +0200)]
ChangeLog: Fix the release date for 4.9.3.
Florian Forster [Fri, 9 Jul 2010 09:39:08 +0000 (11:39 +0200)]
Bumped version to 4.9.3; Updated ChangeLog.
Florian Forster [Tue, 6 Jul 2010 11:00:32 +0000 (13:00 +0200)]
src/plugin.c: Check "read_loop" when returning from "pthread_cond_timedwait".
Otherwise it may take up to $Interval seconds until all read threads
shut down. This bug was introduced in version 4.8.4 (commit
dbe1a7d).
Florian Forster [Mon, 28 Jun 2010 15:52:19 +0000 (17:52 +0200)]
Remove usage of obsoleted XSI extensions wrt. the "test" command.
Alexander Wuerstlein [Mon, 28 Jun 2010 07:57:02 +0000 (09:57 +0200)]
Fix usage of Solaris /usr/bin/echo
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Mon, 28 Jun 2010 08:01:39 +0000 (10:01 +0200)]
df plugin: Remove the complaint code again.
Calls to the plugin are delayed when an error is returned anyway, so it's
better to have an error message in addition to the "has failed, will suspend"
message generated in src/plugin.c.
Florian Forster [Mon, 28 Jun 2010 07:25:58 +0000 (09:25 +0200)]
df plugin: Report an error if "cu_mount_getlist" fails.
Florian Forster [Thu, 24 Jun 2010 14:08:43 +0000 (16:08 +0200)]
collection3: df_complex graph: Add "reserved" space.
Florian Forster [Thu, 24 Jun 2010 14:05:53 +0000 (16:05 +0200)]
collection3: Add Windows data sources to the "memory" graph.
Florian Forster [Thu, 24 Jun 2010 14:05:21 +0000 (16:05 +0200)]
collection3: Add graphs for "bitrate", "signal_power", "signal_quality", and "snr".
Florian Forster [Sun, 20 Jun 2010 16:02:39 +0000 (18:02 +0200)]
Merge remote branch 'trenkel/collectd-4.10' into collectd-4.10
Florian Forster [Wed, 9 Jun 2010 11:10:52 +0000 (13:10 +0200)]
src/common.h: Add some documentation for "strtoderive".
Florian Forster [Wed, 9 Jun 2010 11:10:18 +0000 (13:10 +0200)]
swap plugin: Use "strtoderive" to parse strings.
Florian Forster [Wed, 16 Jun 2010 13:36:44 +0000 (15:36 +0200)]
bindings/java/Makefile.am: Fix rebuilding of Java plugins.
Sven Trenkel [Wed, 16 Jun 2010 12:01:18 +0000 (14:01 +0200)]
python plugin: Switch back to calling the type object to create a new object like in collectd-4.9.
PyObject_New should not be used.
This should fix a compile problem with some versions of Python.
Florian Forster [Sun, 13 Jun 2010 19:44:09 +0000 (21:44 +0200)]
Merge branch 'collectd-4.9' into collectd-4.10
Florian Forster [Sun, 13 Jun 2010 13:50:48 +0000 (15:50 +0200)]
bind plugin: Fix building with --enable-standards.
Florian Forster [Wed, 9 Jun 2010 08:38:55 +0000 (10:38 +0200)]
Merge remote branch 'tokkee/sh/collectd-4.9' into collectd-4.9
Florian Forster [Wed, 9 Jun 2010 08:38:11 +0000 (10:38 +0200)]
contrib/GenericJMX.conf: Use the "jmx_memory" type.
Sebastian Harl [Mon, 7 Jun 2010 22:55:32 +0000 (00:55 +0200)]
collectd.conf(5): Fixed some typos.
Thanks to lintian for reporting one of them ;-)
Timur Kirilichev [Fri, 7 May 2010 02:31:26 +0000 (06:31 +0400)]
collectd2html.pl: Further improvements to the XHTML support.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
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>