Florian Forster [Sat, 22 Mar 2008 08:45:41 +0000 (09:45 +0100)]
src/utils_cache.c: Fix a bug that was introduced by the preceding merge.
Florian Forster [Sat, 22 Mar 2008 08:41:42 +0000 (09:41 +0100)]
Merge branch 'collectd-4.3'
Conflicts:
src/utils_cache.c
Florian Forster [Sat, 22 Mar 2008 08:40:00 +0000 (09:40 +0100)]
Merge branch 'collectd-4.2' into collectd-4.3
Sebastian Harl [Tue, 18 Mar 2008 11:35:08 +0000 (12:35 +0100)]
collectd(1): Document the supported signals.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Tue, 18 Mar 2008 11:34:17 +0000 (12:34 +0100)]
perl plugin: Fixed the "EnableDebugger after LoadPlugin" warning.
For some strange reason my original patch (perl plugin: Warn if
"EnableDebugger" has been used after "LoadPlugin".) has been applied at the
wrong position (it has been applied to perl_config_includedir() instead of
perl_config_enabledebugger() - I have absolutely no clue why though).
Also, the check for the precondition of this warning has been fixed. In some
cases aTHX does not seem to be set, even though the Perl interpreter has
already been initialized. Now, perl_threads is used to check for that
condition.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Thu, 20 Mar 2008 12:22:15 +0000 (13:22 +0100)]
configfile.c: Include more than one files in lexicographical order.
Using qsort() and strcmp() the list of files (after reading the contents
of a directory or expanding globs) is sorted before inclusion. As the
order of options in the config file matters this is more convenient.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Thu, 20 Mar 2008 10:03:32 +0000 (11:03 +0100)]
liboconfig/oconfig.c: Free all allocated memory in oconfig_free().
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Thu, 20 Mar 2008 10:02:06 +0000 (11:02 +0100)]
configfile.c: Abort if any config file could not be read.
So far, when including all files from some directory, errors while reading
any of those config files have been reported but otherwise ignored. So,
collectd would run with some potentially incomplete configuration which is
not what I would expect.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Thu, 20 Mar 2008 10:01:18 +0000 (11:01 +0100)]
configfile.c: Fixed a memory leak in cf_read_generic().
In case stat(2) failed, the memory allocated for the return value has not
been freed.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Thu, 20 Mar 2008 10:00:37 +0000 (11:00 +0100)]
configfile.c: Fixed a segfault after a parse error.
In cf_read_generic(), the parse result had not been checked to not be
NULL, which caused a segfault when trying to access any of its members.
Now, an error will be returned in that case.
Also, cf_ci_append_children() has been made more robust in that respect.
It now detects an empty source and does nothing in that case.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Sat, 22 Mar 2008 08:27:44 +0000 (09:27 +0100)]
AUTHORS: Speak about `plugins', not `modules'.
Also sorted the plugins and put them all before any other patches.
Florian Forster [Tue, 18 Mar 2008 09:19:43 +0000 (10:19 +0100)]
Merge branch 'pull/collectd-4.3' into collectd-4.3
Florian Forster [Tue, 18 Mar 2008 09:18:11 +0000 (10:18 +0100)]
src/utils_{cache,threshold}.c: Fix the concept of failed and missing values.
Apparently I was confused at the time - and still am ;)
Florian Forster [Mon, 17 Mar 2008 09:45:23 +0000 (10:45 +0100)]
Merge branch 'pull/collectd-4.3' into collectd-4.3
Florian Forster [Fri, 14 Mar 2008 13:30:02 +0000 (14:30 +0100)]
src/utils_cache.c: Fix the handling of `Persist'.
And reorganized/cleaned up the code a bit.
Florian Forster [Thu, 13 Mar 2008 17:19:48 +0000 (18:19 +0100)]
contrib/rrd_filter.px: Added the ability to add (empty) data sources.
Florian Forster [Thu, 13 Mar 2008 17:19:00 +0000 (18:19 +0100)]
src/{mbmon,plugin,unixsock}.c: Simple fixes for Solaris 5.8
Florian Forster [Thu, 13 Mar 2008 11:33:50 +0000 (12:33 +0100)]
contrib/rrd_filter.px: Added a scale and shift filter.
Florian Forster [Wed, 5 Mar 2008 13:15:02 +0000 (14:15 +0100)]
src/utils_threshold.c: Fix the configuration of {Failure,Warning}Max and inverted checking.
The first issue is a simple copy'n'paste error, the second a nasty oversight.
Florian Forster [Wed, 5 Mar 2008 09:03:18 +0000 (10:03 +0100)]
contrib/rrd_filter.px: Remove the (unused) Data::Dumper.
Florian Forster [Wed, 5 Mar 2008 08:44:24 +0000 (09:44 +0100)]
Bumped version to 4.3.1; Updated ChangeLog.
Florian Forster [Wed, 5 Mar 2008 08:43:21 +0000 (09:43 +0100)]
contrib/rrd_filter.px: Renamed the old `extractDS.px'.
It can do more than extracting DSes now.
Florian Forster [Wed, 5 Mar 2008 08:28:11 +0000 (09:28 +0100)]
network plugin: Use `sstrncpy' instead of `strncpy'.
This removes a few "buf[buflen - 1] = '\0';".
Florian Forster [Wed, 5 Mar 2008 08:27:28 +0000 (09:27 +0100)]
src/common.[ch]: Changed the signature of `sstrncpy' to match that of `strncpy'.
Florian Forster [Wed, 5 Mar 2008 08:16:16 +0000 (09:16 +0100)]
Merge branch 'collectd-4.2' into collectd-4.3
Conflicts:
ChangeLog
src/network.c
version-gen.sh
Florian Forster [Tue, 4 Mar 2008 13:43:40 +0000 (14:43 +0100)]
Bumped version to 4.2.5; Updated ChangeLog.
Florian Forster [Tue, 4 Mar 2008 13:36:14 +0000 (14:36 +0100)]
configure.in: Fix a typo.
Florian Forster [Tue, 4 Mar 2008 13:35:07 +0000 (14:35 +0100)]
network plugin: Tested and fixed the receiving part on Sparc.
Florian Forster [Tue, 4 Mar 2008 10:09:07 +0000 (11:09 +0100)]
network plugin: Use `memcpy' when parsing packages, too.
This should prevent crashes due to unaligned memory access when running as
server.
Florian Forster [Tue, 4 Mar 2008 08:36:42 +0000 (09:36 +0100)]
ChangeLog: Wrote an entry for 4.2.5.
Florian Forster [Thu, 28 Feb 2008 22:06:26 +0000 (23:06 +0100)]
Merge branch 'collectd-4.3'
Florian Forster [Thu, 28 Feb 2008 22:06:16 +0000 (23:06 +0100)]
Merge branch 'collectd-4.2' into collectd-4.3
Sebastian Harl [Thu, 28 Feb 2008 17:33:06 +0000 (18:33 +0100)]
Collectd::Unixsock, cussh.pl: Added support for the "flush" command.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Thu, 28 Feb 2008 18:54:55 +0000 (19:54 +0100)]
src/common.c: Use uint8_t's instead of (signed) char's.
Florian Forster [Thu, 28 Feb 2008 14:15:53 +0000 (15:15 +0100)]
src/common.[ch]: Implemented `htond' and `ntohd' and applied it to the network plugin.
The functions convert doubles to the x86 representation or from the x86
representation to the representation used on the host. On x86 systems, this is
a NOP.
Florian Forster [Thu, 28 Feb 2008 13:23:27 +0000 (14:23 +0100)]
configure.in: Added checks to find out how doubles are stored.
Florian Forster [Wed, 27 Feb 2008 22:22:36 +0000 (23:22 +0100)]
src/utils_cmd_flush.c: Allow two options: `plugin' and `timeout'
Both options are optional. The meaning of `timeout' is the same, but must now
be prepended with `timeout='. The new `plugin=' option allows the user to
select only specific plugins to flush.
Florian Forster [Wed, 27 Feb 2008 21:50:22 +0000 (22:50 +0100)]
Merge branch 'master' of octo@verplant.org:/var/lib/git/collectd
Sebastian Harl [Wed, 27 Feb 2008 20:58:45 +0000 (21:58 +0100)]
collectd.c: Check for errors in sigaction().
Terminate collectd if sigaction() fails which should not happen anyway.
While I was at it, I renamed the signal handler functions and the sigaction
structs to follow the coding style used everywhere else in collectd.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Wed, 27 Feb 2008 20:57:37 +0000 (21:57 +0100)]
unixsock plugin, utils_cmd_flush: Implemented the "flush" command.
This command flushes all cached data using plugin_flush_all(). An optional
timeout may be specified as an argument.
A new module "utils_cmd_flush" has been added for this purpose.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Wed, 27 Feb 2008 20:56:32 +0000 (21:56 +0100)]
rrdtool plugin: Get the cache lock before checking for a nonexistent cache.
This should not make any difference, but, in theory, this is a semantical
error, so, let's just fix it :-)
Thanks to Stefan Völkel for pointing this out.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Wed, 27 Feb 2008 14:33:57 +0000 (15:33 +0100)]
Merge branch 'collectd-4.3'
Florian Forster [Wed, 27 Feb 2008 14:33:45 +0000 (15:33 +0100)]
Merge branch 'collectd-4.2' into collectd-4.3
Florian Forster [Wed, 27 Feb 2008 11:20:42 +0000 (12:20 +0100)]
src/utils_cache.c: Fix SPARC alignment problems.
Florian octo Forster [Wed, 27 Feb 2008 09:24:03 +0000 (10:24 +0100)]
Merge branch 'pull/master'
Florian octo Forster [Wed, 27 Feb 2008 09:22:19 +0000 (10:22 +0100)]
network plugin: Align write access to the send buffer.
SPARC and possibly other architectures cannot access arbitrary memory
locations. This caused a `bus error' on SPARC when the network plugin was
loaded. This change hopefully fixes this problem.
Florian Forster [Wed, 27 Feb 2008 09:21:00 +0000 (10:21 +0100)]
src/Makefile.am: Added dependencies on `utils_cmd_putnotif.[ch]' to the exec plugin.
Florian Forster [Wed, 27 Feb 2008 09:17:01 +0000 (10:17 +0100)]
src/utils_cmd_{putnotif,putval}.h: Don't include `plugin.h' without a reason.
Florian Forster [Wed, 27 Feb 2008 09:16:31 +0000 (10:16 +0100)]
src/utils_cmd_getval.[ch]: Moved the `getval' command out of the unixsock plugin.
Florian Forster [Wed, 27 Feb 2008 09:08:54 +0000 (10:08 +0100)]
unixsock plugin: us_handle_getval: Changed the function to use the global cache rather than the local one.
Florian Forster [Wed, 27 Feb 2008 09:07:57 +0000 (10:07 +0100)]
src/utils_cache.[ch]: Implemented `uc_get_rate_by_name'.
This functions allows to get values from the cache without creating a
`value_list_t' and `data_set_t' first. The existing function `uc_get_rate' has
been changed to use this function, too.
Florian Forster [Wed, 27 Feb 2008 08:29:17 +0000 (09:29 +0100)]
network plugin: Add a `flush' callback.
Florian Forster [Wed, 27 Feb 2008 07:33:48 +0000 (08:33 +0100)]
src/plugin.[ch]: Implemented `plugin_flush_one' which flushes only one specific plugin.
Sebastian Harl [Tue, 26 Feb 2008 17:15:28 +0000 (18:15 +0100)]
rrdtool plugin: Added a flush callback.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Tue, 26 Feb 2008 17:12:07 +0000 (18:12 +0100)]
collectd, plugin: Added support for "flush" callbacks.
A flush callback may be provided to make it possible to flush internal caches
(e.g. the rrdtool plugin's data cache) from outside the plugin. On SIGUSR1,
flush callback is invoked for all plugins. As flushing large amounts of data
might take some time a new thread is started to handle the request
asynchronously.
Thanks to Stefan Völkel for proposing this.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Wed, 27 Feb 2008 07:10:08 +0000 (08:10 +0100)]
Merge branch 'collectd-4.3'
Florian Forster [Wed, 27 Feb 2008 07:09:18 +0000 (08:09 +0100)]
Merge branch 'collectd-4.2' into collectd-4.3
Rob Lensen [Wed, 27 Feb 2008 07:04:57 +0000 (08:04 +0100)]
tcpconns plugin: Fix for compilation under FreeBSD.
Florian octo Forster [Tue, 26 Feb 2008 11:22:15 +0000 (12:22 +0100)]
src/collectd.c: Add the `-t' and `-h' switches to the usage information.
Stefan Völkel [Mon, 25 Feb 2008 19:14:19 +0000 (20:14 +0100)]
rrdtool plugin: Simplified heartbeat calculation
Looks simpler, should do the same.
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Tue, 19 Feb 2008 11:24:53 +0000 (12:24 +0100)]
hddtemp plugin: Use SCSI_DISK8_MAJOR thru SCSI_DISK15_MAJOR only if available.
Some Linux versions don't seem to provide the major numbers 8 thru 15.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Mon, 25 Feb 2008 09:34:01 +0000 (10:34 +0100)]
src/utils_match.[ch]: Pass a list of up to 31 submatches to the callback.
Florian Forster [Mon, 25 Feb 2008 07:30:28 +0000 (08:30 +0100)]
Merge branch 'collectd-4.3'
Florian Forster [Mon, 25 Feb 2008 07:30:10 +0000 (08:30 +0100)]
Merge branch 'collectd-4.2' into collectd-4.3
Sebastian Harl [Sun, 24 Feb 2008 17:25:14 +0000 (18:25 +0100)]
ping plugin: Fixed a typo when setting the TTL.
PING_DEF_TIMEOUT used to be used instead of PING_OPT_TTL as option
argument of ping_setopt(). This caused really strange effects when pinging
hosts, like a failed assertion in ping_timeval_sub() in liboping
indicating a latency <= 0.
Thanks to Romain Francoise for pointing this out and a lot of helpful
debugging information.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Sun, 24 Feb 2008 11:17:24 +0000 (12:17 +0100)]
exec plugin: Don't pass an invalid egid to setgroups() if no group was given.
In case that no group has been specified in the config file, egid = -1 used to
be passed to setgroups() which, obviously, is not what we want.
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Sebastian Harl [Mon, 25 Feb 2008 07:28:39 +0000 (08:28 +0100)]
perl plugin: Warn if "EnableDebugger" has been used after "LoadPlugin".
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Sun, 24 Feb 2008 16:45:04 +0000 (17:45 +0100)]
configure.in: Add the `tail' plugin to list of plugins.
Florian Forster [Sun, 24 Feb 2008 14:43:14 +0000 (15:43 +0100)]
Merge branch 'ff/tail'
Florian Forster [Sun, 24 Feb 2008 14:43:07 +0000 (15:43 +0100)]
src/types_list.c: Removed annoying debug messages.
Florian Forster [Sun, 24 Feb 2008 14:41:33 +0000 (15:41 +0100)]
src/utils_match.c: Added a debug message to print the received regex.
Escapes in the configfile made it interesting what string actually arrives at
the plugin.
Florian Forster [Sun, 24 Feb 2008 14:40:30 +0000 (15:40 +0100)]
src/utils_tail_match.c: Submit NAN if type if gauge and no values were matched.
Florian Forster [Sun, 24 Feb 2008 14:23:32 +0000 (15:23 +0100)]
tail plugin: Fix a typo in the name of the config keys.
Florian Forster [Sun, 24 Feb 2008 11:11:36 +0000 (12:11 +0100)]
tail plugin: Add a plugin to tail and parse logfiles.
Florian Forster [Sun, 24 Feb 2008 08:48:35 +0000 (09:48 +0100)]
Renamed: src/utils_logtail.[ch] -> src/utils_tail_match.[ch]
Florian Forster [Sat, 23 Feb 2008 18:51:59 +0000 (19:51 +0100)]
src/utils_match.[ch]: Improved the handling of gauge values.
They can not use the consolidation functions `AVERAGE', `MIN', `MAX' and `LAST'
just as you know them from RRDTool.
Florian Forster [Sat, 23 Feb 2008 18:27:12 +0000 (19:27 +0100)]
Merge branch 'ff/tail'
Florian Forster [Sat, 23 Feb 2008 18:26:28 +0000 (19:26 +0100)]
src/utils_match.c: Actually set `ds_type' in the object.
Also use the sub-match, not the overall match.
Florian Forster [Sat, 23 Feb 2008 18:25:27 +0000 (19:25 +0100)]
src/utils_logtail.c: Added another error message.
Florian Forster [Sat, 23 Feb 2008 18:25:03 +0000 (19:25 +0100)]
src/utils_tail.c: Added more error messages.
Florian Forster [Sat, 23 Feb 2008 16:30:34 +0000 (17:30 +0100)]
src/utils_logtail.h: Completed the documentation.
Florian Forster [Sat, 23 Feb 2008 16:08:57 +0000 (17:08 +0100)]
src/utils_logtail.[ch]: Implement a module that parses logfiles using the `utils_tail' and `utils_match' modules.
Florian Forster [Sat, 23 Feb 2008 14:44:27 +0000 (15:44 +0100)]
src/utils_match.[ch]: Add a module to automate regular expression matching on a string.
Florian Forster [Sat, 23 Feb 2008 12:16:44 +0000 (13:16 +0100)]
src/utils_logtail.c: Code cleanups.
Replaced the `DESTROY_INSTANCE' macro with the `destroy_instance' function.
Made the `logtail_read' easier to read.
Luke Heberling [Sat, 23 Feb 2008 11:37:48 +0000 (12:37 +0100)]
src/utils_logtail.[ch]: Add a module to provide facilities for logfile tailing.
Florian Forster [Sat, 23 Feb 2008 11:07:17 +0000 (12:07 +0100)]
Merge branch 'lh/tail'
Florian Forster [Sat, 23 Feb 2008 11:05:40 +0000 (12:05 +0100)]
src/utils_tail.[ch]: Streamlined error handling.
Also the coding style has been adapted to match the one of the rest of the
daemon better.
Florian Forster [Sat, 23 Feb 2008 09:58:09 +0000 (10:58 +0100)]
Merge branch 'collectd-4.2' into collectd-4.3
Florian Forster [Sat, 23 Feb 2008 09:58:00 +0000 (10:58 +0100)]
Merge branch 'collectd-4.1' into collectd-4.2
Florian Forster [Sat, 23 Feb 2008 09:56:37 +0000 (10:56 +0100)]
ping plugin: Deactivate the plugin if (pingobj == NULL).
If (pingobj == NULL), then the init-function will return (-1) so that the
plugin is deactivated.
Brian Micek [Sat, 23 Feb 2008 09:51:46 +0000 (10:51 +0100)]
src/collectd.c: Fix the arguments passed to an error message.
Unfortunately the compiler doesn't check va-args, so this was unnoticed :/
Florian Forster [Sat, 23 Feb 2008 09:48:19 +0000 (10:48 +0100)]
Merge branch 'collectd-4.2' of octo@verplant.org:/var/lib/git/collectd into collectd-4.2
Christophe Kalt [Sat, 23 Feb 2008 09:47:20 +0000 (10:47 +0100)]
swap plugin: Reapply a patch for Solaris.
This is a previously applied change that somehow got lost.
See http://git.verplant.org/?p=collectd.git;a=commitdiff;h=
ee1113650b0b565776fc3d62162d84741e234f05
and http://git.verplant.org/?p=collectd.git;a=commitdiff;h=
f68b68c5825efbd23c51531ff4e43c78a3bb2b3b
Florian Forster [Fri, 22 Feb 2008 16:24:23 +0000 (17:24 +0100)]
contrib/extractDS.px: Enhanced the script to modify RRD files a bit.
It can now also change the stepsize and add an RRA.
Luke Heberling [Fri, 22 Feb 2008 16:18:30 +0000 (17:18 +0100)]
src/utils_tail.[ch]: Added a generic interface for `tail'ing files.
This will be used to parse logfiles in the near future.
Florian Forster [Tue, 19 Feb 2008 18:06:13 +0000 (19:06 +0100)]
ChangeLog: Removed the legacy message about Nagios integration in the exec plugin.
Sebastian Harl [Tue, 19 Feb 2008 13:22:45 +0000 (14:22 +0100)]
README: Moved "libxml2" from the "Features" section to "Prerequisites".
D'oh!
Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
Florian Forster [Tue, 19 Feb 2008 13:00:37 +0000 (14:00 +0100)]
Merge branch 'pull/collectd-4.1' into collectd-4.1
Florian Forster [Tue, 19 Feb 2008 13:00:22 +0000 (14:00 +0100)]
src/collectd.c: Write a more informative error message if looking up the FQDN fails.
As requested by Micha Krause.
Florian Forster [Tue, 19 Feb 2008 12:55:32 +0000 (13:55 +0100)]
exec plugin: Use `setgroups' to set the list of supplementary group IDs.
Thanks to Peter Holik for suggesting this.